diff --git a/templates/grafana/deployment.yaml b/templates/grafana/deployment.yaml index aaaa1e5..7779682 100644 --- a/templates/grafana/deployment.yaml +++ b/templates/grafana/deployment.yaml @@ -24,7 +24,7 @@ spec: type: RuntimeDefault containers: - name: grafana - image: docker.io/grafana/grafana:7.3.1 + image: docker.io/grafana/grafana:7.3.2 env: - name: GF_PATHS_CONFIG value: "/etc/grafana/custom.ini" diff --git a/templates/prometheus/rules.yaml b/templates/prometheus/rules.yaml index 926af9e..c7179aa 100644 --- a/templates/prometheus/rules.yaml +++ b/templates/prometheus/rules.yaml @@ -50,28 +50,6 @@ data: "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])) without (grpc_type, grpc_code)\n /\nsum(rate(grpc_server_handled_total{job=~\".*etcd.*\"}[5m])) without (grpc_type, grpc_code)\n > 1\n", - "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])) without (grpc_type, grpc_code)\n /\nsum(rate(grpc_server_handled_total{job=~\".*etcd.*\"}[5m])) without (grpc_type, grpc_code)\n > 5\n", - "for": "5m", - "labels": { - "severity": "critical" - } - }, { "alert": "etcdGRPCRequestsSlow", "annotations": {