From 784cf9bda6823d6d2f6adc6fc6ed39c6234250ff Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Mar 24 2023 17:52:24 +0000 Subject: Fix db settings monitor_gating dashboard --- diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml b/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml index 9db2b7f..d4632a4 100644 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml +++ b/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml @@ -12,7 +12,7 @@ data: - name: Datanommer type: postgres url: db-datanommer01.iad2.fedoraproject.org:5432 - database: datanommer + database: datanommer2 user: datanommer_ro secureJsonData: password: {{ datanommer_ro_password }} @@ -24,10 +24,3 @@ data: connMaxLifetime: 14400 # Grafana v5.4+ postgresVersion: 1200 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10 timescaledb: false - - name: Promscale - type: prometheus - url: https://promscale.apps.ocp.ci.centos.org/ - access: proxy - basicAuth: false - withCredentials: false - isDefault: false diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml b/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml index 58082cf..8165b8e 100644 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml +++ b/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml @@ -6,10 +6,6 @@ metadata: name: monitor-dashboard spec: replicas: 1 - selector: - matchLabels: - app: monitor-dashboard - deploymentconfig: monitor-dashboard template: metadata: labels: @@ -58,11 +54,12 @@ spec: - name: 'GF_USERS_AUTO_ASSIGN_ORG_ROLE' value: 'Admin' - name: 'V' - value: '14' + value: '15' image: registry.hub.docker.com/grafana/grafana:latest name: dashboard ports: - containerPort: 3000 + volumeMounts: - mountPath: /etc/grafana/provisioning/datasources name: grafana-datasources - mountPath: /var/lib/grafana/dashboards