UNCLASSIFIED - NO CUI

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

Merge branch 'update-mimir-tag-5.5.1-bb.6' into 'master'

mimir update to 5.5.1-bb.6

Closes big-bang/product/packages/mimir#62 and big-bang/product/packages/mimir#65

See merge request !5837
parents 5f8682ac 336af081
No related branches found
No related tags found
1 merge request!5837mimir update to 5.5.1-bb.6
Pipeline #3991115 passed
...@@ -109,7 +109,7 @@ datasources: ...@@ -109,7 +109,7 @@ datasources:
type: prometheus type: prometheus
uid: mimir uid: mimir
access: proxy access: proxy
url: http://mimir-mimir-nginx.mimir.svc.cluster.local/prometheus url: http://mimir-mimir-gateway.mimir.svc.cluster.local/prometheus
editable: true editable: true
{{- end }} {{- end }}
{{- if .Values.monitoring.enabled }} {{- if .Values.monitoring.enabled }}
......
...@@ -173,9 +173,9 @@ prometheus: ...@@ -173,9 +173,9 @@ prometheus:
remoteWrite: remoteWrite:
{{- if .Values.istio.enabled }} {{- if .Values.istio.enabled }}
# I promise it's not a typo; the port is 80 even though it's TLS # I promise it's not a typo; the port is 80 even though it's TLS
- url: https://mimir-mimir-nginx.mimir.svc.cluster.local:80/api/v1/push - url: https://mimir-mimir-gateway.mimir.svc.cluster.local:80/api/v1/push
{{- else }} {{- else }}
- url: http://mimir-mimir-nginx.mimir.svc.cluster.local/api/v1/push - url: http://mimir-mimir-gateway.mimir.svc.cluster.local/api/v1/push
{{- end }} {{- end }}
{{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.addons.mimir.values) "STRICT") }} {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.addons.mimir.values) "STRICT") }}
tlsConfig: tlsConfig:
......
...@@ -2125,12 +2125,12 @@ addons: ...@@ -2125,12 +2125,12 @@ addons:
git: git:
repo: https://repo1.dso.mil/big-bang/product/packages/mimir.git repo: https://repo1.dso.mil/big-bang/product/packages/mimir.git
tag: "5.5.1-bb.4" tag: "5.5.1-bb.6"
path: "./chart" path: "./chart"
helmRepo: helmRepo:
repoName: "registry1" repoName: "registry1"
chartName: "mimir" chartName: "mimir"
tag: "5.5.1-bb.4" tag: "5.5.1-bb.6"
# -- Enable Mimir Enterprise # -- Enable Mimir Enterprise
enterprise: enterprise:
......
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