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

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

@@ -8,6 +8,22 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [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.1}/NOTES.md

@@ -4,6 +4,11 @@ This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
 
+## [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
 
 It is no longer necessary to install the frontend with `pip install

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.2.0
+Version: 2.2.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>
@@ -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.1}/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.1}/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.1}/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.1}/requirements-django52.txt

@@ -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.6
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)

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

@@ -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.6
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)

{argus_server-2.2.0 → argus_server-2.2.1}/src/argus/htmx/templates/htmx/user/_incidents_table_layout_dropdown.html

@@ -4,12 +4,12 @@
     <span class="badge badge-primary">{{ preferences.argus_htmx.incidents_table_layout }}</span>
   </summary>
   <ul class="max-h-64 overflow-y-scroll">
-    {% for item in preferences_choices.argus_htmx.incidents_table_layout %}
+    {% for layout, layout_name in preferences_choices.argus_htmx.incidents_table_layout %}
       <li>
         <input type="radio"
                class="btn btn-sm btn-block btn-ghost justify-start"
-               value="{{ item }}"
-               aria-label="{{ item }}"
+               value="{{ layout }}"
+               aria-label="{{ layout_name }}"
                name="incidents_table_layout"
                autocomplete="off"
                hx-post="{% url 'htmx:update-preferences' namespace='argus_htmx' %}"

argus_server-2.2.1/src/argus/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.1"

argus_server-2.2.0/src/argus/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.0"