varanus 0.1.0.dev1__tar.gz → 0.1.0.dev2__tar.gz

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: varanus
-Version: 0.1.0.dev1
+Version: 0.1.0.dev2
 Summary: Django application monitoring.
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: msgspec>=0.19.0
@@ -11,7 +11,7 @@ Requires-Dist: granian>=2.4.2 ; extra == 'server'
 Requires-Dist: psycopg[binary]>=3.2.1 ; extra == 'server'
 Requires-Dist: websockets>=13.0 ; extra == 'server'
 Requires-Dist: whitenoise>=6.7.0 ; extra == 'server'
-Requires-Python: >=3.13
+Requires-Python: >=3.11
 Provides-Extra: server
 Description-Content-Type: text/markdown
 

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "varanus"
-version = "0.1.0.dev1"
+version = "0.1.0.dev2"
 description = "Django application monitoring."
 readme = "README.md"
-requires-python = ">=3.13"
+requires-python = ">=3.11"
 dependencies = [
     "httpx>=0.27.0",
     "msgspec>=0.19.0",

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/events.py

@@ -1,3 +1,4 @@
+import inspect
 import logging
 from datetime import datetime, timezone
 
@@ -25,6 +26,7 @@ class ErrorLine(Struct):
     lineno: int | None
     function: str | None
     module: str | None
+    linesrc: str | None
     locals: dict[str, str]
 
 
@@ -52,6 +54,13 @@ class Error(Event):
             abs_path = f_code.co_filename if f_code else None
             function = f_code.co_name if f_code else None
             lineno = getattr(tb, "tb_lineno", None)
+            linesrc = None
+            if f_code and lineno:
+                try:
+                    source, start = inspect.getsourcelines(f_code)
+                    linesrc = source[lineno - start].strip()
+                except (OSError, TypeError):
+                    pass
             module = f_globals.get("__name__", "")
             lines.append(
                 ErrorLine(
@@ -59,6 +68,7 @@ class Error(Event):
                     lineno=lineno,
                     function=function,
                     module=module,
+                    linesrc=linesrc,
                     locals={name: repr(val) for name, val in f_locals.items()},
                 )
             )

varanus-0.1.0.dev2/src/varanus/server/migrations/0003_alter_log_level.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.8 on 2025-11-17 19:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("varanus", "0002_context_node_error_node_log_node_metric_node_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="log",
+            name="level",
+            field=models.IntegerField(
+                blank=True,
+                choices=[
+                    (50, "CRITICAL"),
+                    (40, "ERROR"),
+                    (30, "WARNING"),
+                    (20, "INFO"),
+                    (10, "DEBUG"),
+                    (0, "NOTSET"),
+                ],
+                null=True,
+            ),
+        ),
+    ]

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/models.py

@@ -1,6 +1,5 @@
 import hashlib
 import http
-import logging
 import secrets
 from typing import Self
 
@@ -161,7 +160,16 @@ class Node(EnvironmentModel):
         ]
 
     def __str__(self):
-        return self.name
+        return f"{self.environment}@{self.name}"
+
+    def get_absolute_url(self):
+        return reverse(
+            "node-details",
+            kwargs={
+                "slug": self.site.slug,
+                "pk": self.pk,
+            },
+        )
 
     @classmethod
     def update(cls, info: events.NodeInfo, site: Site, environment: str = ""):
@@ -450,9 +458,17 @@ class Error(ContextualModel, FingerprintModel):
 
 
 class Log(ContextualModel, FingerprintModel):
+    class Level(models.IntegerChoices):
+        CRITICAL = 50, "CRITICAL"
+        ERROR = 40, "ERROR"
+        WARNING = 30, "WARNING"
+        INFO = 20, "INFO"
+        DEBUG = 10, "DEBUG"
+        NOTSET = 0, "NOTSET"
+
     message = models.TextField()
     name = models.CharField(max_length=200, blank=True)
-    level = models.IntegerField(null=True, blank=True)
+    level = models.IntegerField(null=True, blank=True, choices=Level)
     file = models.TextField(blank=True)
     lineno = models.IntegerField(null=True, blank=True)
     error = models.ForeignKey(
@@ -481,10 +497,6 @@ class Log(ContextualModel, FingerprintModel):
             **extra,
         )
 
