Skip to content

[prometheus-cloudwatch-exporter] Adding commonLabels functionality that adds labels to all #6185

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[prometheus-cloudwatch-exporter] Adding commonLabels functionality that adds labels to all #6185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a46e497
Adding commonLabels functionality that adds labels to all
tincho-burgos Oct 3, 2025
d8e124f
Correcting commonLabels
tincho-burgos Oct 3, 2025
a7053bd
Merge branch 'main' into mburgos/Adding_commonLabels_functionality
tincho-burgos Oct 23, 2025
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
2 changes: 1 addition & 1 deletion charts/prometheus-cloudwatch-exporter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "0.16.0"
appVersion: "0.17.0"
description: A Helm chart for prometheus cloudwatch-exporter
name: prometheus-cloudwatch-exporter
version: 0.28.1
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
rules:
- apiGroups: [""]
resources: ["secrets","configmap"]
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
subjects:
- kind: ServiceAccount
name: {{ template "prometheus-cloudwatch-exporter.serviceAccountName" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
data:
config.yml: |
{{ tpl .Values.config . | nindent 4 }}
6 changes: 6 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
{{- with .Values.deployment.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
Expand All @@ -26,6 +29,9 @@ spec:
labels:
app: {{ template "prometheus-cloudwatch-exporter.name" . }}
release: {{ .Release.Name }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 8 -}}
{{- end }}
{{- if .Values.pod.labels }}
{{ toYaml .Values.pod.labels | indent 8 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
{{- if .Values.ingress.labels }}
{{ toYaml .Values.ingress.labels | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/pdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
spec:
{{- if .Values.podDisruptionBudget.minAvailable }}
minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
Expand Down
9 changes: 6 additions & 3 deletions charts/prometheus-cloudwatch-exporter/templates/prometheusrule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
{{- if .Values.prometheusRule.labels }}
labels:
{{ toYaml .Values.prometheusRule.labels | indent 4}}
{{- end }}
{{- if .Values.prometheusRule.labels }}
{{ toYaml .Values.prometheusRule.labels | nindent 4 }}
{{- end }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
name: {{ $fullName }}
{{- if .Values.prometheusRule.namespace }}
namespace: {{ .Values.prometheusRule.namespace }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
type: Opaque
data:
{{ if .Values.aws.aws_access_key_id }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
{{- if .Values.service.labels }}
{{ toYaml .Values.service.labels | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ metadata:
chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
{{- if .Values.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
Expand Down
9 changes: 6 additions & 3 deletions charts/prometheus-cloudwatch-exporter/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
{{- if .Values.serviceMonitor.labels }}
labels:
{{ toYaml .Values.serviceMonitor.labels | indent 4}}
{{- end }}
{{- if .Values.serviceMonitor.labels }}
{{ toYaml .Values.serviceMonitor.labels | nindent 4}}
{{- end }}
{{- if .Values.commonLabels }}
{{- toYaml .Values.commonLabels | nindent 4 -}}
{{- end }}
name: {{ template "prometheus-cloudwatch-exporter.fullname" . }}
{{- if .Values.serviceMonitor.namespace }}
namespace: {{ .Values.serviceMonitor.namespace }}
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-cloudwatch-exporter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

# Adding labels to all K8S resources
commonLabels: {}

replicaCount: 1

image:
Expand Down