Merge branch 'issue2695' into develop

nicolargo · Mar 9, 2024 · d1a7f61 · d1a7f61
2 parents 573d73f + 5dfc91d
commit d1a7f61
Show file tree

Hide file tree

Showing 7 changed files with 242 additions and 203 deletions.
diff --git a/conf/glances.conf b/conf/glances.conf
@@ -71,6 +71,9 @@ load_critical=500
 disable=False
 # Default refresh rate is 60 seconds
 #refresh=60
+# System information to display (a string where {key} will be replaced by the value)
+# Available information are: hostname, os_name, os_version, os_arch, linux_distro, platform
+#system_info_msg=({linux_distro} {platform} / {os_name} {os_version})
 
 [cpu]
 disable=False

diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf
@@ -71,6 +71,9 @@ load_critical=500
 disable=False
 # Default refresh rate is 60 seconds
 #refresh=60
+# System information to display (a string where {key} will be replaced by the value)
+# Available information are: hostname, os_name, os_version, os_arch, linux_distro, platform
+#system_info_msg=({linux_distro} {platform} / {os_name} {os_version})
 
 [cpu]
 disable=False

diff --git a/docs/aoa/header.rst b/docs/aoa/header.rst
@@ -11,6 +11,16 @@ Additionally, on GNU/Linux, it also shows the kernel version.
 
 In client mode, the server connection status is also displayed.
 
+The system information message can be configured in the configuration file
+(for the moment, it only work for the Curses interface):
+
+.. code-block:: ini
+    [system]
+    system_info_msg=({linux_distro} {platform} / {os_name} {os_version})
+
+**NOTE:** Available information are: hostname, os_name, os_version, os_arch,
+linux_distro, platform (use mustache syntax).
+
 It is possible to disable or define time interval to be used for refreshing the
 public IP address (default is 300 seconds) from the configuration
 file under the ``[ip]`` section: