doc changes + opensearch datasource now based on opensearch group

Author: wtripp180901

ansible/roles/kube_prometheus_stack/tasks/main.yml

@@ -166,7 +166,7 @@
         name: opensearch
       subsets:
         - addresses:
-            - ip: "{{ control_ip }}"
+            - ip: "{{ opensearch_ip }}"
           ports:
             - port: 9200
               name: opensearch

docs/monitoring-and-logging.md

@@ -3,7 +3,7 @@
 ## Components overview
 
 ### [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)
-An umbrella Helm chart which the appliance uses to deploy and manages containerised versions of Grafana and Prometheus.
+An umbrella Helm chart which the appliance uses to deploy and manages containerised versions of Prometheus, Grafana, Alertmanager and Node Exporter.
 
 ### [filebeat](https://www.elastic.co/beats/filebeat)
 

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

@@ -22,6 +22,7 @@ grafana_address: "{{ hostvars[groups['prometheus'].0].api_address }}"
 
 # Service IP addresses
 openondemand_ip: "{{ hostvars[groups['openondemand'].0].ansible_host if groups['openondemand'] else '' }}"
+opensearch_ip: "{{ hostvars[groups['opensearch'].0].ansible_host if groups['opensearch'] else '' }}"
 
 ############################# bootstrap: local user configuration #########################
 

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

@@ -49,7 +49,7 @@ grafana_datasources:
   - name: slurmstats
     # see https://github.com/grafana/opensearch-datasource#configure-the-data-source-with-provisioning
     type: grafana-opensearch-datasource
-    url: "https://{{ control_ip }}:9200"
+    url: "https://{{ opensearch_ip }}:9200"
     basicAuth: true
     basicAuthUser: admin
     secureJsonData: