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

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

@@ -4,10 +4,88 @@ read by developers.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the changes for the upcoming release can be found in <https://github.com/Uninett/Argus/tree/master/changelog.d/>.
+This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the changes for the upcoming release can be found in <https://github.com/Uninett/Argus/tree/main/changelog.d/>.
 
 <!-- towncrier release notes start -->
 
+## [2.5.0] - 2025-12-04
+
+The big new thing this time around is a way to prevent notifications from
+certain incidents by masking them via a planned maintenance filter stored in
+a planned maintenance task. This task works just like a notification profile:
+more filters add precision. The only way to set up a filter right now is via
+the admin. Users with admin-access can click on the admin link, see the section
+"ARGUS_PLANNEDMAINTENANCE".
+
+We want some feedback on the feature before we add support
+for setting up planned maintenance tasks via the API and the frontend.
+
+Otherwise: work on increasing consistency in the frontend continues, and the
+version number of argus should now always be available.
+
+Customizers, please see the NOTES.md, the preferences page has more changes.
+
+Remember to migrate if upgrading.
+
+### Added
+
+- Add preview for theme and date format preferences
+  ([#1557](https://github.com/Uninett/Argus/issues/1557))
+- Add model for planned maintenance tasks
+  ([#1586](https://github.com/Uninett/Argus/issues/1586))
+- Added functionality to add/edit planned maintenance tasks to Django admin
+  ([#1587](https://github.com/Uninett/Argus/issues/1587))
+- Filter out events covered by ongoing planned maintenance tasks from being
+  sent ([#1588](https://github.com/Uninett/Argus/issues/1588))
+- Added Argus version number to user menu dropdown and login page
+  ([#1650](https://github.com/Uninett/Argus/issues/1650))
+
+### Changed
+
+- Split user preferences into multiple sections
+  ([#1557](https://github.com/Uninett/Argus/issues/1557))
+- Increase accessibility of cards by using borders instead of shadow
+  ([#1641](https://github.com/Uninett/Argus/issues/1641))
+
+
+## [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 +113,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.5.0}/NOTES.md

@@ -3,6 +3,38 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+## [2.5.0] - 2025-12-04
+
+This release adds a new app, "argus.plannedmaintenance", which uses a new
+database table, so remember to migrate.
+
+The new table is to store planned maintenance tasks, which are used to exclude
+some notifications from being sent. A notification is only sent *iff* an
+incident and its events are not found by any filter during a currently ongoing
+planned maintenance task.
+
+Customizers: We have started work on adding previews to all the preferences;
+first out is previews of themes and date formats. If you have added your own
+preferences or otherwise customized the preferences page you need to take extra
+care when upgrading.
+
+## [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.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.3.0
+Version: 2.5.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>
@@ -59,7 +59,7 @@ Description-Content-Type: text/markdown
 
 # Argus
 [![test badge](https://github.com/Uninett/Argus/actions/workflows/python.yml/badge.svg)](https://github.com/Uninett/Argus/actions)
-[![codecov badge](https://codecov.io/gh/Uninett/Argus/branch/master/graph/badge.svg)](https://codecov.io/gh/Uninett/Argus)
+[![codecov badge](https://codecov.io/gh/Uninett/Argus/branch/main/graph/badge.svg)](https://codecov.io/gh/Uninett/Argus)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![djLint](https://img.shields.io/badge/html%20style-djlint-blue.svg)](https://www.djlint.com)
 [![docs badge](https://readthedocs.org/projects/argus-server/badge/?version=latest&style=flat)](http://argus-server.rtfd.io/en/latest/)
@@ -320,12 +320,12 @@ Refer to the [tox.ini](tox.ini) file for further options.
 
 Do not ever remove these
 
-* master
+* main
 * argus-demo
 * stable/SOMETHING
 
 The last branch-type is for backporting bugfixes and similar to older releases,
-bypassing master if necessary.
+bypassing main if necessary.
 
 
 ## How to do maintenance

{argus_server-2.3.0 → argus_server-2.5.0}/README.md

@@ -1,6 +1,6 @@
 # Argus
 [![test badge](https://github.com/Uninett/Argus/actions/workflows/python.yml/badge.svg)](https://github.com/Uninett/Argus/actions)
-[![codecov badge](https://codecov.io/gh/Uninett/Argus/branch/master/graph/badge.svg)](https://codecov.io/gh/Uninett/Argus)
+[![codecov badge](https://codecov.io/gh/Uninett/Argus/branch/main/graph/badge.svg)](https://codecov.io/gh/Uninett/Argus)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![djLint](https://img.shields.io/badge/html%20style-djlint-blue.svg)](https://www.djlint.com)
 [![docs badge](https://readthedocs.org/projects/argus-server/badge/?version=latest&style=flat)](http://argus-server.rtfd.io/en/latest/)
@@ -261,12 +261,12 @@ Refer to the [tox.ini](tox.ini) file for further options.
 
 Do not ever remove these
 
-* master
+* main
 * argus-demo
 * stable/SOMETHING
 
 The last branch-type is for backporting bugfixes and similar to older releases,
-bypassing master if necessary.
+bypassing main if necessary.
 
 
 ## How to do maintenance

{argus_server-2.3.0 → argus_server-2.5.0}/codecov.yml

@@ -2,10 +2,10 @@ coverage:
   status:
     project:
       default:
-        threshold: 90%
+        threshold: 1%
     patch:
       default:
-        threshold: 90%
+        threshold: 1%
 
 ignore:
   - "manage.py"

{argus_server-2.3.0 → argus_server-2.5.0}/docs/about-argus.rst

@@ -67,6 +67,7 @@ server, such as:
 * Administration of Argus user accounts
 * Creating API authentication tokens for users
 * Defining new source systems to collect incidents from
+* Creating and updating planned maintenance tasks
 
 Pick and choose
 ---------------

{argus_server-2.3.0 → argus_server-2.5.0}/docs/development/howtos/regenerate-the-ER-diagram.rst

@@ -20,7 +20,7 @@ Test by making a .dot-file
 
 To test if everything is installed correctly, run::
 
-    python manage.py graph_models argus_auth argus_incident argus_notificationprofile \
+    python manage.py graph_models argus_auth argus_incident argus_notificationprofile argus_plannedmaintenance \
     --group-models -X Permission,AbstractUser,AbstractBaseUser,PermissionsMixin
 
 This will dump a `.dot-file <https://graphviz.org/doc/info/lang.html>`_, the
@@ -42,7 +42,7 @@ We need to have one more dependency installed: one of ``pygraphviz`` or
 
 To generate the final PNG in the correct location, run::
 
-    python manage.py graph_models argus_auth argus_incident argus_notificationprofile \
+    python manage.py graph_models argus_auth argus_incident argus_notificationprofile argus_plannedmaintenance \
     --group-models -X Permission,AbstractUser,AbstractBaseUser,PermissionsMixin \
     -o docs/reference/img/ER_model.png
 
@@ -52,7 +52,7 @@ Use ``graphviz`` directly on a .dot-file
 1. Make sure you have graphviz installed, how is OS/distro dependent
 2. Generate the dot-file with::
 
-    python manage.py graph_models argus_auth argus_incident argus_notificationprofile \
+    python manage.py graph_models argus_auth argus_incident argus_notificationprofile argus_plannedmaintenance \
     --group-models -X Permission,AbstractUser,AbstractBaseUser,PermissionsMixin \
     -o ER_model.dot
 3. Generate the PNG with ``dot``::

{argus_server-2.3.0 → argus_server-2.5.0}/docs/development/howtos/release-checklist.rst

@@ -43,11 +43,11 @@ not needed to do this yet.
 Checklist
 ---------
 
-#. Ensure you're on the correct branch to be released. Either ``master`` or
+#. Ensure you're on the correct branch to be released. Either ``main`` or
    newest stable, which has a name of the form ``stable/1.5.x``. Release from
    the stable branch only under exceptional circumstances. For instance:
    there's a critical bugfix for production and there's a lot of new stuff on
-   master that is not ready to go.
+   main that is not ready to go.
 
 #. Check that there are no files that have not been commited:
 

argus_server-2.5.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.5.0}/docs/development/howtos/vendor-a-repo.rst

@@ -55,7 +55,7 @@ Prep the ORIGIN repo
 
         git fetch TARGET
 
-9. Merge ORIGIN-clone's "main" into feceiving's "master"::
+9. Merge ORIGIN-clone's "main" into receiving's "master"::
 
         git merge --allow-unrelated-histories TARGET/master
 

{argus_server-2.3.0 → argus_server-2.5.0}/docs/django_settings.py

@@ -25,6 +25,7 @@ INSTALLED_APPS = [
     "argus.filter",
     "argus.notificationprofile",
     "argus.dev",
+    "argus.plannedmaintenance",
 ]
 
 MEDIA_PLUGINS = []

{argus_server-2.3.0 → argus_server-2.5.0}/docs/integrations/notifications/writing-notification-plugins.rst

@@ -4,7 +4,7 @@ Writing your own notification plugin
 ====================================
 
 When writing a new notification plugin the plugins for
-`SMS-as-Email <https://github.com/Uninett/Argus/blob/master/src/argus/notificationprofile/media/sms_as_email.py>`_
+`SMS-as-Email <https://github.com/Uninett/Argus/blob/main/src/argus/notificationprofile/media/sms_as_email.py>`_
 and
 `Teams <https://github.com/Uninett/argus_notification_msteams/blob/main/src/argus_notification_msteams.py>`_
 can be used as guides.

{argus_server-2.3.0 → argus_server-2.5.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.5.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.5.0}/docs/reference/models.rst

@@ -89,6 +89,18 @@ Handling notifications
       Holds a ``DestinationConfig``'s type. The ``installed``-field is updated
       on startup to keep track of which ``notification plugin``\s are installed.
 
+Handling maintenance work
+=========================
+
+.. glossary::
+
+   PlannedMaintenanceTask
+      Holds who created the task and when (not editable), the start and end time
+      of such a task, and a description of what this maintenance work entails and/or
+      why it is happening.
+
+      It also holds a collection of ``Filter``\s that describe what kind of events are
+      covered by that planned maintenance.
 
 ER diagram
 ==========

argus_server-2.5.0/docs/reference/planned-maintenance.rst

@@ -0,0 +1,43 @@
+===================
+Planned maintenance
+===================
+
+To interact with planned maintenance tasks visit the admin interface at:
+``/admin/argus_plannedmaintenance/plannedmaintenancetask/``.
+
+A planned maintenance task consists of a start time and an end time (where the latter
+is by default infinity). Those define the period during which planned work is happening
+and when notifications for events, for example for affected devices, should not be
+sent.
+
+Filters are used to define exactly which kind of events notifications should be
+suppressed for. As it is for notification profiles, if multiple filters are connected
+to one planned maintenance task, then that tasks will only lead to a notification being
+suppressed if all of the filters apply to that event.
+
+.. warning:: When notifications are suppressed during a planned maintenance task and
+    that task ends, while the incident is still open, you will not receive a
+    notification.
+    It is your responsibility to check that everything is resolved when a planned
+    maintenance task is finished!
+
+The planned maintenance task list
+=================================
+
+In the admin you can view a list of planned maintenance tasks, filter them and search
+for specific ones.
+
+You can also select multiple planned maintenance tasks and delete them or mark them as
+finished. Marking a task as finished will set an open task's end time to the current
+time. If you mark a task as finished that has not begun yet, then that task will be
+deleted.
+
+Adding/editing a planned maintenance task
+=========================================
+
+If you want to add a planned maintenance task click the
+``Add planned maintenance task`` button. If you want to see details for a specific
+task or edit it, click the username in the column ``created by``.
+
+You can mark an existing task as finished and see its history by clicking on the
+buttons in the top right corner of the edit page.

{argus_server-2.3.0 → argus_server-2.5.0}/src/argus/auth/factories.py

@@ -16,7 +16,6 @@ class BaseUserFactory(factory.django.DjangoModelFactory):
 
     is_staff = False
     is_superuser = False
-    password = factory.PostGenerationMethodCall("set_password", "defaultpassword")
 
 
 class PersonUserFactory(BaseUserFactory):
@@ -30,6 +29,7 @@ class PersonUserFactory(BaseUserFactory):
         lambda o: "%s.%s@%s" % (o.first_name.lower(), o.last_name.lower(), factory.Faker("safe_domain_name"))
     )
     username = email
+    password = factory.django.Password("very SECRET P455w0rD")
 
 
 class SourceUserFactory(BaseUserFactory):
@@ -40,6 +40,7 @@ class SourceUserFactory(BaseUserFactory):
     username = factory.Sequence(lambda n: "source_%d" % n)
     is_staff = False
     is_superuser = False
+    password = factory.django.Password(None)
 
 
 class AdminUserFactory(PersonUserFactory):

{argus_server-2.3.0 → argus_server-2.5.0}/src/argus/dev/management/commands/create_fake_incident.py

@@ -8,6 +8,7 @@ from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.core.management import CommandError, call_command
 from django.core.management.base import BaseCommand
+from django.db.utils import IntegrityError
 
 from argus.dev.utils import get_json_from_file
 from argus.incident.constants import Level
@@ -125,5 +126,5 @@ class Command(BaseCommand):
 
             try:
                 create_fake_incident(**incident)
-            except (ValueError, ValidationError) as e:
+            except (IntegrityError, ValueError, ValidationError) as e:
                 self.stderr.write(self.style.ERROR(str(e)))

{argus_server-2.3.0 → argus_server-2.5.0}/src/argus/dev/management/commands/create_source.py

@@ -1,6 +1,9 @@
 from django.core.management.base import BaseCommand
+from django.db import transaction
 
+from argus.auth.factories import SourceUserFactory
 from argus.incident.factories import SourceSystemFactory, SourceSystemTypeFactory
+from argus.incident.models import SourceSystem
 
 
 class Command(BaseCommand):
@@ -15,5 +18,9 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         source = options["source"]
         source_type = options.get("source_type") or "argus"
-        sst = SourceSystemTypeFactory(name=source_type.lower())
-        SourceSystemFactory(name=source, type=sst)
+        if SourceSystem.objects.filter(name=source, type__name=source_type).exists():
+            return
+        with transaction.atomic():
+            user = SourceUserFactory(username=source)
+            sst = SourceSystemTypeFactory(name=source_type.lower())
+            SourceSystemFactory(user=user, name=source, type=sst)

{argus_server-2.3.0 → argus_server-2.5.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.5.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.5.0}/src/argus/htmx/context_processors.py

@@ -10,6 +10,7 @@ See django settings for ``TEMPLATES``.
 from django.conf import settings
 
 from . import defaults
+from argus.site.views import get_version
 
 
 def static_paths(request):
@@ -17,8 +18,13 @@ 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),
     }
 
 
 def banner_message(request):
     return {"banner_message": getattr(settings, "BANNER_MESSAGE", None)}
+
+
+def metadata(request):
+    return {"version": get_version()}

{argus_server-2.3.0 → argus_server-2.5.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,