From 241a19943b7321aa1f2e2ece86b5ad68997390fe Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Sun, 24 Oct 2021 11:17:49 +0700
Subject: T3937: rewrite the "show system memory" script in Python

---
 op-mode-definitions/show-system.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'op-mode-definitions/show-system.xml.in')

diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 18a28868d..b32aee0c2 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -104,7 +104,7 @@
             <properties>
               <help>Show system memory usage</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_ram.sh</command>
+            <command>${vyos_op_scripts_dir}/show_ram.py</command>
             <children>
               <leafNode name="cache">
                 <properties>
-- 
cgit v1.2.3


From c2866603751f85b98b88d445874e6f1945647c30 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Sun, 24 Oct 2021 21:20:02 +0700
Subject: T3938: rewrite the uptime script in Python

---
 op-mode-definitions/show-system.xml.in |  2 +-
 src/op_mode/show_uptime.py             | 50 ++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100755 src/op_mode/show_uptime.py

(limited to 'op-mode-definitions/show-system.xml.in')

diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 18a28868d..059cd813b 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -142,7 +142,7 @@
                 <properties>
                   <help>Show summary of system processes</help>
                 </properties>
-                <command>uptime</command>
+                <command>${vyos_op_scripts_dir}/show_uptime.py</command>
               </leafNode>
               <leafNode name="tree">
                 <properties>
diff --git a/src/op_mode/show_uptime.py b/src/op_mode/show_uptime.py
new file mode 100755
index 000000000..c3dea52e6
--- /dev/null
+++ b/src/op_mode/show_uptime.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 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
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+def get_uptime_seconds():
+  from re import search
+  from vyos.util import read_file
+
+  data = read_file("/proc/uptime")
+  seconds = search("([0-9\.]+)\s", data).group(1)
+
+  return int(float(seconds))
+
+def get_load_averages():
+    from re import search
+    from vyos.util import cmd
+
+    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)
+
+    res = {}
+    res[1]  = float(matches["one"])
+    res[5]  = float(matches["five"])
+    res[15] = float(matches["fifteen"])
+
+    return res
+
+if __name__ == '__main__':
+    from vyos.util import seconds_to_human
+
+    print("Uptime: {}\n".format(seconds_to_human(get_uptime_seconds())))
+
+    avgs = get_load_averages()
+
+    print("Load averages:")
+    print("1  minute:   {:.02f}%".format(avgs[1]*100))
+    print("5  minutes:  {:.02f}%".format(avgs[5]*100))
+    print("15 minutes:  {:.02f}%".format(avgs[15]*100))
-- 
cgit v1.2.3