UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit aa3511bd authored by Michael Martin's avatar Michael Martin
Browse files

Merge branch 'update-monitoring-tag-67.11.0-bb.2' into 'master'

monitoring update to 67.11.0-bb.2

See merge request !5741
parents 5bf7fd67 b8467e25
No related branches found
No related tags found
1 merge request!5741monitoring update to 67.11.0-bb.2
Pipeline #3942043 passed
......@@ -48,6 +48,11 @@ istio:
(dig "istio" "hardened" "enabled" false .Values.eckOperator.values)
(dig "istio" "hardened" "enabled" false .Values.elasticsearchKibana.values)
}}
loki:
enabled: {{ and .Values.loki.enabled (or
(dig "hardened" "enabled" false .Values.istio.values)
(dig "istio" "hardened" "enabled" false .Values.monitoring.values))
}}
{{- if and (dig "values" "istio" "hardened" "enabled" false .Values.monitoring) (contains "s3" .Values.addons.thanos.objectStorage.endpoint) }}
customServiceEntries:
- name: egress-object-store
......
......@@ -878,11 +878,11 @@ monitoring:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/monitoring.git
path: "./chart"
tag: "67.11.0-bb.1"
tag: "67.11.0-bb.2"
helmRepo:
repoName: "registry1"
chartName: "monitoring"
tag: "67.11.0-bb.1"
tag: "67.11.0-bb.2"
# -- Flux reconciliation overrides specifically for the Monitoring Package
flux:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment