[fix] Updated system info to retrieve friendly OS identifiers #544

Added "distro" package as dependency.

Fixes #544

Author: pandafy

openwisp_utils/admin_theme/system_info.py

@@ -2,6 +2,7 @@
 import sys
 from collections import OrderedDict
 
+import distro
 from django.conf import settings
 from django.utils.module_loading import import_string
 
@@ -76,8 +77,11 @@ def get_enabled_openwisp_modules():
 
 def get_os_details():
     uname = platform.uname()
+    os_name = distro.name(pretty=True)
+    # Simplify kernel version (e.g., "5.15.0-164-generic" -> "5.15.0")
+    kernel_version = uname.release.split("-")[0]
     return {
-        "os_version": uname.version,
-        "kernel_version": uname.release,
+        "os_version": os_name,
+        "kernel_version": kernel_version,
         "hardware_platform": uname.machine,
     }

openwisp_utils/metric_collection/tests/__init__.py

@@ -3,8 +3,8 @@
     "openwisp-users": "1.1.0a",
 }
 _OS_DETAILS_RETURN_VALUE = {
-    "kernel_version": "5.13.0-52-generic",
-    "os_version": "#59~20.04.1-Ubuntu SMP Thu Jun 16 21:21:28 UTC 2022",
+    "kernel_version": "5.13.0",
+    "os_version": "Ubuntu 20.04.1 LTS",
     "hardware_platform": "x86_64",
 }
 
@@ -39,7 +39,7 @@
     {
         "category": "Upgrade",
         "action": "kernel_version",
-        "name": "5.13.0-52-generic",
+        "name": "5.13.0",
         "value": 1,
         "times": 1,
         "period_start": 1701388800,
@@ -48,7 +48,7 @@
     {
         "category": "Upgrade",
         "action": "os_version",
-        "name": "#59~20.04.1-Ubuntu SMP Thu Jun 16 21:21:28 UTC 2022",
+        "name": "Ubuntu 20.04.1 LTS",
         "value": 1,
         "times": 1,
         "period_start": 1701388800,
@@ -105,7 +105,7 @@
     {
         "category": "Heartbeat",
         "action": "kernel_version",
-        "name": "5.13.0-52-generic",
+        "name": "5.13.0",
         "value": 1,
         "times": 1,
         "period_start": 1701388800,
@@ -114,7 +114,7 @@
     {
         "category": "Heartbeat",
         "action": "os_version",
-        "name": "#59~20.04.1-Ubuntu SMP Thu Jun 16 21:21:28 UTC 2022",
+        "name": "Ubuntu 20.04.1 LTS",
         "value": 1,
         "times": 1,
         "period_start": 1701388800,
@@ -170,7 +170,7 @@
     {
         "category": "Install",
         "action": "kernel_version",
-        "name": "5.13.0-52-generic",
+        "name": "5.13.0",
         "value": 1,
         "times": 1,
         "period_start": 1701388800,
@@ -179,7 +179,7 @@
     {
         "category": "Install",
         "action": "os_version",
-        "name": "#59~20.04.1-Ubuntu SMP Thu Jun 16 21:21:28 UTC 2022",
+        "name": "Ubuntu 20.04.1 LTS",
         "value": 1,
         "times": 1,
         "period_start": 1701388800,

setup.py

@@ -31,6 +31,7 @@
         "swapper~=1.4.0",
         # allow wider range here to avoid interfering with other modules
         "urllib3>=2.0.0,<3.0.0",
+        "distro~=1.9.0",
     ],
     extras_require={
         "qa": [