Merge pull request #406 from smarterclayton/router

metrics: Add ingress related recording rules for OpenShift
openshift · Jul 20, 2019 · 1d3a2dc · 1d3a2dc
2 parents 466a05d + 352fbb0
commit 1d3a2dc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/assets/prometheus-k8s/rules.yaml b/assets/prometheus-k8s/rules.yaml
@@ -417,6 +417,16 @@ spec:
       for: 15m
       labels:
         severity: critical
+  - name: openshift-ingress.rules
+    rules:
+    - expr: sum by (code) (rate(haproxy_server_http_responses_total[5m]) > 0)
+      record: code:cluster:ingress_http_request_count:rate5m:sum
+    - expr: sum by (frontend) (rate(haproxy_frontend_bytes_in_total[5m]))
+      record: frontend:cluster:ingress_frontend_bytes_in:rate5m:sum
+    - expr: sum by (frontend) (rate(haproxy_frontend_bytes_out_total[5m]))
+      record: frontend:cluster:ingress_frontend_bytes_out:rate5m:sum
+    - expr: sum by (frontend) (haproxy_frontend_current_sessions)
+      record: frontend:cluster:ingress_frontend_connections:sum
   - name: openshift-build.rules
     rules:
     - expr: sum(openshift_build_total{job="kubernetes-apiservers",phase="Error"})/(sum(openshift_build_total{job="kubernetes-apiservers",phase=~"Failed|Complete|Error"}))

diff --git a/jsonnet/rules.jsonnet b/jsonnet/rules.jsonnet
@@ -96,6 +96,27 @@
           },
         ],
       },
+      {
+        name: 'openshift-ingress.rules',
+        rules: [
+          {
+            expr: 'sum by (code) (rate(haproxy_server_http_responses_total[5m]) > 0)',
+            record: 'code:cluster:ingress_http_request_count:rate5m:sum',
+          },
+          {
+            expr: 'sum by (frontend) (rate(haproxy_frontend_bytes_in_total[5m]))',
+            record: 'frontend:cluster:ingress_frontend_bytes_in:rate5m:sum',
+          },
+          {
+            expr: 'sum by (frontend) (rate(haproxy_frontend_bytes_out_total[5m]))',
+            record: 'frontend:cluster:ingress_frontend_bytes_out:rate5m:sum',
+          },
+          {
+            expr: 'sum by (frontend) (haproxy_frontend_current_sessions)',
+            record: 'frontend:cluster:ingress_frontend_connections:sum',
+          }
+        ],
+      },
       {
         name: 'openshift-build.rules',
         rules: [