X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/25d07fd9899c0ba0e741a21eb9a590ea6073e163..0c4c2dfa07939b515d41f8128c0b937ec6823cd1:/cookbooks/prometheus/templates/default/alert_rules.yml.erb

diff --git a/cookbooks/prometheus/templates/default/alert_rules.yml.erb b/cookbooks/prometheus/templates/default/alert_rules.yml.erb
index a0cea5792..dfd885bb8 100644
--- a/cookbooks/prometheus/templates/default/alert_rules.yml.erb
+++ b/cookbooks/prometheus/templates/default/alert_rules.yml.erb
@@ -118,7 +118,7 @@ groups:
         labels:
           alertgroup: database
         annotations:
-          delay: "{{ $value }}"
+          queries: "{{ $value }}"
   - name: discourse
     rules:
       - alert: discourse job failure rate
@@ -331,6 +331,15 @@ groups:
           alertgroup: "{{ $labels.site }}"
         annotations:
           power: "{{ $value }} dBm"
+  - name: load
+    rules:
+      - alert: load average
+        expr: sum(node_load5) by (instance) / count(node_cpu_frequency_max_hertz) by (instance) > 2
+        for: 5m
+        labels:
+          alertgroup: "{{ $labels.instance }}"
+        annotations:
+          load: "{{ $value | humanizePercentage }}"
   - name: mail
     rules:
       - alert: exim down
@@ -488,6 +497,11 @@ groups:
           alertgroup: nominatim
         annotations:
           delay: "{{ $value | humanizeDuration }}"
+      - alert: nominatim connections
+        expr: sum(nginx_connections_writing and on (instance) chef_role{name="nominatim"}) > 2500
+        for: 15m
+        labels:
+          alertgroup: nominatim
   - name: overpass
     rules:
       - alert: overpass osm database age
@@ -793,7 +807,7 @@ groups:
   - name: web
     rules:
       - alert: web error rate
-        expr: sum(rate(api_call_count_total{status=~"50[0-8]|5[1-9][0-9]"}[5m])) by (instance) / sum(rate(api_call_count_total[5m])) by (instance) > 0.002
+        expr: sum(rate(api_call_count_total{status=~"50[0-8]|5[1-9][0-9]"}[5m])) by (instance) / sum(rate(api_call_count_total[5m])) by (instance) > 0.002 and sum(rate(api_call_count_total{status=~"50[0-8]|5[1-9][0-9]"}[5m])) by (instance) > 0.01
         for: 5m
         labels:
           alertgroup: web