argus-server 2.5.0__tar.gz → 2.6.0__tar.gz

{argus_server-2.5.0 → argus_server-2.6.0}/CHANGELOG.md

@@ -8,6 +8,23 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [2.6.0] - 2026-01-06
+
+This is a tiny release to finish up what was started at the end of 2025.
+
+### Added
+
+- Add preview for incident table preferences
+  ([#1658](https://github.com/Uninett/Argus/issues/1658))
+
+### Fixed
+
+- Filter on source type in dashboard. The previous release made it work for
+  notifications but not in the incident list in the frontend.
+- Fix bug where the incident table overlaps filter dropdowns
+  ([#1669](https://github.com/Uninett/Argus/issues/1669))
+
+
 ## [2.5.0] - 2025-12-04
 
 The big new thing this time around is a way to prevent notifications from

{argus_server-2.5.0 → argus_server-2.6.0}/NOTES.md

@@ -3,6 +3,19 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+
+## [2.6.0] - 2026-01-06
+
+This is a tiny release to finish up what was started at the end of 2025.
+
+The feature for having mutiple column presets for the incident list is now
+finished. Please make add issue if you have a column-type you would like
+added.
+
+Also, there were some bugs with the typeahead for the tag filter and the new
+source system type filter that was introduced in 2.4.0, the ones we know of
+have been fixed.
+
 ## [2.5.0] - 2025-12-04
 
 This release adds a new app, "argus.plannedmaintenance", which uses a new

{argus_server-2.5.0 → argus_server-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.5.0
+Version: 2.6.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.5.0 → argus_server-2.6.0}/docs/development/howtos/customizing-filtering.rst

@@ -27,24 +27,29 @@ changed incidents.
 FilterWrapper
 -------------
 
-Base class, the important methods are ``incident_fits`` and ``event_fits``.
+Base class, the important methods are ``incident_fits``, ``event_fits`` and
+``filter_fits``. The latter two take a single event. ``filter_fits`` checks
+both ``event_fits`` and ``incident_fits``, in that order.
 
 FallbackFilterWrapper
 ---------------------
 
 Subclass of ``FilterWrapper``. Merges a filter with the filter in the setting
-``ARGUS_FALLBACK_FILTER``.
+:setting:`ARGUS_FALLBACK_FILTER`.
 
-ComplexFilterWrapper
---------------------
+PrecisionFilterWrapper
+----------------------
 
-OR's together multiple simple FilterWrappers, used by NotificationProfile.
+AND's together multiple simple filters, using ``FilterWrapper`` by default. Not
+used directly.
 
-ComplexFallbackFilterWrapper
-----------------------------
+Has the methods ``incident_fits`` and ``event_fits``, and ``filter_fits`` which
+takes an event and checks both ``event_fits`` and ``incident_fits``, in that
+order.
 
-Subclass of ``FilterWrapper``. Takes the setting ``ARGUS_FALLBACK_FILTER`` into
-account for each filter.
+``NotificationProfile`` has the subclass ``NotificationProfileFilterWrapper``,
+which combines a ``PrecisionFilterWrapper`` with a ``FallbackFilterWrapper``.
+It is thus affected by the setting :setting:`ARGUS_FALLBACK_FILTER`.
 
 ---------------------------------------
 Matching a filter to multiple incidents

{argus_server-2.5.0 → argus_server-2.6.0}/docs/development/howtos/sonarqube.rst

@@ -16,4 +16,13 @@ python:S1192 - String literals should not be duplicated
 If it makes it more readable, for example if configuration is happening within the
 Python code, then we accept it with "This is better for readability".
 
+python:S2208 - Wildcard imports should not be used
+--------------------------------------------------
+
+This is okay in settings files. Mark as false positive with "Django standard
+practice for settings files". Notice that `sonarqube`_ ignores all ``#noqa``
+so "#noqa: `F401`_, `F403`_" won't help.
+
 .. _sonarqube: https://www.sonarsource.com/products/sonarcloud/
+.. _F401: https://www.flake8rules.com/rules/F401.html
+.. _F403: https://www.flake8rules.com/rules/F403.html

{argus_server-2.5.0 → argus_server-2.6.0}/docs/reference/htmx-frontend.rst

@@ -304,7 +304,7 @@ 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
+    :Redundant with: start_time, age
 
 age
     :From: age

argus_server-2.6.0/requirements/django52.txt

@@ -0,0 +1 @@
+django>=5.2.9,<6.0

{argus_server-2.5.0 → argus_server-2.6.0}/requirements-django52.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
+#    pip-compile --no-strip-extras --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
 #
 annotated-types==0.7.0
     # via pydantic
@@ -37,7 +37,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==2.3.0
     # via argus-server (pyproject.toml)
-django==5.2.8
+django==5.2.9
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)
@@ -162,7 +162,7 @@ tzdata==2025.2
     # via faker
 uritemplate==4.1.1
     # via drf-spectacular
-urllib3==2.5.0
+urllib3==2.6.0
     # via
     #   -r constraints.txt
     #   requests

{argus_server-2.5.0 → argus_server-2.6.0}/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
+#    pip-compile --no-strip-extras --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
 #
 annotated-types==0.7.0
     # via pydantic
@@ -37,7 +37,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==2.3.0
     # via argus-server (pyproject.toml)
-django==5.2.8
+django==5.2.9
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)
@@ -162,7 +162,7 @@ tzdata==2025.2
     # via faker
 uritemplate==4.1.1
     # via drf-spectacular
-urllib3==2.5.0
+urllib3==2.6.0
     # via
     #   -r constraints.txt
     #   requests

argus_server-2.6.0/src/argus/filter/checks.py

@@ -0,0 +1,25 @@
+from django.conf import settings
+from django.core.checks import Warning
+
+from rest_framework import serializers
+
+from argus.filter.validators import validate_jsonfilter
+
+
+__all__ = ["fallback_filter_check"]
+
+
+def fallback_filter_check(app_configs, **kwargs):
+    fallback_filter = getattr(settings, "ARGUS_FALLBACK_FILTER", {})
+    try:
+        validate_jsonfilter(fallback_filter)
+    except serializers.ValidationError:
+        warning = Warning(
+            'The ARGUS_FALLBACK_FILTER setting is invalid and has been set to "{}"',
+            hint="See the docs for the format of the ARGUS_FALLBACK_FILTER setting",
+            obj=fallback_filter,
+            id="argus_filter.W001",
+        )
+        return [warning]
+    else:
+        return []

{argus_server-2.5.0 → argus_server-2.6.0}/src/argus/filter/default.py

@@ -1,8 +1,7 @@
 from .filterwrapper import (  # noqa: F401
     FilterWrapper,
     FallbackFilterWrapper,
-    ComplexFilterWrapper,
-    ComplexFallbackFilterWrapper,
+    PrecisionFilterWrapper,
 )
 from .queryset_filters import QuerySetFilter  # noqa: F401
 from .filters import (  # noqa: F401

{argus_server-2.5.0 → argus_server-2.6.0}/src/argus/filter/filterwrapper.py

@@ -9,14 +9,15 @@ from argus.compat import StrEnum
 
 
 if TYPE_CHECKING:
+    from django.db.models import Model
+    from django.db.models.query import QuerySet
     from argus.incident.models import Event, Incident
 
 
 __all__ = [
     "FilterWrapper",
     "FallbackFilterWrapper",
-    "ComplexFilterWrapper",
-    "ComplexFallbackFilterWrapper",
+    "PrecisionFilterWrapper",
 ]
 
 
@@ -120,6 +121,13 @@ class FilterWrapper:
             LOG.debug("Filter: %s: HIT!", self)
         return not any_failed
 
+    def filter_fits(self, event) -> bool:
+        event_fits = self.event_fits(event)
+        incident_fits = self.incident_fits(event.incident)
+        if event_fits and incident_fits:
+            return True
+        return False
+
 
 class FallbackFilterWrapper(FilterWrapper):
     "Changed by ARGUS_FALLBACK_FILTER setting"
@@ -133,36 +141,37 @@ class FallbackFilterWrapper(FilterWrapper):
         return value if value else self.fallback_filter.get(key, None)
 
 
-class ComplexFilterWrapper:
+class PrecisionFilterWrapper:
+    "Combine several filters together via Boolean AND for higher precision"
+
     filterwrapper = FilterWrapper
 
-    def __init__(self, **kwargs):
-        self.profile = kwargs.pop("profile", None)
+    def __init__(self, model_or_queryset: Model | QuerySet, filterwrapper: Optional[FilterWrapper] = None):
+        # subclasses accepting model needs to pass on the manager in super()
+        self.queryset = model_or_queryset
+        if filterwrapper:
+            self.filterwrapper = filterwrapper
 
     def incident_fits(self, incident: Incident) -> bool:
         """Check against multiple filters
 
         The filters are AND-ed together for greater precision.
         """
-        if not self.profile.active:
-            return False
-        is_selected_by_time = self.profile.timeslot.timestamp_is_within_time_recurrences(incident.start_time)
-        if not is_selected_by_time:
-            return False
-        for f in self.profile.filters.only("filter"):
+        for f in self.queryset.only("filter"):
             if not self.filterwrapper(f.filter).incident_fits(incident):
                 return False
         return True
 
     def event_fits(self, event: Event) -> bool:
-        if not self.profile.active:
-            return False
         # return as early as possible
-        for f in self.profile.filters.only("filter"):
+        for f in self.queryset.only("filter"):
             if FilterWrapper(f.filter).event_fits(event):
                 return True
         return False
 
-
-class ComplexFallbackFilterWrapper(ComplexFilterWrapper):
-    filterwrapper = FallbackFilterWrapper
+    def filter_fits(self, event: Event) -> bool:
+        event_fits = self.event_fits(event)
+        incident_fits = self.incident_fits(event.incident)
+        if event_fits and incident_fits:
+            return True
+        return False

{argus_server-2.5.0 → argus_server-2.6.0}/src/argus/filter/queryset_filters.py

@@ -12,6 +12,14 @@ if TYPE_CHECKING:
 __all__ = ["QuerySetFilter"]
 
 
+def _incidents_with_source_system_types(incident_queryset, filterblob: FilterBlobType):
+    source_list = filterblob.get("source_types", [])
+    if source_list:
+        incident_queryset.prefetch_related("source")
+        return incident_queryset.filter(source__type_id__in=source_list).distinct()
+    return incident_queryset.distinct()
+
+
 def _incidents_with_source_systems(incident_queryset, filterblob: FilterBlobType):
     source_list = filterblob.get("sourceSystemIds", [])
     if source_list:
@@ -63,12 +71,19 @@ class QuerySetFilter:
         fw = FilterWrapper(filterblob)
         if fw.is_empty:
             return Incident.objects.none().distinct()
+        filtered_by_source_type = _incidents_with_source_system_types(incident_queryset, filterblob)
         filtered_by_source = _incidents_with_source_systems(incident_queryset, filterblob)
         filtered_by_tags = _incidents_with_tags(incident_queryset, filterblob)
         filtered_by_tristates = _incidents_fitting_tristates(incident_queryset, filterblob)
         filtered_by_maxlevel = _incidents_fitting_maxlevel(incident_queryset, filterblob)
 
-        return filtered_by_source & filtered_by_tags & filtered_by_tristates & filtered_by_maxlevel
+        return (
+            filtered_by_source_type
+            & filtered_by_source
+            & filtered_by_tags
+            & filtered_by_tristates
+            & filtered_by_maxlevel
+        )
 
     @classmethod
     def incidents_by_filter(cls, incident_queryset, filter: Filter):

{argus_server-2.5.0 → argus_server-2.6.0}/src/argus/htmx/incident/columns.py

@@ -20,7 +20,7 @@ LOG = logging.getLogger(__name__)
 CELL_WRAPPER_TEMPLATE_DEFAULT = "htmx/incident/_incident_table_cell_wrapper_default.html"
 CELL_WRAPPER_TEMPLATE_LINK_TO_DETAILS = "htmx/incident/_incident_table_cell_wrapper_link_to_details.html"
 
-_BUILTIN_COLUMN_LAYOUT_NAME = "built-in"
+BUILTIN_COLUMN_LAYOUT_NAME = "built-in"
 _DEFAULT_COLUMN_LAYOUT_NAME = "default"
 
 
@@ -197,7 +197,7 @@ BUILTIN_COLUMNS = {col.name: col for col in _BUILTIN_COLUMN_LIST}
 def get_builtin_column_layout():
     "Return the column layout defined in `argus.htmx.defaults`"
 
-    return _BUILTIN_COLUMN_LAYOUT_NAME, BUILTIN_INCIDENT_TABLE_COLUMNS
+    return BUILTIN_COLUMN_LAYOUT_NAME, BUILTIN_INCIDENT_TABLE_COLUMNS
 
 
 def get_default_column_layout():
@@ -249,7 +249,7 @@ def get_column_choices():
     return columns
 
 
-def get_incident_table_columns(name: str = _BUILTIN_COLUMN_LAYOUT_NAME) -> list[IncidentTableColumn]:
+def get_incident_table_columns(name: str = BUILTIN_COLUMN_LAYOUT_NAME) -> list[IncidentTableColumn]:
     """Return the named incident column layout
 
     Falls back to the built-in layout if the name is unknown."""
@@ -257,7 +257,7 @@ def get_incident_table_columns(name: str = _BUILTIN_COLUMN_LAYOUT_NAME) -> list[
     LOG.debug("Getting layouts: get_incident_table_columns")
     layouts = get_available_column_layouts()
     if name not in layouts:
-        name = _BUILTIN_COLUMN_LAYOUT_NAME
+        name = BUILTIN_COLUMN_LAYOUT_NAME
     columns = layouts[name]
     return [_resolve_column(col) for col in columns]
 
@@ -272,7 +272,7 @@ def get_default_column_layout_name():
     layouts = get_available_column_layouts()
     if _DEFAULT_COLUMN_LAYOUT_NAME in layouts.keys():
         return _DEFAULT_COLUMN_LAYOUT_NAME
-    return _BUILTIN_COLUMN_LAYOUT_NAME
+    return BUILTIN_COLUMN_LAYOUT_NAME
 
 
 def _resolve_column(col: str | IncidentTableColumn):

{argus_server-2.5.0 → argus_server-2.6.0}/src/argus/htmx/incident/views.py

@@ -91,7 +91,7 @@ def incident_update(request: HtmxHttpRequest, action: str):
     try:
         formclass, callback_func = INCIDENT_UPDATE_ACTIONS[action]
     except KeyError:
-        LOG.error("Unrecognized action name %s when updating incidents.", action)
+        LOG.error("Unrecognized action name when updating incidents.")
         return HttpResponseBadRequest("Invalid update action")
     incident_ids = get_incident_ids_to_update(request)
     if not incident_ids: