alerts and rules optional (#640)

portefaix · Jan 10, 2024 · 63772b5 · 63772b5
1 parent 2d59d82
commit 63772b5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/charts/kubernetes-mixin/Chart.yaml b/charts/kubernetes-mixin/Chart.yaml
@@ -31,7 +31,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.0
+version: 1.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/kubernetes-mixin/README.md b/charts/kubernetes-mixin/README.md
@@ -1,31 +1,32 @@
 # kubernetes-mixin
 
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0](https://img.shields.io/badge/AppVersion-0.8.0-informational?style=flat-square)
+![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 A Helm chart for Kubernetes Mixin
 
 **Homepage:** <https://charts.portefaix.xyz>
 
 ## Maintainers
 
-| Name       | Email                         | Url |
-| ---------- | ----------------------------- | --- |
-| nlamirault | <nicolas.lamirault@gmail.com> |     |
+| Name | Email | Url |
+| ---- | ------ | --- |
+| nlamirault | <nicolas.lamirault@gmail.com> |  |
 
 ## 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 | `"kubernetes"` |                                                                          |
-| 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 |
+| fullnameOverride | string | `""` | Provide a name to substitute for the full names of resources |
+| grafana.folder | string | `"kubernetes"` |  |
+| monitor.additionalLabels | object | `{}` | Additional labels to add to resources managed by the Prometheus Operator |
+| prometheusRule.alerts.enabled | string | `"enable"` | Enable by default PrometheusRule creation for alerts |
+| prometheusRule.rules.enabled | string | `"enable"` | Enable by default PrometheusRule creation for rules |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
diff --git a/charts/kubernetes-mixin/templates/alerts.yaml b/charts/kubernetes-mixin/templates/alerts.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.prometheusRule.alerts.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -771,3 +772,4 @@ spec:
             for: 15m
             labels:
               severity: critical
+{{- end }}
diff --git a/charts/kubernetes-mixin/templates/rules.yaml b/charts/kubernetes-mixin/templates/rules.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.prometheusRule.rules.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -716,3 +717,4 @@ spec:
             labels:
               quantile: "0.5"
             record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile
+{{- end }}
diff --git a/charts/kubernetes-mixin/values.yaml b/charts/kubernetes-mixin/values.yaml
@@ -37,3 +37,11 @@ monitor:
 grafana:
   # Grafana folder in which to store the dashboards
   folder: kubernetes
+
+prometheusRule:
+  alerts:
+    # prometheusRule.alerts.enabled -- Enable by default PrometheusRule creation for alerts
+    enabled: enable
+  rules:
+    # prometheusRule.rules.enabled -- Enable by default PrometheusRule creation for rules
+    enabled: enable