sysview-py 0.2.0__tar.gz → 0.3.0__tar.gz

{sysview_py-0.2.0 → sysview_py-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sysview-py
-Version: 0.2.0
+Version: 0.3.0
 Summary: Add your description here
 Author: Michael Wilson
 Author-email: Michael Wilson <mw@1wilson.org>

{sysview_py-0.2.0 → sysview_py-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sysview-py"
-version = "0.2.0"
+version = "0.3.0"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{sysview_py-0.2.0 → sysview_py-0.3.0}/src/sysview_py/main.py

@@ -20,7 +20,6 @@ def main():
         sysview.read_hosts()
         sysview.get_latest_reports()
         sysview.update_html()
-        print("finished")
 
 
 if __name__ == "__main__":

{sysview_py-0.2.0 → sysview_py-0.3.0}/src/sysview_py/report.py

@@ -14,6 +14,11 @@ class Host:
         self.name = name
         self.report_types = report_types
         self.reports = reports
+        self.url_path = f"hosts/{self.name}/host.html"
+
+    @property
+    def description(self):
+        return f"Last updated {self.last_updated}"
 
     @property
     def last_updated(self):
@@ -87,6 +92,18 @@ class ReportItem:
     def __repr__(self):
         return f"ReportItem(command={self.command}, status={self.status})"
 
+    @property
+    def description(self):
+        return f"{self.status_text}\nUpdated: {self.date}"
+
+    @property
+    def name(self):
+        return self.command
+
+    @property
+    def url_path(self):
+        return f"{self.report_type}_{self.id}.html"
+
     @property
     def status(self):
         age = datetime.now() - self.date

sysview_py-0.3.0/src/sysview_py/static/sysview.css

@@ -0,0 +1,67 @@
+#OK {
+	background-color: #C1E1C1;
+	text-align: center;
+	color: black;
+}
+
+#WARNING {
+	background-color: #FAC898;
+	text-align: center;
+	color: black;
+}
+
+#CRITICAL {
+	background-color: #FAA0A0;
+	text-align: center;
+	color: black;
+}
+
+#UNKNOWN {
+	background-color: #A7C7E7;
+	text-align: center;
+	color: black;
+}
+
+.active {
+	background-color: dimgrey;
+}
+
+:root {
+	width: 100%;
+  color-scheme: dark;
+  --bg: #212121;
+  --accent-bg: #2b2b2b;
+  --text: #dcdcdc;
+  --text-light: #ababab;
+  --accent: #ffb300;
+  --accent-hover: #ffe099;
+  --accent-text: var(--bg);
+  --code: #f06292;
+  --preformatted: #ccc;
+  --disabled: #111;
+}
+
+.card-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 1rem;
+    justify-content: center;
+    padding: 1rem;
+
+  }
+  .card {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    width: 300px;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    padding: 1rem;
+  }
+
+@media (max-width: 768px) {
+    .card-container {
+      flex-direction: column;
+      align-items: center;
+    }
+}

{sysview_py-0.2.0 → sysview_py-0.3.0}/src/sysview_py/sysview.py

@@ -53,12 +53,12 @@ class Sysview:
             loader=PackageLoader("sysview_py"),
             autoescape=select_autoescape()
         )
-        html = env.get_template("index.html").render(hosts=self.hosts, title="Hosts", active="Hosts", path="")
+        html = env.get_template("card_view.html").render(items=self.hosts, title="Hosts", active="Hosts", path="")
         html_path = self.html_root / "index.html"
         with open(html_path, 'w') as f:
             f.write(html)
         for host in self.hosts:
-            html = env.get_template("host.html").render(host=host, title=host.name, active="Hosts", path="../../")
+            html = env.get_template("card_view.html").render(items=host.all_items, title=host.name, active="Hosts", path="../../")
             host_dir = self.html_hosts / host.name
             host_dir.mkdir()
             html_path = host_dir / "host.html"
@@ -67,9 +67,12 @@ class Sysview:
             for item in host.all_items:
                 html = env.get_template("service.html").render(item=item, title=host.name, active="Services", path="../../")
                 html_path = host_dir / f"{item.report_type}_{item.id}.html"
