Merge branch 'main' into alert-kubeadmconfig

CHANGELOG.md

@@ -11,6 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add alert to monitor the `KubeadmConfig` CRs having trouble generating bootstrap data.
 
+## [4.27.0] - 2024-11-27
+
+### Added
+
+- `KongProductionDeploymentNotSatisfied` to alert on clusters starting with `p`.
+- `KongNonProdDeploymentNotSatisfied` to alert on clusters not starting with `p`.
+
+### Removed
+
+- Split `KongDeploymentNotSatisfied` into `KongProductionDeploymentNotSatisfied` and `KongNonProdDeploymentNotSatisfied` to be able to control alerting in- and outside business hours.
+
 ## [4.26.2] - 2024-11-27
 
 ### Changed
@@ -3282,7 +3293,8 @@ Fix `PromtailRequestsErrors` alerts as promtail retries after some backoff so ac
 
 - Add existing rules from https://github.com/giantswarm/prometheus-meta-operator/pull/637/commits/bc6a26759eb955de92b41ed5eb33fa37980660f2
 
-[Unreleased]: https://github.com/giantswarm/prometheus-rules/compare/v4.26.2...HEAD
+[Unreleased]: https://github.com/giantswarm/prometheus-rules/compare/v4.27.0...HEAD
+[4.27.0]: https://github.com/giantswarm/prometheus-rules/compare/v4.26.2...v4.27.0
 [4.26.2]: https://github.com/giantswarm/prometheus-rules/compare/v4.26.1...v4.26.2
 [4.26.1]: https://github.com/giantswarm/prometheus-rules/compare/v4.26.0...v4.26.1
 [4.26.0]: https://github.com/giantswarm/prometheus-rules/compare/v4.25.0...v4.26.0

helm/prometheus-rules/Chart.yaml

@@ -5,7 +5,7 @@ home: https://github.com/giantswarm/prometheus-rules
 icon: https://s.giantswarm.io/app-icons/1/png/default-app-light.png
 name: prometheus-rules
 appVersion: '0.1.0'
-version: '4.26.2'
+version: '4.27.0'
 annotations:
   application.giantswarm.io/team: "atlas"
   config.giantswarm.io/version: 1.x.x

helm/prometheus-rules/templates/platform/cabbage/alerting-rules/kong.rules.yml

@@ -26,11 +26,25 @@ spec:
         severity: page
         team: cabbage
         topic: kong
-    - alert: KongDeploymentNotSatisfied
+    - alert: KongNonProdDeploymentNotSatisfied
       annotations:
         description: '{{`Kong Deployment {{ $labels.namespace}}/{{ $labels.deployment }} is not satisfied.`}}'
         opsrecipe: workload-cluster-managed-deployment-not-satisfied/
-      expr: managed_app_deployment_status_replicas_available{managed_app=~"kong.*"} / (managed_app_deployment_status_replicas_available{managed_app=~"kong.*"} + managed_app_deployment_status_replicas_unavailable{managed_app=~"kong.*"}) < 0.6
+      expr: managed_app_deployment_status_replicas_available{managed_app=~"kong.*", cluster_id!~"p.*"} / (managed_app_deployment_status_replicas_available{managed_app=~"kong.*", cluster_id!~"p.*"} + managed_app_deployment_status_replicas_unavailable{managed_app=~"kong.*", cluster_id!~"p.*"}) < 0.6
+      for: 30m
+      labels:
+        area: platform
+        cancel_if_cluster_status_creating: "true"
+        cancel_if_cluster_status_deleting: "true"
+        cancel_if_outside_working_hours: "true"
+        severity: page
+        team: cabbage
+        topic: kong
+    - alert: KongProductionDeploymentNotSatisfied
+      annotations:
+        description: '{{`Kong Deployment {{ $labels.namespace}}/{{ $labels.deployment }} is not satisfied.`}}'
+        opsrecipe: workload-cluster-managed-deployment-not-satisfied/
+      expr: managed_app_deployment_status_replicas_available{managed_app=~"kong.*", cluster_id=~"p.*"} / (managed_app_deployment_status_replicas_available{managed_app=~"kong.*", cluster_id=~"p.*"} + managed_app_deployment_status_replicas_unavailable{managed_app=~"kong.*", cluster_id=~"p.*"}) < 0.6
       for: 30m
       labels:
         area: platform