diff --git a/chart/templates/logging/elasticsearch-kibana/values.yaml b/chart/templates/logging/elasticsearch-kibana/values.yaml index 16810df8c40aa8775f81af468ff5a790967089af..ade6792c6453efdfeee6d610c7e9f7124d61656b 100644 --- a/chart/templates/logging/elasticsearch-kibana/values.yaml +++ b/chart/templates/logging/elasticsearch-kibana/values.yaml @@ -74,6 +74,16 @@ monitoring: metrics: enabled: {{ .Values.monitoring.enabled }} + {{- $istioInjection := (and (eq (dig "istio" "injection" "enabled" .Values.logging) "enabled") .Values.istio.enabled) }} + {{- if and (eq (dig "istio" "mtls" "mode" "STRICT" .Values.logging.values) "STRICT") $istioInjection }} + serviceMonitor: + scheme: https + tlsConfig: + caFile: /etc/prom-certs/root-cert.pem + certFile: /etc/prom-certs/cert-chain.pem + keyFile: /etc/prom-certs/key.pem + insecureSkipVerify: true + {{- end }} elasticsearch: imagePullSecrets: diff --git a/chart/values.yaml b/chart/values.yaml index e55e79cdf88259dda54989ab316d226cc2fb4223..f222e44f25f470083cce1d6370c15abf680d266a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -435,7 +435,7 @@ logging: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git path: "./chart" - tag: "0.12.1-bb.0" + tag: "0.12.1-bb.1" # -- Flux reconciliation overrides specifically for the Logging (EFK) Package flux: