diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index bf1999f2..373f0556 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "57a092b45d0eae6c9e600e62513ffcd2f1f25a92", + "version": "562d645ac923388ff5b8d270b0536764d34b0e0f", "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc=" }, { @@ -28,8 +28,8 @@ "subdir": "grafonnet" } }, - "version": "daad85cf3fad3580e58029414630e29956aefe21", - "sum": "zkOBVXtNSGlOdbm5TRCbEik7c/Jk+btbJqaE9qW8j3Y=" + "version": "3082bfca110166cd69533fa3c0875fdb1b68c329", + "sum": "4/sUV0Kk+o8I+wlYxL9R6EPhL/NiLfYHk+NXlU64RUk=" }, { "source": { @@ -38,7 +38,7 @@ "subdir": "grafana-builder" } }, - "version": "89299b1c5e93952622801795353d496fb337f44e", + "version": "8df6a4ff1623781260c3236761c2ebe837958b3f", "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8=" }, { @@ -69,7 +69,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "faa0561a823cbd3b726aaefffcf6ee317547041a", + "version": "25b5047a57352345e478b215370dfcd1fecee27d", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -79,7 +79,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "93255df07113f87dcdec0726b4f4db4e6344df26", + "version": "b1889aa1561ee269f628e2b9659155e7714dbbf0", "sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE=" }, { @@ -89,7 +89,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "93255df07113f87dcdec0726b4f4db4e6344df26", + "version": "b1889aa1561ee269f628e2b9659155e7714dbbf0", "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo=" }, { @@ -99,7 +99,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "a4f5928b074e75addb76a27c5ebfe78314fcd6d1", + "version": "b7ca32169844f0b5143f3e5e318fc05fa025df18", "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=", "name": "prometheus-operator-mixin" }, @@ -110,7 +110,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "64d466d7730165c0d260f187e2e9742bc0295bf2", + "version": "b7ca32169844f0b5143f3e5e318fc05fa025df18", "sum": "MRwyChXdKG3anL2OWpbUu3qWc97w9J6YsjUWjLFQyB0=" }, { @@ -131,8 +131,8 @@ "subdir": "docs/node-mixin" } }, - "version": "46cdf618c9419ea62dd1a87331def97a0f18c837", - "sum": "sxI7cBEy34JSbB0gHy9xC/ErtFsRzl9eJPsWVqd+XSY=" + "version": "b597c1244d7bef49e6f3359c87a56dd7707f6719", + "sum": "cZTNXQMUCLB5FGYpMn845dcqGdkcYt58qCqOFIV/BoQ=" }, { "source": { @@ -141,7 +141,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "3cafc58827d1ebd1a67749f88be4218f0bab3d8d", + "version": "6eeded0fdf760e81af75d9c44ce539ab77da4505", "sum": "VK0c3sQ3ksiM6JQsAVfWmL5NbzGv9llMfXFNXfFdJ+A=", "name": "prometheus" }, diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 6fd259ea..123d0f6b 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -23777,7 +23777,7 @@ 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:rate1m{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", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -24047,7 +24047,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\"}", + "expr": "instance:node_vmstat_pgmajfault:rate1m{job=\"node-exporter\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -24153,7 +24153,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\"}", + "expr": "instance:node_network_receive_bytes_excluding_lo:rate1m{job=\"node-exporter\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}} Receive", @@ -24161,7 +24161,7 @@ items: "step": 10 }, { - "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\"}", + "expr": "instance:node_network_transmit_bytes_excluding_lo:rate1m{job=\"node-exporter\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}} Transmit", @@ -24255,7 +24255,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\"}", + "expr": "instance:node_network_receive_drop_excluding_lo:rate1m{job=\"node-exporter\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}} Receive", @@ -24263,7 +24263,7 @@ items: "step": 10 }, { - "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\"}", + "expr": "instance:node_network_transmit_drop_excluding_lo:rate1m{job=\"node-exporter\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}} Transmit", @@ -24361,7 +24361,7 @@ 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": "instance_device:node_disk_io_time_seconds:rate1m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_seconds:rate1m{job=\"node-exporter\"}))\n", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}} {{device}}", @@ -24447,7 +24447,7 @@ 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": "instance_device:node_disk_io_time_weighted_seconds:rate1m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_weighted_seconds:rate1m{job=\"node-exporter\"}))\n", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}} {{device}}", @@ -24730,7 +24730,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "instance:node_cpu_utilisation:rate5m{job=\"node-exporter\", instance=\"$instance\"}", + "expr": "instance:node_cpu_utilisation:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "Utilisation", @@ -25000,7 +25000,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\", instance=\"$instance\"}", + "expr": "instance:node_vmstat_pgmajfault:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "Major page faults", @@ -25106,7 +25106,7 @@ items: "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:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "Receive", @@ -25114,7 +25114,7 @@ items: "step": 10 }, { - "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}", + "expr": "instance:node_network_transmit_bytes_excluding_lo:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "Transmit", @@ -25208,7 +25208,7 @@ items: "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:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "Receive drops", @@ -25216,7 +25216,7 @@ items: "step": 10 }, { - "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}", + "expr": "instance:node_network_transmit_drop_excluding_lo:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "Transmit drops", @@ -25314,7 +25314,7 @@ items: "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:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{device}}", @@ -25400,7 +25400,7 @@ items: "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:rate1m{job=\"node-exporter\", instance=\"$instance\"}", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{device}}", @@ -25727,7 +25727,7 @@ items: { "expr": "(\n (1 - rate(node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", instance=\"$instance\"}[$__interval]))\n/ ignoring(cpu) group_left\n count without (cpu)( node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", instance=\"$instance\"})\n)\n", "format": "time_series", - "interval": "$__rate_interval", + "interval": "1m", "intervalFactor": 5, "legendFormat": "{{cpu}}", "refId": "A" @@ -26163,7 +26163,7 @@ items: { "expr": "rate(node_disk_read_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])", "format": "time_series", - "interval": "$__rate_interval", + "interval": "1m", "intervalFactor": 2, "legendFormat": "{{device}} read", "refId": "A" @@ -26171,7 +26171,7 @@ items: { "expr": "rate(node_disk_written_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])", "format": "time_series", - "interval": "$__rate_interval", + "interval": "1m", "intervalFactor": 2, "legendFormat": "{{device}} written", "refId": "B" @@ -26179,7 +26179,7 @@ items: { "expr": "rate(node_disk_io_time_seconds_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])", "format": "time_series", - "interval": "$__rate_interval", + "interval": "1m", "intervalFactor": 2, "legendFormat": "{{device}} io time", "refId": "C" @@ -26393,7 +26393,7 @@ items: { "expr": "rate(node_network_receive_bytes_total{job=\"node-exporter\", instance=\"$instance\", device!=\"lo\"}[$__interval])", "format": "time_series", - "interval": "$__rate_interval", + "interval": "1m", "intervalFactor": 2, "legendFormat": "{{device}}", "refId": "A" @@ -26487,7 +26487,7 @@ items: { "expr": "rate(node_network_transmit_bytes_total{job=\"node-exporter\", instance=\"$instance\", device!=\"lo\"}[$__interval])", "format": "time_series", - "interval": "$__rate_interval", + "interval": "1m", "intervalFactor": 2, "legendFormat": "{{device}}", "refId": "A" diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml index 1300f5b6..16145980 100644 --- a/manifests/node-exporter-prometheusRule.yaml +++ b/manifests/node-exporter-prometheusRule.yaml @@ -234,9 +234,9 @@ spec: record: instance:node_num_cpu:sum - expr: | 1 - avg without (cpu, mode) ( - rate(node_cpu_seconds_total{job="node-exporter", mode="idle"}[5m]) + rate(node_cpu_seconds_total{job="node-exporter", mode="idle"}[1m]) ) - record: instance:node_cpu_utilisation:rate5m + record: instance:node_cpu_utilisation:rate1m - expr: | ( node_load1{job="node-exporter"} @@ -252,31 +252,31 @@ spec: ) record: instance:node_memory_utilisation:ratio - expr: | - rate(node_vmstat_pgmajfault{job="node-exporter"}[5m]) - record: instance:node_vmstat_pgmajfault:rate5m + rate(node_vmstat_pgmajfault{job="node-exporter"}[1m]) + record: instance:node_vmstat_pgmajfault:rate1m - expr: | - rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[5m]) - record: instance_device:node_disk_io_time_seconds:rate5m + rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m]) + record: instance_device:node_disk_io_time_seconds:rate1m - expr: | - rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[5m]) - record: instance_device:node_disk_io_time_weighted_seconds:rate5m + rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m]) + record: instance_device:node_disk_io_time_weighted_seconds:rate1m - expr: | sum without (device) ( - rate(node_network_receive_bytes_total{job="node-exporter", device!="lo"}[5m]) + rate(node_network_receive_bytes_total{job="node-exporter", device!="lo"}[1m]) ) - record: instance:node_network_receive_bytes_excluding_lo:rate5m + record: instance:node_network_receive_bytes_excluding_lo:rate1m - expr: | sum without (device) ( - rate(node_network_transmit_bytes_total{job="node-exporter", device!="lo"}[5m]) + rate(node_network_transmit_bytes_total{job="node-exporter", device!="lo"}[1m]) ) - record: instance:node_network_transmit_bytes_excluding_lo:rate5m + record: instance:node_network_transmit_bytes_excluding_lo:rate1m - expr: | sum without (device) ( - rate(node_network_receive_drop_total{job="node-exporter", device!="lo"}[5m]) + rate(node_network_receive_drop_total{job="node-exporter", device!="lo"}[1m]) ) - record: instance:node_network_receive_drop_excluding_lo:rate5m + record: instance:node_network_receive_drop_excluding_lo:rate1m - expr: | sum without (device) ( - rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[5m]) + rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[1m]) ) - record: instance:node_network_transmit_drop_excluding_lo:rate5m + record: instance:node_network_transmit_drop_excluding_lo:rate1m