SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-22 04:01:27 +00:00
Code Issues Projects Releases Wiki Activity

fix: Take swap into account when counting service RAM usage metrics

Browse source
This commit is contained in:
Inex Code 2024-07-30 15:22:23 +03:00
parent bd2fae2e6d
commit 806c3052ff
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
selfprivacy_api/utils/monitoring.py
View file

@ -281,9 +281,9 @@ class MonitoringQueries:
offset, duration = MonitoringQueries._calculate_offset_and_duration(start, end) offset, duration = MonitoringQueries._calculate_offset_and_duration(start, end)
if offset == 0: if offset == 0:
query = f'max_over_time(container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}[{duration}s])' query = f'max_over_time((container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}+container_memory_swap{{id!~".*slice.*slice", id=~".*slice"}})[{duration}s:])'
else: else:
query = f'max_over_time(container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}[{duration}s] offset {offset}s)' query = f'max_over_time((container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}+container_memory_swap{{id!~".*slice.*slice", id=~".*slice"}})[{duration}s:] offset {offset}s)'
data = MonitoringQueries._send_query(query, result_type="vector") data = MonitoringQueries._send_query(query, result_type="vector")
@ -320,9 +320,9 @@ class MonitoringQueries:
offset, duration = MonitoringQueries._calculate_offset_and_duration(start, end) offset, duration = MonitoringQueries._calculate_offset_and_duration(start, end)
if offset == 0: if offset == 0:
query = f'avg_over_time(container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}[{duration}s])' query = f'avg_over_time((container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}+container_memory_swap{{id!~".*slice.*slice", id=~".*slice"}})[{duration}s:])'
else: else:
query = f'avg_over_time(container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}[{duration}s] offset {offset}s)' query = f'avg_over_time((container_memory_rss{{id!~".*slice.*slice", id=~".*slice"}}+container_memory_swap{{id!~".*slice.*slice", id=~".*slice"}})[{duration}s:] offset {offset}s)'
data = MonitoringQueries._send_query(query, result_type="vector") data = MonitoringQueries._send_query(query, result_type="vector")