Merge pull request #1329 from dmbaturin/T4432

T4432: display load averages normalized for the number of CPU cores

1 files changed, 10 insertions, 7 deletions

diff --git a/src/op_mode/show_uptime.py b/src/op_mode/show_uptime.py
index 1b5e33fa9..b70c60cf8 100755
--- a/src/op_mode/show_uptime.py
+++ b/src/op_mode/show_uptime.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -26,14 +26,17 @@ def get_uptime_seconds():
 def get_load_averages():
     from re import search
     from vyos.util import cmd
+    from vyos.cpu import get_core_count
 
     data = cmd("uptime")
     matches = search(r"load average:\s*(?P<one>[0-9\.]+)\s*,\s*(?P<five>[0-9\.]+)\s*,\s*(?P<fifteen>[0-9\.]+)\s*", data)
 
+    core_count = get_core_count()
+
     res = {}
-    res[1]  = float(matches["one"])
-    res[5]  = float(matches["five"])
-    res[15] = float(matches["fifteen"])
+    res[1]  = float(matches["one"]) / core_count
+    res[5]  = float(matches["five"]) / core_count
+    res[15] = float(matches["fifteen"]) / core_count
 
     return res
 
@@ -53,9 +56,9 @@ def get_formatted_output():
     out = "Uptime: {}\n\n".format(data["uptime"])
     avgs = data["load_average"]
     out += "Load averages:\n"
-    out += "1  minute:   {:.02f}%\n".format(avgs[1]*100)
-    out += "5  minutes:  {:.02f}%\n".format(avgs[5]*100)
-    out += "15 minutes:  {:.02f}%\n".format(avgs[15]*100)
+    out += "1  minute:   {:.01f}%\n".format(avgs[1]*100)
+    out += "5  minutes:  {:.01f}%\n".format(avgs[5]*100)
+    out += "15 minutes:  {:.01f}%\n".format(avgs[15]*100)
 
     return out