sysview-py 0.3.7__tar.gz → 0.4.0__tar.gz

{sysview_py-0.3.7 → sysview_py-0.4.0}/PKG-INFO

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

{sysview_py-0.3.7 → sysview_py-0.4.0}/pyproject.toml

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

{sysview_py-0.3.7 → sysview_py-0.4.0}/src/sysview_py/db.py

@@ -1,5 +1,6 @@
 import datetime
 import sqlite3
+from .report import ReportItem, Report
 
 
 class SysviewDB:
@@ -8,8 +9,9 @@ class SysviewDB:
         CREATE TABLE types(name, UNIQUE(name));
         CREATE TABLE hosts_types(host, type, UNIQUE(host, type));
         CREATE TABLE reports(hostname, type, date, raw_report);
-        CREATE TABLE items(command, status, status_text, additional_text, raw_item, report_id);
+        CREATE TABLE items(command, status, status_text, additional_text, raw_item, hostname, report_id);
     """
+
     def __init__(self, path):
         self.path = path
         self._connection = None
@@ -50,7 +52,9 @@ class SysviewDB:
         host_types = self.get_types(hostname)
         for host_type in host_types:
             sql = f"SELECT rowid,raw_report  from reports WHERE type = '{host_type}' AND hostname= '{hostname}' ORDER BY rowid DESC LIMIT 1"
-            latest_report = self._cursor.execute(sql).fetchone()
+            report_id, latest_report = self._cursor.execute(sql).fetchone()
+            latest_report = Report(raw_report=latest_report, report_id=report_id)
+            latest_report.parse()
             reports.append(latest_report)
         return reports
 
@@ -75,14 +79,39 @@ class SysviewDB:
                 i.status_text,
                 i.additional_text,
                 i.raw_item,
+                report.hostname,
                 report_id,
             )
             for i in report.items
         ]
-        self._cursor.executemany("INSERT INTO items VALUES(?, ?, ?, ?, ?, ?)", items)
+        self._cursor.executemany("INSERT INTO items VALUES(?, ?, ?, ?, ?, ?, ?)", items)
 
         self._connection.commit()
 
+    def get_last_changed_item(self, item):
+        sql = f"SELECT report_id,raw_item FROM items WHERE command = '{item.command}' AND hostname = '{item.host}' AND NOT status = '{item.status}' ORDER BY rowid DESC LIMIT 1"
+        last_changed_item = self._cursor.execute(sql).fetchone()
+        if last_changed_item is not None:
+            report_id = last_changed_item[0]
+            raw_item = last_changed_item[1]
+            last_changed_item = ReportItem(raw_item, report_id=report_id)
+            last_changed_item.parse()
+            sql = f"SELECT date FROM reports WHERE rowid = '{last_changed_item.report_id}'"
+            report_date = datetime.datetime.utcfromtimestamp(
+                self._cursor.execute(sql).fetchone()[0]
+            )
+            last_changed_item.date = report_date
+        return last_changed_item
+
+    def get_item_history(self, item, max_len=10):
+        history = []
+        last_item = item
+        while last_item is not None and len(history) < max_len:
+            last_item = self.get_last_changed_item(last_item)
+            if last_item is not None:
+                history.append(last_item)
+        return history
+
 
 def adapt_date_iso(val):
     """Adapt datetime.date to ISO 8601 date."""

{sysview_py-0.3.7 → sysview_py-0.4.0}/src/sysview_py/flock.py

@@ -4,7 +4,7 @@ from contextlib import contextmanager
 
 @contextmanager
 def lock_file(file_path):
-    f = open(file_path, 'w')
+    f = open(file_path, "w")
     fcntl.flock(f.fileno(), fcntl.LOCK_EX)
     try:
         yield f

{sysview_py-0.3.7 → sysview_py-0.4.0}/src/sysview_py/main.py

@@ -4,7 +4,7 @@ import sys
 from .sysview import Sysview
 from .flock import lock_file
 
-LOCK_FILE=Path.home() / ".sysview.lock"
+LOCK_FILE = Path.home() / ".sysview.lock"
 
 
 def main():

{sysview_py-0.3.7 → sysview_py-0.4.0}/src/sysview_py/report.py

@@ -2,12 +2,8 @@ import hashlib
 from datetime import datetime, timedelta
 
 
-status_map = {
-        "UNKNOWN": 3,
-        "CRITICAL": 2,
-        "WARNING": 1,
-        "OK": 0
-}
+status_map = {"UNKNOWN": 3, "CRITICAL": 2, "WARNING": 1, "OK": 0}
+
 
 class Host:
     def __init__(self, name, report_types=tuple(), reports=[]):
@@ -78,7 +74,7 @@ class ReportItem:
         date=None,
         host=None,
         report_type=None,
-        report_id=None
+        report_id=None,
     ):
         self.raw_item = raw_item
         self.command = command
@@ -101,7 +97,7 @@ class ReportItem:
     def name(self):
         result = self.command
         if len(result) > self.max_name_length:
-            result = result[:self.max_name_length] + "..."
+            result = result[: self.max_name_length] + "..."
         return result
 
     @property
@@ -110,11 +106,12 @@ class ReportItem:
 
     @property
     def status(self):
-        age = datetime.now() - self.date
-        threshold = timedelta(days=1)
         status = self._status
-        if age > threshold:
-            status = "UNKNOWN"
+        threshold = timedelta(days=1)
+        if self.date is not None:
+            age = datetime.now() - self.date
+            if age > threshold:
+                status = "UNKNOWN"
         return status
 
     @status.setter
@@ -127,7 +124,9 @@ class ReportItem:
 
     @property
     def id(self):
-        return hashlib.sha256((f"{self.report_id}_{self.command}").encode('utf-8')).hexdigest()
+        return hashlib.sha256(
+            (f"{self.report_id}_{self.command}").encode("utf-8")
+        ).hexdigest()
 
     def parse(self):
         parsed_required_fields = False
@@ -153,7 +152,13 @@ class ReportItem:
 
 class Report:
     def __init__(
-        self, raw_report, hostname=None, date=None, report_type=None, items=None, report_id=None
+        self,
+        raw_report,
+        hostname=None,
+        date=None,
+        report_type=None,
+        items=None,
+        report_id=None,
     ):
         self.raw_report = raw_report
         self.hostname = hostname
@@ -199,7 +204,9 @@ class Report:
                 raw_item += f"{line}\n"
             elif "---" == line:
                 if item_pointer > 0:
-                    item = ReportItem(raw_item, report_id=self.report_id, date=self.date)
+                    item = ReportItem(
+                        raw_item, report_id=self.report_id, date=self.date
+                    )
                     item.parse()
                     self.items.append(item)
                 item_pointer = item_pointer + 1

{sysview_py-0.3.7 → sysview_py-0.4.0}/src/sysview_py/sysview.py

@@ -1,5 +1,6 @@
 import shutil
 import sys
+import datetime
 from jinja2 import Environment, PackageLoader, select_autoescape
 from pathlib import Path
 from .db import SysviewDB
@@ -10,10 +11,12 @@ DEFAULT_HTML_PATH = Path.home() / "sysview"
 STATIC_FILES_PATH = Path(__file__).parent / "static"
 
 
-
 class Sysview:
     status_sort_order = ("UNKNOWN", "CRITICAL", "WARNING", "OK")
-    def __init__(self, db=DEFAULT_DB_PATH, hosts=[], reports=[], html_root=DEFAULT_HTML_PATH):
+
+    def __init__(
+        self, db=DEFAULT_DB_PATH, hosts=[], reports=[], html_root=DEFAULT_HTML_PATH
+    ):
         self.db = db
         self.hosts = hosts
         self.reports = reports
@@ -37,6 +40,9 @@ class Sysview:
         for raw_report in raw_reports:
             report = Report(raw_report)
             report.parse()
+            report.date = datetime.datetime.now()
+            for item in report.items:
+                item.date = report.date
             self.db.add(report)
 
     def read_hosts(self):
@@ -50,41 +56,57 @@ class Sysview:
         self.html_hosts.mkdir(parents=True)
         shutil.copytree(STATIC_FILES_PATH, self.html_root / STATIC_FILES_PATH.name)
         env = Environment(
-            loader=PackageLoader("sysview_py"),
-            autoescape=select_autoescape()
+            loader=PackageLoader("sysview_py"), autoescape=select_autoescape()
+        )
+        html = env.get_template("card_view.html").render(
+            items=self.hosts, title="Hosts", active="Hosts", path="", auto_refresh=True
         )
-        html = env.get_template("card_view.html").render(items=self.hosts, title="Hosts", active="Hosts", path="", auto_refresh=True)
         html_path = self.html_root / "index.html"
-        with open(html_path, 'w') as f:
+        with open(html_path, "w") as f:
             f.write(html)
         for host in self.hosts:
-            html = env.get_template("card_view.html").render(items=host.all_items, title=host.name, active="Hosts", path="../../", auto_refresh=True)
+            html = env.get_template("card_view.html").render(
+                items=host.all_items,
+                title=host.name,
+                active="Hosts",
+                path="../../",
+                auto_refresh=True,
+            )
             host_dir = self.html_hosts / host.name
             host_dir.mkdir()
             html_path = host_dir / "host.html"
-            with open(html_path, 'w') as f:
+            with open(html_path, "w") as f:
                 f.write(html)
             for item in host.all_items:
-                html = env.get_template("service.html").render(item=item, title=host.name, active="Services", path="../../", auto_refresh=False)
+                item_history = self.db.get_item_history(item)
+                html = env.get_template("service.html").render(
+                    item=item,
+                    title=host.name,
+                    active="Services",
+                    path="../../",
+                    auto_refresh=False,
+                    item_history=item_history,
+                )
                 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:
+                with open(html_path, "w") as f:
                     f.write(html)
-                with open(raw_path, 'w') as f:
+                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="", auto_refresh=True)
+        html = env.get_template("card_view.html").render(
+            items=self.all_services,
+            title="Services",
+            active="Services",
+            path="",
+            auto_refresh=True,
+        )
         html_path = self.html_root / f"services.html"
-        with open(html_path, 'w') as f:
+        with open(html_path, "w") as f:
             f.write(html)
 
     def get_latest_reports(self):
         for host in self.hosts:
-            host.reports = []
-            raw_reports = self.db.get_latest_reports(hostname=host.name)
-            for report_id, raw_report in raw_reports:
-                report = Report(raw_report, report_id=report_id)
-                report.parse()
-                host.reports.append(report)
+            host.reports = self.db.get_latest_reports(hostname=host.name)
             host.reports.sort(key=lambda report: report.status_code, reverse=True)
         self.hosts.sort(key=lambda host: host.status_code, reverse=True)
 

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

@@ -0,0 +1,21 @@
+{% include 'header.html' %}
+	<nav>
+	<a href="host.html">Show host</a>
+	|
+	<a href="{{ item.report_type }}_{{ item.id }}.txt">Raw report</a>
+	</nav>
+	</table>
+	<pre id="{{item.status}}">{{ item.status }}: {{ item.status_text }}</pre>
+	<i>Received: {{ item.date }}</i>
+	{% if item_history %}
+	<h3>History</h3>
+	<table>
+{% for history_item in item_history %}	
+		<tr>
+			<td id="{{ history_item.status }}">{{ history_item.date }}</td>
+			<td>{{ history_item.status_text }}</td>
+		</tr>
+{% endfor %}
+	</table>
+	{% endif %}
+{% include 'footer.html' %}

sysview_py-0.3.7/src/sysview_py/templates/host.html

@@ -1,19 +0,0 @@
-{% include 'header.html' %}
-		<table>
-			<tr>
-				<th>Command</th>
-				<th>Output</th>
-				<th>Last updated</th>
-				<th>Status</th>
-			</tr>
-			{% for item in host.all_items %}
-
-			<tr>
-				<td><a href="{{ item.report_type }}_{{ item.id }}.html">{{ item.command }}</a></td>
-				<td>{{ item.status_text }}</td>
-				<td>{{ item.date }}</td>
-				<td class="{{ item.status }}"></td>
-			</tr>
-			{% endfor %}
-		</table>
-{% include 'footer.html' %}

sysview_py-0.3.7/src/sysview_py/templates/index.html

@@ -1,20 +0,0 @@
-{% include 'header.html' %}
-		<table>
-			<thead><tr>
-				<th>Hostname</th>
-				<th>Report types</th>
-				<th>Last updated</th>
-				<th>Status</th>
-			</tr></thead>
-			<tbody>
-			{% for host in hosts %}
-			<tr>
-				<td><a href="hosts/{{ host.name }}/host.html">{{ host.name }}</a></td>
-				<td>{{ host.report_types }}</td>
-				<td>{{ host.last_updated }}</td>
-				<td class="{{ host.status }}"></td>
-			</tr>
-			{% endfor %}
-			</tbody>
-		</table>
-{% include 'footer.html' %}

sysview_py-0.3.7/src/sysview_py/templates/index.html.table

@@ -1,22 +0,0 @@
-<html>
-	{% include 'header.html' %}
-		<table>
-			<thead><tr>
-				<th>Hostname</th>
-				<th>Report types</th>
-				<th>Last updated</th>
-				<th>Status</th>
-			</tr></thead>
-			<tbody>
-			{% for host in hosts %}
-			<tr>
-				<td><a href="hosts/{{ host.name }}/host.html">{{ host.name }}</a></td>
-				<td>{{ host.report_types }}</td>
-				<td>{{ host.last_updated }}</td>
-				<td class="{{ host.status }}"></td>
-			</tr>
-			{% endfor %}
-			</tbody>
-		</table>
-	{% include 'footer.html' %}
-</html>

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

@@ -1,8 +0,0 @@
-{% 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' %}

sysview_py-0.3.7/src/sysview_py/templates/services.html

@@ -1,22 +0,0 @@
-<html>
-	{% include 'header.html' %}
-		<table>
-			<tr>
-				<th>Hostname</th>
-				<th>Command</th>
-				<th>Output</th>
-				<th>Last updated</th>
-				<th>Status</th>
-			</tr>
-			{% for item in services %}
-			<tr>
-				<td>{{ item.host }}</td>
-				<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 id="{{ item.status }}"></td>
-			</tr>
-			{% endfor %}
-		</table>
-	{% include 'footer.html' %}
-</html>