-    @property
-    def level_name(self):
-        return logging.getLevelName(self.level) if self.level is not None else "UNKNOWN"
-
     def fingerprint_parts(self):
         return (self.message, self.name, self.level, self.file, self.lineno)
 

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/search/base.py

@@ -1,11 +1,12 @@
-from typing import ClassVar, Mapping, Self
+from typing import Callable, ClassVar, Literal, Mapping, Self, TypeAlias
 
 from django.db.models import QuerySet
 from django.http import HttpRequest
 from django.template import loader
 from django.utils.datastructures import MultiValueDict
+from django.utils.functional import Promise
 
-type StringValues = dict[str, list[str]]
+StringValues: TypeAlias = dict[str, list[str]]
 
 
 def string_data(data) -> StringValues:
@@ -26,12 +27,23 @@ def string_data(data) -> StringValues:
 class SearchField:
     template_name: str
 
-    def __init__(self, label=None, field_name=None):
+    def __init__(
+        self,
+        label=None,
+        field_name=None,
+        empty_label="NULL",
+        # These belong on Facet
+        choice_label: Callable[..., str | Promise] | None = None,
+        order: Literal["value", "count"] = "value",
+    ):
         self.name = ""
         self.label = label or ""
         self.field_name = field_name or ""
         self.prefix = ""
         self.id = ""
+        self.empty_label = empty_label
+        self.choice_label = choice_label
+        self.order = order
 
     def __set_name__(self, owner, name: str):
         # print("__set_name__", owner, name)
@@ -40,7 +52,7 @@ class SearchField:
         self.prefix = f"{name}_"
         self.id = f"id_{name}"
         if not self.label:
-            self.label = name.capitalize()
+            self.label = name.capitalize().replace("__", " ")
         if not self.field_name:
             self.field_name = name
         if not hasattr(owner, "_fields"):

varanus-0.1.0.dev2/src/varanus/server/search/facet.py

@@ -0,0 +1,63 @@
+import functools
+import operator
+from typing import Any, ClassVar
+
+from django.db.models import Count, Q, QuerySet
+
+from .base import SearchField, StringValues
+
+
+class Choice:
+    id: str
+    value: str
+    label: str
+    count: int
+
+    def __init__(self, field: SearchField, value: Any, count: int):
+        self.value = self.stringify(value)
+        if callable(field.choice_label):
+            self.label = field.choice_label(value)
+        else:
+            self.label = self.value or field.empty_label
+        self.id = field.id + "_" + self.value.replace(" ", "")
+        self.count = count
+
+    @classmethod
+    def stringify(cls, value):
+        return str(value) if value is not None else ""
+
+
+class Facet(SearchField):
+    choice_class: ClassVar[type[Choice]] = Choice
+
+    def get_choices(self, queryset):
+        choice_qs = queryset.values_list(self.field_name).annotate(num=Count("*"))
+        match self.order:
+            case "value":
+                choice_qs = choice_qs.order_by(self.field_name)
+            case "count":
+                choice_qs = choice_qs.order_by("-num")
+        return [self.choice_class(self, c, num) for c, num in choice_qs]
+
+
+class MultiFacet(Facet):
+    template_name = "search/multifacet.html"
+
+    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
+        filters = []
+        if selected := set(field_data.get("s", [])):
+            if "" in selected:
+                selected.discard("")
+                filters.append(Q(**{f"{self.field_name}__isnull": True}))
+            if selected:
+                filters.append(Q(**{f"{self.field_name}__in": selected}))
+        if filters:
+            queryset = queryset.filter(functools.reduce(operator.or_, filters))
+        return queryset
+
+    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
+        return {
+            **super().get_context(queryset, field_data),
+            "choices": self.get_choices(queryset),
+            "selected": field_data.get("s", []),
+        }

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/base.html

@@ -32,6 +32,7 @@
                 <form action="" method="get">
                     {{ search.render|safe }}
                     <button class="btn btn-primary">Filter</button>
+                    <a href="{{ request.path }}" class="btn btn-secondary">Clear</a>
                 </form>
             {% endblock search %}
         </div>
@@ -42,11 +43,6 @@
 </div>
 
 <div class="offcanvas offcanvas-end" style="width:33%" tabindex="-1" id="inspector">
-    <div class="offcanvas-header">
-        <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-    </div>
-    <div class="offcanvas-body" id="inspector-content">
-    </div>
 </div>
 {% endblock content %}
 

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/environment_nodes.html

@@ -0,0 +1,6 @@
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">{{ environment }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/error.html

@@ -0,0 +1,49 @@
+{% load i18n %}
+{% load varanus %}
+
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">
+        {% if context.request %}
+            <a href="{{ context.request.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ context.request.get_absolute_url }}" hx-target="#inspector"><i class="bi bi-chevron-left"></i> {{ context }}</a>
+        {% endif %}
+    </h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+    <table class="table table-sm">
+        <tbody>
+            <tr>
+                <th>{% trans "Kind" %}</th>
+                <td>{{ object.kind }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Module" %}</th>
+                <td>{{ object.module }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Message" %}</th>
+                <td>{{ object.message }}</td>
+            </tr>
+        </tbody>
+    </table>
+
+    <ul class="list-unstyled">
+        {% for line in object.lines %}
+            <li>
+                <p class="mb-3 p-1 border-bottom">
+                    <strong>{{ line.module }}.{{ line.function }}</strong><br />
+                    <small class="text-secondary">{{ line.file|truncatepath }}:{{ line.lineno }}</small>
+                    {% if line.linesrc %}
+                        <br /><code>{{ line.linesrc }}</code>
+                    {% endif %}
+                </p>
+                <dl class="ms-3">
+                    {% for name, value in line.locals.items %}
+                        <dt class="font-monospace"><code>{{ name }}</code></dt>
+                        <dd class="ms-3"><pre>{{ value }}</pre></dd>
+                    {% endfor %}
+                </dl>
+            </li>
+        {% endfor %}
+    </ul>
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/log.html

@@ -0,0 +1,36 @@
+{% load i18n %}
+
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">
+        {% if context.request %}
+            <a href="{{ context.request.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ context.request.get_absolute_url }}" hx-target="#inspector"><i class="bi bi-chevron-left"></i> {{ context }}</a>
+        {% endif %}
+    </h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+    <table class="table table-sm">
+        <tbody>
+            <tr>
+                <th>{% trans "Name" %}</th>
+                <td>{{ object.name }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Level" %}</th>
+                <td>{{ object.get_level_display }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "File" %}</th>
+                <td>{{ object.file }}:{{ object.lineno }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Message" %}</th>
+                <td>{{ object.message }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Error" %}</th>
+                <td>{{ object.error }}</td>
+            </tr>
+        </tbody>
+    </table>
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/metric.html

@@ -0,0 +1,40 @@
+{% load i18n %}
+
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">
+        {% if context.request %}
+            <a href="{{ context.request.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ context.request.get_absolute_url }}" hx-target="#inspector"><i class="bi bi-chevron-left"></i> {{ context }}</a>
+        {% endif %}
+    </h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+    <table class="table table-sm">
+        <tbody>
+            <tr>
+                <th>{% trans "Name" %}</th>
+                <td>{{ object.name }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Count" %}</th>
+                <td>{{ object.agg_count }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Sum" %}</th>
+                <td>{{ object.agg_sum }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Average" %}</th>
+                <td>{{ object.agg_avg }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Min" %}</th>
+                <td>{{ object.agg_min }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Max" %}</th>
+                <td>{{ object.agg_max }}</td>
+            </tr>
+        </tbody>
+    </table>
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/node.html

@@ -0,0 +1,44 @@
+{% load i18n %}
+
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">{{ node }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+    <table class="table table-sm table-striped">
+        <thead class="table-header">
+            <tr>
+                <th>{% trans "Package" %}</th>
+                <th>{% trans "Version" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for p in node.packages.all %}
+                <tr>
+                    <td>{{ p.package }}</td>
+                    <td>{{ p.version }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+    {% for update in node.updates.all %}
+        <h6><em>{{ update.timestamp }}</em></h6>
+        <dl>
+            {% if update.installed %}
+                <dt>{% trans "Installed" %}</dt>
+                <dd>{{ update.installed }}</dd>
+            {% endif %}
+
+            {% if update.updated %}
+                <dt>{% trans "Updated" %}</dt>
+                <dd>{{ update.updated }}</dd>
+            {% endif %}
+
+            {% if update.removed %}
+                <dt>{% trans "Removed" %}</dt>
+                <dd>{{ update.removed }}</dd>
+            {% endif %}
+        </dl>
+    {% endfor %}
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/node_environments.html

@@ -0,0 +1,6 @@
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">{{ name }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/query.html

@@ -0,0 +1,31 @@
+{% load i18n %}
+
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">
+        {% if context.request %}
+            <a href="{{ context.request.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ context.request.get_absolute_url }}" hx-target="#inspector"><i class="bi bi-chevron-left"></i> {{ context }}</a>
+        {% endif %}
+    </h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+    <table class="table table-sm">
+        <tbody>
+            <tr>
+                <th>{% trans "Database" %}</th>
+                <td>{{ object.db }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Elapsed" %}</th>
+                <td>{{ object.elapsed_ms }}ms</td>
+            </tr>
+            {% if object.params %}
+                <tr>
+                    <th>{% trans "Parameters" %}</th>
+                    <td>{{ object.params }}</td>
+                </tr>
+            {% endif %}
+        </tbody>
+    </table>
+    <code><pre>{{ object.sql_formatted }}</pre></code>
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/request.html

@@ -0,0 +1,136 @@
+{% load i18n %}
+
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">{{ object.method }} {{ object.path }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+    <table class="table table-sm">
+        <tbody>
+            <tr>
+                <th>{% trans "Host" %}</th>
+                <td>{{ object.host }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Node" %}</th>
+                <td>{{ object.node }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Request" %}</th>
+                <td>{{ object.method }} {{ object.path }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "Status" %}</th>
+                <td>{{ object.http_status }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "IP" %}</th>
+                <td>{{ object.ip }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "User" %}</th>
+                <td>{{ object.user }}</td>
+            </tr>
+        </tbody>
+    </table>
+
+    {% if object.headers %}
+        <h5>{% trans "Headers" %}</h5>
+        <table class="table table-sm">
+            <tbody>
+                {% for name, value in object.headers.items %}
+                    <tr>
+                        <th>{{ name }}</th>
+                        <td>{{ value }}</th>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+
+    {% if context.errors.exists %}
+    <table class="table table-sm">
+        <thead class="table-header">
+            <tr>
+                <th>{% trans "Error" %}</th>
+                <th>{% trans "Kind" %}</th>
+                <th>{% trans "Module" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for err in context.errors.all %}
+                <tr>
+                    <td>
+                        <a href="{{ err.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ err.get_absolute_url }}" hx-target="#inspector">{{ err.message }}</a>
+                    </td>
+                    <td>{{ err.kind }}</td>
+                    <td>{{ err.module }}</td>
+            {% endfor %}
+        </tbody>
+    </table>
+    {% endif %}
+
+    {% if context.logs.exists %}
+    <table class="table table-sm">
+        <thead class="table-header">
+            <tr>
+                <th>{% trans "Log" %}</th>
+                <th>{% trans "Level" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for log in context.logs.all %}
+                <tr>
+                    <td>
+                        <a href="{{ log.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ log.get_absolute_url }}" hx-target="#inspector">{{ log.message }}</a>
+                    </td>
+                    <td>{{ log.get_level_display }}</td>
+            {% endfor %}
+        </tbody>
+    </table>
+    {% endif %}
+
+    {% if context.queries.exists %}
+    <table class="table table-sm">
+        <thead class="table-header">
+            <tr>
+                <th>{% trans "Query" %}</th>
+                <th>{% trans "Elapsed" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for query in context.queries.all %}
+                <tr>
+                    <td>
+                        <a href="{{ query.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ query.get_absolute_url }}" hx-target="#inspector">{{ query.sql_summary }}</a>
+                    </td>
+                    <td>{{ query.elapsed_ms }}ms</td>
+            {% endfor %}
+        </tbody>
+    </table>
+    {% endif %}
+
+    {% if context.metrics.exists %}
+    <table class="table table-sm">
+        <thead class="table-header">
+            <tr>
+                <th>{% trans "Metric" %}</th>
+                <th>{% trans "Count" %}</th>
+                <th>{% trans "Sum" %}</th>
+                <th>{% trans "Average" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for m in context.metrics.all %}
+                <tr>
+                    <td>
+                        <a href="{{ m.get_absolute_url }}" data-bs-target="#inspector" hx-get="{{ m.get_absolute_url }}" hx-target="#inspector">{{ m.name }}</a>
+                    </td>
+                    <td>{{ m.agg_count }}</td>
+                    <td>{{ m.agg_sum }}</td>
+                    <td>{{ m.agg_avg }}</td>
+            {% endfor %}
+        </tbody>
+    </table>
+    {% endif %}
+</div>

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/errors.html

@@ -17,7 +17,7 @@
         {% for e in results %}
             <tr>
                 <td>
-                    <a href="{{ e.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ e.get_absolute_url }}" hx-target="#inspector-content">{{ e.context }}</a>
+                    <a href="{{ e.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ e.get_absolute_url }}" hx-target="#inspector">{{ e.context }}</a>
                 </td>
                 <td>{{ e.kind }}</td>
                 <td>{{ e.message }}</td>

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/logs.html

@@ -18,9 +18,9 @@
         {% for log in results %}
             <tr>
                 <td>
-                    <a href="{{ log.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ log.get_absolute_url }}" hx-target="#inspector-content">{{ log.context }}</a>
+                    <a href="{{ log.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ log.get_absolute_url }}" hx-target="#inspector">{{ log.context }}</a>
                 </td>
-                <td>{{ log.level_name }}</td>
+                <td>{{ log.get_level_display }}</td>
                 <td>{{ log.message }}</td>
                 <td>{{ log.name }}</td>
                 <td>{{ log.file }}:{{ log.lineno }}</td>

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/metrics.html

@@ -20,7 +20,7 @@
         {% for m in results %}
             <tr>
                 <td>
-                    <a href="{{ m.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ m.get_absolute_url }}" hx-target="#inspector-content">{{ m.context }}</a>
+                    <a href="{{ m.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ m.get_absolute_url }}" hx-target="#inspector">{{ m.context }}</a>
                 </td>
                 <td>{{ m.name }}</td>
                 <td>{{ m.agg_count }}</td>

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/overview.html

@@ -26,6 +26,7 @@ varanus.client.setup(
         <tr>
             <th>{% trans "Environment" %}</th>
             <th>{% trans "Node" %}</th>
+            <th>{% trans "Packages" %}</th>
             <th>{% trans "Platform" %}</th>
             <th>{% trans "Python Version" %}</th>
             <th>{% trans "First Seen" %}</th>
@@ -35,8 +36,15 @@ varanus.client.setup(
     <tbody>
         {% for node in nodes %}
             <tr>
-                <td>{{ node.environment }}</td>
-                <td>{{ node.name }}</td>
+                <td>
+                    <a href="{% url 'environment-nodes' site.slug node.environment %}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{% url 'environment-nodes' site.slug node.environment %}" hx-target="#inspector">{{ node.environment }}</a>
+                </td>
+                <td>
+                    <a href="{% url 'node-environments' site.slug node.name %}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{% url 'node-environments' site.slug node.name %}" hx-target="#inspector">{{ node.name }}</a>
+                </td>
+                <td>
+                    <a href="{% url 'node-details' site.slug node.pk %}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{% url 'node-details' site.slug node.pk %}" hx-target="#inspector">{{ node.num_packages }}</a>
+                </td>
                 <td>{{ node.platform }}</td>
                 <td>{{ node.python_version }}</td>
                 <td>{{ node.first_seen }}</td>

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/queries.html

@@ -20,7 +20,7 @@
         {% for q in results %}
             <tr>
                 <td>
-                    <a href="{{ q.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ q.get_absolute_url }}" hx-target="#inspector-content">{{ q.context }}</a>
+                    <a href="{{ q.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ q.get_absolute_url }}" hx-target="#inspector">{{ q.context }}</a>
                 </td>
                 <td>{{ q.command }}</td>
                 <td>{{ q.db }}</td>

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/requests.html

@@ -18,7 +18,7 @@
         {% for r in results %}
             <tr>
                 <td>
-                    <a href="{{ r.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ r.get_absolute_url }}" hx-target="#inspector-content">{{ r.path }}</a>
+                    <a href="{{ r.get_absolute_url }}" data-bs-toggle="offcanvas" data-bs-target="#inspector" hx-get="{{ r.get_absolute_url }}" hx-target="#inspector">{{ r.path }}</a>
                 </td>
                 <td>{{ r.size|filesizeformat }}</td>
                 <td>{{ r.context.elapsed_ms }}ms</td>

varanus-0.1.0.dev2/src/varanus/server/templatetags/varanus.py

@@ -0,0 +1,13 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def truncatepath(path: str, num: int = 50):
+    if len(path) > num:
+        parts = path.split("/")
+        while len("/".join(parts)) > num:
+            parts.pop(0)
+        return "…" + "/".join(parts)
+    return path

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/urls.py

@@ -29,6 +29,28 @@ urlpatterns = [
                     site.Details.as_view(),
                     name="event-details",
                 ),
+                path(
+                    "node/",
+                    include(
+                        [
+                            path(
+                                "name/<name>/",
+                                site.NodeEnvironments.as_view(),
+                                name="node-environments",
+                            ),
+                            path(
+                                "environment/<environment>/",
+                                site.EnvironmentNodes.as_view(),
+                                name="environment-nodes",
+                            ),
+                            path(
+                                "<pk>/",
+                                site.NodeDetails.as_view(),
+                                name="node-details",
+                            ),
+                        ]
+                    ),
+                ),
             ]
         ),
     ),

{varanus-0.1.0.dev1 → varanus-0.1.0.dev2}/src/varanus/server/views/site.py

@@ -1,13 +1,22 @@
 from typing import ClassVar
 
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import OuterRef, QuerySet, Subquery
+from django.db.models import Count, OuterRef, QuerySet, Subquery
+from django.shortcuts import get_object_or_404
+from django.utils.functional import Promise
 
-from ..models import Context
+from ..models import Context, Log
 from ..search import DateRange, MultiFacet, Search
 from .base import SiteView
 
 
+def level_name(level) -> str | Promise:
+    try:
+        return Log.Level(level).label
+    except ValueError:
+        return str(level)
+
+
 class Overview(SiteView):
     template_name = "site/overview.html"
 
@@ -18,6 +27,7 @@ class Overview(SiteView):
                 .order_by("-timestamp")
                 .values("timestamp")[:1]
             ),
+            num_packages=Count("packages"),
         )
         return {
             "host": self.request.get_host(),
@@ -36,7 +46,7 @@ class SearchView(SiteView):
         search = self.search_class(self.get_queryset(), self.request.GET)
         return {
             "search": search,
-            "results": search.queryset(),
+            "results": search.queryset()[:50],
         }
 
 
@@ -46,7 +56,9 @@ class Logs(SearchView):
     class search_class(Search):
         timeframe = DateRange(field_name="timestamp")
         name = MultiFacet()
-        level = MultiFacet()
+        level = MultiFacet(choice_label=level_name)
+        environment = MultiFacet()
+        node__name = MultiFacet()
 
     def get_queryset(self) -> QuerySet:
         return self.site.logs.select_related("context")
@@ -59,6 +71,8 @@ class Errors(SearchView):
         timeframe = DateRange(field_name="timestamp")
         kind = MultiFacet()
         module = MultiFacet()
+        environment = MultiFacet()
+        node__name = MultiFacet()
 
     def get_queryset(self) -> QuerySet:
         return self.site.errors.select_related("context")
@@ -70,6 +84,8 @@ class Requests(SearchView):
     class search_class(Search):
         timeframe = DateRange(field_name="timestamp")
         status = MultiFacet()
+        environment = MultiFacet()
+        node__name = MultiFacet()
 
     def get_queryset(self) -> QuerySet:
         return self.site.requests.select_related("context")
@@ -82,6 +98,8 @@ class Queries(SearchView):
         timeframe = DateRange(field_name="timestamp")
         type = MultiFacet(field_name="command")
         db = MultiFacet()
+        environment = MultiFacet()
+        node__name = MultiFacet()
 
     def get_queryset(self) -> QuerySet:
         return self.site.queries.select_related("context")
@@ -93,6 +111,8 @@ class Metrics(SearchView):
     class search_class(Search):
         timeframe = DateRange(field_name="timestamp")
         name = MultiFacet()
+        environment = MultiFacet()
+        node__name = MultiFacet()
 
     def get_queryset(self) -> QuerySet:
         return self.site.metrics.select_related("context")
@@ -109,4 +129,37 @@ class Details(SiteView):
         obj = ct.get_object_for_this_type(pk=self.kwargs["pk"])
         return {
             "object": obj,
+            "context": obj.context,
+        }
+
+
+class NodeDetails(SiteView):
+    template_name = "site/details/node.html"
+
+    def get_context(self):
+        node = get_object_or_404(self.site.nodes, pk=self.kwargs["pk"])
+        return {
+            "node": node,
+        }
+
+
+class NodeEnvironments(SiteView):
+    template_name = "site/details/node_environments.html"
+
+    def get_context(self):
+        return {
+            "name": self.kwargs["name"],
+            "nodes": self.site.nodes.filter(name__iexact=self.kwargs["name"]),
+        }
+
+
+class EnvironmentNodes(SiteView):
+    template_name = "site/details/environment_nodes.html"
+
+    def get_context(self):
+        return {
+            "environment": self.kwargs["environment"],
+            "nodes": self.site.nodes.filter(
+                environment__iexact=self.kwargs["environment"]
+            ),
         }

varanus-0.1.0.dev1/src/varanus/server/search/facet.py

@@ -1,59 +0,0 @@
-from typing import Any, ClassVar
-
-from django.db.models import Count, QuerySet
-
-from .base import SearchField, StringValues
-
-
-class Choice:
-    id: str
-    value: str
-    label: str
-    count: int
-
-    def __init__(self, field: SearchField, value: Any):
-        self.value = self.stringify(value)
-        self.label = self.value
-        self.id = field.id + "_" + self.value.replace(" ", "")
-        self.count = 0
-
-    @classmethod
-    def stringify(cls, value):
-        return str(value)
-
-
-class Facet(SearchField):
-    choice_class: ClassVar[type[Choice]] = Choice
-
-    def get_choices(self, queryset, with_counts=True):
-        choices = [
-            self.choice_class(self, c)
-            for c in queryset.order_by(self.field_name)
-            .values_list(self.field_name, flat=True)
-            .distinct(self.field_name)
-        ]
-        if with_counts:
-            counts = {
-                self.choice_class.stringify(r[self.field_name]): r["num"]
-                for r in queryset.values(self.field_name).annotate(num=Count("*"))
-            }
-            for c in choices:
-                c.count = counts.get(c.value, 0)
-        return choices
-
-
-class MultiFacet(Facet):
-    template_name = "search/multifacet.html"
-
-    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
-        filters = {}
-        if selected := field_data.get("s", []):
-            filters[f"{self.field_name}__in"] = selected
-        return queryset.filter(**filters)
-
-    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
-        return {
-            **super().get_context(queryset, field_data),
-            "choices": self.get_choices(queryset),
-            "selected": field_data.get("s", []),
-        }

varanus-0.1.0.dev1/src/varanus/server/templates/site/details/error.html

@@ -1 +0,0 @@
-{{ object }}

varanus-0.1.0.dev1/src/varanus/server/templates/site/details/log.html

@@ -1 +0,0 @@
-{{ object }}

varanus-0.1.0.dev1/src/varanus/server/templates/site/details/metric.html

@@ -1 +0,0 @@
-{{ object }}

varanus-0.1.0.dev1/src/varanus/server/templates/site/details/query.html

@@ -1 +0,0 @@
-<code><pre>{{ object.sql_formatted }}</pre></code>

varanus-0.1.0.dev1/src/varanus/server/templates/site/details/request.html

@@ -1,44 +0,0 @@
-{% load i18n %}
-
-<table class="table table-sm">
-    <tbody>
-        <tr>
-            <th>{% trans "Host" %}</th>
-            <td>{{ object.host }}</td>
-        </tr>
-        <tr>
-            <th>{% trans "Node" %}</th>
-            <td>{{ object.node }}</td>
-        </tr>
-        <tr>
-            <th>{% trans "Request" %}</th>
-            <td>{{ object.method }} {{ object.path }}</td>
-        </tr>
-        <tr>
-            <th>{% trans "Status" %}</th>
-            <td>{{ object.http_status }}</td>
-        </tr>
-        <tr>
-            <th>{% trans "IP" %}</th>
-            <td>{{ object.ip }}</td>
-        </tr>
-        <tr>
-            <th>{% trans "User" %}</th>
-            <td>{{ object.user }}</td>
-        </tr>
-    </tbody>
-</table>
-
-{% if object.headers %}
-<h5>{% trans "Headers" %}</h5>
-<table class="table table-sm">
-    <tbody>
-        {% for name, value in object.headers.items %}
-            <tr>
-                <th>{{ name }}</th>
-                <td>{{ value }}</th>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
-{% endif %}