From f9bbcea9e129fb5c6a09c8807a8fe2c6f08063b6 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sun, 23 Feb 2025 19:50:48 +0100 Subject: [PATCH] First version OK, need change on UI --- glances/outputs/glances_restful_api.py | 17 +- glances/outputs/static/css/style.scss | 5 +- .../static/js/components/plugin-alert.vue | 2 +- .../js/components/plugin-processlist.vue | 177 ++++++++++-------- glances/outputs/static/js/filters.js | 7 +- glances/outputs/static/package-lock.json | 13 +- glances/outputs/static/public/browser.js | Bin 511673 -> 511763 bytes glances/outputs/static/public/glances.js | Bin 612451 -> 613606 bytes 8 files changed, 131 insertions(+), 90 deletions(-) diff --git a/glances/outputs/glances_restful_api.py b/glances/outputs/glances_restful_api.py index b4c01062..aba6cd82 100644 --- a/glances/outputs/glances_restful_api.py +++ b/glances/outputs/glances_restful_api.py @@ -222,6 +222,9 @@ class GlancesRestfulApi: # POST router.add_api_route(f'{base_path}/events/clear/warning', self._events_clear_warning, methods=['POST']) router.add_api_route(f'{base_path}/events/clear/all', self._events_clear_all, methods=['POST']) + router.add_api_route( + f'{base_path}/processes/extended/disable', self._api_disable_extended_processes, methods=['POST'] + ) router.add_api_route( f'{base_path}/processes/extended/{{pid}}', self._api_set_extended_processes, methods=['POST'] ) @@ -924,6 +927,18 @@ class GlancesRestfulApi: return GlancesJSONResponse(True) + def _api_disable_extended_processes(self): + """Glances API RESTful implementation. + + Disable extended process stats + HTTP/200 if OK + HTTP/400 if PID is not found + HTTP/404 if others error + """ + glances_processes.extended_process = None + + return GlancesJSONResponse(True) + def _api_get_extended_processes(self): """Glances API RESTful implementation. @@ -937,8 +952,6 @@ class GlancesRestfulApi: if not process_stats: process_stats = {} - print("Call _api_get_extended_processes") - return GlancesJSONResponse(process_stats) def _api_get_processes(self, pid: str): diff --git a/glances/outputs/static/css/style.scss b/glances/outputs/static/css/style.scss index e14f02b1..384b7ab2 100644 --- a/glances/outputs/static/css/style.scss +++ b/glances/outputs/static/css/style.scss @@ -168,7 +168,7 @@ body { margin-bottom: 1em; } -.clear-button { +.button { background-color: $glances-link-hover-color !important; color: white; border: none; @@ -178,7 +178,7 @@ body { transition-duration: 0.4s; } -.clear-button:hover { +.button:hover { background-color: white; color: black; } @@ -393,6 +393,7 @@ body { } #processlist { + overflow-y: auto; height: 600px; .table { diff --git a/glances/outputs/static/js/components/plugin-alert.vue b/glances/outputs/static/js/components/plugin-alert.vue index b3f7856f..c4eb3414 100644 --- a/glances/outputs/static/js/components/plugin-alert.vue +++ b/glances/outputs/static/js/components/plugin-alert.vue @@ -3,7 +3,7 @@ Warning or critical alerts (last {{ countAlerts }} entries) - + No warning or critical alert detected diff --git a/glances/outputs/static/js/components/plugin-processlist.vue b/glances/outputs/static/js/components/plugin-processlist.vue index 0d931a62..7274ca49 100644 --- a/glances/outputs/static/js/components/plugin-processlist.vue +++ b/glances/outputs/static/js/components/plugin-processlist.vue @@ -2,7 +2,33 @@
-
PIN PROCESS: {{ extended_stat }} - {{ getPinProcess() }}
+
+
+ Pinned thread: + {{ $filters.limitTo(extended_stats.cmdline, 80) }} + +
+
+ CPU Min/Max/Mean: + {{ $filters.number(extended_stats.cpu_min, 1) + }}% / {{ + $filters.number(extended_stats.cpu_max, 1) }}% / {{ $filters.number(extended_stats.cpu_mean, 1) + }}% + Affinity: + {{ extended_stats.cpu_affinity | length }} +
+
+ MEM Min/Max/Mean: + {{ $filters.number(extended_stats.memory_min, 1) }}% / {{ + $filters.number(extended_stats.memory_max, 1) }}% / {{ $filters.number(extended_stats.memory_mean, + 1) + }}% + Memory info: + + {{ $filters.dictToString(extended_stats.memory_info) }} + +
+
@@ -32,7 +58,7 @@ - - +
@@ -116,8 +142,8 @@
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }} @@ -342,7 +368,7 @@