Merge pull request #1014 from dgrisonnet/bz-1905903

[release-4.6] Bug 1905903: jsonnet: remove apiserver_request:availability30d
openshift · Dec 11, 2020 · 96fa143 · 96fa143
2 parents a282c5d + a1e3902
commit 96fa143
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 76 deletions.
diff --git a/assets/prometheus-k8s/rules.yaml b/assets/prometheus-k8s/rules.yaml
@@ -413,80 +413,6 @@ spec:
   - interval: 3m
     name: kube-apiserver-availability.rules
     rules:
-    - expr: |
-        1 - (
-          (
-            # write too slow
-            sum(increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d]))
-            -
-            sum(increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d]))
-          ) +
-          (
-            # read too slow
-            sum(increase(apiserver_request_duration_seconds_count{verb=~"LIST|GET"}[30d]))
-            -
-            (
-              (
-                sum(increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope=~"resource|",le="0.1"}[30d]))
-                or
-                vector(0)
-              )
-              +
-              sum(increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="namespace",le="0.5"}[30d]))
-              +
-              sum(increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="cluster",le="5"}[30d]))
-            )
-          ) +
-          # errors
-          sum(code:apiserver_request_total:increase30d{code=~"5.."} or vector(0))
-        )
-        /
-        sum(code:apiserver_request_total:increase30d)
-      labels:
-        verb: all
-      record: apiserver_request:availability30d
-    - expr: |
-        1 - (
-          sum(increase(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30d]))
-          -
-          (
-            # too slow
-            (
-              sum(increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[30d]))
-              or
-              vector(0)
-            )
-            +
-            sum(increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[30d]))
-            +
-            sum(increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[30d]))
-          )
-          +
-          # errors
-          sum(code:apiserver_request_total:increase30d{verb="read",code=~"5.."} or vector(0))
-        )
-        /
-        sum(code:apiserver_request_total:increase30d{verb="read"})
-      labels:
-        verb: read
-      record: apiserver_request:availability30d
-    - expr: |
-        1 - (
-          (
-            # too slow
-            sum(increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d]))
-            -
-            sum(increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d]))
-          )
-          +
-          # errors
-          sum(code:apiserver_request_total:increase30d{verb="write",code=~"5.."} or vector(0))
-        )
-        /
-        sum(code:apiserver_request_total:increase30d{verb="write"})
-      labels:
-        verb: write
-      record: apiserver_request:availability30d
     - expr: |
         sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="LIST",code=~"2.."}[30d]))
       record: code_verb:apiserver_request_total:increase30d

diff --git a/jsonnet/main.jsonnet b/jsonnet/main.jsonnet
@@ -61,6 +61,19 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
                    super.groups,
                  ),
              },
+           } + {
+             prometheusRules+:: {
+               groups:
+                 std.map(
+                   function(ruleGroup)
+                     // Removing unused apiserver_request:availability30d recording rule as its evaluation fails. https://bugzilla.redhat.com/show_bug.cgi?id=1872786
+                     if ruleGroup.name == 'kube-apiserver-availability.rules' then
+                       ruleGroup { rules: std.filter(function(rule) !('record' in rule && rule.record == 'apiserver_request:availability30d'), ruleGroup.rules) }
+                     else
+                       ruleGroup,
+                   super.groups,
+                 ),
+             }
            } +
            (import 'telemeter-client/client.libsonnet') +
            {

diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go