Merge branch 'issue410' into develop

Author: nicolargo

docs/api.rst

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GLANCES" "1" "Jan 04, 2025" "4.3.0.8" "Glances"
+.TH "GLANCES" "1" "Jan 26, 2025" "4.3.1_dev09" "Glances"
 .SH NAME
 glances \- An eye on your system
 .SH SYNOPSIS

docs/man/glances.1

@@ -29,7 +29,7 @@
 from datetime import datetime
 from operator import itemgetter, methodcaller
 from statistics import mean
-from typing import Any, Union
+from typing import Any, Optional, Union
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlparse
 from urllib.request import Request, urlopen
@@ -393,13 +393,22 @@ def dictlist(data, item):
         return None
 
 
-def json_dumps_dictlist(data, item):
+def dictlist_json_dumps(data, item):
     dl = dictlist(data, item)
     if dl is None:
         return None
     return json_dumps(dl)
 
 
+def dictlist_first_key_value(data: list[dict], key, value) -> Optional[dict]:
+    """In a list of dict, return first item where key=value or none if not found."""
+    try:
+        ret = next(item for item in data if key in item and item[key] == value)
+    except StopIteration:
+        ret = None
+    return ret
+
+
 def string_value_to_float(s):
     """Convert a string with a value and an unit to a float.
     Example:

glances/globals.py

@@ -21,6 +21,7 @@
 from glances.globals import json_dumps
 from glances.logger import logger
 from glances.password import GlancesPassword
+from glances.processes import glances_processes
 from glances.servers_list import GlancesServersList
 from glances.servers_list_dynamic import GlancesAutoDiscoverClient
 from glances.stats import GlancesStats
@@ -221,6 +222,12 @@ def _router(self) -> APIRouter:
         # 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']
+        )
 
         # GET
         route_mapping = {
@@ -235,6 +242,8 @@ def _router(self) -> APIRouter:
             f'{base_path}/all/views': self._api_all_views,
             f'{base_path}/pluginslist': self._api_plugins,
             f'{base_path}/serverslist': self._api_servers_list,
+            f'{base_path}/processes/extended': self._api_get_extended_processes,
+            f'{base_path}/processes/{{pid}}': self._api_get_processes,
             f'{plugin_path}': self._api,
             f'{plugin_path}/history': self._api_history,
             f'{plugin_path}/history/{{nb}}': self._api_history,
@@ -900,3 +909,62 @@ def _api_args_item(self, item: str):
             raise HTTPException(status.HTTP_404_NOT_FOUND, f"Cannot get args item ({str(e)})")
 
         return GlancesJSONResponse(args_json)
+
+    def _api_set_extended_processes(self, pid: str):
+        """Glances API RESTful implementation.
+
+        Set the extended process stats for the given PID
+        HTTP/200 if OK
+        HTTP/400 if PID is not found
+        HTTP/404 if others error
+        """
+        process_stats = glances_processes.get_stats(int(pid))
+
+        if not process_stats:
+            raise HTTPException(status.HTTP_404_NOT_FOUND, f"Unknown PID process {pid}")
+
+        glances_processes.extended_process = process_stats
+
+        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.
+
+        Get the extended process stats (if set before)
+        HTTP/200 if OK
+        HTTP/400 if PID is not found
+        HTTP/404 if others error
+        """
+        process_stats = glances_processes.get_extended_stats()
+
+        if not process_stats:
+            process_stats = {}
+
+        return GlancesJSONResponse(process_stats)
+
+    def _api_get_processes(self, pid: str):
+        """Glances API RESTful implementation.
+
+        Get the process stats for the given PID
+        HTTP/200 if OK
+        HTTP/400 if PID is not found
+        HTTP/404 if others error
+        """
+        process_stats = glances_processes.get_stats(int(pid))
+
+        if not process_stats:
+            raise HTTPException(status.HTTP_404_NOT_FOUND, f"Unknown PID process {pid}")
+
+        return GlancesJSONResponse(process_stats)

glances/outputs/glances_restful_api.py