+                raw_path = host_dir / f"{item.report_type}_{item.id}.txt"
                 with open(html_path, 'w') as f:
                     f.write(html)
-        html = env.get_template("services.html").render(services=self.all_services, title="Services", active="Services", path="")
+                with open(raw_path, 'w') as f:
+                    f.write(item.raw_item)
+        html = env.get_template("card_view.html").render(items=self.all_services, title="Services", active="Services", path="")
         html_path = self.html_root / f"services.html"
         with open(html_path, 'w') as f:
             f.write(html)

sysview_py-0.3.0/src/sysview_py/templates/card_view.html

@@ -0,0 +1,25 @@
+<html>
+	{% include 'header.html' %}
+{% if items[0].report_id is defined and active == 'Hosts' %}
+<h2>{{ items[0].host }}</h2>
+<p>Updated: {{ items[0].date }}</p>
+{% endif %}
+ <section class="card-container">
+{% for item in items %}
+<article id="{{item.status }}" class="card">
+	{% if active == 'Hosts' %}
+	<a id="{{ item.status }}" href="{{ item.url_path }}">{{ item.name }}</a>
+	{% else %}
+	<a id="{{ item.status }}" href="hosts/{{ item.host }}/{{ item.url_path }}">{{ item.name }}</a>
+	{{ item.host }}
+	{% endif %}
+	{% if item.last_updated is defined %}
+	{{ item.last_updated }}
+	{% elif item.date is defined %}
+	{{ item.date }}
+	{% endif %}
+  </article>
+{% endfor %}
+ </section>
+	{% include 'footer.html' %}
+</html>

{sysview_py-0.2.0 → sysview_py-0.3.0}/src/sysview_py/templates/header.html

@@ -21,6 +21,5 @@
 			<a href="{{ path }}services.html">Services</a>
 			{% endif %}
 		</nav>
-		<h1>{{ title }}</h1>
 	</header>
 	<main>

sysview_py-0.3.0/src/sysview_py/templates/service.html

@@ -0,0 +1,10 @@
+<html>
+	{% include 'header.html' %}
+	<nav>
+	<a href="host.html">Show host</a>
+	|
+	<a href="{{ item.report_type }}_{{ item.id }}.txt">Raw report</a>
+	</nav>
+	<pre>{{ item.raw_item }}</pre>
+	{% include 'footer.html' %}
+</html>

{sysview_py-0.2.0 → sysview_py-0.3.0}/src/sysview_py/templates/services.html

@@ -14,7 +14,7 @@
 				<td><a href="hosts/{{ item.host }}/{{ item.report_type}}_{{ item.id }}.html">{{ item.command }}</a></td>
 				<td>{{ item.status_text }}</td>
 				<td>{{ item.date }}</td>
-				<td class="{{ item.status }}"></td>
+				<td id="{{ item.status }}"></td>
 			</tr>
 			{% endfor %}
 		</table>

sysview_py-0.2.0/src/sysview_py/static/sysview.css

@@ -1,38 +0,0 @@
-.OK {
-	color: black;
-	background-color: green;
-}
-
-.WARNING {
-	color: black;
-	background-color: gold;
-}
-
-.CRITICAL {
-	color: black;
-	background-color: crimson;
-}
-
-.UNKNOWN {
-	color: black;
-	background-color: purple;
-}
-
-.active {
-	background-color: dimgrey;
-}
-
-:root {
-	width: 100%;
-  color-scheme: dark;
-  --bg: #212121;
-  --accent-bg: #2b2b2b;
-  --text: #dcdcdc;
-  --text-light: #ababab;
-  --accent: #ffb300;
-  --accent-hover: #ffe099;
-  --accent-text: var(--bg);
-  --code: #f06292;
-  --preformatted: #ccc;
-  --disabled: #111;
-}

sysview_py-0.2.0/src/sysview_py/templates/service.html

@@ -1,6 +0,0 @@
-<html>
-	{% include 'header.html' %}
-	<a href="host.html">Back to host</a>
-	<pre>{{ item.raw_item }}</pre>
-	{% include 'footer.html' %}
-</html>