feat: add servicemonitor additonal labels (#354)

* feat: add servicemonitor additonal labels * Update README spacing * Update charts/atlantis/templates/servicemonitor.yaml Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com> --------- Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
runatlantis · Feb 27, 2024 · 9fb5bfd · 9fb5bfd
1 parent 2ee4d8c
commit 9fb5bfd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -174,6 +174,7 @@ The following options are supported. See [values.yaml](/charts/atlantis/values.y
 | `servicemonitor.enabled`                            | Enable Prometheus service monitor. This requires metrics.prometheus.endpoint to be defined (/metrics is a good default) in the repoConfig value                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`                  |
 | `servicemonitor.interval`                           | Interval at which metrics should be scraped                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `30s`                    |
 | `servicemonitor.path`                               | HTTP path to scrape for metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `/metrics`               |
+| `servicemonitor.additionalLabels`                   | Prometheus ServiceMonitor labels                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{}`                     |
 | `statefulSet.annotations`                           | Additional annotations to use for StatefulSet.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                     |
 | `statefulSet.labels`                                | Additional labels to use for StatefulSet.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                     |
 | `statefulSet.priorityClassName`                     | Leverage a PriorityClass to ensure your pods survive resource shortages.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `{}`                     |

diff --git a/charts/atlantis/Chart.yaml b/charts/atlantis/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 appVersion: v0.27.0
 description: A Helm chart for Atlantis https://www.runatlantis.io
 name: atlantis
-version: 4.20.0
+version: 4.21.0
 keywords:
   - terraform
 home: https://www.runatlantis.io

diff --git a/charts/atlantis/templates/servicemonitor.yaml b/charts/atlantis/templates/servicemonitor.yaml
@@ -4,7 +4,10 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "atlantis.fullname" . }}
   labels:
-{{- include "atlantis.labels" . | nindent 4 }}
+    {{- include "atlantis.labels" . | nindent 4 }}
+    {{- with .Values.servicemonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.service.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}

diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
@@ -567,6 +567,8 @@ servicemonitor:
   enabled: false
   interval: "30s"
   path: /metrics
+  # Prometheus ServiceMonitor labels
+  additionalLabels: {}
   auth:
     # if auth is enabled on Atlantis, use one of the following mechanism
     basicAuth: