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.

Sign up for GitHub

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

Jump to bottom

Upgrade dNation monitoring #89

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Upgrade dNation monitoring #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

apiVersion: v2
name: dnation-kubernetes-monitoring-stack
version: 3.3.1
appVersion: 2.5.4 # dnation-kubernetes-monitoring
version: 3.4.0
appVersion: 2.6.0 # dnation-kubernetes-monitoring
description: An umbrella helm chart for Kubernetes monitoring based on kube-prometheus-stack, thanos, loki, loki-distributed, promtail and dnation-kubernetes-monitoring.
keywords:
- dnation
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies:
repository: https://grafana.github.io/helm-charts
condition: promtail.enabled
- name: dnation-kubernetes-monitoring
version: "2.5.*"
version: "2.6.*"
repository: https://dnationcloud.github.io/helm-hub
condition: dnation-kubernetes-monitoring.enabled
- name: ssl-exporter
Expand Down
9 changes: 7 additions & 2 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ promtail:
clients:
- url: http://loki-gateway/loki/api/v1/push
tenant_id: 1
# !IMPORTANT: each cluster must have prometheus external label 'cluster' with unique value.
# This will be used as cluster discriminator when metrics are aggregated on observer cluster.
# !IMPORTANT: each cluster must have promtail external label 'cluster' with unique value.
# This will be used as cluster discriminator when logs are aggregated on observer cluster.
extraArgs:
- -client.external-labels=cluster=observer-cluster

Expand Down Expand Up @@ -201,6 +201,11 @@ kube-prometheus-stack:
##
prometheus:
prometheusSpec:
# !IMPORTANT: each cluster must have prometheus external label 'cluster' with unique value.
# This will be used as cluster discriminator when metrics are aggregated on observer cluster.
externalLabels:
cluster: observer-cluster

## PrometheusRules to be selected for target discovery
##
ruleSelector:
Expand Down
2 changes: 1 addition & 1 deletion multicluster-config/custom-observer-values-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# !IMPORTANT: each cluster must have prometheus and promtail external label 'cluster' with unique value.
# This will be used as cluster discriminator when metrics are aggregated on observer cluster.
# This will be used as cluster discriminator when metrics and logs are aggregated on observer cluster.

thanosStorage:
# More details about supported storage types and config options can be found here: https://thanos.io/tip/thanos/storage.md/
Expand Down