@@ -225,7 +225,30 @@ def print_all():
     print('Get all Glances stats::')
     print('')
     print(f'    # curl {API_URL}/all')
-    print('    Return a very big dictionary (avoid using this request, performances will be poor)...')
+    print('    Return a very big dictionary with all stats')
+    print('')
+    print('Note: Update is done automatically every time /all or /<plugin> is called.')
+    print('')
+
+
+def print_processes():
+    sub_title = 'GET stats of a specific process'
+    print(sub_title)
+    print('-' * len(sub_title))
+    print('')
+    print('Get stats for process with PID == 777::')
+    print('')
+    print(f'    # curl {API_URL}/processes/777')
+    print('    Return stats for process (dict)')
+    print('')
+    print('Enable extended stats for process with PID == 777 (only one process at a time can be enabled)::')
+    print('')
+    print(f'    # curl -X POST {API_URL}/processes/extended/777')
+    print(f'    # curl {API_URL}/all')
+    print(f'    # curl {API_URL}/processes/777')
+    print('    Return stats for process (dict)')
+    print('')
+    print('Note: Update *is not* done automatically when you call /processes/<pid>.')
     print('')
 
 
@@ -370,6 +393,9 @@ def update(self, stats, duration=1):
         # Get all stats
         print_all()
 
+        # Get process stats
+        print_processes()
+
         # Get top stats (only for plugins with a list of items)
         # Example for processlist plugin: get top 2 processes
         print_top(stats)

glances/outputs/glances_stdout_apidoc.py

@@ -168,28 +168,28 @@ body {
     margin-bottom: 1em;
 }
 
-.clear-button {
-    background-color: $glances-link-hover-color !important;
-    color: white;
-    border: none;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    transition-duration: 0.4s;
+.button {
+    color: #99CCFF; /* Bleu clair high-tech */
+    background: rgba(0, 0, 0, 0.4); /* Fond légèrement transparent */
+    border: 1px solid #99CCFF; /* Bordure discrète */
+    padding: 5px 10px;
+    border-radius: 5px;
+    letter-spacing: 1px;
+    cursor: pointer;
+    transition: all 0.2s ease-in-out;
+    position: relative;
+    overflow: hidden;
 }
 
-.clear-button:hover {
-    background-color: white;
-    color: black;
+.button:hover {
+    background: rgba(153, 204, 255, 0.15); /* Légère coloration au survol */
+    border-color: #B0D0FF;
+    color: #B0D0FF;
 }
 
-#system {
-    span {
-        padding-left: 10px;
-    }
-    span:nth-child(1) {
-        padding-left: 0px;
-    }
+.button:active {
+    transform: scale(0.95); /* Légère réduction pour effet de pression */
+    box-shadow: 0 0 8px rgba(153, 204, 255, 0.5); /* Flash léger */
 }
 
 .frequency {
@@ -392,12 +392,26 @@ body {
     }
 }
 
+#processlist div.extendedstats {
+        margin-bottom: 1em;
+        margin-top: 1em;
+}
+
+#processlist div.extendedstats div span:not(:last-child) {
+        margin-right: 1em;
+}
+
 #processlist {
     overflow-y: auto;
     height: 600px;
     .table {
         margin-bottom: 1em;
     }
+
+    .table-hover tbody tr:hover td {
+        background: $glances-link-hover-color;
+    }
+
     // Default column size
     * > td:nth-child(-n+12) {
         width: 5em;
@@ -427,6 +441,7 @@ body {
     }
 }
 
+
 #alerts {
     span {
         padding-left: 10px;

glances/outputs/static/css/style.scss

@@ -3,7 +3,7 @@
     <span class="title" v-if="hasAlerts">
       Warning or critical alerts (last {{ countAlerts }} entries)
       <span>
-        <button class="clear-button" v-on:click="clear()">Clear alerts</button>
+        <button class="button" v-on:click="clear()">Clear alerts</button>
       </span>
     </span>
     <span class="title" v-else>No warning or critical alert detected</span>