Merge branch 'master' into alertengine/add-blacklisted-reason-to-aler…

…t-sender

.dockerignore

@@ -7,4 +7,5 @@
 !tools/**/*
 !requirements.txt
 !tests/requirements.txt
+!doc/requirements.txt
 !requirements/**/*

.readthedocs.yaml

@@ -5,10 +5,14 @@ sphinx:
  builder: html
 
 python:
- version: 3.7
  install:
  - requirements: doc/requirements.txt
  - method: pip
  path: .
  extra_requirements:
  - setuptools_scm
+
+build:
+ os: ubuntu-22.04
+ tools:
+ python: "3.7"

CHANGELOG.md

@@ -24,6 +24,11 @@ found in the [HISTORY](HISTORY) file.
 - Show help text instead of error when running `nav` command without arguments ([#2601](https://github.com/Uninett/nav/issues/2601), [#2603](https://github.com/Uninett/nav/pull/2603))
 - Prevent users from entering invalid `sysObjectID` values when editing Netbox types in SeedDB ([#2584](https://github.com/Uninett/nav/pull/2584), [#2566](https://github.com/Uninett/nav/issues/2566))
 - Removed upper version bound for *Pillow* image manipulation library, to fix security warnings ([#2567](https://github.com/Uninett/nav/pull/2567))
+- Alerts that cannot be sent due to blacklisted media plugins will no longer fill up `alertengine.log` every 30 seconds, unless DEBUG level logging is enabled ([#1787](https://github.com/Uninett/nav/issues/1787), [#2652](https://github.com/Uninett/nav/pull/2652))
+- DNS lookups in ipdevinfo are now properly case insensitive ([#2615](https://github.com/Uninett/nav/issues/2615), [#2650](https://github.com/Uninett/nav/pull/2650))
+- Alert Profiles will now properly require Slack alert addresses to be valid URLs ([#2657](https://github.com/Uninett/nav/pull/2657))
+- 5 minute and 15 minute load average values will now be collected correctly for Juniper devices ([#2671](https://github.com/Uninett/nav/issues/2671), [#2672](https://github.com/Uninett/nav/pull/2672))
+- Fix cabling API, which broke due to internal refactorings ([#2621](https://github.com/Uninett/nav/pull/2621))
 - Only install NAV's custom `epollreactor2` in ipdevpoll if running on Linux ([#2503](https://github.com/Uninett/nav/issues/2503), [#2604](https://github.com/Uninett/nav/pull/2604))
  - Stops ipdevpoll from crashing on BSDs.
 

Dockerfile

@@ -86,8 +86,9 @@ COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/nav.conf
 COPY requirements/ /requirements
 COPY requirements.txt /
 COPY tests/requirements.txt /test-requirements.txt
+COPY doc/requirements.txt /doc-requirements.txt
 # Since we used pip3 to install pip globally, pip should now be for Python 3
-RUN pip-compile --resolver=backtracking --output-file /requirements.txt.lock /requirements.txt /test-requirements.txt
+RUN pip-compile --resolver=backtracking --output-file /requirements.txt.lock /requirements.txt /test-requirements.txt /doc-requirements.txt
 RUN pip install -r /requirements.txt.lock
 
 ARG CUSTOM_PIP=ipython

doc/conf.py

@@ -10,7 +10,7 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
+import sphinx_bootstrap_theme
 import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -188,7 +188,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

doc/requirements.txt

@@ -1,2 +1,3 @@
 -r ../requirements/django32.txt
 -r ../requirements/base.txt
+sphinx-bootstrap-theme==0.8.1