From 6a42e0cecd2f73f325ad522f585eaa3e074fedc1 Mon Sep 17 00:00:00 2001
From: Evgeny L <eli@mirantis.com>
Date: Wed, 16 Jan 2019 20:04:58 +0000
Subject: [PATCH] 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
---
 .../osh-infra/osh-infra-dashboards/grafana.yaml    | 14 +++++++-------
 .../osh-infra/osh-infra-monitoring/prometheus.yaml |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml b/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
index 17dd92d06..968b05b52 100644
--- a/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
+++ b/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
@@ -68,12 +68,6 @@ metadata:
         path: .osh_infra.grafana.oslo_db
       dest:
         path: .values.endpoints.oslo_db.auth.user
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_infra_service_accounts
-        path: .osh_infra.prometheus.admin
-      dest:
-        path: .values.endpoints.monitoring.auth.admin
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_infra_service_accounts
@@ -94,6 +88,12 @@ metadata:
       dest:
         path: .values.endpoints.oslo_db_session.path
         pattern: DB_NAME
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: osh_infra_service_accounts
+        path: .osh_infra.prometheus.admin
+      dest:
+        path: .values.endpoints.monitoring.auth.user
 
     # Secrets
     - dest:
@@ -127,7 +127,7 @@ metadata:
         name: osh_infra_oslo_db_admin_password
         path: .
     - dest:
-        path: .values.endpoints.monitoring.auth.admin.password
+        path: .values.endpoints.monitoring.auth.user.password
       src:
         schema: deckhand/Passphrase/v1
         name: osh_infra_prometheus_admin_password
diff --git a/global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml b/global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml
index bfde817a9..2be75f150 100644
--- a/global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml
+++ b/global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml
@@ -50,11 +50,11 @@ metadata:
         name: osh_infra_service_accounts
         path: .osh_infra.prometheus.admin
       dest:
-        path: .values.endpoints.prometheus.auth.admin
+        path: .values.endpoints.monitoring.auth.admin
 
     # Secrets
     - dest:
-        path: .values.endpoints.prometheus.auth.admin.password
+        path: .values.endpoints.monitoring.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
         name: osh_infra_prometheus_admin_password