Remove unused elastic and tempo info (#1177)

* Remove unused elastic and tempo info * Update CHANGELOG.md
giantswarm · May 14, 2024 · c998734 · c998734
1 parent 73ef9a2
commit c998734
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 161 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Removed `apiserver_down` inhibition dummy trigger.
 - Remove cilium entry from KAAS SLOs.
+- Remove elasticsearch and tempo related alerts and recording rules.
 
 ## [3.13.1] - 2024-04-30
 

diff --git a/helm/prometheus-rules/templates/alerting-rules/elasticsearch.rules.yml b/helm/prometheus-rules/templates/alerting-rules/elasticsearch.rules.yml
diff --git a/helm/prometheus-rules/templates/alerting-rules/managed-logging.rules.yml b/helm/prometheus-rules/templates/alerting-rules/managed-logging.rules.yml
diff --git a/helm/prometheus-rules/templates/alerting-rules/service-level.rules.yml b/helm/prometheus-rules/templates/alerting-rules/service-level.rules.yml
@@ -18,21 +18,21 @@ spec:
       expr: |
         label_replace(
             (
-                  slo_errors_per_request:ratio_rate1h{service!~"efk-.*|.*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
+                  slo_errors_per_request:ratio_rate1h{service!~".*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
                 > on (cluster_id, service) group_left ()
                   slo_threshold_high
               and
-                  slo_errors_per_request:ratio_rate5m{service!~"efk-.*|.*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
+                  slo_errors_per_request:ratio_rate5m{service!~".*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
                 > on (cluster_id, service) group_left ()
                   slo_threshold_high
             )
           or
             (
-                  slo_errors_per_request:ratio_rate6h{service!~"efk-.*|.*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
+                  slo_errors_per_request:ratio_rate6h{service!~".*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
                 > on (cluster_id, service) group_left ()
                   slo_threshold_low
               and
-                  slo_errors_per_request:ratio_rate30m{service!~"efk-.*|.*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
+                  slo_errors_per_request:ratio_rate30m{service!~".*external-dns.*|kong-.*|.*(ingress-nginx|nginx-ingress-controller).*", namespace!~"linkerd.*"}
                 > on (cluster_id, service) group_left ()
                   slo_threshold_low
             ),

diff --git a/helm/prometheus-rules/templates/recording-rules/tempo-mixins.rules.yml b/helm/prometheus-rules/templates/recording-rules/tempo-mixins.rules.yml
diff --git a/test/conf/promtool_ignore b/test/conf/promtool_ignore
@@ -18,7 +18,6 @@ templates/alerting-rules/disk.management-cluster.rules.yml
 templates/alerting-rules/disk.workload-cluster.rules.yml
 templates/alerting-rules/docker.management-cluster.rules.yml
 templates/alerting-rules/docker.workload-cluster.rules.yml
-templates/alerting-rules/elasticsearch.rules.yml
 templates/alerting-rules/etcd.management-cluster.rules.yml
 templates/alerting-rules/etcd.workload-cluster.rules.yml
 templates/alerting-rules/etcdbackup.rules.yml
@@ -36,7 +35,6 @@ templates/alerting-rules/kube-state-metrics.rules.yml
 templates/alerting-rules/kubelet.management-cluster.rules.yml
 templates/alerting-rules/kubelet.workload-cluster.rules.yml
 templates/alerting-rules/kyverno.rules.yml
-templates/alerting-rules/managed-logging.rules.yml
 templates/alerting-rules/management-cluster.rules.yml
 templates/alerting-rules/microendpoint.rules.yml
 templates/alerting-rules/net-exporter.management-cluster.rules.yml
@@ -62,5 +60,4 @@ templates/recording-rules/gs-managed-app-deployment-status.rules.yml
 templates/recording-rules/kubernetes-mixins.rules.yml
 templates/recording-rules/service-level.rules.yml
 templates/recording-rules/mimir-mixins.rules.yml
-templates/recording-rules/tempo-mixins.rules.yml
 templates/recording-rules/loki-mixins.rules.yml