Merge pull request #340 from brancz/remove-etcd-grpc-failed-alerts

manifests: Remove etcd gRPC calls failed alerts

Author: openshift-merge-robot

assets/prometheus-k8s/rules.yaml

@@ -1163,30 +1163,6 @@ spec:
       for: 15m
       labels:
         severity: warning
-    - alert: etcdHighNumberOfFailedGRPCRequests
-      annotations:
-        message: 'etcd cluster "{{ $labels.job }}": {{ $value }}% of requests for
-          {{ $labels.grpc_method }} failed on etcd instance {{ $labels.instance }}.'
-      expr: |
-        100 * sum(rate(grpc_server_handled_total{job=~".*etcd.*", grpc_code!="OK"}[5m])) BY (job, instance, grpc_service, grpc_method)
-          /
-        sum(rate(grpc_server_handled_total{job=~".*etcd.*"}[5m])) BY (job, instance, grpc_service, grpc_method)
-          > 1
-      for: 10m
-      labels:
-        severity: warning
-    - alert: etcdHighNumberOfFailedGRPCRequests
-      annotations:
-        message: 'etcd cluster "{{ $labels.job }}": {{ $value }}% of requests for
-          {{ $labels.grpc_method }} failed on etcd instance {{ $labels.instance }}.'
-      expr: |
-        100 * sum(rate(grpc_server_handled_total{job=~".*etcd.*", grpc_code!="OK"}[5m])) BY (job, instance, grpc_service, grpc_method)
-          /
-        sum(rate(grpc_server_handled_total{job=~".*etcd.*"}[5m])) BY (job, instance, grpc_service, grpc_method)
-          > 5
-      for: 5m
-      labels:
-        severity: critical
     - alert: etcdGRPCRequestsSlow
       annotations:
         message: 'etcd cluster "{{ $labels.job }}": gRPC requests to {{ $labels.grpc_method

jsonnet/main.jsonnet

@@ -28,6 +28,18 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
                  },
                },
              },
+           } + {
+             prometheusAlerts+:: {
+               groups:
+                 std.map(
+                   function(ruleGroup)
+                     if ruleGroup.name == 'etcd' then
+                       ruleGroup { rules: std.filter(function(rule) !('alert' in rule && rule.alert == 'etcdHighNumberOfFailedGRPCRequests'), ruleGroup.rules) }
+                     else
+                       ruleGroup,
+                   super.groups,
+                 ),
+             },
            } +
            (import 'telemeter-client/client.libsonnet') +
            {