From fa96639c86621b2a548bbb2971f42e5fa5fa7e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Krupa=20=28paulfantom=29?= <pawel@krupa.net.pl>
Date: Tue, 25 Oct 2022 10:34:32 +0200
Subject: [PATCH] charts/promscale: regenerate alerts

---
 charts/promscale/Chart.yaml                   |  2 +-
 .../promscale/templates/prometheus-rule.yaml  | 50 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/charts/promscale/Chart.yaml b/charts/promscale/Chart.yaml
index 801bac04..d5dad282 100644
--- a/charts/promscale/Chart.yaml
+++ b/charts/promscale/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: promscale
 description: Promscale Connector deployment
 
-version: 14.4.0
+version: 14.4.1
 appVersion: 0.16.0
 
 home: https://github.com/timescale/promscale
diff --git a/charts/promscale/templates/prometheus-rule.yaml b/charts/promscale/templates/prometheus-rule.yaml
index 0ee9dc51..13c43472 100644
--- a/charts/promscale/templates/prometheus-rule.yaml
+++ b/charts/promscale/templates/prometheus-rule.yaml
@@ -27,11 +27,11 @@ spec:
     - alert: PromscaleIngestHighErrorRate
       expr: |
         (
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_ingest_requests_total{code=~"5.."}[5m])
           )
         /
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_ingest_requests_total[5m])
           )
         ) > 0.05
@@ -44,11 +44,11 @@ spec:
     - alert: PromscaleIngestHighErrorRate
       expr: |
         (
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_ingest_requests_total{code=~"5.."}[5m])
           )
         /
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_ingest_requests_total[5m])
           )
         ) > 0.1
@@ -63,12 +63,12 @@ spec:
         (
           histogram_quantile(
             0.90,
-            sum by (job, instance, type, le) (
+            sum by (job, instance, namespace, type, le) (
               rate(promscale_ingest_duration_seconds_bucket[5m])
             )
           ) > 10
         and
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
               rate(promscale_ingest_duration_seconds_bucket[5m])
           )
         ) > 0
@@ -84,12 +84,12 @@ spec:
         (
           histogram_quantile(
             0.90,
-            sum by (job, instance, type, le) (
+            sum by (job, instance, namespace, type, le) (
               rate(promscale_ingest_duration_seconds_bucket[5m])
             )
           ) > 30
         and
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
               rate(promscale_ingest_duration_seconds_bucket[5m])
           )
         ) > 0
@@ -105,11 +105,11 @@ spec:
     - alert: PromscaleQueryHighErrorRate
       expr: |
         (
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_query_requests_total{code=~"5.."}[5m])
           )
         /
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_query_requests_total[5m])
           )
         ) > 0.05
@@ -122,11 +122,11 @@ spec:
     - alert: PromscaleQueryHighErrorRate
       expr: |
         (
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_query_requests_total{code=~"5.."}[5m])
           )
         /
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_query_requests_total[5m])
           )
         ) > 0.1
@@ -141,12 +141,12 @@ spec:
         (
           histogram_quantile(
             0.90,
-            sum by (job, instance, type, le) (
+            sum by (job, instance, namespace, type, le) (
               rate(promscale_query_duration_seconds_bucket[5m])
             )
           ) > 5
         and
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_query_duration_seconds_bucket[5m])
           ) > 0
         )
@@ -162,12 +162,12 @@ spec:
         (
           histogram_quantile(
             0.90,
-            sum by (job, instance, type, le) (
+            sum by (job, instance, namespace, type, le) (
               rate(promscale_query_duration_seconds_bucket[5m])
             )
           ) > 10
         and
-          sum by (job, instance, type) (
+          sum by (job, instance, namespace, type) (
             rate(promscale_query_duration_seconds_bucket[5m])
           ) > 0
         )
@@ -198,12 +198,12 @@ spec:
     - alert: PromscaleDBHighErrorRate
       expr: |
         (
-          sum by (job) (
+          sum by (job, instance, namespace) (
             # Error counter exists for query, query_row & exec, and not for send_batch.
             rate(promscale_database_request_errors_total{method=~"query.*|exec"}[5m])
           )
         /
-          sum by (job) (
+          sum by (job, instance, namespace) (
             rate(promscale_database_requests_total{method=~"query.*|exec"}[5m])
           )
         ) > 0.05
@@ -217,12 +217,12 @@ spec:
       expr: |
         (
           histogram_quantile(0.9,
-            sum by (le, job, type) (
+            sum by (job, instance, namespace, le) (
               rate(promscale_database_requests_duration_seconds_bucket[5m])
             )
           ) > 5
         and
-          sum by (job, type) (
+          sum by (job, instance, namespace) (
             rate(promscale_database_requests_duration_seconds_count[5m])
           ) > 0
         )
@@ -237,11 +237,11 @@ spec:
     - alert: PromscaleStorageUnhealthy
       expr: |
         (
-          sum by (job) (
+          sum by (job, instance, namespace) (
             rate(promscale_sql_database_health_check_errors_total[5m])
           )
         /
-          sum by (job) (
+          sum by (job, instance, namespace) (
             rate(promscale_sql_database_health_check_total[5m])
           )
         ) > 0.05
@@ -292,7 +292,7 @@ spec:
             (
               delta(promscale_sql_database_chunks_metrics_expired_count[10m]) > 0
             )
-        )      
+        )
         or
         (
             (
@@ -302,7 +302,7 @@ spec:
             (
               delta(promscale_sql_database_chunks_traces_uncompressed_count[10m]) > 0
             )
-        )      
+        )
         or
         (
             (
@@ -312,7 +312,7 @@ spec:
             (
               delta(promscale_sql_database_chunks_traces_expired_count[10m]) > 0
             )
-        )      
+        )
       labels:
         severity: warning
       annotations: