From e2c79cfb6f190aa457147f73137ba11c3d37dd6e Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Tue, 23 Sep 2025 09:07:21 +0100 Subject: [PATCH 1/2] MAINT: remove unused datasource This datasource is not in use so we can remove it --- .../grafana/templates/cloud_datasource.yaml.j2 | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 b/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 index e5f22ed5..42691e6c 100644 --- a/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 +++ b/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 @@ -47,19 +47,6 @@ datasources: secureJsonData: token: {{ weekly_reports_token }} - - name: WeeklyReportsInfluxDB-DW - type: influxdb - access: proxy - uid: "weekly-reports-dw" - url: "http://172.16.115.39:8086" - basicAuth: false - jsonData: - httpMode: POST - organization: cloud - version: Flux - secureJsonData: - token: {{ weekly_reports_token_dw }} - - name: Meerkat DB type: prometheus uid: "meerkat-db" From 36cd908fa69f07611c6b9843deac5f6c919a567e Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Tue, 23 Sep 2025 09:12:31 +0100 Subject: [PATCH 2/2] ENH: Add Harbor Prometheus Datasource Add datasource to store node exporter metrics so we can see historical usage off harbor --- .../roles/grafana/templates/cloud_datasource.yaml.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 b/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 index 42691e6c..9ae95624 100644 --- a/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 +++ b/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 @@ -93,3 +93,11 @@ datasources: basicAuthUser: {{ prod_chatops_prometheus_username }} secureJsonData: basicAuthPassword: {{ prod_chatops_prometheus_password }} + + - name: HarborPrometheus + type: prometheus + uid: "harbor-prometheus" + access: proxy + url: http://130.246.83.216:9090 + isDefault: false + basicAuth: false