Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-03-20 18:01:16 +00:00 committed by GitHub
commit 75c28ec351
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 575 additions and 59 deletions

View file

@ -734,6 +734,7 @@
./services/monitoring/nagios.nix
./services/monitoring/netdata.nix
./services/monitoring/parsedmarc.nix
./services/monitoring/prometheus/alertmanager-irc-relay.nix
./services/monitoring/prometheus/alertmanager.nix
./services/monitoring/prometheus/default.nix
./services/monitoring/prometheus/exporters.nix