Refresh Prometheus rules/alerts and Grafana dashboards

* Refresh upstream Prometheus rules/alerts and Grafana dashboards
poseidon · Sep 13, 2020 · e6fe7ca · e6fe7ca
1 parent 979c092
commit e6fe7ca
Show file tree

Hide file tree

Showing 11 changed files with 3,623 additions and 1,896 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@ Notable changes between versions.
 
 ### Addons
 
+* Refresh Prometheus rules/alerts and Grafana dashboards
 * Reduce apiserver metrics cardinality for non-core APIs ([#830](https://github.com/poseidon/typhoon/pull/830))
 
 ## v1.19.1

diff --git a/addons/grafana/dashboards-coredns.yaml b/addons/grafana/dashboards-coredns.yaml
@@ -49,6 +49,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": "true"
               },
@@ -140,6 +141,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": "true"
               },
@@ -231,6 +233,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": "true"
               },
@@ -335,6 +338,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -440,6 +444,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -544,6 +549,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -649,6 +655,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -767,6 +774,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -858,6 +866,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": "true",
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },

diff --git a/addons/grafana/dashboards-etcd.yaml b/addons/grafana/dashboards-etcd.yaml
@@ -11,7 +11,6 @@ data:
       "editable": true,
       "gnetId": null,
       "hideControls": false,
-      "id": 6,
       "links": [
 
       ],
@@ -343,7 +342,7 @@ data:
               "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,

diff --git a/addons/grafana/dashboards-k8s-nodes.yaml b/addons/grafana/dashboards-k8s-nodes.yaml
@@ -565,6 +565,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -656,6 +657,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -760,6 +762,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -864,6 +867,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -962,6 +966,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1075,6 +1080,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1168,6 +1174,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1274,6 +1281,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1378,6 +1386,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1469,6 +1478,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1574,6 +1584,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1665,6 +1676,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1769,6 +1781,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -1873,6 +1886,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -1998,6 +2012,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -2021,7 +2036,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_latency_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", instance=~\"$instance\"}[5m])) by (instance, verb, url, le))",
+                  "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", instance=~\"$instance\"}[5m])) by (instance, verb, url, le))",
                   "format": "time_series",
                   "intervalFactor": 2,
                   "legendFormat": "{{instance}} {{verb}} {{url}}",
@@ -2102,6 +2117,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -2193,6 +2209,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -2284,6 +2301,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -2470,7 +2488,7 @@ data:
           "30d"
         ]
       },
-      "timezone": "",
+      "timezone": "UTC",
       "title": "Kubernetes / Kubelet",
       "uid": "3138fa155d5915769fbded898ac09fd9",
       "version": 0
@@ -2607,6 +2625,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -2698,6 +2717,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -2802,6 +2822,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -2893,6 +2914,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -2997,6 +3019,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -3109,6 +3132,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -3132,7 +3156,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_latency_seconds_bucket{job=\"kube-proxy\",instance=~\"$instance\",verb=\"POST\"}[5m])) by (verb, url, le))",
+                  "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{job=\"kube-proxy\",instance=~\"$instance\",verb=\"POST\"}[5m])) by (verb, url, le))",
                   "format": "time_series",
                   "intervalFactor": 2,
                   "legendFormat": "{{verb}} {{url}}",
@@ -3213,6 +3237,7 @@ data:
                 "min": false,
                 "rightSide": true,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": true
               },
@@ -3236,7 +3261,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_latency_seconds_bucket{job=\"kube-proxy\", instance=~\"$instance\", verb=\"GET\"}[5m])) by (verb, url, le))",
+                  "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{job=\"kube-proxy\", instance=~\"$instance\", verb=\"GET\"}[5m])) by (verb, url, le))",
                   "format": "time_series",
                   "intervalFactor": 2,
                   "legendFormat": "{{verb}} {{url}}",
@@ -3317,6 +3342,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -3408,6 +3434,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -3499,6 +3526,7 @@ data:
                 "min": false,
                 "rightSide": false,
                 "show": true,
+                "sideWidth": null,
                 "total": false,
                 "values": false
               },
@@ -3659,7 +3687,7 @@ data:
           "30d"
         ]
       },
-      "timezone": "",
+      "timezone": "UTC",
       "title": "Kubernetes / Proxy",
       "uid": "632e265de029684c40b21cb76bca4f94",
       "version": 0