Fix active query alerts

diff --git a/cookbooks/prometheus/templates/default/alert_rules.yml.erb b/cookbooks/prometheus/templates/default/alert_rules.yml.erb
index 20136a7715f6ae26b4ad14e0a52a1cf0792d915f..1fac68869072fa423a1f2c1e9e8affdb42a00976 100644 (file)
--- a/cookbooks/prometheus/templates/default/alert_rules.yml.erb
+++ b/cookbooks/prometheus/templates/default/alert_rules.yml.erb
@@ -106,14 +106,14 @@ groups:
   - name: database
     rules:
       - alert: active rails queries
   - name: database
     rules:
       - alert: active rails queries

-        expr: sum(pg_stat_activity_count{instance="snap-01",datname="openstreetmap",usename="rails",state="active"}) > 50 and on (instance) chef_role{name="db-master"}
+        expr: sum(pg_stat_activity_count{datname="openstreetmap",usename="rails",state="active"}) by (instance) > 50 and on (instance) chef_role{name="db-master"}

         for: 5m
         labels:
           alertgroup: database
         annotations:
           queries: "{{ $value }}"
       - alert: active cgimap queries
         for: 5m
         labels:
           alertgroup: database
         annotations:
           queries: "{{ $value }}"
       - alert: active cgimap queries

-        expr: sum(pg_stat_activity_count{instance="snap-01",datname="openstreetmap",usename="cgimap",state="active"}) > 30 and on (instance) chef_role{name="db-master"}
+        expr: sum(pg_stat_activity_count{datname="openstreetmap",usename="cgimap",state="active"}) by (instance) > 30 and on (instance) chef_role{name="db-master"}

         for: 5m
         labels:
           alertgroup: database
         for: 5m
         labels:
           alertgroup: database