argus-server 2.2.0__tar.gz → 2.2.2__tar.gz

{argus_server-2.2.0 → argus_server-2.2.2}/CHANGELOG.md

@@ -8,6 +8,44 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [2.2.2] - 2025-11-03
+
+### Added
+
+- Added the beginnings of a style guide at /styleguide/. The look of the form
+  inputs that were not manually laid out have in some cases also changed, for
+  greater consistency. ([#1558](https://github.com/Uninett/Argus/issues/1558))
+- Added `zino-argus-glue` to documented list of known glue services
+
+### Changed
+
+- Increased logging verbosity when finding destinations for notifications and
+  actually sending the notifications, to aid in debugging production systems.
+  Now also logs which destination id's are found and used.
+  ([#1563](https://github.com/Uninett/Argus/issues/1563))
+
+### Fixed
+
+- The development docker compose had stopped working due to changes outside of
+  our control (pip, git, the very distro) and has been updated.
+
+
+## [2.2.1] - 2025-09-18
+
+### Fixed, frontend
+
+* The incident list layout preference selector is no longer buggy
+
+### Fixed
+
+* Some problems with the dockerfile for production was fixed (see /docker), and
+  the README and the comments in the Dockerfile have been improved
+
+### Changed
+
+* Updated the installation instructions in the README, should have ben part of
+  2.2.0
+
 ## [2.2.0] - 2025-08-26
 
 The most important bit of this release is the new (old) way to install and set

{argus_server-2.2.0 → argus_server-2.2.2}/Dockerfile

@@ -1,15 +1,19 @@
 # This Dockerfile is designed to run a development environment for Argus,
 # with the Argus source code tree mounted at /argus
 #
-FROM python:3.12
+FROM python:3.13-trixie
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends tini \
-    build-essential libpq-dev libffi-dev libssl-dev
+    build-essential libpq-dev libffi-dev libssl-dev git
 RUN mkdir -p /argus
 COPY requirements.txt /argus
 COPY requirements/*.txt /argus/requirements/
 
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
 WORKDIR /argus
 RUN pip install gunicorn -r requirements.txt -r /argus/requirements/dev.txt
 

{argus_server-2.2.0 → argus_server-2.2.2}/Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean testclean distclean coverageclean cacheclean nuke tailwind docclean upgrade-tailwind
+.PHONY: clean testclean distclean coverageclean cacheclean nuke tailwind docclean upgrade-tailwind tailwind-watch
 
 TAILWINDDIR=src/argus/htmx/tailwindtheme
 STATICDIR=src/argus/htmx/static
@@ -32,7 +32,10 @@ testclean: coverageclean clean
 nuke: clean docclean distclean testclean cacheclean
 
 tailwind:
-	tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
+	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -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
 
 upgrade-tailwind:
 	PYTHONPATH=$(PYTHONPATH) python3 src/argus/htmx/tailwindtheme/get_tailwind.py

{argus_server-2.2.0 → argus_server-2.2.2}/NOTES.md

@@ -3,6 +3,21 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+## [2.2.2] - 2025-11-03
+
+To aid in development there a live styleguide for the frontend on
+`/styleguide`.
+
+Logging verbosity has increased for sending notifications.
+
+Otherwise: typos have been fixed, a new glue service has been added to the
+documentation, the development docker-compose setup should be working again.
+
+
+## [2.2.1] - 2025-09-18
+
+A bug in the user preference added in 2.1.0 was fixed, otherwise this is just
+a polish this, document that, upgrade some dependencies release.
 
 ## [2.2.0] - 2025-08-26
 

{argus_server-2.2.0 → argus_server-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.2.0
+Version: 2.2.2
 Summary: Argus is an alert aggregator for monitoring systems
 Project-URL: Homepage, https://github.com/Uninett/Argus
 Author-email: Uninett Opensource <opensource@uninett.no>
@@ -105,40 +105,35 @@ There are several ways to install Argus.
 * Docker and Docker Compose to run Argus in Docker. This will also run
   a PostgreSQL server for you.
 
-#### Optional: Frontend
-
-You need to have the frontend-specific dependencies installed.
-
-```
-pip install argus-server[htmx]
-```
-
-will do it.
-
 #### Optional: Federated login for frontend
 
 See [Federated Login @ Read The Docs](https://argus-server.rtfd.io/en/latest/development/howtos/federated-logins.html) or [local copy of Federated Login docs](docs/development/howtos/federated-logins.rst).
 
-### Install Argus using pip
+### Install Argus using pip from PyPI
 
-You can also install Argus with `pip` via PyPI. The package name is `argus-server`:
+You can install Argus with `pip` via PyPI. The package name is `argus-server`:
 ```console
 $ pip install argus-server
 ```
 
-If you are using the PyPI package in production, please note: The file
-`requirements.txt` contains the pinned versions of dependencies that the
-release was tested on. The file `constraints.txt` is for controlling versions
-of sub-dependencies so as to not poison the pyproject.toml.
+If you are using the PyPI wheel package in production, please note: It does
+not use pinned dependencies. (There is no single official standard for pinned
+dependencies in Python as of yet.)
 
-To update the dependency lock-files, use `tox`:
+### Install Argus from source
 
+Download the source code first.
 ```console
-$ pip install "tox>=4"
-$ tox run -e upgrade-deps -- -U
+$ git clone https://github.com/Uninett/Argus.git
+$ cd Argus
 ```
 
-To upgrade a single dependency, replace the `-U` flag with `-P PACKAGENAME`.
+PyPI has sdists of the source if you do not want to use git.
+
+The file `requirements.txt` contains the pinned versions of dependencies that
+the release was tested on. The file `constraints.txt` is for controlling
+versions of sub-dependencies so as to not poison the pyproject.toml. The wheel
+package does not contain either of these two files.
 
 To install from the lock-file use pip:
 
@@ -146,6 +141,8 @@ To install from the lock-file use pip:
 $ pip install -c constraints.txt --upgrade -r requirements.txt
 ```
 
+### First run
+
 Now change and adapt [Argus' settings](#settings-in-argus) according to your needs.
 
 Run the initial Argus setup, and make note of the admin password that is generated:
@@ -167,6 +164,17 @@ Then run the Argus API server:
 $ python manage.py runserver
 ```
 
+#### Update pinned dependencies
+
+To update the dependency lock-files, use `tox`:
+
+```console
+$ pip install "tox>=4"
+$ tox run -e upgrade-deps -- -U
+```
+
+To upgrade a single dependency, replace the `-U` flag with `-P PACKAGENAME`.
+
 ### Setup Argus using Docker Compose
 
 Download the source code first.
@@ -222,7 +230,7 @@ $ git clone https://github.com/Uninett/Argus.git
 $ cd Argus
 ```
 
-We recommend using virtualenv or virtaulenvwrapper to create
+We recommend using virtualenv or virtualenvwrapper to create
 a place to stash Argus' dependencies.
 
 Create and activate a Python virtual environment.

{argus_server-2.2.0 → argus_server-2.2.2}/README.md

@@ -46,40 +46,35 @@ There are several ways to install Argus.
 * Docker and Docker Compose to run Argus in Docker. This will also run
   a PostgreSQL server for you.
 
-#### Optional: Frontend
-
-You need to have the frontend-specific dependencies installed.
-
-```
-pip install argus-server[htmx]
-```
-
-will do it.
-
 #### Optional: Federated login for frontend
 
 See [Federated Login @ Read The Docs](https://argus-server.rtfd.io/en/latest/development/howtos/federated-logins.html) or [local copy of Federated Login docs](docs/development/howtos/federated-logins.rst).
 
-### Install Argus using pip
+### Install Argus using pip from PyPI
 
-You can also install Argus with `pip` via PyPI. The package name is `argus-server`:
+You can install Argus with `pip` via PyPI. The package name is `argus-server`:
 ```console
 $ pip install argus-server
 ```
 
-If you are using the PyPI package in production, please note: The file
-`requirements.txt` contains the pinned versions of dependencies that the
-release was tested on. The file `constraints.txt` is for controlling versions
-of sub-dependencies so as to not poison the pyproject.toml.
+If you are using the PyPI wheel package in production, please note: It does
+not use pinned dependencies. (There is no single official standard for pinned
+dependencies in Python as of yet.)
 
-To update the dependency lock-files, use `tox`:
+### Install Argus from source
 
+Download the source code first.
 ```console
-$ pip install "tox>=4"
-$ tox run -e upgrade-deps -- -U
+$ git clone https://github.com/Uninett/Argus.git
+$ cd Argus
 ```
 
-To upgrade a single dependency, replace the `-U` flag with `-P PACKAGENAME`.
+PyPI has sdists of the source if you do not want to use git.
+
+The file `requirements.txt` contains the pinned versions of dependencies that
+the release was tested on. The file `constraints.txt` is for controlling
+versions of sub-dependencies so as to not poison the pyproject.toml. The wheel
+package does not contain either of these two files.
 
 To install from the lock-file use pip:
 
@@ -87,6 +82,8 @@ To install from the lock-file use pip:
 $ pip install -c constraints.txt --upgrade -r requirements.txt
 ```
 
+### First run
+
 Now change and adapt [Argus' settings](#settings-in-argus) according to your needs.
 
 Run the initial Argus setup, and make note of the admin password that is generated:
@@ -108,6 +105,17 @@ Then run the Argus API server:
 $ python manage.py runserver
 ```
 
+#### Update pinned dependencies
+
+To update the dependency lock-files, use `tox`:
+
+```console
+$ pip install "tox>=4"
+$ tox run -e upgrade-deps -- -U
+```
+
+To upgrade a single dependency, replace the `-U` flag with `-P PACKAGENAME`.
+
 ### Setup Argus using Docker Compose
 
 Download the source code first.
@@ -163,7 +171,7 @@ $ git clone https://github.com/Uninett/Argus.git
 $ cd Argus
 ```
 
-We recommend using virtualenv or virtaulenvwrapper to create
+We recommend using virtualenv or virtualenvwrapper to create
 a place to stash Argus' dependencies.
 
 Create and activate a Python virtual environment.

{argus_server-2.2.0 → argus_server-2.2.2}/docker/Dockerfile

@@ -2,16 +2,20 @@
 # Needs the repository root directory as its context:
 #
 # If you're in the same dorectory as this Dockerfile try:
-#   docker build ..
+#   docker build -f Dockerfile ..
 #
 # If you're in the repository root try:
 #   docker build -f docker/Dockerfile .
 
-FROM python:3.12
+FROM python:3.13-trixie
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends tini build-essential
 
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
 # Install some dev requirements that aren't part of the minimal dependencies:
 RUN pip install psycopg2-binary django-extensions python-dotenv gunicorn
 

{argus_server-2.2.0 → argus_server-2.2.2}/docker/README.md

@@ -21,10 +21,23 @@ docker build -t argus -f docker/Dockerfile .
 ## Configuration of the running container
 
 This image runs with default production settings, with a few tweaks from
-[dockersettings.py](dockersettings.py). This means that the most useful
-settings can be overriden through the use of environment variables exported to
-the container.  Consult the documentation section on [site-specific
+[dockersettings.py](dockersettings.py). The most useful settings can be
+overriden through the use of environment variables exported to the container,
+but some MUST be set.
+
+The required environment variables in question are:
+
+* `ARGUS_FRONTEND_URL` (url)
+* `DATABASE_URL` (example: postgresql://argus:PASSWORD@HOST.NAME:5432/argus)
+* `DEFAULT_FROM_EMAIL` (email address)
+* `EMAIL_HOST` (hostname or ip address)
+* `SECRET_KEY` (long random string, around 50 characters is good)
+
+The `SECRET_KEY` and `DATABASE_URL` should be protected from prying eyes.
+
+Consult the documentation section on [site-specific
 settings](http://argus-server.rtfd.io/en/latest/site-specific-settings.html).
+for further details.
 
 ## Limitations
 

{argus_server-2.2.0 → argus_server-2.2.2}/docs/development/howtos/howtos-for-github.rst

@@ -23,4 +23,4 @@ magic address GitHub provides for you, then you need to toggle "Keep my email
 addresses private" on the same page to "On". You can even prevent commits not
 using the magic address from being pushed to GitHub.
 
-See `Setting your commit email address at GitHub<https://docs.github.com/en/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address>`_ for more information.
+See `Setting your commit email address at GitHub <https://docs.github.com/en/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address>`_ for more information.

argus_server-2.2.2/docs/development/styleguide.rst

@@ -0,0 +1,23 @@
+============================
+Style guide for web frontend
+============================
+
+There's a live style guide on ``/styleguide/``. It contains a live form so that
+you can experiment with form input to see what a valid and invalid form looks
+like.
+
+The live style guide is not complete, and not fully implemented into the site
+yet. If you are looking for low hanging fruit:
+
+* The headers (h1-h3) needs to be styled as per the style guide.
+* The cards (all pages except the incident list and preferences page) should
+  look the same.
+* There should be no preferences directly in the user menu drop down.
+* There should be no use of the class "border-b" anywhere.
+
+More work is involved in making sure all form fields use the style guide
+designs for inputs/labels. Another larger task is issue #1557:
+`Restyling the preferences page <https://github.com/Uninett/Argus/issues/1557>`_.
+
+See also issue #1519:
+`Add styleguide <https://github.com/Uninett/Argus/issues/1519>`_.

{argus_server-2.2.0 → argus_server-2.2.2}/docs/development.rst

@@ -9,4 +9,5 @@ Development
    development/management-commands
    development/makefile-rules
    development/howtos
+   development/styleguide
    development/troubleshooting

{argus_server-2.2.0 → argus_server-2.2.2}/docs/integrations/glue-services/index.rst

@@ -33,6 +33,17 @@ Network Administration Visualized
 This is an extension of NAV, runs on the same server, and uses the NAV config
 files.
 
+Zino
+~~~~
+
+| Home: https://nordu.net/zino/
+| Source: https://github.com/Uninett/zino-argus-glue
+| PyPI: `zino-argus-glue <https://pypi.org/project/zino-argus-glue/>`_
+
+This is a standalone process that connects to both the Zino and Argus APIs and
+exchanges/synchronizes information between them.
+
+
 Mist Systems Administration (Juniper)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

{argus_server-2.2.0 → argus_server-2.2.2}/pyproject.toml

@@ -80,7 +80,12 @@ artifacts = ["src/argus/version.py"]
 packages = ["src/argus"]
 
 [tool.hatch.build.targets.sdist]
-exclude = ["/.github"]
+exclude = [
+    "/.github",
+    "/*.json",
+    "/*.py",
+    "/*.sh",
+]
 
 [tool.versioningit.write]
 file = "src/argus/version.py"

{argus_server-2.2.0 → argus_server-2.2.2}/requirements-django52.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --extra=htmx --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
+#    pip-compile --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.2
+django==5.2.7
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)
@@ -139,7 +139,7 @@ rpds-py==0.25.1
     #   referencing
 sniffio==1.3.1
     # via anyio
-social-auth-app-django==5.4.3
+social-auth-app-django==5.6.0
     # via argus-server (pyproject.toml)
 social-auth-core==4.6.1
     # via

{argus_server-2.2.0 → argus_server-2.2.2}/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --extra=htmx --output-file=requirements.txt constraints.txt pyproject.toml requirements/django52.txt
+#    pip-compile --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.2
+django==5.2.7
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)
@@ -139,7 +139,7 @@ rpds-py==0.25.1
     #   referencing
 sniffio==1.3.1
     # via anyio
-social-auth-app-django==5.4.3
+social-auth-app-django==5.6.0
     # via argus-server (pyproject.toml)
 social-auth-core==4.6.1
     # via

argus_server-2.2.2/src/argus/htmx/forms.py

@@ -0,0 +1,73 @@
+from django import forms
+from django.core.exceptions import ValidationError
+
+
+__all__ = ["StyleGuideForm"]
+
+
+class _ArgusBaseForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("label_suffix", "")
+        super().__init__(*args, **kwargs)
+
+
+# Turn off colons EVERYWHERE
+forms.Form = _ArgusBaseForm
+
+
+class StyleGuideForm(forms.Form):
+    ERROR_INPUT = "MXZ"
+    _choices = ("S", "Medium", "Loooooooong", "Multi word long choice")
+    CHOICES = tuple(enumerate(_choices, 1))
+
+    # field variations:
+    required = forms.CharField(required=True)
+    help_text = forms.CharField(
+        required=False, help_text="This is the help text for a specific field, should always be shown"
+    )
+    error = forms.CharField(required=True)
+
+    # field types:
+    input_ = forms.CharField(label="Input", required=False)
+    password = forms.Field(required=False, widget=forms.PasswordInput)
+    number = forms.IntegerField(required=False)
+    date = forms.DateField(required=False)
+    datetime = forms.DateTimeField(required=False)
+    time = forms.TimeField(required=False)
+    email = forms.EmailField(required=False)
+    url = forms.URLField(required=False)
+    checkbox = forms.BooleanField(required=False)
+    select = forms.ChoiceField(required=False, choices=CHOICES)
+    checkbox_select = forms.ChoiceField(
+        required=False,
+        choices=CHOICES,
+        widget=forms.CheckboxSelectMultiple,
+    )
+    radio_select = forms.ChoiceField(
+        required=False,
+        choices=CHOICES,
+        widget=forms.RadioSelect,
+    )
+
+    # special field types:
+    # level as range
+    # typeahead
+    # ..
+
+    def clean_error(self):
+        input = self.cleaned_data.get("error", "")
+        if input != self.ERROR_INPUT:
+            raise ValidationError(
+                'This field only accepts "%(correct)s" as a value',
+                params={"correct": self.ERROR_INPUT},
+                code="invalid",
+            )
+        return input
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if not (cleaned_data.get("error", None) and cleaned_data.get("required", None)):
+            raise ValidationError(
+                'Both of the fields "required" and "error" needs to be filled and valid',
+                code="invalid",
+            )

{argus_server-2.2.0 → argus_server-2.2.2}/src/argus/htmx/incident/filter.py

@@ -13,18 +13,22 @@ filter_backend = get_filter_backend()
 QuerySetFilter = filter_backend.QuerySetFilter
 
 
+class RangeInput(forms.NumberInput):
+    template_name = "django/forms/widgets/range.html"
+
+
 class IncidentFilterForm(forms.Form):
     open = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={"type": "range", "step": "1", "min": min(OpenStatus).value, "max": max(OpenStatus).value}
+        widget=RangeInput(
+            attrs={"class": "range-primary", "step": "1", "min": min(OpenStatus).value, "max": max(OpenStatus).value}
         ),
         label="Open State",
         initial=OpenStatus.BOTH.value,
         required=False,
     )
     acked = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={"type": "range", "step": "1", "min": min(AckedStatus).value, "max": max(AckedStatus).value}
+        widget=RangeInput(
+            attrs={"class": "range-primary", "step": "1", "min": min(AckedStatus).value, "max": max(AckedStatus).value}
         ),
         label="Acked",
         initial=AckedStatus.BOTH.value,
@@ -42,7 +46,7 @@ class IncidentFilterForm(forms.Form):
         widget=forms.TextInput(
             attrs={
                 "placeholder": "key=value, ...",
-                "class": "input input-primary input-bordered input-sm overflow-y-auto min-h-8 h-auto max-h-16 max-w-xs leading-tight",
+                "class": "input-primary input-sm overflow-y-auto min-h-8 h-auto max-h-16 max-w-xs leading-tight",
             }
         ),
         required=False,
@@ -50,8 +54,8 @@ class IncidentFilterForm(forms.Form):
         help_text='Press "Enter" after each completed tag',
     )
     maxlevel = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={"type": "range", "step": "1", "min": min(Level).value, "max": max(Level).value}
+        widget=RangeInput(
+            attrs={"class": "range-primary", "step": "1", "min": min(Level).value, "max": max(Level).value}
         ),
         label="Level <=",
         initial=max(Level).value,

{argus_server-2.2.0 → argus_server-2.2.2}/src/argus/htmx/incident/forms.py

@@ -38,7 +38,7 @@ class TimeframeForm(forms.Form):
         initial=TIMEFRAME_DEFAULT,
         widget=forms.Select(
             attrs={
-                "class": "select select-xs bg-transparent text-base border-none -ml-2",
+                "class": "border-none select-xs bg-transparent text-base -ml-2",
                 "autocomplete": "off",
                 "hx-get": ".",
                 "hx-trigger": "change",