Skip to content

PMM-15398 Count shared memory as used, not cache #5855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theTibi wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Open

PMM-15398 Count shared memory as used, not cache #5855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dashboards/dashboards/OS/Memory_Details.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions dashboards/dashboards/OS/Node_Summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dashboards/dashboards/OS/Nodes_Compare.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions dashboards/dashboards/OS/Nodes_Overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/config.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading