diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 922ff464bd05cc3794b70ecb126fd9a64546aea3..d5c218becb053ef667c6fb3a1a293f60678ce2cb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,7 +4,7 @@ on:
- pull_request
env:
golang-version: '1.17'
- kind-version: 'v0.12.0'
+ kind-version: 'v0.14.0'
jobs:
generate:
runs-on: ${{ matrix.os }}
@@ -83,8 +83,8 @@ jobs:
strategy:
matrix:
kind-image:
- - 'kindest/node:v1.23.0'
- - 'kindest/node:v1.22.4'
+ - 'kindest/node:v1.24.1'
+ - 'kindest/node:v1.23.6'
steps:
- uses: actions/checkout@v3
with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8eb41e6c8927eeced465227992b0af4ca68cced0..afba96502271e873b7cc712ab2cf8267edef8381 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## release-0.11 / 2022-06-15
+
+* [CHANGE] Disable injecting unnecessary variables allowing access to k8s API [#1591](https://github.com/prometheus-operator/kube-prometheus/pull/1591)
+* [FEATURE] Add grafana-mixin [#1458](https://github.com/prometheus-operator/kube-prometheus/pull/1458)
+* [FEATURE] Add example usage of prometheus-agent [#1472](https://github.com/prometheus-operator/kube-prometheus/pull/1472)
+* [FEATURE] Add Pyrra as (optional) component [#1667](https://github.com/prometheus-operator/kube-prometheus/pull/1667)
+* [ENHANCEMENT] Adds NetworkPolicies to all components of Kube-prometheus [#1650](https://github.com/prometheus-operator/kube-prometheus/pull/1650)
+* [ENHANCEMENT] Scan generated manifests with kubescape in CI [#1584](https://github.com/prometheus-operator/kube-prometheus/pull/1584)
+* [ENHANCEMENT] Explicitly declare allowPrivilegeEscalation to false in all components [#1593](https://github.com/prometheus-operator/kube-prometheus/pull/1593)
+* [ENHANCEMENT] Forbid write access to root filesystem [#1600](https://github.com/prometheus-operator/kube-prometheus/pull/1600)
+* [ENHANCEMENT] Drop Linux capabilities, , just keeping CAP_SYS_TIME for node-exporter [#1610](https://github.com/prometheus-operator/kube-prometheus/pull/1610)
+* [ENHANCEMENT] Remove hostPort from node-export daemonset [#1612](https://github.com/prometheus-operator/kube-prometheus/pull/1612)
+* [ENHANCEMENT] Add priorityClassName as system-cluster-critical for node_exporter [#1649](https://github.com/prometheus-operator/kube-prometheus/pull/1649)
+* [ENHANCEMENT] Added custom overrides for kube-rbac-proxy-self [#1637](https://github.com/prometheus-operator/kube-prometheus/pull/1637)
+* [ENHANCEMENT] Adds readinessProbe and livenessProbe to prometheus-adapter jsonnet [#1696](https://github.com/prometheus-operator/kube-prometheus/pull/1696)
+* [BUGFIX] Update kubeadm integration of kube-prometheus [#1569](https://github.com/prometheus-operator/kube-prometheus/pull/1569)
+* [BUGFIX] Add projected volumes permission to addon/podsecuritypolicie [#1572](https://github.com/prometheus-operator/kube-prometheus/pull/1572)
+* [BUGFIX] Hide namespace for prometheus clusterRole and clusterRolebinding [#1566](https://github.com/prometheus-operator/kube-prometheus/pull/1566)
+* [BUGFIX] Fix accidentally broken thanosSelector after #1543 [#1556](https://github.com/prometheus-operator/kube-prometheus/pull/1556)
+* [BUGFIX] Jsonnet: filter out kube-proxy alerts when kube-proxy is disabled [#1609](https://github.com/prometheus-operator/kube-prometheus/pull/1609)
+* [BUGFIX] Sanitize regex denylist in ksm-lite addon [#1613](https://github.com/prometheus-operator/kube-prometheus/pull/1613)
+* [BUGFIX] Sanitize all regex denylist in ksm-lite addon [#1614](https://github.com/prometheus-operator/kube-prometheus/pull/1614)
+* [BUGFIX] Add extra-volume mount for plugins downloads [#1624](https://github.com/prometheus-operator/kube-prometheus/pull/1624)
+* [BUGFIX] Added allowedCapabilities to node-exporter psp [#1642](https://github.com/prometheus-operator/kube-prometheus/pull/1642)
+* [BUGFIX] Fix cluster:node_cpu:ratio query [#1628](https://github.com/prometheus-operator/kube-prometheus/pull/1628)
+* [BUGFIX] Removed CAP_ from node-exporter daemonset [#1647](https://github.com/prometheus-operator/kube-prometheus/pull/1647)
+* [BUGFIX] Update PodMonitor for kube-proxy [#1630](https://github.com/prometheus-operator/kube-prometheus/pull/1630)
+* [BUGFIX] Adds port name to prometheus-adapter [#1701](https://github.com/prometheus-operator/kube-prometheus/pull/1701)
+* [BUGFIX] Fix grafana network access [#1721](https://github.com/prometheus-operator/kube-prometheus/pull/1721)
+* [BUGFIX] Fix networkpolicies-disabled addon [#1724](https://github.com/prometheus-operator/kube-prometheus/pull/1724)
+* [BUGFIX] Adjust NodeFilesystemSpaceFillingUp thresholds according default kubelet GC behavior [#1729](https://github.com/prometheus-operator/kube-prometheus/pull/1729)
+* [BUGFIX] Fix problems when enabling eks platform patch [#1675](https://github.com/prometheus-operator/kube-prometheus/pull/1675)
+* [BUGFIX] Access requests to sidecar from thanos-query [#1730](https://github.com/prometheus-operator/kube-prometheus/pull/1730)
+* [BUGFIX] Fix prometheus namespace connection for addons/pyrra [#1734](https://github.com/prometheus-operator/kube-prometheus/pull/1734)
+
## release-0.10 / 2021-12-17
* [CHANGE] Adjust node filesystem space filling up warning threshold to 20% [#1357](https://github.com/prometheus-operator/kube-prometheus/pull/1357)
diff --git a/README.md b/README.md
index d549042c5e115255e3ddb0f22224d152fbefe27e..a580f03e422258583fe513f5efd4ee9ea9d634dd 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,12 @@ This adapter is an Extension API Server and Kubernetes needs to be have this fea
The following Kubernetes versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
-| kube-prometheus stack | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 |
+| kube-prometheus stack | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 |
|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|
-| [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7) | ✔ | ✔ | ✗ | ✗ | ✗ |
-| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8) | ✗ | ✔ | ✔ | ✗ | ✗ |
-| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9) | ✗ | ✗ | ✔ | ✔ | ✗ |
-| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✗ | ✗ | ✗ | ✔ | ✔ |
+| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8) | ✔ | ✔ | ✗ | ✗ | ✗ |
+| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9) | ✗ | ✔ | ✔ | ✗ | ✗ |
+| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✗ | ✗ | ✔ | ✔ | ✗ |
+| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗ | ✗ | ✗ | ✔ | ✔ |
| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | ✗ | ✔ |
## Quickstart
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index c0d9adf227df4accf063b445e93837e25e59556e..91cbc9b65c80fd19c274e708b4d91b9a898b7150 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -8,7 +8,7 @@
"subdir": "grafana"
}
},
- "version": "master"
+ "version": "d039275e4916aceae1c137120882e01d857787ac"
},
{
"source": {
@@ -17,7 +17,7 @@
"subdir": "grafana-mixin"
}
},
- "version": "main",
+ "version": "release-v9.0.0",
"name": "grafana-mixin"
},
{
@@ -27,7 +27,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "main"
+ "version": "release-3.5"
},
{
"source": {
@@ -36,7 +36,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "main"
+ "version": "release-0.57"
},
{
"source": {
@@ -45,7 +45,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "main",
+ "version": "release-0.57",
"name": "prometheus-operator-mixin"
},
{
@@ -55,7 +55,7 @@
"subdir": ""
}
},
- "version": "master"
+ "version": "release-0.11"
},
{
"source": {
@@ -64,7 +64,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "master"
+ "version": "release-2.5"
},
{
"source": {
@@ -73,7 +73,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "master"
+ "version": "release-2.5"
},
{
"source": {
@@ -82,7 +82,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "master"
+ "version": "release-1.3"
},
{
"source": {
@@ -91,7 +91,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "main",
+ "version": "release-2.36",
"name": "prometheus"
},
{
@@ -101,7 +101,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "main",
+ "version": "release-0.24",
"name": "alertmanager"
},
{
@@ -111,7 +111,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "main"
+ "version": "release-0.4"
},
{
"source": {
@@ -120,7 +120,7 @@
"subdir": "mixin"
}
},
- "version": "main",
+ "version": "release-0.26",
"name": "thanos-mixin"
}
],
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index cfea4d7aae269265be5be4cda1c9b829a53f6a82..48283d72c00c972561f01d3b14b510c09265962c 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "144f4458382347b2647840eaf923776f282f35f1",
- "sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
+ "version": "0be65da6cc9905d93554bfdf51e1faaeae1149a4",
+ "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
},
{
"source": {
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
- "version": "1120f9e255760a3c104b57871fcb91801e934382",
+ "version": "3eed09056849ab873b867b561b7ce580ef2c75ba",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -44,32 +44,32 @@
{
"source": {
"git": {
- "remote": "https://github.com/grafana/grafonnet-lib.git",
- "subdir": "grafonnet-7.0"
+ "remote": "https://github.com/grafana/jsonnet-libs.git",
+ "subdir": "grafana-builder"
}
},
- "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
- "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
+ "version": "9e9d5cddd4f02a25b9dec09a5910878a8ba8e045",
+ "sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
},
{
"source": {
"git": {
- "remote": "https://github.com/grafana/jsonnet-libs.git",
- "subdir": "grafana-builder"
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
+ "subdir": ""
}
},
- "version": "9e9d5cddd4f02a25b9dec09a5910878a8ba8e045",
- "sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
+ "version": "b8f44bb7be728423836bef0e904ec7166895a34b",
+ "sum": "LCgSosxceeYuoau5fYSPtE5eXOFe46DxexfkrctUv7c="
},
{
"source": {
"git": {
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
- "subdir": ""
+ "subdir": "lib/promgrafonnet"
}
},
- "version": "3422a511bf8f645e3e684632785b27864ee5dc0c",
- "sum": "tpgokDM1s/6CL4p+tlq3Nu54r62/kPfGnLUKRgYIC4k="
+ "version": "b8f44bb7be728423836bef0e904ec7166895a34b",
+ "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
"source": {
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "aa8729abea95d5f19893231e6264c73f83f05353",
+ "version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "aa8729abea95d5f19893231e6264c73f83f05353",
+ "version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "89d905f764c81d3e55342fbd2919fcdba881c609",
+ "version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,7 +109,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "89d905f764c81d3e55342fbd2919fcdba881c609",
+ "version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
"sum": "pUggCYwO/3Y/p6Vgryx8Y4KO3QkJ+GqimrZtn/luzzI="
},
{
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "f958b8be84b870e363f7dafcbeb807b463269a75",
+ "version": "14b01e6a34dd3155768c7e9bd5c4376055de9419",
"sum": "f3iZDUXQ/YWB5yDCY7VLD5bs442+3CdJgXJhJyWhNf8=",
"name": "alertmanager"
},
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "e5128e83f215e421b985e7e160cff448f17aff25",
- "sum": "/ma9CIghDhPEIBZAt41Mkutb6813lMKdIX54SmNQ79g="
+ "version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6",
+ "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "542b9ecdbd758009d52402f6a486d1237a6647b7",
+ "version": "3c0a100dec2950f23e91f7efbf8867750960807d",
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "3a58b4ed4f649c9502b8dc3e6bfc5b4159e33b48",
+ "version": "1f6478a3e69cf77bef556672d8c037c96ec10306",
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
},
{
@@ -161,8 +161,8 @@
"subdir": "mixin"
}
},
- "version": "5da60e0c9443f1a9980bcad81be22150d05d0bd6",
- "sum": "/UJrWExMDM89fPfidt1pNLSQOLXsyBpmyp3unRbjaXw=",
+ "version": "17c576472d80972bfd3705e1e0a08e6f8da8e04b",
+ "sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE=",
"name": "thanos-mixin"
},
{
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 3365e540ed3ef64cd683dbc42f4968776cecb902..e6d23d89c09998f527e8f14f5282ba03d49f5f62 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -25950,8 +25950,8 @@ items:
"list": [
{
"current": {
- "text": "default",
- "value": "default"
+ "text": "Prometheus",
+ "value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
@@ -27002,8 +27002,8 @@ items:
"list": [
{
"current": {
- "text": "default",
- "value": "default"
+ "text": "Prometheus",
+ "value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
@@ -27115,7 +27115,7 @@ items:
namespace: monitoring
- apiVersion: v1
data:
- nodes-darwin.json: |-
+ nodes.json: |-
{
"__inputs": [
@@ -27353,8 +27353,8 @@ items:
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
- "showTitle": true,
- "title": "CPU",
+ "showTitle": false,
+ "title": "Dashboard Row",
"titleSize": "h6",
"type": "row"
},
@@ -27404,43 +27404,36 @@ items:
],
"spaceLength": 10,
"span": 9,
- "stack": false,
+ "stack": true,
"steppedLine": false,
"targets": [
{
- "expr": "node_memory_total_bytes{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "(\n node_memory_MemTotal_bytes{job=\"node-exporter\", instance=\"$instance\"}\n-\n node_memory_MemFree_bytes{job=\"node-exporter\", instance=\"$instance\"}\n-\n node_memory_Buffers_bytes{job=\"node-exporter\", instance=\"$instance\"}\n-\n node_memory_Cached_bytes{job=\"node-exporter\", instance=\"$instance\"}\n)\n",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Physical Memory",
+ "legendFormat": "memory used",
"refId": "A"
},
{
- "expr": "(\n node_memory_internal_bytes{job=\"node-exporter\", instance=\"$instance\"} -\n node_memory_purgeable_bytes{job=\"node-exporter\", instance=\"$instance\"} +\n node_memory_wired_bytes{job=\"node-exporter\", instance=\"$instance\"} +\n node_memory_compressed_bytes{job=\"node-exporter\", instance=\"$instance\"}\n)\n",
+ "expr": "node_memory_Buffers_bytes{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Memory Used",
+ "legendFormat": "memory buffers",
"refId": "B"
},
{
- "expr": "(\n node_memory_internal_bytes{job=\"node-exporter\", instance=\"$instance\"} -\n node_memory_purgeable_bytes{job=\"node-exporter\", instance=\"$instance\"}\n)\n",
+ "expr": "node_memory_Cached_bytes{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "App Memory",
+ "legendFormat": "memory cached",
"refId": "C"
},
{
- "expr": "node_memory_wired_bytes{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "node_memory_MemFree_bytes{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Wired Memory",
+ "legendFormat": "memory free",
"refId": "D"
- },
- {
- "expr": "node_memory_compressed_bytes{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "Compressed",
- "refId": "E"
}
],
"thresholds": [
@@ -27484,53 +27477,92 @@ items:
]
},
{
+ "cacheTimeout": null,
+ "colorBackground": false,
+ "colorValue": false,
+ "colors": [
+ "rgba(50, 172, 45, 0.97)",
+ "rgba(237, 129, 40, 0.89)",
+ "rgba(245, 54, 54, 0.9)"
+ ],
"datasource": "$datasource",
- "fieldConfig": {
- "defaults": {
- "max": 100,
- "min": 0,
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "rgba(50, 172, 45, 0.97)"
- },
- {
- "color": "rgba(237, 129, 40, 0.89)",
- "value": 80
- },
- {
- "color": "rgba(245, 54, 54, 0.9)",
- "value": 90
- }
- ]
- },
- "unit": "percent"
- }
+ "format": "percent",
+ "gauge": {
+ "maxValue": 100,
+ "minValue": 0,
+ "show": true,
+ "thresholdLabels": false,
+ "thresholdMarkers": true
},
"gridPos": {
},
"id": 5,
+ "interval": null,
+ "links": [
+
+ ],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
+ "maxDataPoints": 100,
+ "nullPointMode": "connected",
+ "nullText": null,
+ "postfix": "",
+ "postfixFontSize": "50%",
+ "prefix": "",
+ "prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 3,
+ "sparkline": {
+ "fillColor": "rgba(31, 118, 189, 0.18)",
+ "full": false,
+ "lineColor": "rgb(31, 120, 193)",
+ "show": false
+ },
+ "tableColumn": "",
"targets": [
{
- "expr": "(\n (\n avg(node_memory_internal_bytes{job=\"node-exporter\", instance=\"$instance\"}) -\n avg(node_memory_purgeable_bytes{job=\"node-exporter\", instance=\"$instance\"}) +\n avg(node_memory_wired_bytes{job=\"node-exporter\", instance=\"$instance\"}) +\n avg(node_memory_compressed_bytes{job=\"node-exporter\", instance=\"$instance\"})\n ) /\n avg(node_memory_total_bytes{job=\"node-exporter\", instance=\"$instance\"})\n)\n*\n100\n",
+ "expr": "100 -\n(\n avg(node_memory_MemAvailable_bytes{job=\"node-exporter\", instance=\"$instance\"})\n/\n avg(node_memory_MemTotal_bytes{job=\"node-exporter\", instance=\"$instance\"})\n* 100\n)\n",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": ""
+ "legendFormat": "",
+ "refId": "A"
}
],
+ "thresholds": "80, 90",
"title": "Memory Usage",
- "transparent": false,
- "type": "gauge"
+ "type": "singlestat",
+ "valueFontSize": "80%",
+ "valueMaps": [
+ {
+ "op": "=",
+ "text": "N/A",
+ "value": "null"
+ }
+ ],
+ "valueName": "current"
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
- "showTitle": true,
- "title": "Memory",
+ "showTitle": false,
+ "title": "Dashboard Row",
"titleSize": "h6",
"type": "row"
},
@@ -27653,230 +27685,118 @@ items:
]
},
{
- "datasource": "$datasource",
- "fieldConfig": {
- "defaults": {
- "custom": {
+ "aliasColors": {
- },
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green"
- },
- {
- "color": "yellow",
- "value": 0.8
- },
- {
- "color": "red",
- "value": 0.9
- }
- ]
- },
- "unit": "decbytes"
- },
- "overrides": [
- {
- "matcher": {
- "id": "byName",
- "options": "Mounted on"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 260
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Size"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 93
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Used"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 72
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Available"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 88
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Used, %"
- },
- "properties": [
- {
- "id": "unit",
- "value": "percentunit"
- },
- {
- "id": "custom.displayMode",
- "value": "gradient-gauge"
- },
- {
- "id": "max",
- "value": 1
- },
- {
- "id": "min",
- "value": 0
- }
- ]
- }
- ]
},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "$datasource",
+ "fill": 1,
+ "fillGradient": 0,
"gridPos": {
},
"id": 7,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "sideWidth": null,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [
+
+ ],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": null,
+ "seriesOverrides": [
+ {
+ "alias": "used",
+ "color": "#E0B400"
+ },
+ {
+ "alias": "available",
+ "color": "#73BF69"
+ }
+ ],
+ "spaceLength": 10,
"span": 6,
+ "stack": true,
+ "steppedLine": false,
"targets": [
{
- "expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
- "format": "table",
- "instant": true,
+ "expr": "sum(\n max by (device) (\n node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"}\n -\n node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"}\n )\n)\n",
+ "format": "time_series",
"intervalFactor": 2,
- "legendFormat": ""
+ "legendFormat": "used",
+ "refId": "A"
},
{
- "expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
- "format": "table",
- "instant": true,
+ "expr": "sum(\n max by (device) (\n node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"}\n )\n)\n",
+ "format": "time_series",
"intervalFactor": 2,
- "legendFormat": ""
+ "legendFormat": "available",
+ "refId": "B"
}
],
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
"title": "Disk Space Usage",
- "transformations": [
- {
- "id": "groupBy",
- "options": {
- "fields": {
- "Value #A": {
- "aggregations": [
- "lastNotNull"
- ],
- "operation": "aggregate"
- },
- "Value #B": {
- "aggregations": [
- "lastNotNull"
- ],
- "operation": "aggregate"
- },
- "mountpoint": {
- "aggregations": [
-
- ],
- "operation": "groupby"
- }
- }
- }
- },
- {
- "id": "merge",
- "options": {
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": [
- }
- },
- {
- "id": "calculateField",
- "options": {
- "alias": "Used",
- "binary": {
- "left": "Value #A (lastNotNull)",
- "operator": "-",
- "reducer": "sum",
- "right": "Value #B (lastNotNull)"
- },
- "mode": "binary",
- "reduce": {
- "reducer": "sum"
- }
- }
- },
- {
- "id": "calculateField",
- "options": {
- "alias": "Used, %",
- "binary": {
- "left": "Used",
- "operator": "/",
- "reducer": "sum",
- "right": "Value #A (lastNotNull)"
- },
- "mode": "binary",
- "reduce": {
- "reducer": "sum"
- }
- }
- },
+ ]
+ },
+ "yaxes": [
{
- "id": "organize",
- "options": {
- "excludeByName": {
-
- },
- "indexByName": {
-
- },
- "renameByName": {
- "Value #A (lastNotNull)": "Size",
- "Value #B (lastNotNull)": "Available",
- "mountpoint": "Mounted on"
- }
- }
+ "format": "bytes",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": 0,
+ "show": true
},
{
- "id": "sortBy",
- "options": {
- "fields": {
-
- },
- "sort": [
- {
- "field": "Mounted on"
- }
- ]
- }
+ "format": "bytes",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": 0,
+ "show": true
}
- ],
- "transparent": false,
- "type": "table"
+ ]
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
- "showTitle": true,
- "title": "Disk",
+ "showTitle": false,
+ "title": "Dashboard Row",
"titleSize": "h6",
"type": "row"
},
@@ -28074,8 +27994,8 @@ items:
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
- "showTitle": true,
- "title": "Network",
+ "showTitle": false,
+ "title": "Dashboard Row",
"titleSize": "h6",
"type": "row"
}
@@ -28089,8 +28009,8 @@ items:
"list": [
{
"current": {
- "text": "default",
- "value": "default"
+ "text": "Prometheus",
+ "value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
@@ -28111,1066 +28031,13 @@ items:
"datasource": "$datasource",
"hide": 0,
"includeAll": false,
- "label": "Instance",
- "multi": false,
- "name": "instance",
- "options": [
-
- ],
- "query": "label_values(node_uname_info{job=\"node-exporter\", sysname=\"Darwin\"}, instance)",
- "refresh": 2,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [
-
- ],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- }
- ]
- },
- "time": {
- "from": "now-1h",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "1m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ],
- "time_options": [
- "5m",
- "15m",
- "1h",
- "6h",
- "12h",
- "24h",
- "2d",
- "7d",
- "30d"
- ]
- },
- "timezone": "utc",
- "title": "Node Exporter / MacOS",
- "version": 0
- }
- kind: ConfigMap
- metadata:
- labels:
- app.kubernetes.io/component: grafana
- app.kubernetes.io/name: grafana
- app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.5.5
- name: grafana-dashboard-nodes-darwin
- namespace: monitoring
-- apiVersion: v1
- data:
- nodes.json: |-
- {
- "__inputs": [
-
- ],
- "__requires": [
-
- ],
- "annotations": {
- "list": [
-
- ]
- },
- "editable": false,
- "gnetId": null,
- "graphTooltip": 1,
- "hideControls": false,
- "id": null,
- "links": [
-
- ],
- "refresh": "30s",
- "rows": [
- {
- "collapse": false,
- "collapsed": false,
- "panels": [
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "fill": 1,
- "fillGradient": 0,
- "gridPos": {
-
- },
- "id": 2,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "sideWidth": null,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [
-
- ],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "seriesOverrides": [
-
- ],
- "spaceLength": 10,
- "span": 6,
- "stack": true,
- "steppedLine": false,
- "targets": [
- {
- "expr": "(\n (1 - sum without (mode) (rate(node_cpu_seconds_total{job=\"node-exporter\", mode=~\"idle|iowait|steal\", instance=\"$instance\"}[$__rate_interval])))\n/ ignoring(cpu) group_left\n count without (cpu, mode) (node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", instance=\"$instance\"})\n)\n",
- "format": "time_series",
- "intervalFactor": 5,
- "legendFormat": "{{cpu}}",
- "refId": "A"
- }
- ],
- "thresholds": [
-
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "CPU Usage",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
-
- ]
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": null,
- "logBase": 1,
- "max": 1,
- "min": 0,
- "show": true
- },
- {
- "format": "percentunit",
- "label": null,
- "logBase": 1,
- "max": 1,
- "min": 0,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "fill": 0,
- "fillGradient": 0,
- "gridPos": {
-
- },
- "id": 3,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "sideWidth": null,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [
-
- ],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "seriesOverrides": [
-
- ],
- "spaceLength": 10,
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "node_load1{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "1m load average",
- "refId": "A"
- },
- {
- "expr": "node_load5{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "5m load average",
- "refId": "B"
- },
- {
- "expr": "node_load15{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "15m load average",
- "refId": "C"
- },
- {
- "expr": "count(node_cpu_seconds_total{job=\"node-exporter\", instance=\"$instance\", mode=\"idle\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "logical cores",
- "refId": "D"
- }
- ],
- "thresholds": [
-
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Load Average",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
-
- ]
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "CPU",
- "titleSize": "h6",
- "type": "row"
- },
- {
- "collapse": false,
- "collapsed": false,
- "panels": [
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "fill": 1,
- "fillGradient": 0,
- "gridPos": {
-
- },
- "id": 4,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "sideWidth": null,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [
-
- ],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "seriesOverrides": [
-
- ],
- "spaceLength": 10,
- "span": 9,
- "stack": true,
- "steppedLine": false,
- "targets": [
- {
- "expr": "(\n node_memory_MemTotal_bytes{job=\"node-exporter\", instance=\"$instance\"}\n-\n node_memory_MemFree_bytes{job=\"node-exporter\", instance=\"$instance\"}\n-\n node_memory_Buffers_bytes{job=\"node-exporter\", instance=\"$instance\"}\n-\n node_memory_Cached_bytes{job=\"node-exporter\", instance=\"$instance\"}\n)\n",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "memory used",
- "refId": "A"
- },
- {
- "expr": "node_memory_Buffers_bytes{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "memory buffers",
- "refId": "B"
- },
- {
- "expr": "node_memory_Cached_bytes{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "memory cached",
- "refId": "C"
- },
- {
- "expr": "node_memory_MemFree_bytes{job=\"node-exporter\", instance=\"$instance\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "memory free",
- "refId": "D"
- }
- ],
- "thresholds": [
-
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory Usage",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
-
- ]
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- }
- ]
- },
- {
- "datasource": "$datasource",
- "fieldConfig": {
- "defaults": {
- "max": 100,
- "min": 0,
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "rgba(50, 172, 45, 0.97)"
- },
- {
- "color": "rgba(237, 129, 40, 0.89)",
- "value": 80
- },
- {
- "color": "rgba(245, 54, 54, 0.9)",
- "value": 90
- }
- ]
- },
- "unit": "percent"
- }
- },
- "gridPos": {
-
- },
- "id": 5,
- "span": 3,
- "targets": [
- {
- "expr": "100 -\n(\n avg(node_memory_MemAvailable_bytes{job=\"node-exporter\", instance=\"$instance\"}) /\n avg(node_memory_MemTotal_bytes{job=\"node-exporter\", instance=\"$instance\"})\n* 100\n)\n",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": ""
- }
- ],
- "title": "Memory Usage",
- "transparent": false,
- "type": "gauge"
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "Memory",
- "titleSize": "h6",
- "type": "row"
- },
- {
- "collapse": false,
- "collapsed": false,
- "panels": [
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "fill": 0,
- "fillGradient": 0,
- "gridPos": {
-
- },
- "id": 6,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "sideWidth": null,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [
-
- ],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "seriesOverrides": [
- {
- "alias": "/ read| written/",
- "yaxis": 1
- },
- {
- "alias": "/ io time/",
- "yaxis": 2
- }
- ],
- "spaceLength": 10,
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(node_disk_read_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{device}} read",
- "refId": "A"
- },
- {
- "expr": "rate(node_disk_written_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{device}} written",
- "refId": "B"
- },
- {
- "expr": "rate(node_disk_io_time_seconds_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{device}} io time",
- "refId": "C"
- }
- ],
- "thresholds": [
-
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Disk I/O",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
-
- ]
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "s",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
- },
- {
- "datasource": "$datasource",
- "fieldConfig": {
- "defaults": {
- "custom": {
-
- },
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green"
- },
- {
- "color": "yellow",
- "value": 0.8
- },
- {
- "color": "red",
- "value": 0.9
- }
- ]
- },
- "unit": "decbytes"
- },
- "overrides": [
- {
- "matcher": {
- "id": "byName",
- "options": "Mounted on"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 260
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Size"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 93
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Used"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 72
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Available"
- },
- "properties": [
- {
- "id": "custom.width",
- "value": 88
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "Used, %"
- },
- "properties": [
- {
- "id": "unit",
- "value": "percentunit"
- },
- {
- "id": "custom.displayMode",
- "value": "gradient-gauge"
- },
- {
- "id": "max",
- "value": 1
- },
- {
- "id": "min",
- "value": 0
- }
- ]
- }
- ]
- },
- "gridPos": {
-
- },
- "id": 7,
- "span": 6,
- "targets": [
- {
- "expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
- "format": "table",
- "instant": true,
- "intervalFactor": 2,
- "legendFormat": ""
- },
- {
- "expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
- "format": "table",
- "instant": true,
- "intervalFactor": 2,
- "legendFormat": ""
- }
- ],
- "title": "Disk Space Usage",
- "transformations": [
- {
- "id": "groupBy",
- "options": {
- "fields": {
- "Value #A": {
- "aggregations": [
- "lastNotNull"
- ],
- "operation": "aggregate"
- },
- "Value #B": {
- "aggregations": [
- "lastNotNull"
- ],
- "operation": "aggregate"
- },
- "mountpoint": {
- "aggregations": [
-
- ],
- "operation": "groupby"
- }
- }
- }
- },
- {
- "id": "merge",
- "options": {
-
- }
- },
- {
- "id": "calculateField",
- "options": {
- "alias": "Used",
- "binary": {
- "left": "Value #A (lastNotNull)",
- "operator": "-",
- "reducer": "sum",
- "right": "Value #B (lastNotNull)"
- },
- "mode": "binary",
- "reduce": {
- "reducer": "sum"
- }
- }
- },
- {
- "id": "calculateField",
- "options": {
- "alias": "Used, %",
- "binary": {
- "left": "Used",
- "operator": "/",
- "reducer": "sum",
- "right": "Value #A (lastNotNull)"
- },
- "mode": "binary",
- "reduce": {
- "reducer": "sum"
- }
- }
- },
- {
- "id": "organize",
- "options": {
- "excludeByName": {
-
- },
- "indexByName": {
-
- },
- "renameByName": {
- "Value #A (lastNotNull)": "Size",
- "Value #B (lastNotNull)": "Available",
- "mountpoint": "Mounted on"
- }
- }
- },
- {
- "id": "sortBy",
- "options": {
- "fields": {
-
- },
- "sort": [
- {
- "field": "Mounted on"
- }
- ]
- }
- }
- ],
- "transparent": false,
- "type": "table"
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "Disk",
- "titleSize": "h6",
- "type": "row"
- },
- {
- "collapse": false,
- "collapsed": false,
- "panels": [
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "fill": 0,
- "fillGradient": 0,
- "gridPos": {
-
- },
- "id": 8,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "sideWidth": null,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [
-
- ],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "seriesOverrides": [
-
- ],
- "spaceLength": 10,
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(node_network_receive_bytes_total{job=\"node-exporter\", instance=\"$instance\", device!=\"lo\"}[$__rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{device}}",
- "refId": "A"
- }
- ],
- "thresholds": [
-
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Network Received",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
-
- ]
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- }
- ]
- },
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "fill": 0,
- "fillGradient": 0,
- "gridPos": {
-
- },
- "id": 9,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "sideWidth": null,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [
-
- ],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "seriesOverrides": [
-
- ],
- "spaceLength": 10,
- "span": 6,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(node_network_transmit_bytes_total{job=\"node-exporter\", instance=\"$instance\", device!=\"lo\"}[$__rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{device}}",
- "refId": "A"
- }
- ],
- "thresholds": [
-
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Network Transmitted",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
-
- ]
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- }
- ]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "Network",
- "titleSize": "h6",
- "type": "row"
- }
- ],
- "schemaVersion": 14,
- "style": "dark",
- "tags": [
- "node-exporter-mixin"
- ],
- "templating": {
- "list": [
- {
- "current": {
- "text": "default",
- "value": "default"
- },
- "hide": 0,
- "label": "Data Source",
- "name": "datasource",
- "options": [
-
- ],
- "query": "prometheus",
- "refresh": 1,
- "regex": "",
- "type": "datasource"
- },
- {
- "allValue": null,
- "current": {
-
- },
- "datasource": "$datasource",
- "hide": 0,
- "includeAll": false,
- "label": "Instance",
+ "label": null,
"multi": false,
"name": "instance",
"options": [
],
- "query": "label_values(node_uname_info{job=\"node-exporter\", sysname!=\"Darwin\"}, instance)",
+ "query": "label_values(node_exporter_build_info{job=\"node-exporter\"}, instance)",
"refresh": 2,
"regex": "",
"sort": 0,
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index e32c9877a922a19e51f523865694b9a7fc2d4ff8..41b9a28fd349b9c970a7f963e179268da70e72b1 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -113,9 +113,6 @@ spec:
- mountPath: /grafana-dashboard-definitions/0/node-rsrc-use
name: grafana-dashboard-node-rsrc-use
readOnly: false
- - mountPath: /grafana-dashboard-definitions/0/nodes-darwin
- name: grafana-dashboard-nodes-darwin
- readOnly: false
- mountPath: /grafana-dashboard-definitions/0/nodes
name: grafana-dashboard-nodes
readOnly: false
@@ -210,9 +207,6 @@ spec:
- configMap:
name: grafana-dashboard-node-rsrc-use
name: grafana-dashboard-node-rsrc-use
- - configMap:
- name: grafana-dashboard-nodes-darwin
- name: grafana-dashboard-nodes-darwin
- configMap:
name: grafana-dashboard-nodes
name: grafana-dashboard-nodes