mimir-mixin - Support for specific additional labels on resoruces (#916)

* Adds Support for specifying additional labels to be added only to recording rules / alerting rules Signed-off-by: Ofer Ziss <[email protected]>
portefaix · Nov 13, 2024 · b307971 · b307971
1 parent b63abef
commit b307971
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 17 deletions.
diff --git a/charts/mimir-mixin/Chart.yaml b/charts/mimir-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
   - monitoring-mixin
   - mimir
   - portefaix
-version: 1.6.0
+version: 1.6.1
 appVersion: 2.9.0
 
 maintainers:

diff --git a/charts/mimir-mixin/README.md b/charts/mimir-mixin/README.md
@@ -1,31 +1,32 @@
 # mimir-mixin
 
-![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
 
 A Helm chart for Grafana Mimir mixin
 
 **Homepage:** <https://charts.portefaix.xyz>
 
 ## Maintainers
 
-| Name       | Email                         | Url |
-| ---------- | ----------------------------- | --- |
-| nlamirault | <[email protected]> |     |
+| Name | Email | Url |
+| ---- | ------ | --- |
+| nlamirault | <[email protected]> |  |
 
 ## Source Code
 
-- <https://github.com/nlamirault/portefaix-hub/tree/master/charts/kubernetes-mixin>
+* <https://github.com/nlamirault/portefaix-hub/tree/master/charts/kubernetes-mixin>
 
 ## Values
 
-| Key                      | Type   | Default        | Description                                                              |
-| ------------------------ | ------ | -------------- | ------------------------------------------------------------------------ |
-| additionalAnnotations    | object | `{}`           | Additional annotations to add to all resources                           |
-| additionalLabels         | object | `{}`           | Additional labels to add to all resources                                |
-| fullnameOverride         | string | `""`           | Provide a name to substitute for the full names of resources             |
-| grafana.folder           | string | `"monitoring"` |                                                                          |
-| monitor.additionalLabels | object | `{}`           | Additional labels to add to resources managed by the Prometheus Operator |
-
----
-
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| additionalAnnotations | object | `{}` | Additional annotations to add to all resources |
+| additionalLabels | object | `{}` | Additional labels to add to all resources |
+| alerts.additionalLabels | object | `{}` | Additional labels to add to alert resources managed by the Prometheus Operator |
+| fullnameOverride | string | `""` | Provide a name to substitute for the full names of resources |
+| grafana.folder | string | `"monitoring"` |  |
+| monitor.additionalLabels | object | `{}` | Additional labels to add to resources managed by the Prometheus Operator |
+| recordings.additionalLabels | object | `{}` | Additional labels to add to recording rule resources managed by the Prometheus Operator |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/mimir-mixin/templates/alerts.yaml b/charts/mimir-mixin/templates/alerts.yaml
@@ -11,6 +11,9 @@ metadata:
     {{- if .Values.monitor.additionalLabels }}
     {{- toYaml .Values.monitor.additionalLabels | nindent 4 }}
     {{- end }}
+    {{- if .Values.alerts.additionalLabels }}
+    {{- toYaml .Values.alerts.additionalLabels | nindent 4 }}
+    {{- end }}
 spec:
   groups:
       - name: mimir_alerts

diff --git a/charts/mimir-mixin/templates/rules.yaml b/charts/mimir-mixin/templates/rules.yaml
@@ -11,6 +11,9 @@ metadata:
     {{- if .Values.monitor.additionalLabels }}
     {{- toYaml .Values.monitor.additionalLabels | nindent 4 }}
     {{- end }}
+    {{- if .Values.recordings.additionalLabels }}
+    {{- toYaml .Values.recordings.additionalLabels | nindent 4 }}
+    {{- end }}
 spec:
   groups:
       - name: mimir_api_1

diff --git a/charts/mimir-mixin/values.yaml b/charts/mimir-mixin/values.yaml
@@ -34,6 +34,16 @@ monitor:
   additionalLabels: {}
     # release: kube-prometheus-stack
 
+alerts:
+  # -- Additional labels to add to alert resources managed by the Prometheus Operator
+  additionalLabels: {}
+    # release: kube-prometheus-stack
+
+recordings:
+  # -- Additional labels to add to recording rule resources managed by the Prometheus Operator
+  additionalLabels: {}
+    # release: kube-prometheus-stack
+
 grafana:
   # Grafana folder in which to store the dashboards
   folder: monitoring