summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-17 17:45:10 +0000
committerGerrit Code Review <review@openstack.org>2019-01-17 17:45:10 +0000
commit31dfbac91d72dc98273024023f9f55eb62280cbe (patch)
tree9a64654a87e8b22683a645547f6372451e0b8131
parenta410d7686c41298383ec2db12f376ab4a1a923c3 (diff)
parent6a42e0cecd2f73f325ad522f585eaa3e074fedc1 (diff)
Merge "Fix prometheus and grafana password overrides"
-rw-r--r--global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml14
-rw-r--r--global/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml4
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 17dd92d..968b05b 100644
--- a/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
+++ b/global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
@@ -71,12 +71,6 @@ metadata:
71 - src: 71 - src:
72 schema: pegleg/AccountCatalogue/v1 72 schema: pegleg/AccountCatalogue/v1
73 name: osh_infra_service_accounts 73 name: osh_infra_service_accounts
74 path: .osh_infra.prometheus.admin
75 dest:
76 path: .values.endpoints.monitoring.auth.admin
77 - src:
78 schema: pegleg/AccountCatalogue/v1
79 name: osh_infra_service_accounts
80 path: .osh_infra.grafana.oslo_db.database 74 path: .osh_infra.grafana.oslo_db.database
81 dest: 75 dest:
82 path: .values.endpoints.oslo_db.path 76 path: .values.endpoints.oslo_db.path
@@ -94,6 +88,12 @@ metadata:
94 dest: 88 dest:
95 path: .values.endpoints.oslo_db_session.path 89 path: .values.endpoints.oslo_db_session.path
96 pattern: DB_NAME 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 # Secrets 98 # Secrets
99 - dest: 99 - dest:
@@ -127,7 +127,7 @@ metadata:
127 name: osh_infra_oslo_db_admin_password 127 name: osh_infra_oslo_db_admin_password
128 path: . 128 path: .
129 - dest: 129 - dest:
130 path: .values.endpoints.monitoring.auth.admin.password 130 path: .values.endpoints.monitoring.auth.user.password
131 src: 131 src:
132 schema: deckhand/Passphrase/v1 132 schema: deckhand/Passphrase/v1
133 name: osh_infra_prometheus_admin_password 133 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 bfde817..2be75f1 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:
50 name: osh_infra_service_accounts 50 name: osh_infra_service_accounts
51 path: .osh_infra.prometheus.admin 51 path: .osh_infra.prometheus.admin
52 dest: 52 dest:
53 path: .values.endpoints.prometheus.auth.admin 53 path: .values.endpoints.monitoring.auth.admin
54 54
55 # Secrets 55 # Secrets
56 - dest: 56 - dest:
57 path: .values.endpoints.prometheus.auth.admin.password 57 path: .values.endpoints.monitoring.auth.admin.password
58 src: 58 src:
59 schema: deckhand/Passphrase/v1 59 schema: deckhand/Passphrase/v1
60 name: osh_infra_prometheus_admin_password 60 name: osh_infra_prometheus_admin_password