Skip to content

Use Prometheus CRD to add the cluster label to metrics #5885

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

Merged
nlamirault merged 1 commit into from
Nov 8, 2024
Merged

Use Prometheus CRD to add the cluster label to metrics #5885

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
10 changes: 5 additions & 5 deletions gitops/argocd/charts/database/dragonfly-operator/values-talos-homelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dragonfly-operator:
cpu: 10m
memory: 50Mi

serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
10 changes: 5 additions & 5 deletions gitops/argocd/charts/dora/dora-github/values-talos-homelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ opentelemetry-collector:
requests:
memory: 100Mi

serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
10 changes: 5 additions & 5 deletions gitops/argocd/charts/identity/dex/values-talos-homelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ dex:
- secretRef:
name: dex-credentials

serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

resources:
limits:
Expand Down
40 changes: 21 additions & 19 deletions gitops/argocd/charts/kube-system/cilium/values-talos-homelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,18 @@ cilium:
sourceLabels:
- __meta_kubernetes_pod_node_name
targetLabel: node
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
relay:
prometheus:
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

# relay:
# prometheus:
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

ui:
frontend:
resources:
Expand All @@ -126,12 +128,12 @@ cilium:
nodeSelector:
kubernetes.io/os: linux
portefaix.xyz/master: "true"
prometheus:
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# prometheus:
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

prometheus:
serviceMonitor:
Expand All @@ -141,6 +143,6 @@ cilium:
sourceLabels:
- __meta_kubernetes_pod_node_name
targetLabel: node
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
112 changes: 57 additions & 55 deletions gitops/argocd/charts/monitoring/kube-prometheus-stack/values-talos-homelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,18 @@ kube-prometheus-stack:
memory: 32Mi
nodeSelector:
portefaix.xyz/master: "true"
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

kubeApiServer:
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -140,16 +140,16 @@ kube-prometheus-stack:
- targetLabel: instance
sourceLabels:
- "node"
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
relabelings:
- action: replace
sourceLabels: [__metrics_path__]
targetLabel: metrics_path
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -174,10 +174,10 @@ kube-prometheus-stack:
serviceMonitor:
https: true
insecureSkipVerify: true
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -200,10 +200,10 @@ kube-prometheus-stack:
port: 2381
targetPort: 2381
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -228,10 +228,10 @@ kube-prometheus-stack:
serviceMonitor:
https: true
insecureSkipVerify: true
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -256,10 +256,10 @@ kube-prometheus-stack:
selector:
k8s-app: kube-proxy
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -276,10 +276,10 @@ kube-prometheus-stack:

coreDns:
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -296,10 +296,10 @@ kube-prometheus-stack:

kubeDns:
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
metricRelabelings:
- action: drop
regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
Expand All @@ -318,9 +318,9 @@ kube-prometheus-stack:
prometheus:
monitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
- targetLabel: "instance"
sourceLabels:
- "__meta_kubernetes_pod_node_name"
Expand All @@ -336,9 +336,9 @@ kube-prometheus-stack:
prometheus:
monitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
- targetLabel: "instance"
sourceLabels:
- "__meta_kubernetes_pod_node_name"
Expand Down Expand Up @@ -368,11 +368,11 @@ kube-prometheus-stack:
memory: 30Mi
nodeSelector:
portefaix.xyz/master: "true"
serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

prometheus:
ingress:
Expand All @@ -384,14 +384,16 @@ kube-prometheus-stack:
path: /
pathType: Prefix

serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster

prometheusSpec:
retention: 2d
externalLabels:
cluster: portefaix-talos-homelab
resources:
limits:
# cpu: 800m
Expand Down
11 changes: 5 additions & 6 deletions gitops/argocd/charts/observability/grafana/values-talos-homelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ observability:
cluster_name: "portefaix-talos-homelab"

grafana:

persistence:
type: statefulset
enabled: true
Expand Down Expand Up @@ -100,8 +99,8 @@ grafana:
cpu: 10m
memory: 50Mi

serviceMonitor:
relabelings:
- action: replace
replacement: portefaix-talos-homelab
targetLabel: cluster
# serviceMonitor:
# relabelings:
# - action: replace
# replacement: portefaix-talos-homelab
# targetLabel: cluster
Loading
Loading