[operator] Allow PrometheusRule duration set

open-telemetry · Nov 14, 2024 · 6f18515 · 6f18515
1 parent f770492
commit 6f18515
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
@@ -6,7 +6,11 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
+<<<<<<< HEAD
     helm.sh/chart: opentelemetry-operator-0.74.2
+=======
+    helm.sh/chart: opentelemetry-operator-0.74.1
+>>>>>>> adf0eeca ([operator] Allow PrometheusRule duration set)
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm
@@ -43,7 +47,11 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
+<<<<<<< HEAD
     helm.sh/chart: opentelemetry-operator-0.74.2
+=======
+    helm.sh/chart: opentelemetry-operator-0.74.1
+>>>>>>> adf0eeca ([operator] Allow PrometheusRule duration set)
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.113.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/templates/prometheusrule.yaml b/charts/opentelemetry-operator/templates/prometheusrule.yaml
@@ -24,7 +24,7 @@ spec:
     rules:
     - alert: ReconcileErrors
       expr: rate(controller_runtime_reconcile_total{controller="opentelemetrycollector",result="error"}[5m]) > 0
-      for: 5m
+      for: {{ .Values.manager.prometheusRule.defaultRules.duration }}
       labels:
         severity: warning
         {{- with .Values.manager.prometheusRule.defaultRules.additionalRuleLabels }}
@@ -38,7 +38,7 @@ spec:
         {{- end }}
     - alert: WorkqueueDepth
       expr: workqueue_depth{name="opentelemetrycollector"} > 0
-      for: 5m
+      for: {{ .Values.manager.prometheusRule.defaultRules.duration }}
       labels:
         severity: warning
         {{- with .Values.manager.prometheusRule.defaultRules.additionalRuleLabels }}

diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
@@ -953,6 +953,14 @@
                                     "required": [],
                                     "properties": {},
                                     "examples": [{}]
+                                },
+                                "duration": {
+                                    "type": "string",
+                                    "default": {},
+                                    "title": "The prometheusRule duration to be considered firing",
+                                    "required": [],
+                                    "properties": {},
+                                    "examples": [{}]
                                 }
                             },
                             "examples": [{

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -142,6 +142,8 @@ manager:
       additionalRuleLabels: {}
       ## Additional annotations for PrometheusRule alerts
       additionalRuleAnnotations: {}
+      ## Alerts are considered firing once they have been returned for this long.
+      duration: 5m
     # additional labels on the PrometheusRule object
     extraLabels: {}
     # add annotations on the PrometheusRule object