From 0cb496b81857bbf929fc108ff9aeb866ecc9ec51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Ricart?= Date: Thu, 27 Feb 2025 11:47:34 +0100 Subject: [PATCH] fix os info --- parsers/debian.py | 2 +- template/base.rst.j2 | 4 ++-- template/debian.rst.j2 | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/parsers/debian.py b/parsers/debian.py index 1ae1f61..5144f96 100644 --- a/parsers/debian.py +++ b/parsers/debian.py @@ -27,7 +27,7 @@ def parse_debian(content): if section in ["services","routes"]: result[section] = loads(result[section]) result["ip"] = parse_ip(result["ip"]) - result["os"] = result["version"] + result["os"] = loads(result["version"]) return result if __name__ == "__main__": diff --git a/template/base.rst.j2 b/template/base.rst.j2 index 698dcfe..6822a35 100644 --- a/template/base.rst.j2 +++ b/template/base.rst.j2 @@ -2,6 +2,6 @@ {{ hostname.replace("\n", "") }} {{ "=" * (hostname|length) }} -:os: {{ os["name"] }} -:version: {{ os["version"] }} +:os: {{ os["NAME"] }} +:version: {{ os["VERSION"] }} diff --git a/template/debian.rst.j2 b/template/debian.rst.j2 index bd5d60b..7378ce1 100644 --- a/template/debian.rst.j2 +++ b/template/debian.rst.j2 @@ -28,3 +28,4 @@ services ================================================== ==================== =============={% for svc in services %} {{ "{:<50}".format(svc["unit"][:49]) }} {{ "{:<20}".format(svc["sub"].replace("running",":green:`running`").replace("failed", ":red:`failed`")) }} {{ svc["description"] }}{% endfor %} ================================================== ==================== ============== +