Browse Source

Fix prometheus and grafana password overrides

* prometheus - change `prometheus` subpath to `monitoring`
* grafana - path to prometheus credentials should be `user`
instead of `admin`

Change-Id: Iee014ce3ff4ee2ebb534003ce3f18ab8bcd63b9d
Evgeny L 3 months ago
parent
commit
6a42e0cecd

+ 7
- 7
global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml View File

@@ -68,12 +68,6 @@ metadata:
68 68
         path: .osh_infra.grafana.oslo_db
69 69
       dest:
70 70
         path: .values.endpoints.oslo_db.auth.user
71
-    - src:
72
-        schema: pegleg/AccountCatalogue/v1
73
-        name: osh_infra_service_accounts
74
-        path: .osh_infra.prometheus.admin
75
-      dest:
76
-        path: .values.endpoints.monitoring.auth.admin
77 71
     - src:
78 72
         schema: pegleg/AccountCatalogue/v1
79 73
         name: osh_infra_service_accounts
@@ -94,6 +88,12 @@ metadata:
94 88
       dest:
95 89
         path: .values.endpoints.oslo_db_session.path
96 90
         pattern: DB_NAME
91
+    - src:
92
+        schema: pegleg/AccountCatalogue/v1
93
+        name: osh_infra_service_accounts
94
+        path: .osh_infra.prometheus.admin
95
+      dest:
96
+        path: .values.endpoints.monitoring.auth.user
97 97
 
98 98
     # Secrets
99 99
     - dest:
@@ -127,7 +127,7 @@ metadata:
127 127
         name: osh_infra_oslo_db_admin_password
128 128
         path: .
129 129
     - dest:
130
-        path: .values.endpoints.monitoring.auth.admin.password
130
+        path: .values.endpoints.monitoring.auth.user.password
131 131
       src:
132 132
         schema: deckhand/Passphrase/v1
133 133
         name: osh_infra_prometheus_admin_password

+ 2
- 2
global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml View File

@@ -50,11 +50,11 @@ metadata:
50 50
         name: osh_infra_service_accounts
51 51
         path: .osh_infra.prometheus.admin
52 52
       dest:
53
-        path: .values.endpoints.prometheus.auth.admin
53
+        path: .values.endpoints.monitoring.auth.admin
54 54
 
55 55
     # Secrets
56 56
     - dest:
57
-        path: .values.endpoints.prometheus.auth.admin.password
57
+        path: .values.endpoints.monitoring.auth.admin.password
58 58
       src:
59 59
         schema: deckhand/Passphrase/v1
60 60
         name: osh_infra_prometheus_admin_password

Loading…
Cancel
Save