From 5975a4ba415bf66b8246cdd87fbef6ac1d9641a1 Mon Sep 17 00:00:00 2001 From: Lukasz Jakimczuk <39192420+ljakimczuk@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:08:33 +0200 Subject: [PATCH 1/2] Removing CRSync rules (#1376) --- CHANGELOG.md | 4 ++ .../alerting-rules/crsync.rules.yml | 43 ------------------- 2 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/crsync.rules.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 95021edf4..d831077b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Removed + +- Remove CRsync alerting rules. + ### Changed - Upgrade Alloy to 0.5.2 which brings no value to this repo. diff --git a/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/crsync.rules.yml b/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/crsync.rules.yml deleted file mode 100644 index 3a9a3e7f9..000000000 --- a/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/crsync.rules.yml +++ /dev/null @@ -1,43 +0,0 @@ -{{- if eq .Values.managementCluster.name "gazelle" }} -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - creationTimestamp: null - labels: - {{- include "labels.common" . | nindent 4 }} - # No need for .Values.mimir.enabled condition - will be gone with Vintage - cluster_type: "management_cluster" - name: crsync.rules - namespace: {{ .Values.namespace }} -spec: - groups: - - name: crsync - rules: - - alert: CrsyncDeploymentNotSatisfied - annotations: - description: '{{`CrSync deployment {{ $labels.deployment }} is not satisfied in {{ $labels.installation }} / {{ $labels.cluster_id }} at the {{ $labels.namespace }} namespace.`}}' - opsrecipe: deployment-not-satisfied/ - expr: kube_deployment_status_replicas_available{cluster_type="workload_cluster", cluster_id="operations", deployment=~"crsync-.*"} == 0 - for: 10m - labels: - area: platform - cancel_if_cluster_status_creating: "true" - cancel_if_cluster_status_deleting: "true" - cancel_if_cluster_status_updating: "true" - cancel_if_outside_working_hours: "true" - severity: page - team: honeybadger - topic: releng - - alert: CrsyncTooManyTagsMissing - annotations: - description: '{{`Too many tags are not synchronised to registry mirrors.`}}' - opsrecipe: crsync-too-many-tags-missing/ - expr: crsync_sync_tags_total{registry="quay.io"} - on (cluster_id, repository) group_left sum by(cluster_id, repository) (crsync_sync_tags_total{registry!="quay.io"}) > 0 - for: 1h - labels: - area: platform - cancel_if_outside_working_hours: "true" - severity: page - team: honeybadger - topic: releng -{{- end }} From a0f03ddd28d1924e8c6094ed42e2d03101b4cfbb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:24:20 +0200 Subject: [PATCH 2/2] fix(deps): update module github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring to v0.77.1 (#1378) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/hack/checkLabels/go.mod | 2 +- test/hack/checkLabels/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/hack/checkLabels/go.mod b/test/hack/checkLabels/go.mod index 9f788520c..b8be0a7d5 100644 --- a/test/hack/checkLabels/go.mod +++ b/test/hack/checkLabels/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( // Try to keep version in sync with our prometheus rule CRD version. // see https://github.com/giantswarm/prometheus-operator-crd/blob/master/helm/prometheus-operator-crd/Chart.yaml#L11 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1 sigs.k8s.io/yaml v1.4.0 ) diff --git a/test/hack/checkLabels/go.sum b/test/hack/checkLabels/go.sum index 2f78cb179..6e1064ac9 100644 --- a/test/hack/checkLabels/go.sum +++ b/test/hack/checkLabels/go.sum @@ -551,6 +551,8 @@ github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2 h github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2/go.mod h1:Rd8YnCqz+2FYsiGmE2DMlaLjQRB4v2jFNnzCt9YY4IM= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.0 h1:qJ0oVdazkVKcmVJNZncFylrbyf8c48sym/2b8P/0Ahg= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.0/go.mod h1:D0KY8md81DQKdaR/cXwnhoWB3MYYyc/UjvqE8GFkIvA= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1 h1:XGoEXT6WTTihO+MD8MAao+YaQIH905HbK0WK2lyo28k= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1/go.mod h1:D0KY8md81DQKdaR/cXwnhoWB3MYYyc/UjvqE8GFkIvA= github.com/prometheus/alertmanager v0.22.2 h1:JrDZalSEMb2/2bqGAhls6ZnvOxbC5jMIu29JV+uWTC0= github.com/prometheus/alertmanager v0.22.2/go.mod h1:rYinOWxFuCnNssc3iOjn2oMTlhLaPcUuqV5yk5JKUAE= github.com/prometheus/alertmanager v0.25.0 h1:vbXKUR6PYRiZPRIKfmXaG+dmCKG52RtPL4Btl8hQGvg=