diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index da5cedaf81b39e9c0f0b6631993b3193a25443a4..45f58cdd9f6f834320414c1c1c4db1f560dcfb53 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -2,11 +2,11 @@
"alertmanager": "0.22.2",
"blackboxExporter": "0.19.0",
"grafana": "8.0.3",
- "kubeStateMetrics": "2.1.0",
+ "kubeStateMetrics": "2.1.1",
"nodeExporter": "1.2.0",
"prometheus": "2.28.1",
"prometheusAdapter": "0.8.4",
"prometheusOperator": "0.49.0",
- "kubeRbacProxy": "0.10.0",
+ "kubeRbacProxy": "0.11.0",
"configmapReload": "0.5.0"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index b6d6aead5fb9f512e07e3db415cf519a9a78e5b1..71de6da159441778c0052a2a331343faad7ebfdb 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "53d234f1fe2b4212bd8538cd694db8fedc375549",
+ "version": "2526463e44c4152ee8c6110bd0d0fc5e7f1140e2",
"sum": "PPTfil9MoAqtyW+hHJuAj3Ap86pB86vIHativ9R5c4I="
},
{
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "4c6f9dabceb944ce894d79eeb516c98694f5759f",
+ "version": "8df6a4ff1623781260c3236761c2ebe837958b3f",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -48,8 +48,8 @@
"subdir": ""
}
},
- "version": "50dddcc2aecf074c7f7fab92caa87a806e5040fa",
- "sum": "H4TcGWDVaNF51ZaGpJwm9rVympjpTtSjl4UCYI8q1LU="
+ "version": "25b5047a57352345e478b215370dfcd1fecee27d",
+ "sum": "z+ksn3PAtR/fYtxgsrrG4euIriyiefZsTUcJaVXdG1Q="
},
{
"source": {
@@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "50dddcc2aecf074c7f7fab92caa87a806e5040fa",
+ "version": "25b5047a57352345e478b215370dfcd1fecee27d",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "58869f0c5e2e099e712b9c2c2123402ed90abc0b",
+ "version": "44ddbcf76d062269b9429e6da2e15cb3058e678f",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "58869f0c5e2e099e712b9c2c2123402ed90abc0b",
+ "version": "44ddbcf76d062269b9429e6da2e15cb3058e678f",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "3f047bc9c74105ba774aff726798a66b81409f7f",
+ "version": "8008520bc4097d46d2304c6c015cd3e5b6dd3126",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@@ -99,7 +99,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "3f047bc9c74105ba774aff726798a66b81409f7f",
+ "version": "8008520bc4097d46d2304c6c015cd3e5b6dd3126",
"sum": "TcXPVhn0BIFCf5mWa6hyIljVl13ItwPjyeiwro56kjE="
},
{
@@ -120,8 +120,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "129b5f5b5f4b8d2427df1790cef380e52669325b",
- "sum": "r1ZfMhHo+ijlUkaD7fHrELSofWteq6exirgW/aMpnmE="
+ "version": "7fc5c6045aeb1d615296f6daca1f7a77554d5efb",
+ "sum": "vvgImniWcZVtiU3rEQmeN4DaIktPXNn7u3Zqzdv5bMg="
},
{
"source": {
@@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "507d61fdeb4540c34102f41b7286895ecec19324",
+ "version": "24165adadc889131dbd0143b5c16cd3a079e46cd",
"sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=",
"name": "prometheus"
},
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "83419bc5e3c5f667410a04c1c9920e27c3779162",
+ "version": "aa148f8fdb281a9ea4c1e5a7ee2e1336d8459c4f",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin"
},
diff --git a/manifests/blackbox-exporter-deployment.yaml b/manifests/blackbox-exporter-deployment.yaml
index 3056073cfb81117285c9e58b71a50bdb1f65ea05..e47166bdb4e6c7ab47c260199e964192949aa714 100644
--- a/manifests/blackbox-exporter-deployment.yaml
+++ b/manifests/blackbox-exporter-deployment.yaml
@@ -74,7 +74,7 @@ spec:
- --secure-listen-address=:9115
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:19115/
- image: quay.io/brancz/kube-rbac-proxy:v0.10.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.11.0
name: kube-rbac-proxy
ports:
- containerPort: 9115
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 0ac51dcc52331d77cf85998d118a9bc36e256da3..55cb76db10ee66b51addd9d0963cc1a1c0e3f270 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -24035,23 +24035,30 @@ items:
data:
node-cluster-rsrc-use.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
]
},
- "editable": true,
+ "editable": false,
"gnetId": null,
- "graphTooltip": 0,
+ "graphTooltip": 1,
"hideControls": false,
+ "id": null,
"links": [
],
- "refresh": "10s",
+ "refresh": "30s",
"rows": [
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -24062,26 +24069,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 1,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 2,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24091,12 +24106,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(\n instance:node_cpu_utilisation:rate5m{job=\"node-exporter\"}\n*\n instance:node_num_cpu:sum{job=\"node-exporter\"}\n)\n/ scalar(sum(instance:node_num_cpu:sum{job=\"node-exporter\"}))\n",
+ "expr": "((\n instance:node_cpu_utilisation:rate5m{job=\"node-exporter\", cluster=\"$cluster\"}\n *\n instance:node_num_cpu:sum{job=\"node-exporter\", cluster=\"$cluster\"}\n) != 0 )\n/ scalar(sum(instance:node_num_cpu:sum{job=\"node-exporter\", cluster=\"$cluster\"}))\n",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{instance}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "legendFormat": "{{ instance }}",
+ "refId": "A"
}
],
"thresholds": [
@@ -24106,8 +24120,8 @@ items:
"timeShift": null,
"title": "CPU Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24125,17 +24139,17 @@ items:
"format": "percentunit",
"label": null,
"logBase": 1,
- "max": 1,
- "min": 0,
+ "max": null,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -24148,26 +24162,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 2,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 3,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24177,12 +24199,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_load1_per_cpu:ratio{job=\"node-exporter\"}\n/ scalar(count(instance:node_load1_per_cpu:ratio{job=\"node-exporter\"}))\n",
+ "expr": "(\n instance:node_load1_per_cpu:ratio{job=\"node-exporter\", cluster=\"$cluster\"}\n / scalar(count(instance:node_load1_per_cpu:ratio{job=\"node-exporter\", cluster=\"$cluster\"}))\n) != 0\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -24190,10 +24211,10 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "CPU Saturation (load1 per CPU)",
+ "title": "CPU Saturation (Load1 per CPU)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24211,17 +24232,17 @@ items:
"format": "percentunit",
"label": null,
"logBase": 1,
- "max": 1,
- "min": 0,
+ "max": null,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -24231,11 +24252,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "CPU",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -24246,26 +24268,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 3,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 4,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24275,12 +24305,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_memory_utilisation:ratio{job=\"node-exporter\"}\n/ scalar(count(instance:node_memory_utilisation:ratio{job=\"node-exporter\"}))\n",
+ "expr": "(\n instance:node_memory_utilisation:ratio{job=\"node-exporter\", cluster=\"$cluster\"}\n / scalar(count(instance:node_memory_utilisation:ratio{job=\"node-exporter\", cluster=\"$cluster\"}))\n) != 0\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -24290,8 +24319,8 @@ items:
"timeShift": null,
"title": "Memory Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24309,17 +24338,17 @@ items:
"format": "percentunit",
"label": null,
"logBase": 1,
- "max": 1,
- "min": 0,
+ "max": null,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -24332,26 +24361,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 4,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 5,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24361,12 +24398,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\"}",
+ "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\", cluster=\"$cluster\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -24376,8 +24412,8 @@ items:
"timeShift": null,
"title": "Memory Saturation (Major Page Faults)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24392,20 +24428,20 @@ items:
},
"yaxes": [
{
- "format": "rps",
+ "format": "rds",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "rds",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -24415,11 +24451,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Memory",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -24430,33 +24467,41 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 5,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 6,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
{
- "alias": "/ Receive/",
+ "alias": "/Receive/",
"stack": "A"
},
{
- "alias": "/ Transmit/",
+ "alias": "/Transmit/",
"stack": "B",
"transform": "negative-Y"
}
@@ -24467,20 +24512,18 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Receive",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
},
{
- "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Transmit",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "B"
}
],
"thresholds": [
@@ -24488,10 +24531,10 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Net Utilisation (Bytes Receive/Transmit)",
+ "title": "Network Utilisation (Bytes Receive/Transmit)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24514,12 +24557,12 @@ items:
"show": true
},
{
- "format": "short",
+ "format": "Bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -24532,26 +24575,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 6,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 7,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
{
"alias": "/ Receive/",
@@ -24569,20 +24620,18 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Receive",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
},
{
- "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Transmit",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "B"
}
],
"thresholds": [
@@ -24590,10 +24639,10 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Net Saturation (Drops Receive/Transmit)",
+ "title": "Network Saturation (Drops Receive/Transmit)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24608,7 +24657,7 @@ items:
},
"yaxes": [
{
- "format": "rps",
+ "format": "Bps",
"label": null,
"logBase": 1,
"max": null,
@@ -24616,12 +24665,12 @@ items:
"show": true
},
{
- "format": "short",
+ "format": "Bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -24631,11 +24680,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Network",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -24646,26 +24696,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 7,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 8,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24675,12 +24733,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\"}))\n",
+ "expr": "(\n instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\", cluster=\"$cluster\"}\n / scalar(count(instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\", cluster=\"$cluster\"}))\n) != 0\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} {{device}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -24690,8 +24747,8 @@ items:
"timeShift": null,
"title": "Disk IO Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24709,17 +24766,17 @@ items:
"format": "percentunit",
"label": null,
"logBase": 1,
- "max": 1,
- "min": 0,
+ "max": null,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -24732,26 +24789,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 8,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 9,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24761,12 +24826,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\"}))\n",
+ "expr": "(\n instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\", cluster=\"$cluster\"}\n / scalar(count(instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\", cluster=\"$cluster\"}))\n) != 0\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} {{device}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -24776,8 +24840,8 @@ items:
"timeShift": null,
"title": "Disk IO Saturation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24795,17 +24859,17 @@ items:
"format": "percentunit",
"label": null,
"logBase": 1,
- "max": 1,
- "min": 0,
+ "max": null,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -24815,11 +24879,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Disk IO",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -24830,26 +24895,34 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 10,
- "id": 9,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 10,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
"lines": true,
- "linewidth": 0,
+ "linewidth": 1,
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -24859,12 +24932,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum without (device) (\n max without (fstype, mountpoint) (\n node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\"} - node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\"}\n )\n) \n/ scalar(sum(max without (fstype, mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\"})))\n",
+ "expr": "sum without (device) (\n max without (fstype, mountpoint) ((\n node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"}\n -\n node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"}\n ) != 0)\n)\n/ scalar(sum(max without (fstype, mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"})))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
- "legendLink": "/dashboard/file/node-rsrc-use.json",
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -24874,8 +24946,8 @@ items:
"timeShift": null,
"title": "Disk Space Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -24893,17 +24965,17 @@ items:
"format": "percentunit",
"label": null,
"logBase": 1,
- "max": 1,
- "min": 0,
+ "max": null,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -24913,20 +24985,21 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Disk Space",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
}
],
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "node-exporter-mixin"
],
"templating": {
"list": [
{
"current": {
- "text": "default",
- "value": "default"
+ "text": "Prometheus",
+ "value": "Prometheus"
},
"hide": 0,
"label": null,
@@ -24938,6 +25011,33 @@ items:
"refresh": 1,
"regex": "",
"type": "datasource"
+ },
+ {
+ "allValue": null,
+ "current": {
+ "text": "",
+ "value": ""
+ },
+ "datasource": "$datasource",
+ "hide": 2,
+ "includeAll": false,
+ "label": null,
+ "multi": false,
+ "name": "cluster",
+ "options": [
+
+ ],
+ "query": "label_values(node_time_seconds, cluster)",
+ "refresh": 2,
+ "regex": "",
+ "sort": 1,
+ "tagValuesQuery": "",
+ "tags": [
+
+ ],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
}
]
},
@@ -24971,8 +25071,7 @@ items:
]
},
"timezone": "utc",
- "title": "USE Method / Cluster",
- "uid": "",
+ "title": "Node Exporter / USE Method / Cluster",
"version": 0
}
kind: ConfigMap
@@ -24988,23 +25087,30 @@ items:
data:
node-rsrc-use.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
]
},
- "editable": true,
+ "editable": false,
"gnetId": null,
- "graphTooltip": 0,
+ "graphTooltip": 1,
"hideControls": false,
+ "id": null,
"links": [
],
- "refresh": "10s",
+ "refresh": "30s",
"rows": [
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25014,14 +25120,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 1,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 2,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25030,26 +25143,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_cpu_utilisation:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_cpu_utilisation:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Utilisation",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25059,8 +25172,8 @@ items:
"timeShift": null,
"title": "CPU Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25079,16 +25192,16 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -25100,14 +25213,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 2,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 3,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25116,26 +25236,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_load1_per_cpu:ratio{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_load1_per_cpu:ratio{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Saturation",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25145,8 +25265,8 @@ items:
"timeShift": null,
"title": "CPU Saturation (Load1 per CPU)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25165,16 +25285,16 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25184,11 +25304,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "CPU",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25198,14 +25319,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 3,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 4,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25214,26 +25342,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_memory_utilisation:ratio{job=\"node-exporter\", job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_memory_utilisation:ratio{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Memory",
- "legendLink": null,
- "step": 10
+ "legendFormat": "Utilisation",
+ "refId": "A"
}
],
"thresholds": [
@@ -25243,8 +25371,8 @@ items:
"timeShift": null,
"title": "Memory Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25263,16 +25391,16 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -25284,14 +25412,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 4,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 5,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25300,26 +25435,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Major page faults",
- "legendLink": null,
- "step": 10
+ "legendFormat": "Major page Faults",
+ "refId": "A"
}
],
"thresholds": [
@@ -25329,8 +25464,8 @@ items:
"timeShift": null,
"title": "Memory Saturation (Major Page Faults)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25345,20 +25480,20 @@ items:
},
"yaxes": [
{
- "format": "short",
+ "format": "rds",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "rds",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25368,11 +25503,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Memory",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25382,14 +25518,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 5,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 6,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25398,11 +25541,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
{
"alias": "/Receive/",
@@ -25416,24 +25560,22 @@ items:
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Receive",
- "legendLink": null,
- "step": 10
+ "refId": "A"
},
{
- "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Transmit",
- "legendLink": null,
- "step": 10
+ "refId": "B"
}
],
"thresholds": [
@@ -25441,10 +25583,10 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Net Utilisation (Bytes Receive/Transmit)",
+ "title": "Network Utilisation (Bytes Receive/Transmit)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25467,12 +25609,12 @@ items:
"show": true
},
{
- "format": "short",
+ "format": "Bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -25484,14 +25626,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 6,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 7,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25500,42 +25649,41 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
{
- "alias": "/Receive/",
+ "alias": "/ Receive/",
"stack": "A"
},
{
- "alias": "/Transmit/",
+ "alias": "/ Transmit/",
"stack": "B",
"transform": "negative-Y"
}
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Receive drops",
- "legendLink": null,
- "step": 10
+ "legendFormat": "Receive",
+ "refId": "A"
},
{
- "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Transmit drops",
- "legendLink": null,
- "step": 10
+ "legendFormat": "Transmit",
+ "refId": "B"
}
],
"thresholds": [
@@ -25543,10 +25691,10 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Net Saturation (Drops Receive/Transmit)",
+ "title": "Network Saturation (Drops Receive/Transmit)",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25561,7 +25709,7 @@ items:
},
"yaxes": [
{
- "format": "rps",
+ "format": "Bps",
"label": null,
"logBase": 1,
"max": null,
@@ -25569,12 +25717,12 @@ items:
"show": true
},
{
- "format": "short",
+ "format": "Bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25583,12 +25731,13 @@ items:
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
- "title": "Net",
- "titleSize": "h6"
+ "title": "Network",
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25598,14 +25747,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 7,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 8,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25614,26 +25770,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{device}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25643,8 +25799,8 @@ items:
"timeShift": null,
"title": "Disk IO Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25663,16 +25819,16 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -25684,14 +25840,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 8,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 9,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25700,26 +25863,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 6,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\", instance=\"$instance\", cluster=\"$cluster\"} != 0",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{device}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25729,8 +25892,8 @@ items:
"timeShift": null,
"title": "Disk IO Saturation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25749,16 +25912,16 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25768,11 +25931,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Disk IO",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25782,14 +25946,21 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
- "fill": 1,
- "id": 9,
+ "fill": 10,
+ "fillGradient": 0,
+ "gridPos": {
+
+ },
+ "id": 10,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
+ "sideWidth": null,
"total": false,
"values": false
},
@@ -25798,26 +25969,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
"span": 12,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "1 -\n(\n max without (mountpoint, fstype) (node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", instance=\"$instance\"})\n/\n max without (mountpoint, fstype) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", instance=\"$instance\"})\n)\n",
+ "expr": "sort_desc(1 -\n (\n max without (mountpoint, fstype) (node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", instance=\"$instance\", cluster=\"$cluster\"})\n /\n max without (mountpoint, fstype) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", instance=\"$instance\", cluster=\"$cluster\"})\n ) != 0\n)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{device}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25827,8 +25998,8 @@ items:
"timeShift": null,
"title": "Disk Space Utilisation",
"tooltip": {
- "shared": false,
- "sort": 0,
+ "shared": true,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -25847,16 +26018,16 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
- "format": "short",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25866,20 +26037,21 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Disk Space",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
}
],
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "node-exporter-mixin"
],
"templating": {
"list": [
{
"current": {
- "text": "default",
- "value": "default"
+ "text": "Prometheus",
+ "value": "Prometheus"
},
"hide": 0,
"label": null,
@@ -25895,22 +26067,48 @@ items:
{
"allValue": null,
"current": {
- "text": "prod",
- "value": "prod"
+ "text": "",
+ "value": ""
+ },
+ "datasource": "$datasource",
+ "hide": 2,
+ "includeAll": false,
+ "label": null,
+ "multi": false,
+ "name": "cluster",
+ "options": [
+
+ ],
+ "query": "label_values(node_time_seconds, cluster)",
+ "refresh": 2,
+ "regex": "",
+ "sort": 1,
+ "tagValuesQuery": "",
+ "tags": [
+
+ ],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
+ },
+ {
+ "allValue": null,
+ "current": {
+
},
"datasource": "$datasource",
"hide": 0,
"includeAll": false,
- "label": "instance",
+ "label": null,
"multi": false,
"name": "instance",
"options": [
],
- "query": "label_values(up{job=\"node-exporter\"}, instance)",
- "refresh": 1,
+ "query": "label_values(node_exporter_build_info{job=\"node-exporter\", cluster=\"$cluster\"}, instance)",
+ "refresh": 2,
"regex": "",
- "sort": 2,
+ "sort": 1,
"tagValuesQuery": "",
"tags": [
@@ -25951,8 +26149,7 @@ items:
]
},
"timezone": "utc",
- "title": "USE Method / Node",
- "uid": "",
+ "title": "Node Exporter / USE Method / Node",
"version": 0
}
kind: ConfigMap
@@ -25981,13 +26178,13 @@ items:
},
"editable": false,
"gnetId": null,
- "graphTooltip": 0,
+ "graphTooltip": 1,
"hideControls": false,
"id": null,
"links": [
],
- "refresh": "",
+ "refresh": "30s",
"rows": [
{
"collapse": false,
@@ -26854,7 +27051,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "node-exporter-mixin"
],
"templating": {
"list": [
@@ -26931,8 +27128,8 @@ items:
"30d"
]
},
- "timezone": "browser",
- "title": "Nodes",
+ "timezone": "utc",
+ "title": "Node Exporter / Nodes",
"version": 0
}
kind: ConfigMap
diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml
index fbfceaeba874cd3d2511026c2d4e6672f4cae0fe..698fdb34b87decc4e2a703516f4f341adb540e47 100644
--- a/manifests/kube-state-metrics-clusterRole.yaml
+++ b/manifests/kube-state-metrics-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
name: kube-state-metrics
rules:
- apiGroups:
diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml
index bcadf7e45d3ae3bbf8a175a24062ea738f8e6c54..db2af90fcaac52102bf102b9edac8e682d19b2f0 100644
--- a/manifests/kube-state-metrics-clusterRoleBinding.yaml
+++ b/manifests/kube-state-metrics-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml
index bd2902607162079b0fa6295865d6aaaf7057af5a..6222ef965a8197d0fae6e2b5a13782f4ecdaa614 100644
--- a/manifests/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
name: kube-state-metrics
namespace: monitoring
spec:
@@ -23,7 +23,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
spec:
containers:
- args:
@@ -31,7 +31,7 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.1.0
+ image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.1.1
name: kube-state-metrics
resources:
limits:
@@ -47,7 +47,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8081/
- image: quay.io/brancz/kube-rbac-proxy:v0.10.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.11.0
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
@@ -68,7 +68,7 @@ spec:
- --secure-listen-address=:9443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8082/
- image: quay.io/brancz/kube-rbac-proxy:v0.10.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.11.0
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
diff --git a/manifests/kube-state-metrics-prometheusRule.yaml b/manifests/kube-state-metrics-prometheusRule.yaml
index 237776f2d872ff237f4aac1dbcd826da8f03f6a3..2f50e5f8216b21109f0a0bfb43432ffb28a158c6 100644
--- a/manifests/kube-state-metrics-prometheusRule.yaml
+++ b/manifests/kube-state-metrics-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
prometheus: k8s
role: alert-rules
name: kube-state-metrics-rules
diff --git a/manifests/kube-state-metrics-service.yaml b/manifests/kube-state-metrics-service.yaml
index 2eb0e7f23e47fb44ea8029bcf2c3ed1c754f5a8d..36aa48a227b66eff54a25223a23140084a4a3db2 100644
--- a/manifests/kube-state-metrics-service.yaml
+++ b/manifests/kube-state-metrics-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml
index 4c5c9f66af220411cb2af82ce8a891127e001a7c..1ab732eae2b9892c480431a2e0edbad20d522e0c 100644
--- a/manifests/kube-state-metrics-serviceAccount.yaml
+++ b/manifests/kube-state-metrics-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index 1fc5d1474bb5f3da5c57f1878dcf6d64175084da..148ecefeff37538dbe154ff9baf54e1d098f8429 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.1.0
+ app.kubernetes.io/version: 2.1.1
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kubernetes-prometheusRule.yaml b/manifests/kubernetes-prometheusRule.yaml
index 1ff25d1fe08270591e3e82ea3a2d0ac0ab813790..e54832ade922a6080fd7552a87ac4cde7acc2cc6 100644
--- a/manifests/kubernetes-prometheusRule.yaml
+++ b/manifests/kubernetes-prometheusRule.yaml
@@ -1188,7 +1188,7 @@ spec:
sum by (namespace, pod, cluster) (
max by (namespace, pod, container, cluster) (
kube_pod_container_resource_requests{resource="memory",job="kube-state-metrics"}
- ) * on(namespace, pod, cluster) group_left() max by (namespace, pod) (
+ ) * on(namespace, pod, cluster) group_left() max by (namespace, pod, cluster) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)
@@ -1205,7 +1205,7 @@ spec:
sum by (namespace, pod, cluster) (
max by (namespace, pod, container, cluster) (
kube_pod_container_resource_requests{resource="cpu",job="kube-state-metrics"}
- ) * on(namespace, pod, cluster) group_left() max by (namespace, pod) (
+ ) * on(namespace, pod, cluster) group_left() max by (namespace, pod, cluster) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)
@@ -1222,7 +1222,7 @@ spec:
sum by (namespace, pod, cluster) (
max by (namespace, pod, container, cluster) (
kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"}
- ) * on(namespace, pod, cluster) group_left() max by (namespace, pod) (
+ ) * on(namespace, pod, cluster) group_left() max by (namespace, pod, cluster) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)
@@ -1239,7 +1239,7 @@ spec:
sum by (namespace, pod, cluster) (
max by (namespace, pod, container, cluster) (
kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"}
- ) * on(namespace, pod, cluster) group_left() max by (namespace, pod) (
+ ) * on(namespace, pod, cluster) group_left() max by (namespace, pod, cluster) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index e414d12b85a318aad36fc5866759173ca2b55693..b177635e25b877e9abce054d700b611bc05b812d 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -60,7 +60,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
- image: quay.io/brancz/kube-rbac-proxy:v0.10.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.11.0
name: kube-rbac-proxy
ports:
- containerPort: 9100
diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml
index 04a8df3f48d1bcd4496d136a7bd7fef81d75b85b..a8944ba26e755be239984cd1dcececc4b0c36e53 100644
--- a/manifests/setup/prometheus-operator-deployment.yaml
+++ b/manifests/setup/prometheus-operator-deployment.yaml
@@ -48,7 +48,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8080/
- image: quay.io/brancz/kube-rbac-proxy:v0.10.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.11.0
name: kube-rbac-proxy
ports:
- containerPort: 8443