argus-server 2.3.0__tar.gz → 2.4.0__tar.gz

{argus_server-2.3.0 → argus_server-2.4.0}/CHANGELOG.md

@@ -8,6 +8,44 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [2.4.0] - 2025-11-28
+
+The most important feature this release is being able to filter on source
+system type. If you have multiple source systems in a filter, all of them of
+the same type, it might pay off to switch over to using the source system type
+instead.
+
+The rest is frontend improvements: The tags filter now has typeahead find. The
+header and footer of the incident list never scroll off screen. The status
+columns have variants with icons instead of text, and there's new columns
+showing an incident's age (time since it happened).
+
+See NOTES.md for further detail.
+
+### Added
+
+- Added test error page ([#1024](https://github.com/Uninett/Argus/issues/1024))
+- Add age columns to incident table
+  ([#1552](https://github.com/Uninett/Argus/issues/1552))
+- Made it possible to filter on a source's type in the incident list, API, and
+  for sending notifications. Also added a new built-in column "source type" for
+  the incident list. When there are very many sources of the same type, the
+  filter and column become useful.
+  ([#1556](https://github.com/Uninett/Argus/issues/1556))
+- Add status columns that use icons instead of text
+  ([#1635](https://github.com/Uninett/Argus/issues/1635))
+- Made a system for rendering previews of preference choices.
+
+### Changed
+
+- Change incident table header and footer to always be visible
+  ([#1548](https://github.com/Uninett/Argus/issues/1548))
+- Add clear button to search column header
+  ([#1573](https://github.com/Uninett/Argus/issues/1573))
+- Change tags input to use searchable multiselect
+  ([#1604](https://github.com/Uninett/Argus/issues/1604))
+
+
 ## [2.3.0] - 2025-11-20
 
 This release has numerous improvements to the frontend. The various
@@ -35,7 +73,6 @@ See NOTES.md for how to convert an existing column layout to the new format.
   ([#1553](https://github.com/Uninett/Argus/issues/1553))
 - Sort list of sources in filter dropdown alphabetically
   ([#1554](https://github.com/Uninett/Argus/issues/1554))
-- [#1576](https://github.com/Uninett/Argus/issues/1576)
 - Added and documented more searchable columns for the incident list:
   `search_description`, `select_levels`, `has_ticket_url`,
   `search_ticket_url`, and a way to mass-produce single-field forms to

{argus_server-2.3.0 → argus_server-2.4.0}/NOTES.md

@@ -3,6 +3,23 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+## [2.4.0] - 2025-11-28
+
+The most important feature this release is being able to filter on source
+system type. If you have multiple source systems in a filter, all of them of
+the same type, it might pay off to switch over to using the source system type
+instead.
+
+The rest is frontend improvements: The tags filter now has typeahead find. The
+header and footer of the incident list never scroll off screen. The status
+columns have variants with icons instead of text, and there's new columns
+showing an incident's age (time since it happened).
+
+The new columns are called `age`, `start_time_and_age`, `status_icon`,
+`ack_icon` and `combined_status_icons`. The last takes up the least horizontal
+space in the table.
+
+
 ## [2.3.0] - 2025-11-20
 
 This release has numerous improvements to the frontend. The various

{argus_server-2.3.0 → argus_server-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.3.0
+Version: 2.4.0
 Summary: Argus is an alert aggregator for monitoring systems
 Project-URL: Homepage, https://github.com/Uninett/Argus
 Author-email: Uninett Opensource <opensource@uninett.no>

argus_server-2.4.0/docs/development/howtos/trigger-test-error-pages.rst

@@ -0,0 +1,14 @@
+===============================
+How to trigger test error pages
+===============================
+
+To test Django's error views in Argus, the following endpoint can be used:
+
+``/.error/?status-code=<error_code>``
+
+Replace ``<error_code>`` with one of the supported HTML error codes: 400, 401, 403, 404, 410, or 500.
+
+Notes
+~~~~~
+- DEBUG must be set to False in the Django settings to view the standard error pages.
+- Status codes ``404`` and ``500`` will trigger relevant exceptions, which in turn send messages to the user in the main view.

{argus_server-2.3.0 → argus_server-2.4.0}/docs/reference/api/v2.rst

@@ -607,6 +607,9 @@ Notification profile endpoints
                     "sourceSystemIds": [
                       2
                     ],
+                    "source_types": [
+                      "argus"
+                    ],
                     "open": null,
                     "acked": null,
                     "stateful": null,
@@ -931,6 +934,9 @@ Notification profile endpoints
                 "sourceSystemIds": [
                   1
                 ],
+                "source_types": [
+                  "argus"
+                ],
                 "tags": [
                   "key1=value1"
                 ],
@@ -955,6 +961,9 @@ Notification profile endpoints
                   "sourceSystemIds": [
                       1
                   ],
+                  "source_types": [
+                      "argus"
+                  ],
                   "tags": [
                       "key1=value1"
                   ],

{argus_server-2.3.0 → argus_server-2.4.0}/docs/reference/htmx-frontend.rst

@@ -210,7 +210,13 @@ ack
     :From: ack
     :Name: ack
     :Description: Show whether the incident is acked or not.
-    :Redundant with: combined_status
+    :Redundant with: combined_status, combined_status_icons
+
+ack_icon
+    :From: ack
+    :Name: ack_icon
+    :Description: Show whether the incident is acked or not, using an icon instead of text.
+    :Redundant with: combined_status, combined_status_icons
 
 color_status
     :From: ack + status
@@ -222,6 +228,11 @@ combined_status
     :Name: combined_status
     :Description: Merges the "open" column and the "ack" column into one.
 
+combined_status_icons
+    :From: ack + status
+    :Name: combined_status_icons
+    :Description: Merges the "open" column and the "ack" column into one, using icons instead of text.
+
 description
     :From: description
     :Name: description
@@ -259,7 +270,13 @@ status
     :From: open
     :Name: status
     :Description: Whether the incident is still ongoing or has been closed.
-    :Redundant with: combined_status
+    :Redundant with: combined_status, combined_status_icons
+
+status_icon
+    :From: open
+    :Name: status_icon
+    :Description: Whether the incident is still ongoing or has been closed, using an icon instead of text.
+    :Redundant with: combined_status, combined_status_icons
 
 row_select
     :From: depends on incident id
@@ -275,11 +292,25 @@ start_time
     :From: start_time
     :Name: start_time
     :Description: When the incident started, fixed width.
+    :Redundant with: narrow_start_time
 
 narrow_start_time
     :From: start_time
     :Name: start_time
     :Description: When the incident started, width depends on date format.
+    :Redundant with: start_time
+
+start_time_and_age
+    :From: start_time + age
+    :Name: start_time_and_age
+    :Description: When the incident started, and how long it has been ongoing.
+    :Redundant with: start_time
+
+age
+    :From: age
+    :Name: age
+    :Description: How long the incident has been ongoing.
+    :Redundant with: start_time_and_age
 
 ticket
     :From: ticket_url
@@ -310,6 +341,20 @@ If you wish to change the available themes, first make sure the support for
 Tailwind CSS and daisyUI has been installed, then see
 :ref:`customize-htmx-frontend`.
 
+Usage of Javascript
+===================
+
+The amount of javascript libraries is deliberately being kept to a minimum. The
+ones in use are vendored to avoid a build step and stored locally to not depend
+on DNS.
+
+The following are in use:
+
+* `htmx <https://htmx.org/>`_ for updating parts of a page smoothly
+* `hyperscript <https://hyperscript.org/>`_ for adding client-side interactivity, used for cases where htmx alone is not sufficient
+* `choices.js <https://choices-js.github.io/Choices/>`_ for typeahead search,
+  multi select
+
 Customization
 =============
 

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/filter/filterwrapper.py

@@ -32,6 +32,7 @@ class FilterKey(StrEnum):
     ACKED = "acked"
     STATEFUL = "stateful"
     SOURCE_SYSTEM_IDS = "sourceSystemIds"
+    SOURCE_SYSTEM_TYPES = "source_types"
     TAGS = "tags"
     EVENT_TYPES = "event_types"
     MAXLEVEL = "maxlevel"
@@ -39,7 +40,7 @@ class FilterKey(StrEnum):
 
 class FilterWrapper:
     TRINARY_FILTERS = (FilterKey.OPEN, FilterKey.ACKED, FilterKey.STATEFUL)
-    LIST_FILTERS = (FilterKey.SOURCE_SYSTEM_IDS, FilterKey.TAGS, FilterKey.EVENT_TYPES)
+    LIST_FILTERS = (FilterKey.SOURCE_SYSTEM_IDS, FilterKey.SOURCE_SYSTEM_TYPES, FilterKey.TAGS, FilterKey.EVENT_TYPES)
     INT_FILTERS = (FilterKey.MAXLEVEL,)
     FILTER_KEYS = TRINARY_FILTERS + LIST_FILTERS + INT_FILTERS
 
@@ -71,6 +72,12 @@ class FilterWrapper:
             return None
         return incident.source.id in filter_
 
+    def _incident_fits_source_system_type(self, incident: Incident) -> TriState:
+        filter_, ignored = self._get_filter_value_and_ignored_status(FilterKey.SOURCE_SYSTEM_TYPES)
+        if ignored:
+            return None
+        return incident.source.type.name in filter_
+
     def _incident_fits_tags(self, incident: Incident) -> TriState:
         filter_, ignored = self._get_filter_value_and_ignored_status(FilterKey.TAGS)
         if ignored:
@@ -100,6 +107,7 @@ class FilterWrapper:
             return False  # Filter is empty!
         checks = {}
         checks["source"] = self._incident_fits_source_system(incident)
+        checks["source_type"] = self._incident_fits_source_system_type(incident)
         checks["tags"] = self._incident_fits_tags(incident)
         checks["max_level"] = self._incident_fits_maxlevel(incident)
         for tristate in self.TRINARY_FILTERS:

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/filter/swappable/serializers.py

@@ -16,6 +16,11 @@ class FilterBlobSerializer(serializers.Serializer):
         allow_empty=True,
         required=False,
     )
+    source_types = serializers.ListField(
+        child=serializers.CharField(),
+        allow_empty=True,
+        required=False,
+    )
     tags = serializers.ListField(
         child=serializers.CharField(min_length=3),
         allow_empty=True,

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/htmx/context_processors.py

@@ -17,6 +17,7 @@ def static_paths(request):
         "stylesheet_path": getattr(settings, "STYLESHEET_PATH", defaults.STYLESHEET_PATH),
         "htmx_path": getattr(settings, "HTMX_PATH", defaults.HTMX_PATH),
         "hyperscript_path": getattr(settings, "HYPERSCRIPT_PATH", defaults.HYPERSCRIPT_PATH),
+        "choices_path": getattr(settings, "CHOICES_PATH", defaults.CHOICES_PATH),
     }
 
 

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/htmx/defaults.py

@@ -67,6 +67,7 @@ TAILWIND_THEME_OVERRIDE = get_json_env("TAILWIND_THEME_OVERRIDE", DEFAULT_THEME_
 STYLESHEET_PATH = get_str_env("ARGUS_STYLESHEET_PATH", STYLESHEET_PATH_DEFAULT)
 HTMX_PATH = get_str_env("ARGUS_HTMX_PATH", HTMX_PATH_DEFAULT)
 HYPERSCRIPT_PATH = get_str_env("ARGUS_HYPERSCRIPT_PATH", HYPERSCRIPT_PATH_DEFAULT)
+CHOICES_PATH = "choices-11.1.0.min.js"
 
 NOTIFICATION_TOAST_AUTOCLOSE_SECONDS = {
     "success": 10,

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/htmx/incident/columns.py

@@ -76,6 +76,18 @@ _BUILTIN_COLUMN_LIST = [
         header_template="htmx/incident/cells/_incident_start_time_header.html",
         detail_link=True,
     ),
+    IncidentTableColumn(
+        "age",
+        "Age",
+        "htmx/incident/cells/_incident_age.html",
+        detail_link=True,
+    ),
+    IncidentTableColumn(
+        "start_time_and_age",
+        "Timestamp",
+        "htmx/incident/cells/_incident_start_time_and_age.html",
+        detail_link=True,
+    ),
     IncidentTableColumn(
         "narrow_start_time",
         "Timestamp",
@@ -88,6 +100,12 @@ _BUILTIN_COLUMN_LIST = [
         "htmx/incident/cells/_incident_status.html",
         detail_link=True,
     ),
+    IncidentTableColumn(
+        "status_icon",
+        "Status",
+        "htmx/incident/cells/_incident_status_icon.html",
+        detail_link=True,
+    ),
     IncidentTableColumn(
         "level",
         "Severity level",
@@ -107,6 +125,12 @@ _BUILTIN_COLUMN_LIST = [
         "htmx/incident/cells/_incident_source.html",
         detail_link=True,
     ),
+    IncidentTableColumn(
+        "source_type",
+        "Source Type",
+        "htmx/incident/cells/_incident_source_type.html",
+        detail_link=True,
+    ),
     IncidentTableColumn(
         "description",
         "Description",
@@ -126,12 +150,24 @@ _BUILTIN_COLUMN_LIST = [
         "htmx/incident/cells/_incident_ack.html",
         detail_link=True,
     ),
+    IncidentTableColumn(
+        "ack_icon",
+        "Ack",
+        "htmx/incident/cells/_incident_ack_icon.html",
+        detail_link=True,
+    ),
     IncidentTableColumn(
         "combined_status",
         "Status",
         "htmx/incident/cells/_incident_combined_status.html",
         detail_link=True,
     ),
+    IncidentTableColumn(
+        "combined_status_icons",
+        "Status",
+        "htmx/incident/cells/_incident_combined_status_icons.html",
+        detail_link=True,
+    ),
     IncidentTableColumn(
         "ticket",
         "Ticket",

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/htmx/incident/filter.py

@@ -6,9 +6,9 @@ from django.urls import reverse
 from django.views.generic import ListView
 
 from argus.filter import get_filter_backend
-from argus.htmx.widgets import BadgeDropdownMultiSelect
+from argus.htmx.widgets import BadgeDropdownMultiSelect, SearchDropdownMultiSelect
 from argus.incident.constants import AckedStatus, Level, OpenStatus
-from argus.incident.models import SourceSystem, Tag
+from argus.incident.models import SourceSystem, SourceSystemType, Tag
 from argus.notificationprofile.models import Filter
 
 filter_backend = get_filter_backend()
@@ -20,7 +20,24 @@ class RangeInput(forms.NumberInput):
     template_name = "django/forms/widgets/range.html"
 
 
-class IncidentFilterForm(forms.Form):
+class TagFieldMixin:
+    def _init_tag_field(self, *args, **kwargs):
+        """
+        Initializes the 'tags' field widget and choices as key=value strings, and dynamically adds submitted tags.
+        """
+        self.fields["tags"].widget.partial_get = reverse("htmx:search-tags")
+        query_dict = args[0] if args else None
+        if not query_dict:
+            self.fields["tags"].choices = []
+            return
+
+        tags = query_dict.get("tags", [])
+
+        choices = [(tag, tag) for tag in tags]
+        self.fields["tags"].choices = choices
+
+
+class IncidentFilterForm(TagFieldMixin, forms.Form):
     open = forms.IntegerField(
         widget=RangeInput(attrs={"step": "1", "min": min(OpenStatus).value, "max": max(OpenStatus).value}),
         label="Open State",
@@ -33,6 +50,14 @@ class IncidentFilterForm(forms.Form):
         initial=AckedStatus.BOTH.value,
         required=False,
     )
+    source_types = forms.MultipleChoiceField(
+        widget=BadgeDropdownMultiSelect(
+            attrs={"placeholder": "select source types..."},
+            partial_get=None,
+        ),
+        required=False,
+        label="Source Types",
+    )
     sourceSystemIds = forms.MultipleChoiceField(
         widget=BadgeDropdownMultiSelect(
             attrs={"placeholder": "select sources..."},
@@ -41,12 +66,12 @@ class IncidentFilterForm(forms.Form):
         required=False,
         label="Sources",
     )
-    tags = forms.CharField(
-        widget=forms.TextInput(
+    tags = forms.MultipleChoiceField(
+        widget=SearchDropdownMultiSelect(
             attrs={
-                "placeholder": "key=value, ...",
-                "class": "input-primary input-sm overflow-y-auto min-h-8 h-auto max-h-16 max-w-xs leading-tight",
-            }
+                "placeholder": "search tags...",
+            },
+            partial_get=None,
         ),
         required=False,
         label="Tags",
@@ -63,7 +88,8 @@ class IncidentFilterForm(forms.Form):
         "open": None,
         "acked": None,
         "sourceSystemIds": [],
-        "tags": "",
+        "source_types": [],
+        "tags": [],
         "maxlevel": max(Level).value,
     }
 
@@ -73,18 +99,23 @@ class IncidentFilterForm(forms.Form):
         self.fields["sourceSystemIds"].widget.partial_get = reverse("htmx:incident-filter")
         source_choices = SourceSystem.objects.order_by("name").values_list("id", "name")
         self.fields["sourceSystemIds"].choices = tuple(source_choices)
+        self._init_tag_field(*args, **kwargs)
+
+        self.fields["source_types"].widget.partial_get = reverse("htmx:incident-filter")
+        source_type_choices = SourceSystemType.objects.order_by("name").values_list("name", "name")
+        self.fields["source_types"].choices = tuple(source_type_choices)
 
     def clean_tags(self):
         tags = self.cleaned_data["tags"]
         if not tags:
-            return None
+            return []
 
         try:
-            for tag in tags.split(","):
-                Tag.split(tag.strip())
+            for tag in tags:
+                tag = tag.strip()
+                Tag.split(tag)
         except ValueError:
             raise forms.ValidationError("Tags need to have the format key=value, key2=value2")
-
         return tags
 
     def _open_tristate(self):
@@ -118,16 +149,19 @@ class IncidentFilterForm(forms.Form):
         filterblob = {}
 
         filterblob["open"] = self._open_tristate()
-
         filterblob["acked"] = self._acked_tristate()
 
         sourceSystemIds = self.cleaned_data.get("sourceSystemIds", [])
         if sourceSystemIds:
             filterblob["sourceSystemIds"] = sourceSystemIds
 
+        source_types = self.cleaned_data.get("source_types", [])
+        if source_types:
+            filterblob["source_types"] = source_types
+
         tags = self.cleaned_data.get("tags", [])
         if tags:
-            filterblob["tags"] = [tag.strip() for tag in tags.split(",")]
+            filterblob["tags"] = tags
 
         maxlevel = self.cleaned_data.get("maxlevel", 0)
         if maxlevel:
@@ -165,18 +199,18 @@ def incident_list_filter(request, qs, use_empty_filter=False):
         form = IncidentFilterForm(_convert_filterblob(filter_obj.filter))
         LOG.debug("using stored filter: %s", filter_obj.filter)
     else:
+        form_data = _normalize_form_data(request)
         if request.method == "POST":
-            form = IncidentFilterForm(request.POST)
-            LOG.debug("using POST: %s", request.POST)
+            form = IncidentFilterForm(form_data)
+            LOG.debug("using POST: %s", form_data)
         else:
             if use_empty_filter:
                 filterblob = IncidentFilterForm.EMPTY_FILTERBLOB
                 form = IncidentFilterForm(filterblob)
                 LOG.debug("using empty filter: %s", filterblob)
             else:
-                form = IncidentFilterForm(request.GET or None)
-                LOG.debug("using GET: %s", request.GET)
-
+                form = IncidentFilterForm(form_data or None)
+                LOG.debug("using GET: %s", form_data)
     if form.is_valid():
         LOG.debug("Cleaned data: %s", form.cleaned_data)
         filterblob = form.to_filterblob()
@@ -193,8 +227,6 @@ def incident_list_filter(request, qs, use_empty_filter=False):
 
 def _convert_filterblob(filterblob):
     """Converts values in filterblob so it can be used as valid input for IncidentFilterForm"""
-    if "tags" in filterblob.keys():
-        filterblob["tags"] = ", ".join(filterblob["tags"])
 
     if "open" in filterblob.keys():
         open_state = filterblob["open"]
@@ -217,6 +249,41 @@ def _convert_filterblob(filterblob):
     return filterblob
 
 
+def _normalize_form_data(request):
+    """Normalizes form data from request, especially the 'tags' parameter."""
+
+    raw_data = request.POST if request.method == "POST" else request.GET
+    data = dict(raw_data.items())
+    for key in raw_data:
+        value = raw_data.getlist(key, [])
+        if key == "tags":
+            value = _normalize_tags_param(value)
+        elif key not in ["source_types", "sourceSystemIds"]:
+            value = value[0]
+        data[key] = value
+    return data
+
+
+def _normalize_tags_param(tags_param):
+    """Normalizes the 'tags' parameter from the form data."""
+
+    if isinstance(tags_param, str):
+        return _split_tag(tags_param)
+    elif isinstance(tags_param, (list, tuple)):
+        tags = []
+        for entry in tags_param:
+            if isinstance(entry, str):
+                entry = _split_tag(entry)
+                tags.extend(entry)
+        return tags
+    return []
+
+
+def _split_tag(tag: str) -> list[str]:
+    """Splits a single tag string by commas and trims whitespace."""
+    return [t.strip() for t in tag.split(",") if t.strip()]
+
+
 def create_named_filter(request, filter_name: str, filterblob: dict):
     form = NamedFilterForm({"name": filter_name, "filter": filterblob})
     filter_obj = None

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/htmx/incident/urls.py

@@ -15,4 +15,5 @@ urlpatterns = [
     path("filter/delete/<int:pk>/", views.delete_filter, name="filter-delete"),
     path("filter/update/<int:pk>/", views.update_filter, name="filter-update"),
     path("filter/existing/", views.get_existing_filters, name="existing-filters"),
+    path("search-tags/", views.search_tags, name="search-tags"),
 ]

{argus_server-2.3.0 → argus_server-2.4.0}/src/argus/htmx/incident/views.py

@@ -13,10 +13,10 @@ from django.utils.timezone import now as tznow
 from django.shortcuts import render, get_object_or_404
 from django.views.decorators.http import require_POST, require_GET
 from django.core.paginator import Paginator
-from django.http import HttpResponse, HttpResponseBadRequest, QueryDict
+from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse, QueryDict
 from django_htmx.http import HttpResponseClientRefresh, retarget
 
-from argus.incident.models import Incident
+from argus.incident.models import Incident, Tag
 from argus.incident.ticket.utils import get_ticket_plugin_path
 from argus.incident.ticket.base import TicketPluginException
 from argus.notificationprofile.models import Filter
@@ -238,6 +238,28 @@ def add_param_to_querydict(querydict: QueryDict, key: str, value: Any):
     return querydict
 
 
+class SearchForm(forms.Form):
+    search = forms.CharField(required=False)
+
+
+@require_GET
+def search_tags(request):
+    query = request.GET.get("q")
+
+    if not query:
+        return JsonResponse({"results": []})
+
+    if Tag.TAG_DELIMITER in query:
+        key, value = Tag.split(query)
+        tags = Tag.objects.filter(key=key, value__icontains=value)[:20]
+    else:
+        tags = Tag.objects.filter(key__icontains=query)[:20]
+
+    options = [{"id": str(tag), "text": str(tag)} for tag in tags]
+
+    return JsonResponse({"results": options})
+
+
 @require_GET
 def incident_list(request: HtmxHttpRequest) -> HttpResponse:
     LOG = logging.getLogger(__name__ + ".incident_list")