refactor(about-me): report current cpu frequency and avoid dmidecode noise, new perfdata

Author: markuslf

CHANGELOG.md

@@ -63,6 +63,7 @@ Icinga Director:
 
 Monitoring Plugins:
 
+* about-me: report current cpu frequency and avoid dmidecode noise, new perfdata
 * cpu-usage: non-blocking behaviour (interval=None + manual deltas via SQLite DB) so we get both accuracy and faster runtime
 * disk-io: modernize code
 * gitlab-health: increase timeout from 3 to 8 secs

check-plugins/about-me/README.md

@@ -67,17 +67,17 @@ Shortened output example:
 
 ```text
 Plugin Output
-server.example.com: Fedora Linux 39 (Workstation Edition) Kernel 6.8.4-200.fc39.x86_64 on Bare-Metal, Dell Inc. XPS 13 9310, Firmware: n/a, SerNo: 39d3e1cd, Proc: 11th Gen Intel Core i7-1185G7 @ 3.00GHz, #Cores: 4, #Threads: 8, Current Speed: 3000 MHz, 16.0GiB RAM, Disk nvme0n1 1.8T, UEFI boot, Display Server wayland, tuned profile "throughput-performance", born 2024-03-20. About-me v2024041001
-
-Hardware Info:
-* BIOS: Dell Inc., Ver 3.21.0 (released 02/01/2024), ROM 32 MB
-* SysInfo: Dell Inc. XPS 13 9310, SerNo 39d3e1cd, SKU N/A, Wake-up Type "Other",
-  UUID 4c4c4544-0044-5a10-8052-c4c04f334a33
-* Base Board: Type Motherboard Dell Inc. 07P9Y7, SerNo /2cc8a595/20ca3e48/, Ver A00
-* Chassis: Dell Inc., Type Notebook, SKU N/A, SerNo 875b42b9
+server.example.com: Fedora Linux 42 (Workstation Edition) Kernel 6.16.4-200.fc42.x86_64 on Bare-Metal, Dell Inc. XPS 13 9350, Firmware: 1.20, SerNo: 12345678, Proc: Intel Core Ultra 7 258V, CPUs: 8/8/8 (phys/lcpu/onln), Current Speed: 3943 MHz, 30.9GiB/4.0GiB RAM (virtmem/max; reboot recommended), Disk nvme0n1 1.8T, UEFI boot, Display Server x11, tuned profile "throughput-performance", born 2024-03-20. About-me v2025090901
+
+Hardware Info from `dmidecode`:
+* BIOS: Dell Inc., Ver 1.13.0 (released 07/11/2025), ROM 64 MB
+* SysInfo: Dell Inc. XPS 13 9350, SerNo 12345678, SKU n/a, Wake-up Type "Other",
+  UUID 4c4c4544-005a-5110-804a-b8c04f593834
+* Base Board: Type Motherboard Dell Inc. 0MMW13, SerNo /12345678/98765432/, Ver A01
+* Chassis: Dell Inc., Type Notebook, SKU n/a, SerNo 12345678
   States: boot-up=Safe, pwr-supply=Safe, thermal=Safe, security=None
-* Proc: Intel(R) Corporation, Ver 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz,
-  Speed 3000 MHz/3000 MHz max., 4/4 Cores enabled, 8 Threads, Voltage 0.8 V
+* Proc: Intel(R) Corporation, Ver Intel(R) Core(TM) Ultra 7 258V,
+  Speed 4700 MHz/4800 MHz max., 8/8 Cores enabled, 8 Threads, Voltage 1.0 V
 * System Boot: No errors detected
 
 Interfaces (IPv4):
@@ -147,14 +147,13 @@ crontab:
 
 | Name | Type | Description |
 |----|----|----|
-| cpu | Number | Number of CPUs (if `dmidecode` is not available) |
-| cpu_cores_enabled | Number | Number of enabled CPU cores (if `dmidecode` is available) |
-| cpu_speed | Number | CPU speed (if `dmidecode` is available) |
-| cpu_threads | Number | Number of CPU cores with Hyper-Threading enabled (if `dmidecode` is available) |
+| cpu_logical | Number | Number of physical cores multiplied by the number of threads that can run on each core (this is known as Hyper Threading) |
+| cpu_physical | Number | Number of physical cores |
+| cpu_usable | Number | The number of usable CPUs. This may not necessarily be equivalent to the actual number of CPUs the current process can use. That can vary in case process CPU affinity has been changed, Linux cgroups are being used or (in case of Windows) on systems using processor groups or having more than 64 CPUs. |
+| cpu_freq | Number | On Linux reports the current real-time value, on all other platforms this usually represents the nominal "fixed" value (never changing) |
 | disks | Number | Number of disks |
 | osversion | None | 'Fedora 33' becomes '33', 'CentOS 7.4.1708' becomes '741708' - to see when an upgrade happened |
-| ram | Bytes | Size of memory (if `dmidecode` is not available) |
-| ram | Bytes | Size of memory (if `dmidecode` is available) |
+| ram | Bytes | Size of memory |
 
 
 ## Credits, License

check-plugins/about-me/about-me

@@ -40,7 +40,7 @@ except ImportError:
 
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2025062002 / v2.1.1'
+__version__ = '2025090901 / v2.1.1'
 
 DESCRIPTION = 'Provides a quick overview of host dimensions and software.'
 
@@ -239,7 +239,7 @@ def get_hw_info():
                 value.get('UUID', 'n/a').replace('Default string', 'n/a'),
             )
     if output:
-        return 'Hardware Info:\n{}\n'.format(output)
+        return 'Hardware Info (`dmidecode`):\n{}\n'.format(output)
     return output
 
 
@@ -626,7 +626,10 @@ def get_sys_dimensions():
     """
     sys_dimensions = {}
     try:
-        sys_dimensions['cpu'] = psutil.cpu_count(logical=True)
+        sys_dimensions['cpu_logical'] = psutil.cpu_count(logical=True)
+        sys_dimensions['cpu_physical'] = psutil.cpu_count(logical=False)
+        sys_dimensions['cpu_usable'] = psutil.cpu_count(logical=True)
+        sys_dimensions['cpu_freq'] = psutil.cpu_freq()
         sys_dimensions['ram'] = psutil.virtual_memory().total
     except:
         pass
@@ -811,9 +814,12 @@ def main():
         msg += 'Firmware: {}, '.format(lib.dmidecode.firmware(dmi))
         msg += 'SerNo: {}, '.format(lib.dmidecode.serno(dmi))
         msg += 'Proc: {}, '.format(lib.dmidecode.cpu_type(dmi))
-        msg += '#Cores: {}, '.format(lib.dmidecode.cpu_cores_enabled(dmi))
-        msg += '#Threads: {}, '.format(lib.dmidecode.cpu_threads(dmi))
-        msg += 'Current Speed: {} MHz, '.format(lib.dmidecode.cpu_speed(dmi))
+        msg += 'CPUs: {}/{}/{} (phys/lcpu/onln), '.format(
+            sys_dimensions['cpu_physical'],
+            sys_dimensions['cpu_logical'],
+            sys_dimensions['cpu_usable'],
+        )
+        msg += 'Current Speed: {} MHz, '.format(int(sys_dimensions['cpu_freq'][0]))
         msg += '{}/{} RAM (virtmem/max'.format(
             lib.human.bytes2human(sys_dimensions['ram']),
             lib.human.bytes2human(lib.dmidecode.ram(dmi)),
@@ -826,14 +832,20 @@ def main():
         msg += 'Firmware: {}, '.format(lib.dmidecode.firmware(dmi))
         msg += 'SerNo: {}, '.format(lib.dmidecode.serno(dmi))
         msg += 'Proc: {}, '.format(lib.dmidecode.cpu_type(dmi))
-        msg += '#Cores: {}, '.format(lib.dmidecode.cpu_cores_enabled(dmi))
-        msg += '#Threads: {}, '.format(lib.dmidecode.cpu_threads(dmi))
-        msg += 'Current Speed: {} MHz, '.format(lib.dmidecode.cpu_speed(dmi))
+        msg += 'CPUs: {}/{}/{} (phys/lcpu/onln), '.format(
+            sys_dimensions['cpu_physical'],
+            sys_dimensions['cpu_logical'],
+            sys_dimensions['cpu_usable'],
+        )
+        msg += 'Current Speed: {} MHz, '.format(int(sys_dimensions['cpu_freq'][0]))
         msg += '{} RAM, '.format(lib.human.bytes2human(lib.dmidecode.ram(dmi)))
     elif sys_dimensions:
-        msg += '{} {}, {} RAM, '.format(
-            sys_dimensions['cpu'],
-            lib.txt.pluralize('CPU', sys_dimensions['cpu']),
+        msg += 'CPUs: {}/{}/{} (phys/lcpu/onln), '.format(
+            sys_dimensions['cpu_physical'],
+            sys_dimensions['cpu_logical'],
+            sys_dimensions['cpu_usable'],
+        )
+        msg += '{} RAM, '.format(
             lib.human.bytes2human(sys_dimensions['ram'])
         )
     else:
@@ -878,13 +890,13 @@ def main():
         re_search = re.search(r'[\d\.]+', os_info)
         if re_search:
             perfdata += lib.base.get_perfdata('osversion', re_search.group(0).replace('.', ''), None, None, None, None, None) # pylint: disable=C0301
+    perfdata += lib.base.get_perfdata('cpu_logical', sys_dimensions['cpu_logical'], None, None, None, 0, None)
+    perfdata += lib.base.get_perfdata('cpu_physical', sys_dimensions['cpu_physical'], None, None, None, 0, None)
+    perfdata += lib.base.get_perfdata('cpu_usable', sys_dimensions['cpu_usable'], None, None, None, 0, None)
+    perfdata += lib.base.get_perfdata('cpu_freq', int(sys_dimensions['cpu_freq'][0]), None, None, None, 0, lib.dmidecode.cpu_speed(dmi))
     if dmi:
-        perfdata += lib.base.get_perfdata('cpu_cores_enabled', lib.dmidecode.cpu_cores_enabled(dmi), None, None, None, 0, None) # pylint: disable=C0301
-        perfdata += lib.base.get_perfdata('cpu_threads', lib.dmidecode.cpu_threads(dmi), None, None, None, 0, None) # pylint: disable=C0301
-        perfdata += lib.base.get_perfdata('cpu_speed', lib.dmidecode.cpu_speed(dmi), None, None, None, 0, None) # pylint: disable=C0301
         perfdata += lib.base.get_perfdata('ram', lib.dmidecode.ram(dmi), 'B', None, None, 0, None)
     elif sys_dimensions:
-        perfdata += lib.base.get_perfdata('cpu', sys_dimensions['cpu'], None, None, None, 0, None)
         perfdata += lib.base.get_perfdata('ram', sys_dimensions['ram'], 'B', None, None, 0, None)
     perfdata += lib.base.get_perfdata('disks', disk_count, None, None, None, 0, None)
 

check-plugins/about-me/grafana/about-me.yml

@@ -48,7 +48,7 @@ spec:
 
   panels:
 
-  - title: About me - CPU Cores, Threads and Disks
+  - title: About me - CPUs and Disks
     type: timeseries
     gridPos:
       h: 8
@@ -80,8 +80,8 @@ spec:
 
     targets:
 
-    - alias: cpu_cores_enabled
-      refId: cpu_cores_enabled
+    - alias: cpu_logical
+      refId: cpu_logical
       groupBy:
       - params:
         - $interval
@@ -105,10 +105,10 @@ spec:
       - condition: AND
         key: metric
         operator: '='
-        value: cpu_cores_enabled
+        value: cpu_logical
 
-    - alias: cpu_threads
-      refId: cpu_threads
+    - alias: cpu_usable
+      refId: cpu_usable
       groupBy:
       - params:
         - $interval
@@ -132,7 +132,34 @@ spec:
       - condition: AND
         key: metric
         operator: '='
-        value: cpu_threads
+        value: cpu_physical
+
+    - alias: cpu_usable
+      refId: cpu_usable
+      groupBy:
+      - params:
+        - $interval
+        type: time
+      measurement: $command
+      resultFormat: time_series
+      select:
+      - - params:
+          - value
+          type: field
+        - params: []
+          type: mean
+      tags:
+      - key: hostname
+        operator: '='
+        value: $hostname
+      - condition: AND
+        key: service
+        operator: '='
+        value: $service
+      - condition: AND
+        key: metric
+        operator: '='
+        value: cpu_usable
 
     - alias: disks
       refId: disks
@@ -162,7 +189,7 @@ spec:
         value: disks
 
 
-  - title: About me - CPU Speed
+  - title: About me - CPU Frequency
     type: timeseries
     gridPos:
       h: 8
@@ -197,8 +224,8 @@ spec:
 
     targets:
 
-    - alias: cpu_speed
-      refId: cpu_speed
+    - alias: cpu_freq
+      refId: cpu_freq
       groupBy:
       - params:
         - $interval
@@ -222,7 +249,7 @@ spec:
       - condition: AND
         key: metric
         operator: '='
-        value: cpu_speed
+        value: cpu_freq
 
 
   - title: About me - RAM