Merge pull request #11768 from brancz/uid

Use UID instead of ID in Grafana dashboard

Documentation/etcd-mixin/mixin.libsonnet

@@ -217,7 +217,7 @@
 
   grafanaDashboards+:: {
     'etcd.json': {
-      id: 6,
+      uid: std.md5('etcd.json'),
       title: 'etcd',
       description: 'etcd sample Grafana dashboard with Prometheus',
       tags: [],
@@ -516,7 +516,7 @@
               stack: false,
               steppedLine: false,
               targets: [{
-                expr: 'etcd_debugging_mvcc_db_total_size_in_bytes{job="$cluster"}',
+                expr: 'etcd_mvcc_db_total_size_in_bytes{job="$cluster"}',
                 hide: false,
                 interval: '',
                 intervalFactor: 2,

Documentation/op-guide/etcd3_alert.rules.yml

@@ -2,6 +2,21 @@
 groups:
 - name: etcd
   rules:
+  - alert: etcdMembersDown
+    annotations:
+      message: 'etcd cluster "{{ $labels.job }}": members are down ({{ $value }}).'
+    expr: |
+      max by (job) (
+        sum by (job) (up{job=~".*etcd.*"} == bool 0)
+      or
+        count by (job,endpoint) (
+          sum by (job,endpoint,To) (rate(etcd_network_peer_sent_failures_total{job=~".*etcd.*"}[3m])) > 0.01
+        )
+      )
+      > 0
+    for: 3m
+    labels:
+      severity: critical
   - alert: etcdInsufficientMembers
     annotations:
       message: 'etcd cluster "{{ $labels.job }}": insufficient members ({{ $value
@@ -22,11 +37,12 @@ groups:
       severity: critical
   - alert: etcdHighNumberOfLeaderChanges
     annotations:
-      message: 'etcd cluster "{{ $labels.job }}": instance {{ $labels.instance }}
+      message: 'etcd cluster "{{ $labels.job }}": {{ $value }} leader changes within
-        has seen {{ $value }} leader changes within the last hour.'
+        the last 15 minutes. Frequent elections may be a sign of insufficient resources,
+        high network latency, or disruptions by other components and should be investigated.'
     expr: |
-      rate(etcd_server_leader_changes_seen_total{job=~".*etcd.*"}[15m]) > 3
+      increase((max by (job) (etcd_server_leader_changes_seen_total{job=~".*etcd.*"}) or 0*absent(etcd_server_leader_changes_seen_total{job=~".*etcd.*"}))[15m:1m]) >= 3
-    for: 15m
+    for: 5m
     labels:
       severity: warning
   - alert: etcdHighNumberOfFailedGRPCRequests
@@ -76,7 +92,7 @@ groups:
   - alert: etcdHighNumberOfFailedProposals
     annotations:
       message: 'etcd cluster "{{ $labels.job }}": {{ $value }} proposal failures within
-        the last hour on etcd instance {{ $labels.instance }}.'
+        the last 30 minutes on etcd instance {{ $labels.instance }}.'
     expr: |
       rate(etcd_server_proposals_failed_total{job=~".*etcd.*"}[15m]) > 5
     for: 15m

Documentation/op-guide/grafana.json

@@ -9,7 +9,6 @@
         "editable": true,
         "gnetId": null,
         "hideControls": false,
-        "id": 6,
         "links": [
 
         ],
@@ -1220,6 +1219,7 @@
         },
         "timezone": "browser",
         "title": "etcd",
+        "uid": "c2f4e12cdf69feb95caa41a5a1b423d9",
         "version": 215
     }
 }