diff --git a/dashboards/dashboards/OS/Memory_Details.json b/dashboards/dashboards/OS/Memory_Details.json index 6875a5ea9c1..d138a001ed2 100644 --- a/dashboards/dashboards/OS/Memory_Details.json +++ b/dashboards/dashboards/OS/Memory_Details.json @@ -193,7 +193,7 @@ "step": 240 }, { - "expr": "clamp_min(avg by (node_name) (((avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[5m])) - ((avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[5m]))+ \n(avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[5m])) + \n(avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[5m]))))),0)", + "expr": "clamp_min(avg by (node_name) (((avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[5m])) - ((avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[5m]))+ \n(avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[5m])) + \n(avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[5m])) + \n((avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\"}[5m])) - (avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\"}[5m])) or (avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[5m])) * 0)))),0)", "format": "time_series", "hide": false, "interval": "$interval", @@ -203,7 +203,7 @@ "step": 240 }, { - "expr": "avg by (node_name) (avg(avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) without (job))", + "expr": "avg by (node_name) (avg((avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) + \n((avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) - (avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) or (avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) * 0)) without (job))", "format": "time_series", "hide": false, "interval": "$interval", diff --git a/dashboards/dashboards/OS/Node_Summary.json b/dashboards/dashboards/OS/Node_Summary.json index 0b54daa3999..0fecb20afdc 100644 --- a/dashboards/dashboards/OS/Node_Summary.json +++ b/dashboards/dashboards/OS/Node_Summary.json @@ -2634,7 +2634,7 @@ "calculatedInterval": "2s", "datasourceErrors": {}, "errors": {}, - "expr": "clamp_min(avg by (node_name) (((avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[5m])) - ((avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[5m]))+ \n(avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[5m])) + \n(avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[5m]))))),0)", + "expr": "clamp_min(avg by (node_name) (((avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemTotal_bytes{node_name=~\"$node_name\"}[5m])) - ((avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_MemFree_bytes{node_name=~\"$node_name\"}[5m]))+ \n(avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Buffers_bytes{node_name=~\"$node_name\"}[5m])) + \n(avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[5m])) + \n((avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\"}[5m])) - (avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\"}[5m])) or (avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\"}[5m])) * 0)))),0)", "format": "time_series", "hide": false, "interval": "$interval", @@ -2646,7 +2646,7 @@ "target": "" }, { - "expr": "avg by (node_name) (avg(avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) without (job))", + "expr": "avg by (node_name) (avg((avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) + \n((avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_SReclaimable_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) - (avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Shmem_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) or (avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[$interval]) or avg_over_time(node_memory_Cached_bytes{node_name=~\"$node_name\",job=~\"rds.*|node.*\"}[5m])) * 0)) without (job))", "interval": "$interval", "legendFormat": "Cache", "refId": "F" diff --git a/dashboards/dashboards/OS/Nodes_Compare.json b/dashboards/dashboards/OS/Nodes_Compare.json index eca6d0873d6..ae6673b5a71 100644 --- a/dashboards/dashboards/OS/Nodes_Compare.json +++ b/dashboards/dashboards/OS/Nodes_Compare.json @@ -1426,7 +1426,7 @@ "steppedLine": false, "targets": [ { - "expr": "avg by (node_name) (max by (node_name) (node_memory_MemTotal_bytes{node_name=~\"$node_name\"}) - (max by (node_name) (node_memory_MemFree_bytes{node_name=~\"$node_name\"}) + max by (node_name) (node_memory_Buffers_bytes{node_name=~\"$node_name\"}) + (max by (node_name) (node_memory_Cached_bytes{node_name=~\"$node_name\"}))))", + "expr": "avg by (node_name) (max by (node_name) (node_memory_MemTotal_bytes{node_name=~\"$node_name\"}) - (max by (node_name) (node_memory_MemFree_bytes{node_name=~\"$node_name\"}) + max by (node_name) (node_memory_Buffers_bytes{node_name=~\"$node_name\"}) + (max by (node_name) (node_memory_Cached_bytes{node_name=~\"$node_name\"}) + \n(max by (node_name) (node_memory_SReclaimable_bytes{node_name=~\"$node_name\"}) - max by (node_name) (node_memory_Shmem_bytes{node_name=~\"$node_name\"}) or max by (node_name) (node_memory_Cached_bytes{node_name=~\"$node_name\"}) * 0))))", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -1450,7 +1450,7 @@ "refId": "C" }, { - "expr": "avg by (node_name) (max by (node_name) (node_memory_Cached_bytes{node_name=~\"$node_name\"}))", + "expr": "avg by (node_name) (max by (node_name) (node_memory_Cached_bytes{node_name=~\"$node_name\"}) + \n(max by (node_name) (node_memory_SReclaimable_bytes{node_name=~\"$node_name\"}) - max by (node_name) (node_memory_Shmem_bytes{node_name=~\"$node_name\"}) or max by (node_name) (node_memory_Cached_bytes{node_name=~\"$node_name\"}) * 0))", "format": "time_series", "interval": "$interval", "intervalFactor": 1, diff --git a/dashboards/dashboards/OS/Nodes_Overview.json b/dashboards/dashboards/OS/Nodes_Overview.json index f5d7aeada74..cc20fd35ee5 100644 --- a/dashboards/dashboards/OS/Nodes_Overview.json +++ b/dashboards/dashboards/OS/Nodes_Overview.json @@ -5467,7 +5467,7 @@ "calculatedInterval": "2s", "datasourceErrors": {}, "errors": {}, - "expr": "topk(5,avg by (node_name) (node_memory_MemTotal_bytes{node_name=~\"$node_name\"} - \n(node_memory_MemFree_bytes{node_name=~\"$node_name\"} + node_memory_Buffers_bytes{node_name=~\"$node_name\"} + node_memory_Cached_bytes{node_name=~\"$node_name\"})))", + "expr": "topk(5,avg by (node_name) (node_memory_MemTotal_bytes{node_name=~\"$node_name\"} - \n(node_memory_MemFree_bytes{node_name=~\"$node_name\"} + node_memory_Buffers_bytes{node_name=~\"$node_name\"} + (node_memory_Cached_bytes{node_name=~\"$node_name\"} + \n(node_memory_SReclaimable_bytes{node_name=~\"$node_name\"} - node_memory_Shmem_bytes{node_name=~\"$node_name\"} or node_memory_Cached_bytes{node_name=~\"$node_name\"} * 0)))))", "format": "time_series", "hide": false, "interval": "$interval", @@ -5479,7 +5479,7 @@ "target": "" }, { - "expr": "avg by () (node_memory_MemTotal_bytes{node_name=~\"$node_name\"} - \n(node_memory_MemFree_bytes{node_name=~\"$node_name\"} + \nnode_memory_Buffers_bytes{node_name=~\"$node_name\"} + \nnode_memory_Cached_bytes{node_name=~\"$node_name\"}))", + "expr": "avg by () (node_memory_MemTotal_bytes{node_name=~\"$node_name\"} - \n(node_memory_MemFree_bytes{node_name=~\"$node_name\"} + \nnode_memory_Buffers_bytes{node_name=~\"$node_name\"} + \n(node_memory_Cached_bytes{node_name=~\"$node_name\"} + \n(node_memory_SReclaimable_bytes{node_name=~\"$node_name\"} - node_memory_Shmem_bytes{node_name=~\"$node_name\"} or node_memory_Cached_bytes{node_name=~\"$node_name\"} * 0))))", "format": "time_series", "interval": "$interval", "intervalFactor": 1, diff --git a/managed/services/telemetry/config.default.yml b/managed/services/telemetry/config.default.yml index 326dca0262b..1fb0a1df0fd 100644 --- a/managed/services/telemetry/config.default.yml +++ b/managed/services/telemetry/config.default.yml @@ -633,7 +633,7 @@ telemetry: - id: PMMNodeMemoryUsage source: VM - query: clamp_min(avg by (node_name) (((avg_over_time(node_memory_MemTotal_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_MemTotal_bytes{node_name=~"pmm-server"}[5m])) - ((avg_over_time(node_memory_MemFree_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_MemFree_bytes{node_name=~"pmm-server"}[5m]))+(avg_over_time(node_memory_Buffers_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_Buffers_bytes{node_name=~"pmm-server"}[5m]))+(avg_over_time(node_memory_Cached_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_Cached_bytes{node_name=~"pmm-server"}[5m]))))),0) + query: clamp_min(avg by (node_name) (((avg_over_time(node_memory_MemTotal_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_MemTotal_bytes{node_name=~"pmm-server"}[5m])) - ((avg_over_time(node_memory_MemFree_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_MemFree_bytes{node_name=~"pmm-server"}[5m]))+(avg_over_time(node_memory_Buffers_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_Buffers_bytes{node_name=~"pmm-server"}[5m]))+(avg_over_time(node_memory_Cached_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_Cached_bytes{node_name=~"pmm-server"}[5m]))+((avg_over_time(node_memory_SReclaimable_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_SReclaimable_bytes{node_name=~"pmm-server"}[5m]))-(avg_over_time(node_memory_Shmem_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_Shmem_bytes{node_name=~"pmm-server"}[5m])) or (avg_over_time(node_memory_Cached_bytes{node_name=~"pmm-server"}[5m]) or avg_over_time(node_memory_Cached_bytes{node_name=~"pmm-server"}[5m]))*0)))),0) summary: "PMM node memory usage" data: - metric_name: "pmm_server_node_memory_usage"