Merge pull request #117 from oci-hpc/2.10.2.1_ds_monitoring

updated grafana install

Author: arnaudfroidmont

autoscaling/tf_init/bastion_update.tf

@@ -62,6 +62,7 @@ resource "local_file" "inventory" {
     instance_pool_ocpus=local.instance_pool_ocpus,
     queue=var.queue,
     instance_type=var.instance_type,
+    monitoring=var.monitoring,
     autoscaling_monitoring = var.autoscaling_monitoring,
     unsupported = var.unsupported,
     hyperthreading = var.hyperthreading,

autoscaling/tf_init/inventory.tpl

@@ -60,6 +60,7 @@ log_vol=${log_vol}
 ldap=${ldap}
 queue=${queue}
 instance_type=${instance_type}
+monitoring=${monitoring}
 hyperthreading=${hyperthreading}
 privilege_sudo=${privilege_sudo}
 privilege_group_name=${privilege_group_name}

conf/variables.tpl

@@ -116,6 +116,7 @@ variable "hyperthreading" { default = ##HT## }
 variable "unsupported" { default = ${unsupported} }
 variable "image_ocid" { default = "##IMAGE##" }
 variable "ldap" { default = ${ldap} }
+variable "monitoring" { default = ${monitoring} }
 variable "autoscaling_monitoring" { default = ${autoscaling_monitoring} }
 
 

playbooks/new_nodes.yml

@@ -203,6 +203,9 @@
     - include_role: 
         name: slurm
       when: slurm|default(false)|bool
+    - include_role: 
+        name: influxdb
+      when: monitoring|default(false)|bool
     - include_role: 
         name: telegraf
       when: monitoring|default(false)|bool

playbooks/resize_add.yml

@@ -205,6 +205,9 @@
     - include_role: 
         name: slurm
       when: slurm|default(false)|bool
+    - include_role: 
+        name: influxdb
+      when: monitoring|default(false)|bool
     - include_role: 
         name: telegraf
       when: monitoring|default(false)|bool

playbooks/roles/autoscaling_mon/tasks/el.yml

@@ -51,35 +51,9 @@
     sslcacert: /etc/pki/tls/certs/ca-bundle.crt
 
 - name: install grafana
-  vars: 
-    package_name: 
-      - grafana-8.5.21-1
-    package_state: present
   include_role: 
-    name: safe_yum
-
-- name: start grafana
-  become: true
-  service: 
-    name: grafana-server
-    state: restarted
-    enabled: true
-
-- name: Ensure grafana key directory exists
-  file:
-    path: "/etc/opt/oci-hpc/passwords/grafana"
-    state: directory
-  delegate_to: localhost
-
-- name: Check api key list
-  uri:
-    url: "{{ grafana_api_url }}/api/auth/keys"
-    user: "{{ grafana_security.admin_user }}"
-    password: "{{ grafana_security.admin_password }}"
-    force_basic_auth: true
-    return_content: true
-  no_log: false
-  register: existing_api_keys
+    name: grafana
+  when: not monitoring|default(false)|bool
 
 - name: install mysql-shell and connector
   vars: 

playbooks/roles/autoscaling_mon/tasks/ubuntu.yml

@@ -50,52 +50,10 @@
 #     sslverify: 1
 #     sslcacert: /etc/pki/tls/certs/ca-bundle.crt
 
-- name: Add grafana key
-  become: true
-  apt_key:
-    state: present
-    url: https://packages.grafana.com/gpg.key
-
-- name: Manage grafana APT repositories
-  become: true
-  apt_repository:
-    repo: deb https://packages.grafana.com/oss/deb stable main
-    state: present
-
 - name: install grafana
-  vars: 
-    package_name: 
-      - grafana-8.5.21-1
-    package_state: present
   include_role: 
-    name: safe_yum
-
-- name: start grafana
-  become: true
-  service: 
-    name: grafana-server
-    state: restarted
-    enabled: true
-
-- name: Ensure grafana key directory exists
-  file:
-    path: "/etc/opt/oci-hpc/passwords/grafana"
-    state: directory
-  delegate_to: localhost
-
-- name: Check api key list
-  uri:
-    url: "{{ grafana_api_url }}/api/auth/keys"
-    method: GET
-    user: "{{ grafana_security.admin_user }}"
-    password: "{{ grafana_security.admin_password }}"
-    force_basic_auth: true
-    return_content: true
-  no_log: false
-  register: existing_api_keys
-  retries: 5
-  delay: 5
-  until: existing_api_keys is not failed
+    name: grafana
+  when: not monitoring|default(false)|bool
 
 # - name: Import mysql-2022 key 
 #   become: true

playbooks/roles/grafana/tasks/el.yml

@@ -15,7 +15,7 @@
 - name: install grafana
   vars: 
     package_name: 
-      - grafana-8.5.21-1
+      - https://dl.grafana.com/oss/release/grafana-8.5.21-1.x86_64.rpm
     package_state: present
   include_role: 
     name: safe_yum

playbooks/roles/grafana/tasks/ubuntu.yml

@@ -18,20 +18,17 @@
     state: present
     url: https://packages.grafana.com/gpg.key
 
-- name: Manage grafana APT repositories
+- name: Download grafana 8.5.21 package
+  get_url:
+    url: https://dl.grafana.com/oss/release/grafana_8.5.21_amd64.deb
+    dest: /tmp/grafana_8.5.21_amd64.deb
+
+- name: Install grafana 8.5.21 package
   become: true
-  apt_repository:
-    repo: deb https://packages.grafana.com/oss/deb stable main
+  ansible.builtin.apt:
+    deb: /tmp/grafana_8.5.21_amd64.deb
     state: present
 
-- name: install grafana
-  vars: 
-    package_name: 
-      - grafana-8.5.21-1
-    package_state: present
-  include_role: 
-    name: safe_yum
-
 - name: start grafana
   become: true
   service: