argus-server 2.7.0__tar.gz → 2.8.1__tar.gz

argus_server-2.8.1/.claude/hooks/check-test-names.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# PostToolUse hook: check test naming conventions after Edit/Write on test files.
+# Gives Claude feedback (exit 2) so it can fix the names before committing.
+
+INPUT=$(cat)
+FILE_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // empty')
+
+# Only check test files under tests/
+if [[ ! "$FILE_PATH" =~ ^.*/tests/.*\.py$ ]] && [[ ! "$FILE_PATH" =~ ^tests/.*\.py$ ]]; then
+  exit 0
+fi
+
+# Find the project root (where checks/ lives)
+PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$(git rev-parse --show-toplevel 2>/dev/null)}"
+CHECKER="$PROJECT_DIR/checks/check_test_names.py"
+
+if [[ ! -f "$CHECKER" ]]; then
+  exit 0
+fi
+
+# Make file_path relative to project root for the checker
+REL_PATH="${FILE_PATH#"$PROJECT_DIR"/}"
+
+output=$(python3 "$CHECKER" --files "$REL_PATH" 2>&1)
+exit_code=$?
+
+if [[ $exit_code -ne 0 ]]; then
+  echo "$output" >&2
+  exit 2
+fi

argus_server-2.8.1/.claude/settings.json

@@ -0,0 +1,16 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/check-test-names.sh",
+            "timeout": 10
+          }
+        ]
+      }
+    ]
+  }
+}

{argus_server-2.7.0 → argus_server-2.8.1}/.gitignore

@@ -8,6 +8,10 @@
 !.pre-commit-config.yaml
 !.readthedocs.yaml
 !.sonarcloud.properties
+!.claude/
+.claude/*
+!.claude/settings.json
+!.claude/hooks/
 !.mailmap
 
 # local config files
@@ -43,9 +47,12 @@ spasettings.py
 *$py.class
 
 # Tailwind CSS
-# src/argus/htmx/static/styles.css
-# Autogenerated via management command
-# src/argus/htmx/tailwindtheme/tailwind.config.js
+src/argus/htmx/static/styles.css
+src/argus/htmx/tailwindtheme/styles.css
+src/argus/htmx/tailwindtheme/tailwind.css
+src/argus/htmx/tailwindtheme/custom-themes/*
+!src/argus/htmx/tailwindtheme/custom-themes/README.md
+
 # OS specific
 src/argus/htmx/tailwindtheme/tailwindcss
 

{argus_server-2.7.0 → argus_server-2.8.1}/CHANGELOG.md

@@ -8,6 +8,117 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [2.8.1] - 2026-04-28
+
+Mini-release to help something depending on the production docker image.
+
+### Fixed
+
+- Use `django-admin` to call `initial_setup` instead of `python3 manage.py` in
+  production image
+
+
+## [2.8.0] - 2026-03-06
+
+The most important change in this release is that we have finally added the
+long awaited task queue, to handle background tasks. The task queue uses the
+database for storage by default so running migrations is necessary. As part of
+using the queue to send notifications we fixed several bugs that caused a lower
+amount of notifications to be sent than expected. Another big change is we have
+upgraded tailwind, which affects theme customization and building packages.
+
+You *must* see the NOTES before updating if you or your deployment do any of
+the following:
+
+- Send notifications (`SEND_NOTIFICATIONS = True`). Affected both by the new
+  queue and the bug-fixes.
+- Alter any templates or CSS, due to the upgrade of tailwind.
+- Replace or rework the incident list filter box.
+- Write your own media plugins.
+- Build your own package (useful for bundling themes and tweaks). The release
+  checklist has changed.
+
+### Added
+
+- Added support for a task queue. We're using `django-tasks`, which is in the
+  process of being merged into Django proper, with the backend
+  `django-tasks-db`. This stores the tasks in the same database as everything
+  else. We're currently only using the queue to send notifications, so if you
+  are not using argus for that (`SEND_NOTIFICATIONS` is off), nothing changes.
+  ([#1608](https://github.com/Uninett/Argus/issues/1608))
+- Add "Create copy" action for planned maintenance tasks
+  ([#1613](https://github.com/Uninett/Argus/issues/1613))
+- Show name of owner for public filters
+  ([#1748](https://github.com/Uninett/Argus/issues/1748))
+- Add preview of incidents covered by selected filters in planned maintenance
+  task form ([#1765](https://github.com/Uninett/Argus/issues/1765))
+- Create admin user from env variables in docker entrypoint
+  ([#1776](https://github.com/Uninett/Argus/issues/1776))
+- Validate `DAISYUI_THEMES` entries, skipping invalid ones with warnings
+  ([#1819](https://github.com/Uninett/Argus/issues/1819))
+- Add Sikt light and dark DaisyUI themes based on Sikt Design System color
+  tokens ([#1822](https://github.com/Uninett/Argus/issues/1822))
+
+### Changed
+
+- Upgrade to Tailwind CSS v4 and DaisyUI v5. See NOTES for theme customization.
+  ([#1262](https://github.com/Uninett/Argus/issues/1262))
+- We are now using a task queue to send notifications instead of forking off
+  a process. This is to increase robustness and hopefully to increase
+  throughput. If argus is being used to send notifications, you MUST change
+  your deployment as there now is an additional service that needs to run in
+  order to handle the notifications on the queue. See the NOTES!
+  ([#1608](https://github.com/Uninett/Argus/issues/1608))
+- Refactor incident list filter UI with collapsible filterbox and dynamic bulk
+  actions bar. ([#1693](https://github.com/Uninett/Argus/issues/1693))
+- Improve maintenance column by adding a dropdown with tasks that affect the
+  incident ([#1745](https://github.com/Uninett/Argus/issues/1745))
+- Support searching for filters by first and last name of user
+  ([#1764](https://github.com/Uninett/Argus/issues/1764))
+- Added under maintenance column to maintenance column preset
+  ([#1775](https://github.com/Uninett/Argus/issues/1775))
+- Improve timeslot form with compact table layout for time recurrences
+  ([#1794](https://github.com/Uninett/Argus/issues/1794))
+- Consolidate notification routes under /notifications/ with tab navigation
+  ([#1795](https://github.com/Uninett/Argus/issues/1795))
+- Improve notification profile form with collapsible cards and inline actions
+  ([#1796](https://github.com/Uninett/Argus/issues/1796))
+- Moved some functionality from the email media plugin to the base class of all
+  media plugins. Basically, any destination can now be marked as being
+  "managed", which means that it is created and managed by a system outside of
+  an end-users control. This can be for instance email addresses or phone
+  numbers fetched from an account-database or address book.
+  ([#1802](https://github.com/Uninett/Argus/issues/1802))
+- Redesign destination page as flat table with inline editing
+  ([#1806](https://github.com/Uninett/Argus/issues/1806))
+- Tailwind CSS intermediate files (theme CSS, config snippets) are no longer
+  tracked in git. See NOTES.
+  ([#1826](https://github.com/Uninett/Argus/issues/1826))
+- Redesign filter toolbar with compact icon buttons and direct filter actions
+  ([#1831](https://github.com/Uninett/Argus/issues/1831))
+
+### Fixed
+
+- Notifications are now also sent on bulk changes to incidents. Note that for
+  filters used for sending notifications, it will be necessary to control event
+  types to maintain the current expected amount of notifications sent. See
+  NOTES. ([#1763](https://github.com/Uninett/Argus/issues/1763))
+- Limit choices of incidents field in PM admin to open incidents
+  ([#1789](https://github.com/Uninett/Argus/issues/1789))
+- Make it possible to use public filters in notification profiles
+  ([#1805](https://github.com/Uninett/Argus/issues/1805))
+- Fixed a bug where the setting that controls whether notifications will be
+  sent was ignored when sending notifications in the background. The
+  notifications were sent regardless.
+  ([#1808](https://github.com/Uninett/Argus/issues/1808))
+- Allow for multiple notification profiles with no name
+  ([#1828](https://github.com/Uninett/Argus/issues/1828))
+- Fix showing age for stateless incidents
+  ([#1833](https://github.com/Uninett/Argus/issues/1833))
+- Fix theme preview showing wrong foreground text color on color swatches
+  ([#1834](https://github.com/Uninett/Argus/issues/1834))
+
+
 ## [2.7.0] - 2026-01-23
 
 This release improves the UX for creating planned maintenance tasks, by having

{argus_server-2.7.0 → argus_server-2.8.1}/Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean testclean distclean coverageclean cacheclean nuke tailwind docclean upgrade-tailwind tailwind-watch
+.PHONY: clean testclean distclean coverageclean cacheclean nuke setup-tailwind tailwind-config tailwind-build-config tailwind docclean upgrade-tailwind tailwind-watch check-test-names
 
 TAILWINDDIR=src/argus/htmx/tailwindtheme
 STATICDIR=src/argus/htmx/static
@@ -31,11 +31,22 @@ testclean: coverageclean clean
 
 nuke: clean docclean distclean testclean cacheclean
 
+setup-tailwind: upgrade-tailwind tailwind-config tailwind
+
+tailwind-config:
+	PYTHONPATH=$(PYTHONPATH) python3 manage.py tailwind_config
+
+tailwind-build-config:
+	PYTHONPATH=$(PYTHONPATH) python3 src/argus/htmx/tailwindtheme/generate_css_config.py
+
 tailwind:
-	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
+	$(TAILWINDDIR)/tailwindcss -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
 
 tailwind-watch:
-	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css --watch
+	$(TAILWINDDIR)/tailwindcss -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css --watch
 
 upgrade-tailwind:
 	PYTHONPATH=$(PYTHONPATH) python3 src/argus/htmx/tailwindtheme/get_tailwind.py
+
+check-test-names:
+	python3 checks/check_test_names.py --base main

{argus_server-2.7.0 → argus_server-2.8.1}/NOTES.md

@@ -3,6 +3,133 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+## [2.8.0] - 2026-03-06
+
+This release adds an important new dependency, django-tasks-db, which brings
+with it a new table. Remember to freshen installed dependencies, then migrate.
+
+### Sending notifications via a task queue
+
+We are now using a task queue to send notifications instead of forking off
+a process. This is to increase robustness and hopefully to increase throughput.
+If argus is being used to send notifications, you MUST change your deployment
+as there now is an additional service that needs to run in order to handle the
+notifications on the queue.
+
+There is a new management command `db_worker` used to proceess the queue. In
+order to send out notifications, this command needs to run supervised by
+something. The included docker-compose for development already does this, but
+if using for instance Kubernetes it should run in its own pod, and if running
+on hardware it needs to be handled by for instance systemd, supervisor, nosh,
+s6 or daemontools. See the new production section of the documentation.
+
+If your argus sends no or very few notifications, it might be relevant to
+override the settings file to use
+`django_tasks.backends.immediate.ImmediateBackend`, see the site settings
+docs.
+
+### Themes and looks
+
+Tailwind has been upgraded to v4 and DaisyUI to v5. Check out the
+[DaisyUi 5 theme-generator](https://daisyui.com/theme-generator/)!
+
+- Custom themes defined in `DAISYUI_THEMES` must now use CSS variable syntax
+  with explicit `--color-` prefixes (e.g., `"--color-primary": "#006d91"`).
+- The `TAILWIND_THEME_OVERRIDE` setting has been removed. Use CSS `@theme`
+  blocks in a `themes/override.css` file instead.
+
+The Makefile has grown several new commands and the release checklist has been
+updated to take them into account.
+
+See the updated documentation for full details on theme customization.
+
+Tailwind CSS intermediate files (theme CSS, config snippets) are no longer
+tracked in git.
+
+- Local theme customizations via `DAISYUI_THEMES` will no longer dirty the
+  working tree.
+- Use `make tailwind-config tailwind` (needs virtualenv) after changing themes
+  or settings.
+- Use `make setup-tailwind` (needs virtualenv) to bootstrap CSS from scratch
+  (fresh clone or CI).
+
+### Frontend, incident list filter box: templates refactored, looks updated
+
+The work that started in 2.7 continues. The filter box in its hidden state now
+takes up even less space than it used to, and when open it now takes up less
+height. The bulk action bar has been made more dynamic; it is easier to see
+which filter has been selected, and the Delete and Update buttons work on thge
+currently selected fiilter.
+
+If you do not use the filterbox but you do support bulk actions you might have
+to update your templates again.
+
+A reminder:
+
+The template `_incident_list_menubar.html` is deprecated; override
+`_incident_toolbar.html` or `_filter_controls.html` instead.
+
+### All notification plugins now supports "managed" mode
+
+A "managed" destination is not managed by an end-user but fetched/generated
+from somewhere else. Such a destination cannot be deleted.
+
+It used to be only the bundled email media plugin had this functionality, we've
+moved it to the base class and renamed it from "synced" to "managed". This is
+most useful for phone numbers and email addresses.
+
+Media plugins will need to be updated if they override any of the methods
+`validate`, `raise_if_not_deletable` or `update`. Media plugins are now
+instantiated with what API version of the settings-field they should return,
+and for that reason `validate` has become an instance method as opposed to
+a classmethod. `raise_if_not_deletable` and `update` has grown in size on the
+base class and might not need to be overidden anymore.
+
+### More notifications will be generated and sent
+
+Notifications are now also sent on bulk changes to incidents. This means that
+by default there will be notifications if the API alters incidents in bulk, or
+an end user alters incidents in the frontend. This means more notifications,
+and it may mean *a lot more* notifications. One per changed incident.
+
+If you want the full fire hose of notifications site-wide you need do
+nothing.
+
+To maintain a lower amount of notifications it is necessary to alter the "Event
+types" filter to care only about source-initiated changes to the incident
+status.
+
+Note: It might not lower the amount all the way back to the levels before
+this bugfix, as it depends on whether any glue-services used the bulk API to
+alter multiple incidents at once. Previously, notifications for those changes
+would be suppressed.
+
+The easiest and fastest way to get back to lower levels of notifications is by
+changing the Django setting `ARGUS_FALLBACK_FILTER` to:
+
+```
+ARGUS_FALLBACK_FILTER = {"event_types": ["STA", "END"]}
+```
+
+This affects all existing and future notification filters, and can be
+overridden by end-users themselves.
+
+End-users themselves can get back the old, low amount of notifications via the
+frontend by creating a filter with "Event Types" set to both:
+
+- Incident start
+- Incident end
+
+… and adding that to their existing notification profiles. This will override
+what's set in `ARGUS_FALLBACK_FILTER`.
+
+A third option is adding a public filter "Source-initiated status changes" via
+admin and using the admin to add that filter to all notification profiles that
+don't explicitly set event types.
+
+`ARGUS_FALLBACK_FILTER` will not affect what's shown on the dashboard or
+filters used for planned maintenance.
+
 ## [2.7.0] - 2026-01-23
 
 ### Planned maintenance
@@ -50,6 +177,26 @@ of events that happened if the start of the incident was not covered by
 a notification timeslot. This might mean more notifications! Please set the
 `event types` filter to only the types of events desired.
 
+### Incident list filter UI refactoring
+
+The incident list filter UI has been refactored. The tabbed interface with
+"Filter Incidents" and "Update Incidents" tabs has been replaced with:
+
+- A collapsible filterbox (hidden by default, toggled with "Show/Hide filters")
+- A dynamic bulk actions bar that appears when rows are selected
+
+**Template changes for customizers:**
+
+The template `_incident_list_menubar.html` is now **deprecated** and will be
+removed in a future version. It currently acts as a shim that includes the new
+`_incident_toolbar.html` template.
+
+If you have overridden `_incident_list_menubar.html`, your override will still
+be loaded, but you should migrate to the new templates:
+
+- `_incident_toolbar.html`: Contains the full toolbar (filter controls + bulk actions)
+- `_filter_controls.html`: Contains the filter select dropdown, CRUD buttons, and show/hide toggle
+
 ## [2.6.0] - 2026-01-06
 
 This is a tiny release to finish up what was started at the end of 2025.

{argus_server-2.7.0 → argus_server-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.7.0
+Version: 2.8.1
 Summary: Argus is an alert aggregator for monitoring systems
 Project-URL: Homepage, https://github.com/Uninett/Argus
 Author-email: Uninett Opensource <opensource@uninett.no>
@@ -25,6 +25,7 @@ Requires-Dist: django-filter
 Requires-Dist: django-htmx
 Requires-Dist: django-phonenumber-field[phonenumberslite]
 Requires-Dist: django-rest-knox
+Requires-Dist: django-tasks-db
 Requires-Dist: django-widget-tweaks==1.5.0
 Requires-Dist: django<6.1,>=5.2.8
 Requires-Dist: djangorestframework>=3.14
@@ -192,7 +193,7 @@ $ docker compose up
 Run the initial Argus setup, and make note of the admin password that is generated:
 
 ```console
-$ docker compose exec api django-admin initial_setup
+$ docker compose exec argus django-admin initial_setup
 ******************************************************************************
 
   Created Argus superuser "admin" with password "ns6bfoKquW12koIP".

{argus_server-2.7.0 → argus_server-2.8.1}/README.md

@@ -132,7 +132,7 @@ $ docker compose up
 Run the initial Argus setup, and make note of the admin password that is generated:
 
 ```console
-$ docker compose exec api django-admin initial_setup
+$ docker compose exec argus django-admin initial_setup
 ******************************************************************************
 
   Created Argus superuser "admin" with password "ns6bfoKquW12koIP".

argus_server-2.8.1/checks/check_test_names.py

@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+"""Check that new test method names follow the given/when/then/it_should convention.
+
+Scans git diff for newly added test methods and warns if they lack
+convention keywords (given, when, then, should).
+
+Usage:
+    # Check staged changes (pre-commit)
+    python checks/check_test_names.py
+
+    # Check branch diff against main
+    python checks/check_test_names.py --base main
+
+    # Check specific files
+    python checks/check_test_names.py --files tests/test_foo.py tests/test_bar.py
+"""
+
+import argparse
+import re
+import subprocess
+import sys
+
+KEYWORDS = {"given", "when", "then"}
+PHRASE_KEYWORDS = {"it_should"}
+TEST_DEF_RE = re.compile(r"^\+\s*def (test_\w+)\(")
+TEST_FILE_RE = re.compile(r"^tests/.*\.py$")
+
+# Matches: +++ b/tests/some/path.py
+DIFF_FILE_RE = re.compile(r"^\+\+\+ b/(.+)$")
+
+
+def get_new_test_names_from_diff(diff: str) -> list[tuple[str, str]]:
+    """Extract (filename, test_name) pairs from added lines in a diff."""
+    results = []
+    current_file = None
+
+    for line in diff.splitlines():
+        file_match = DIFF_FILE_RE.match(line)
+        if file_match:
+            path = file_match.group(1)
+            current_file = path if TEST_FILE_RE.match(path) else None
+            continue
+
+        if current_file is None:
+            continue
+
+        test_match = TEST_DEF_RE.match(line)
+        if test_match:
+            results.append((current_file, test_match.group(1)))
+
+    return results
+
+
+def check_name(name: str) -> bool:
+    """Return True if the test name contains at least one convention keyword."""
+    lower = name.lower()
+    parts = set(lower.split("_"))
+    if parts & KEYWORDS:
+        return True
+    return any(phrase in lower for phrase in PHRASE_KEYWORDS)
+
+
+def get_diff_staged() -> str:
+    result = subprocess.run(
+        ["git", "diff", "--cached", "--unified=0"],
+        capture_output=True,
+        text=True,
+    )
+    return result.stdout
+
+
+def get_diff_base(base: str) -> str:
+    merge_base = subprocess.run(
+        ["git", "merge-base", base, "HEAD"],
+        capture_output=True,
+        text=True,
+    )
+    base_ref = merge_base.stdout.strip()
+    if not base_ref:
+        print(f"Could not find merge base with {base}", file=sys.stderr)
+        sys.exit(2)
+
+    result = subprocess.run(
+        ["git", "diff", base_ref, "HEAD", "--unified=0"],
+        capture_output=True,
+        text=True,
+    )
+    return result.stdout
+
+
+def get_diff_files(files: list[str]) -> str:
+    """Read files and pretend all test defs are new (for checking specific files)."""
+    lines = []
+    for path in files:
+        if not TEST_FILE_RE.match(path):
+            continue
+        lines.append(f"+++ b/{path}")
+        try:
+            with open(path) as f:
+                for line in f:
+                    stripped = line.rstrip()
+                    if re.match(r"\s*def test_\w+\(", stripped):
+                        lines.append(f"+{stripped}")
+        except FileNotFoundError:
+            print(f"File not found: {path}", file=sys.stderr)
+    return "\n".join(lines)
+
+
+def format_plain(violations, total):
+    lines = [
+        f"{len(violations)} of {total} new test name(s) missing convention keywords (given/when/then/it_should):\n"
+    ]
+    for filepath, name in violations:
+        lines.append(f"  {filepath}: {name}")
+    lines.append(
+        "\nConsider rephrasing with given/when/then/it_should, e.g.:"
+        "\n  test_when_no_incidents_then_returns_empty_list"
+        "\n  test_it_should_create_incident_with_set_description"
+        "\n  test_given_expired_token_when_refreshing_then_raises_error"
+    )
+    return "\n".join(lines)
+
+
+def format_markdown(violations, total):
+    lines = [
+        "> [!WARNING]",
+        f"> **{len(violations)}** of **{total}** new test names are missing"
+        " convention keywords (`given`/`when`/`then`/`it_should`)",
+        "",
+        "| File | Test name |",
+        "|------|-----------|",
+    ]
+    for filepath, name in violations:
+        lines.append(f"| `{filepath}` | `{name}` |")
+    lines.extend(
+        [
+            "",
+            "<details>",
+            "<summary>Why am I seeing this?</summary>",
+            "",
+            "Test names should follow a loose **given/when/then** pattern with"
+            " keywords like `given`, `when`, `then`, or `it_should`."
+            " This is a suggestion, not a blocker."
+            " The check runs on new test methods added in this PR.",
+            "",
+            "Examples:",
+            "- `test_when_no_incidents_then_returns_empty_list`",
+            "- `test_it_should_create_incident_with_set_description`",
+            "- `test_given_expired_token_when_refreshing_then_raises_error`",
+            "</details>",
+        ]
+    )
+    return "\n".join(lines)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "--base",
+        help="Base branch to diff against (e.g. main). If omitted, checks staged changes.",
+    )
+    parser.add_argument(
+        "--files",
+        nargs="+",
+        help="Check all test names in specific files (ignores git diff).",
+    )
+    parser.add_argument(
+        "--format",
+        choices=["plain", "markdown"],
+        default="plain",
+        dest="output_format",
+        help="Output format (default: plain).",
+    )
+    args = parser.parse_args()
+
+    if args.files:
+        diff = get_diff_files(args.files)
+    elif args.base:
+        diff = get_diff_base(args.base)
+    else:
+        diff = get_diff_staged()
+
+    new_tests = get_new_test_names_from_diff(diff)
+
+    if not new_tests:
+        return
+
+    violations = [(f, name) for f, name in new_tests if not check_name(name)]
+
+    if not violations:
+        print(f"All {len(new_tests)} new test name(s) follow the naming convention.")
+        return
+
+    formatter = format_markdown if args.output_format == "markdown" else format_plain
+    print(formatter(violations, len(new_tests)))
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

{argus_server-2.7.0 → argus_server-2.8.1}/codecov.yml

@@ -13,6 +13,7 @@ ignore:
   - "tests/**"
   - "src/argus/site/settings/**"
   - "src/argus/spa/dataporten/social.py"
+  - "src/argus/htmx/tailwindtheme/*.py"
   - "**/apps.py"
   - "**/wsgi.py"
   - "**/test*.py"

{argus_server-2.7.0 → argus_server-2.8.1}/docker/Dockerfile

@@ -36,6 +36,8 @@ ENV DJANGO_SETTINGS_MODULE=dockersettings
 
 ENV PORT=8000
 EXPOSE 8000
-COPY docker/docker-entrypoint.sh /api-entrypoint.sh
+COPY docker/cmd-argus.sh /cmd-argus.sh
+COPY docker/cmd-dbqueue.sh /cmd-dbqueue.sh
 USER argus
-ENTRYPOINT ["/usr/bin/tini", "-v", "--", "/api-entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "-v", "--"]
+CMD ["/cmd-argus.sh"]

{argus_server-2.7.0 → argus_server-2.8.1}/docker/README.md

@@ -18,6 +18,17 @@ Or, from the top level directory:
 docker build -t argus -f docker/Dockerfile .
 ```
 
+## Services
+
+While this image provides the necessary environment for the backend processes,
+it defaults to running only the argus server itself (via `cmd-argus.sh`). In
+addition to an argus container, a second container is needed to process
+notifications asynchronously. The second container needs to run from this same
+image, but with the command overridden to `cmd-dbqueue.sh`
+
+The "db_worker" command used in that script comes from django-tasks, and is
+used to process a message queue of tasks to complete in the background.
+
 ## Configuration of the running container
 
 This image runs with default production settings, with a few tweaks from