diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml
index 448ac484d89dd8191f701513aa7edc641e6be11e..09cb60048bf9d1c1afef49aecf044814f10bc144 100644
--- a/manifests/alertmanager-alertmanager.yaml
+++ b/manifests/alertmanager-alertmanager.yaml
@@ -15,4 +15,4 @@ spec:
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: alertmanager-main
- version: v0.17.0
+ version: v0.16.2
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 22d4748885add3680094a37704356ec9d8d70909..446c686459794085b492f306ecf9b7de4cb924d5 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
data:
- datasources.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
+ prometheus.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
kind: Secret
metadata:
name: grafana-datasources
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 1a51fd48ca5ff9f6871012ba1b93d42594f9d45d..abd59cf62de8500f5d6a33bc8c1382dc7a535220 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -3048,7 +3048,7 @@ items:
"unit": "short"
},
{
- "alias": "Memory Usage",
+ "alias": "CPU Usage",
"colorMode": null,
"colors": [
@@ -3061,6 +3061,24 @@ items:
"pattern": "Value #C",
"thresholds": [
+ ],
+ "type": "number",
+ "unit": "short"
+ },
+ {
+ "alias": "Memory Usage",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #D",
+ "thresholds": [
+
],
"type": "number",
"unit": "bytes"
@@ -3076,7 +3094,7 @@ items:
"link": false,
"linkTooltip": "Drill down",
"linkUrl": "",
- "pattern": "Value #D",
+ "pattern": "Value #E",
"thresholds": [
],
@@ -3094,7 +3112,7 @@ items:
"link": false,
"linkTooltip": "Drill down",
"linkUrl": "",
- "pattern": "Value #E",
+ "pattern": "Value #F",
"thresholds": [
],
@@ -3112,7 +3130,7 @@ items:
"link": false,
"linkTooltip": "Drill down",
"linkUrl": "",
- "pattern": "Value #F",
+ "pattern": "Value #G",
"thresholds": [
],
@@ -3130,7 +3148,7 @@ items:
"link": false,
"linkTooltip": "Drill down",
"linkUrl": "",
- "pattern": "Value #G",
+ "pattern": "Value #H",
"thresholds": [
],
@@ -7987,18 +8005,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "max by (namespace, pod, device) ((node_filesystem_size_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"} - node_filesystem_avail_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"}) / node_filesystem_size_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"})",
+ "expr": "node:node_filesystem_usage:{cluster=\"$cluster\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "disk used",
+ "legendFormat": "{{device}}",
"refId": "A"
- },
- {
- "expr": "max by (namespace, pod, device) (node_filesystem_avail_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"} / node_filesystem_size_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "disk free",
- "refId": "B"
}
],
"thresholds": [
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index 8213bc117b189356538eef911fcb1e175ee5123e..e75b44f48c7ad79f9f3bd765ebbb3a25c6f377eb 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -61,7 +61,7 @@ spec:
resources:
limits:
cpu: 20m
- memory: 60Mi
+ memory: 40Mi
requests:
cpu: 10m
memory: 20Mi
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 33359312200f015f886eb40b023c401bb9d65d36..5bdfefe4659af031759b484663823483270894d5 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -278,12 +278,12 @@ spec:
)
record: node:node_disk_saturation:avg_irate
- expr: |
- max by (instance, namespace, pod, device) ((node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"}
+ max by (namespace, pod, device) ((node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"}
- node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
/ node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
record: 'node:node_filesystem_usage:'
- expr: |
- max by (instance, namespace, pod, device) (node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"} / node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
+ max by (namespace, pod, device) (node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"} / node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
record: 'node:node_filesystem_avail:'
- expr: |
sum(irate(node_network_receive_bytes_total{job="node-exporter",device!~"veth.+"}[1m])) +