Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

charts,salt: Set UID for grafana datasources #3668

Merged
merged 1 commit into from
Jan 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
metalk8s-sosreport package compatible with sos version 4.0+
(PR[#3664](https://github.com/scality/metalk8s/pull/3664))

- Explicitly set the Grafana datasource UID to `metalk8s-<datasource_name>`
(PR[#3668](https://github.com/scality/metalk8s/pull/3668))

## Bug fixes

- [#3601](https://github.com/scality/metalk8s/issues/3601) - Marks
Expand Down
12 changes: 12 additions & 0 deletions charts/kube-prometheus-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,20 @@ grafana:
foldersFromFilesStructure: true

datasources:
# NOTE: We do not deploy default datasource as we want to set UID
# and it's not possible using this template
defaultDatasourceEnabled: false

additionalDataSources:
- name: Prometheus
uid: metalk8s-prometheus
type: prometheus
access: proxy
isDefault: true
# Service deployed by Thanos
url: http://thanos-query-http:10902/
jsonData:
timeInterval: 30s

nodeSelector:
node-role.kubernetes.io/infra: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Deploy ConfigMap for Loki datasource:
apiVersion: 1
datasources:
- name: Loki
uid: metalk8s-loki
type: loki
access: proxy
url: http://loki.metalk8s-logging.svc.cluster.local:3100/
Expand Down
9 changes: 5 additions & 4 deletions salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
Original file line number Diff line number Diff line change
Expand Up @@ -25089,13 +25089,14 @@ data:
datasource.yaml: |-
apiVersion: 1
datasources:
- name: Prometheus
type: prometheus
url: http://thanos-query-http:10902/
access: proxy
- access: proxy
isDefault: true
jsonData:
timeInterval: 30s
name: Prometheus
type: prometheus
uid: metalk8s-prometheus
url: http://thanos-query-http:10902/
kind: ConfigMap
metadata:
labels:
Expand Down