Merge pull request #196 from stfc/update_datasource

Doccument and naming changes

Author: khalford

grafana_monitoring/README.md

@@ -27,12 +27,12 @@ To replace the Aquilon configuration...
 6. Copy your SSL certificate with name format `<your-domain>.crt` to `roles/haproxy/files/` and make sure the key is prepended to the top.
 7. Run the ansible playbook
     ```shell
-    anisble-playbook run site.yaml --inventory staging/production
+    ansible-playbook site.yaml --inventory staging/production
     ```
 8. If you need to make changes to either the Grafana or HAProxy config you can run each role separately with their tags
     ```shell
-    anisble-playbook run site.yaml --inventory staging/production --tags grafana
+    ansible-playbook site.yaml --inventory staging/production --tags grafana
     # or
-    anisble-playbook run site.yaml --inventory staging/production --tags haproxy
+    ansible-playbook site.yaml --inventory staging/production --tags haproxy
     ```
 

grafana_monitoring/production

@@ -7,8 +7,8 @@ grafana_dashboards_branch="main"
 domain="grafana.nubes.rl.ac.uk"
 client_id=""
 client_secret=""
+weekly_reports_token=""
 weekly_reports_token_dw=""
-weekly_reports_token_kh=""
 prod_opensearch_password=""
 prod_influx_password=""
 prod_influx_username=""

grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2

@@ -33,10 +33,10 @@ datasources:
     secureJsonData:
       basicAuthPassword: {{ prod_opensearch_password }}
 
-  - name: WeeklyReportsInfluxDB-KH
+  - name: WeeklyReportsInfluxDB
     type: influxdb
     access: proxy
-    uid: "weekly-reports-kh"
+    uid: "weekly-reports"
     url: "https://172.16.114.22:8086"
     basicAuth: false
     jsonData:
@@ -46,7 +46,7 @@ datasources:
       organization: Cloud
       version: Flux
     secureJsonData:
-      token: {{ weekly_reports_token_kh }}
+      token: {{ weekly_reports_token }}
 
   - name: WeeklyReportsInfluxDB-DW
     type: influxdb

grafana_monitoring/staging

@@ -7,8 +7,8 @@ grafana_dashboards_branch="main"
 domain="dev-grafana.nubes.rl.ac.uk"
 client_id=""
 client_secret=""
+weekly_reports_token=""
 weekly_reports_token_dw=""
-weekly_reports_token_kh=""
 prod_opensearch_password=""
 prod_influx_password=""
 prod_influx_username=""