Merge branch 'fix-vault-prometheus-monitoring' into 'master'

Fix vault prometheus monitoring

Closes platform-one/big-bang/apps/sandbox/vault#25

See merge request platform-one/big-bang/bigbang!1804

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:

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: {}

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" {}

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" {}