From 643b09dd24619712f1adeaa0dbaf3b680ffb599d Mon Sep 17 00:00:00 2001
From: "kevin.wilder" <kevin.wilder@darkwolfsolutions.com>
Date: Mon, 27 Jun 2022 22:36:39 +0000
Subject: [PATCH] Fix vault prometheus monitoring
---
chart/templates/monitoring/values.yaml | 3 +++
chart/values.yaml | 4 ++--
docs/production.md | 7 ++++---
tests/test-values.yaml | 6 ++++--
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml
index 1f068dd3ef..1566787f49 100644
--- a/chart/templates/monitoring/values.yaml
+++ b/chart/templates/monitoring/values.yaml
@@ -133,6 +133,9 @@ redis:
vault:
enabled: {{ .Values.addons.vault.enabled }}
+vault:
+ enabled: {{ .Values.addons.vault.enabled }}
+ tlsDisable: {{ dig "global" "tlsDisable" true .Values.addons.vault.values }}
global:
imagePullSecrets:
diff --git a/chart/values.yaml b/chart/values.yaml
index 0a36443aa3..3c4bc207f6 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -578,7 +578,7 @@ monitoring:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
path: "./chart"
- tag: "35.5.1-bb.1"
+ tag: "35.5.1-bb.2"
# -- Flux reconciliation overrides specifically for the Monitoring Package
flux:
@@ -1343,7 +1343,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
path: "./chart"
- tag: "0.20.1-bb.0"
+ tag: "0.20.1-bb.1"
# -- Flux reconciliation overrides specifically for the Vault Package
flux: {}
diff --git a/docs/production.md b/docs/production.md
index 9d7a308625..9c572784b4 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -237,7 +237,6 @@ addons:
extraEnvironmentVars:
# the istio gateway domain
VAULT_API_ADDR: https://vault.bigbang.dev
- VAULT_ADDR: https://127.0.0.1:8200
VAULT_SKIP_VERIFY: "true"
VAULT_LOG_FORMAT: "json"
VAULT_LICENSE: "your-license-key-goes-here"
@@ -257,11 +256,14 @@ addons:
ui = true
listener "tcp" {
- tls_disable = 0
+ tls_disable = false
address = "[::]:8200"
cluster_address = "[::]:8201"
tls_cert_file = "/vault/tls/tls.crt"
tls_key_file = "/vault/tls/tls.key"
+ telemetry {
+ unauthenticated_metrics_access = true
+ }
}
storage "raft" {
@@ -298,7 +300,6 @@ addons:
telemetry {
prometheus_retention_time = "24h"
disable_hostname = true
- unauthenticated_metrics_access = true
}
service_registration "kubernetes" {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 52db91e07c..faf8073993 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1362,11 +1362,14 @@ addons:
ui = true
listener "tcp" {
- tls_disable = 0
+ tls_disable = false
address = "[::]:8200"
cluster_address = "[::]:8201"
tls_cert_file = "/vault/tls/tls.crt"
tls_key_file = "/vault/tls/tls.key"
+ telemetry {
+ unauthenticated_metrics_access = true
+ }
}
storage "raft" {
@@ -1389,7 +1392,6 @@ addons:
telemetry {
prometheus_retention_time = "24h"
disable_hostname = true
- unauthenticated_metrics_access = true
}
service_registration "kubernetes" {}
--
GitLab