varanus 0.1.0.dev0__tar.gz → 0.1.0.dev1__tar.gz

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

@@ -1,17 +1,17 @@
 Metadata-Version: 2.3
 Name: varanus
-Version: 0.1.0.dev0
+Version: 0.1.0.dev1
 Summary: Django application monitoring.
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: msgspec>=0.19.0
 Requires-Dist: cconf>=1.0.0 ; extra == 'server'
 Requires-Dist: django~=5.2.0 ; extra == 'server'
 Requires-Dist: django-passkey-auth>=0.2.0 ; extra == 'server'
+Requires-Dist: granian>=2.4.2 ; extra == 'server'
 Requires-Dist: psycopg[binary]>=3.2.1 ; extra == 'server'
-Requires-Dist: uvicorn>=0.30.6 ; extra == 'server'
 Requires-Dist: websockets>=13.0 ; extra == 'server'
 Requires-Dist: whitenoise>=6.7.0 ; extra == 'server'
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Provides-Extra: server
 Description-Content-Type: text/markdown
 

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

@@ -1,9 +1,9 @@
 [project]
 name = "varanus"
-version = "0.1.0.dev0"
+version = "0.1.0.dev1"
 description = "Django application monitoring."
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 dependencies = [
     "httpx>=0.27.0",
     "msgspec>=0.19.0",
@@ -14,8 +14,8 @@ server = [
     "cconf>=1.0.0",
     "django~=5.2.0",
     "django-passkey-auth>=0.2.0",
+    "granian>=2.4.2",
     "psycopg[binary]>=3.2.1",
-    "uvicorn>=0.30.6",
     "websockets>=13.0",
     "whitenoise>=6.7.0",
 ]

{varanus-0.1.0.dev0 → varanus-0.1.0.dev1}/src/varanus/client/transport/http.py

@@ -1,3 +1,5 @@
+import platform
+from typing import Any
 from urllib.parse import SplitResult
 
 import httpx
@@ -17,11 +19,19 @@ class HttpTransport(BaseTransport):
             headers={
                 "X-Varanus-Key": url.username or "",
                 "X-Varanus-Environment": environment or "",
-            }
+                "X-Varanus-Node": platform.node(),
+            },
+            timeout=1.0,
         )
 
+    def request(self, url: str, obj: Any):
+        try:
+            self.client.post(url, content=msgspec.json.encode(obj))
+        except Exception as ex:
+            print(f"error sending to {url}: {ex}")
+
     def ping(self, info: events.NodeInfo):
-        self.client.post(self.ping_url, content=msgspec.json.encode(info))
+        self.request(self.ping_url, info)
 
     def send(self, event: events.Context):
-        self.client.post(self.event_url, content=msgspec.json.encode(event))
+        self.request(self.event_url, event)

varanus-0.1.0.dev1/src/varanus/server/asgi.py

@@ -0,0 +1,7 @@
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "varanus.server.settings")
+
+application = get_asgi_application()

varanus-0.1.0.dev1/src/varanus/server/migrations/0002_context_node_error_node_log_node_metric_node_and_more.py

@@ -0,0 +1,79 @@
+# Generated by Django 5.2.8 on 2025-11-16 01:38
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("varanus", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="context",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="error",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="log",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="metric",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="query",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="request",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+    ]

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

@@ -7,6 +7,7 @@ from typing import Self
 import msgspec
 import sqlparse
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.core.management import call_command
 from django.core.validators import RegexValidator
 from django.db import connections, models
@@ -256,6 +257,13 @@ class EventModel(EnvironmentModel):
     event_id = models.UUIDField(db_index=True)
     timestamp = models.DateTimeField(default=timezone.now)
     tags = models.JSONField(default=dict, blank=True)
+    node = models.ForeignKey(
+        Node,
+        on_delete=models.SET_NULL,
+        related_name="%(class)ss",
+        null=True,
+        blank=True,
+    )
 
     class Meta:
         abstract = True
@@ -265,6 +273,18 @@ class EventModel(EnvironmentModel):
     def from_event(cls, event: events.Event, **extra):
         raise NotImplementedError()
 
+    def get_absolute_url(self):
+        ct = ContentType.objects.get_for_model(self)
+        return reverse(
+            "event-details",
+            kwargs={
+                "slug": self.site.slug,
+                "event_id": self.event_id,
+                "model": ct.model,
+                "pk": self.pk,
+            },
+        )
+
 
 class FingerprintModel(models.Model):
     fingerprint = models.CharField(max_length=64, db_index=True)
@@ -529,6 +549,10 @@ class Query(ContextualModel, FingerprintModel):
             return stripped
         return stripped[:79] + "…"
 
+    @property
+    def sql_formatted(self):
+        return sqlparse.format(self.sql, reindent=True, keyword_case="upper")
+
     def fingerprint_parts(self):
         return self.sql.split()
 

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

@@ -0,0 +1,9 @@
+from .base import Search
+from .date import DateRange
+from .facet import MultiFacet
+
+__all__ = [
+    "Search",
+    "DateRange",
+    "MultiFacet",
+]

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

@@ -0,0 +1,106 @@
+from typing import ClassVar, Mapping, Self
+
+from django.db.models import QuerySet
+from django.http import HttpRequest
+from django.template import loader
+from django.utils.datastructures import MultiValueDict
+
+type StringValues = dict[str, list[str]]
+
+
+def string_data(data) -> StringValues:
+    if isinstance(data, MultiValueDict):
+        return {str(key): [str(v) for v in values] for key, values in data.lists()}
+    elif isinstance(data, Mapping):
+        return {
+            str(key): (
+                [str(v) for v in values]
+                if isinstance(values, (list, tuple))
+                else ([] if values is None else [str(values)])
+            )
+            for key, values in data.items()
+        }
+    return {}
+
+
+class SearchField:
+    template_name: str
+
+    def __init__(self, label=None, field_name=None):
+        self.name = ""
+        self.label = label or ""
+        self.field_name = field_name or ""
+        self.prefix = ""
+        self.id = ""
+
+    def __set_name__(self, owner, name: str):
+        # print("__set_name__", owner, name)
+        assert issubclass(owner, Search)
+        self.name = name
+        self.prefix = f"{name}_"
+        self.id = f"id_{name}"
+        if not self.label:
+            self.label = name.capitalize()
+        if not self.field_name:
+            self.field_name = name
+        if not hasattr(owner, "_fields"):
+            owner._fields = []
+        owner._fields.append(self)
+
+    def __get__(self, instance: "Search", owner=None) -> StringValues | Self:
+        # print("__get__", instance, owner)
+        if owner is None:
+            return self
+        return {
+            key[len(self.prefix) :]: values
+            for key, values in instance._data.items()
+            if key.startswith(self.prefix)
+        }
+
+    def __set__(self, instance, value):
+        print("__set__", instance, value)
+
+    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
+        raise NotImplementedError()
+
+    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
+        return {
+            "field": self,
+        }
+
+    def render(
+        self,
+        queryset: QuerySet,
+        field_data: StringValues,
+        request: HttpRequest | None = None,
+    ) -> str:
+        return loader.render_to_string(
+            self.template_name,
+            self.get_context(queryset, field_data),
+            request,
+        )
+
+
+class Search:
+    _fields: ClassVar[list[SearchField]]
+
+    def __init__(self, queryset: QuerySet, data=None):
+        self._queryset = queryset
+        self._data = string_data(data)
+
+    def queryset(self, for_field=None):
+        qs = self._queryset
+        for field in self._fields:
+            if field == for_field:
+                continue
+            field_data = getattr(self, field.name)
+            qs = field.apply(qs, field_data)
+        return qs
+
+    def render(self, request: HttpRequest | None = None) -> str:
+        fragments = []
+        for field in self._fields:
+            qs = self.queryset(for_field=field)
+            field_data = getattr(self, field.name)
+            fragments.append(field.render(qs, field_data, request))
+        return "".join(fragments)

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

@@ -0,0 +1,33 @@
+import datetime
+
+from django.db.models import QuerySet
+from django.utils.dateparse import parse_date
+
+from .base import SearchField, StringValues
+
+
+def date_value(field_data: StringValues, name: str) -> datetime.date | None:
+    if name not in field_data:
+        return None
+    if not field_data[name]:
+        return None
+    return parse_date(field_data[name][0])
+
+
+class DateRange(SearchField):
+    template_name = "search/daterange.html"
+
+    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
+        filters = {}
+        if start := date_value(field_data, "start"):
+            filters[f"{self.field_name}__date__gte"] = start
+        if end := date_value(field_data, "end"):
+            filters[f"{self.field_name}__date__lte"] = end
+        return queryset.filter(**filters)
+
+    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
+        return {
+            **super().get_context(queryset, field_data),
+            "start": date_value(field_data, "start"),
+            "end": date_value(field_data, "end"),
+        }

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

@@ -0,0 +1,59 @@
+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.dev0 → varanus-0.1.0.dev1}/src/varanus/server/settings.py

@@ -48,9 +48,9 @@ INSTALLED_APPS = [
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
-    # Put this before staticfiles, so we use our runserver command.
-    "varanus.server.apps.VaranusServer",
+    "whitenoise.runserver_nostatic",
     "django.contrib.staticfiles",
+    "varanus.server.apps.VaranusServer",
     "cconf",
     "passkeys",
 ]

varanus-0.1.0.dev1/src/varanus/server/static/css/varanus.css

@@ -0,0 +1,4 @@
+.table-header th {
+    background-color: var(--bs-secondary-bg-subtle) !important;
+    border-color: var(--bs-secondary-border-subtle) !important;
+}

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

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <!doctype html>
-<html lang="en" data-bs-theme="light">
+<html lang="en" data-bs-theme="dark">
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="x-ua-compatible" content="ie=edge" />
@@ -68,6 +68,8 @@
         </footer>
 
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/js/bootstrap.bundle.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/htmx.org@2/dist/htmx.min.js"></script>
+
         <script src="{% static 'js/varanus.js' %}"></script>
 
         {% block javascript %}{% endblock javascript %}

varanus-0.1.0.dev1/src/varanus/server/templates/search/daterange.html

@@ -0,0 +1,10 @@
+<div class="card mb-3">
+    <div class="card-header">{{ field.label }}</div>
+    <div class="card-body">
+        <div class="input-group">
+            <input type="date" class="form-control" placeholder="From" name="{{ field.prefix }}start" value="{{ start.isoformat|default:'' }}" />
+            <span class="input-group-text">-</span>
+            <input type="date" class="form-control" placeholder="To" name="{{ field.prefix }}end" value="{{ end.isoformat|default:'' }}" />
+        </div>
+    </div>
+</div>

varanus-0.1.0.dev1/src/varanus/server/templates/search/multifacet.html

@@ -0,0 +1,11 @@
+<div class="card mb-3">
+    <div class="card-header">{{ field.label }}</div>
+    <div class="card-body">
+        {% for c in choices %}
+            <div class="form-check">
+                <input type="checkbox" id="{{ c.id }}" class="form-check-input" name="{{ field.prefix }}s" value="{{ c.value }}"{% if c.value in selected %} checked{% endif %} />
+                <label for="{{ c.id }}">{{ c.label }} ({{ c.count }})</label>
+            </div>
+        {% endfor %}
+    </div>
+</div>

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

@@ -25,21 +25,28 @@
     </li>
 </ul>
 
-<!--
 <div class="container-fluid">
-    <form action="" method="GET">
-        {% for search_field, form_fields in filter_form.fieldsets.items %}
-            {% for field in form_fields %}
-                {{ field }}
-            {% endfor %}
-        {% endfor %}
-        <button>{% trans "Filter" %}</button>
-    </form>
+    <div class="row">
+        <div class="col-md-3">
+            {% block search %}
+                <form action="" method="get">
+                    {{ search.render|safe }}
+                    <button class="btn btn-primary">Filter</button>
+                </form>
+            {% endblock search %}
+        </div>
+        <div class="col-md-9">
+            {% block page %}{% endblock page %}
+        </div>
+    </div>
 </div>
--->
 
-<div class="container-fluid">
-    {% block page %}{% endblock page %}
+<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.dev1/src/varanus/server/templates/site/details/error.html

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

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

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

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

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

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

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

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

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

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

@@ -3,8 +3,8 @@
 {% load i18n %}
 
 {% block page %}
-<table class="table">
-    <thead>
+<table class="table table-bordered">
+    <thead class="table-header">
         <tr>
             <th>{% trans "Context" %}</th>
             <th>{% trans "Kind" %}</th>
@@ -14,9 +14,11 @@
         </tr>
     </thead>
     <tbody>
-        {% for e in errors %}
+        {% for e in results %}
             <tr>
-                <td>{{ e.context }}</td>
+                <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>
+                </td>
                 <td>{{ e.kind }}</td>
                 <td>{{ e.message }}</td>
                 <td>{{ e.module }}</td>

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

@@ -3,8 +3,8 @@
 {% load i18n %}
 
 {% block page %}
-<table class="table">
-    <thead>
+<table class="table table-bordered">
+    <thead class="table-header">
         <tr>
             <th>{% trans "Context" %}</th>
             <th>{% trans "Level" %}</th>
@@ -15,9 +15,11 @@
         </tr>
     </thead>
     <tbody>
-        {% for log in logs %}
+        {% for log in results %}
             <tr>
-                <td>{{ log.context }}</td>
+                <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>
+                </td>
                 <td>{{ log.level_name }}</td>
                 <td>{{ log.message }}</td>
                 <td>{{ log.name }}</td>

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

@@ -3,8 +3,8 @@
 {% load i18n %}
 
 {% block page %}
-<table class="table">
-    <thead>
+<table class="table table-bordered">
+    <thead class="table-header">
         <tr>
             <th>{% trans "Context" %}</th>
             <th>{% trans "Name" %}</th>
@@ -17,9 +17,11 @@
         </tr>
     </thead>
     <tbody>
-        {% for m in metrics %}
+        {% for m in results %}
             <tr>
-                <td>{{ m.context }}</td>
+                <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>
+                </td>
                 <td>{{ m.name }}</td>
                 <td>{{ m.agg_count }}</td>
                 <td>{{ m.agg_sum }}</td>