ondemand grafana proxying now conditional on ondemand having groups defined

Author: wtripp180901

ansible/roles/kube_prometheus_stack/defaults/main/helm.yml

@@ -104,9 +104,9 @@ kube_prometheus_stack_release_defaults:
         searchNamespace: ALL
     grafana.ini:
       server:
-        domain: "{{ openondemand_servername }}"
-        root_url: "{{ grafana_url_openondemand_proxy }}"
-        serve_from_sub_path: true
+        domain: "{{ grafana_domain }}"
+        root_url: "{{ grafana_url }}"
+        serve_from_sub_path: "{{ grafana_serve_from_sub_path }}"
       auth: "{{ grafana_auth }}"
       auth.anonymous:
         enabled: "{{ grafana_auth_anonymous }}"

ansible/roles/kube_prometheus_stack/defaults/main/main.yml

@@ -12,9 +12,7 @@ kube_prometheus_stack_release_name: kube-prometheus-stack
 # The timeout to wait for the release to become ready
 kube_prometheus_stack_wait_timeout: 5m
 
-login_ip: "{{ hostvars[groups['openondemand'][0]]['ansible_host'] }}" # probably needs to be more robust
 control_ip: "{{ ansible_default_ipv4.address| default(ansible_all_ipv4_addresses[0]) }}"
-control_sslip: "{{ control_ip | regex_replace('\\.', '-') }}.sslip.io" 
 
 grafana_auth_anonymous: false
 

ansible/roles/kube_prometheus_stack/tasks/main.yml

@@ -33,7 +33,6 @@
         annotations:
           storageclass.kubernetes.io/is-default-class: "false"
 
-# variables would need refactoring to let us loop through the data directories nicely
 - name: Create Prometheus hostPath volume in /var/lib/state
   kubernetes.core.k8s:
     namespace: "{{ kube_prometheus_stack_release_namespace }}"
@@ -53,36 +52,38 @@
           path: "{{ prometheus_db_dir }}"
           type: DirectoryOrCreate
 
-# not looping through these because templating doesn't set ports as integer
-- name: Creating headless service for OOD exporter
-  kubernetes.core.k8s:
-    namespace: "{{ kube_prometheus_stack_release_namespace }}"
-    definition:
-      kind: Service
-      metadata:
-        name: ood-exporter
-      spec:
-        clusterIP: None
-        ports:
-        - name: ood-exporter
-          port: 9301
-          protocol: TCP
-
-- name: Binding OOD exporter service to host
-  kubernetes.core.k8s:
-    namespace: "{{ kube_prometheus_stack_release_namespace }}"
-    definition:
-      kind: Endpoints
-      metadata:
-        name: ood-exporter
-      subsets:
-        - addresses:
-            - ip: "{{ login_ip }}"
-          ports:
-            - port: 9301
-              name: ood-exporter
+- name: Setting up k3s services for OnDemand Exporter
+  when: groups['openondemand'] | count > 0
+  block:
+    - name: Creating headless service for OOD exporter
+      kubernetes.core.k8s:
+        namespace: "{{ kube_prometheus_stack_release_namespace }}"
+        definition:
+          kind: Service
+          metadata:
+            name: ood-exporter
+          spec:
+            clusterIP: None
+            ports:
+            - name: ood-exporter
+              port: 9301
               protocol: TCP
 
+    - name: Binding OOD exporter service to host
+      kubernetes.core.k8s:
+        namespace: "{{ kube_prometheus_stack_release_namespace }}"
+        definition:
+          kind: Endpoints
+          metadata:
+            name: ood-exporter
+          subsets:
+            - addresses:
+                - ip: "{{ openondemand_ip }}"
+              ports:
+                - port: 9301
+                  name: ood-exporter
+                  protocol: TCP
+
 - name: Creating headless service for slurm exporter
   kubernetes.core.k8s:
     namespace: "{{ kube_prometheus_stack_release_namespace }}"

environments/common/inventory/group_vars/all/defaults.yml

@@ -20,6 +20,9 @@ prometheus_address: "{{ hostvars[groups['prometheus'].0].api_address }}:{{ prome
 openondemand_address: "{{ hostvars[groups['openondemand'].0].api_address if groups['openondemand'] | count > 0 else '' }}"
 grafana_address: "{{ hostvars[groups['prometheus'].0].api_address }}"
 
+# Service IP addresses
+openondemand_ip: "{{ hostvars[groups['openondemand'].0].ansible_host if groups['openondemand'] else '' }}"
+
 ############################# bootstrap: local user configuration #########################
 
 # Note RockyLinux 8.5 defines system user/groups in range 201-999

environments/common/inventory/group_vars/all/grafana.yml

@@ -6,6 +6,8 @@ grafana_api_url: "http://{{ grafana_api_address }}:{{ grafana_port }}"
 grafana_url_direct: "http://{{ grafana_address }}:{{ grafana_port }}"
 grafana_url_openondemand_proxy: "https://{{ openondemand_servername | default('') }}/node/{{ groups['prometheus'].0 }}/{{ grafana_port }}"
 grafana_url: "{{ grafana_url_openondemand_proxy if groups['openondemand'] | count > 0 else grafana_url_direct }}"
+grafana_serve_from_sub_path: "{{ groups['openondemand'] | count > 0 }}"
+grafana_domain: "{{ ( openondemand_servername | default('') ) if groups['openondemand'] | count > 0 else grafana_api_address }}"
 
 grafana_dashboards_default:
   # node exporter slurm:

environments/common/inventory/group_vars/all/openondemand.yml

@@ -178,7 +178,7 @@ openondemand_scrape_configs:
     scrape_interval: 2m
     static_configs:
     - targets:
-      - "{{ login_ip }}:9301"
+      - "{{ openondemand_address }}:9301"
       labels:
         environment: "{{ appliances_environment_name }}"
         service: "openondemand"