Merge master into staging-next

2021-05-12 00:50:10 +00:00
parent ec97081437 9c19ef7cf2
commit 5a513ae14b
28 changed files with 1171 additions and 374 deletions
@@ -19219,10 +19219,19 @@ in

  miniflux = callPackage ../servers/miniflux { };

-  nagios = callPackage ../servers/monitoring/nagios { };
+  icinga2 = callPackage ../servers/monitoring/icinga2 { };
+
+  icinga2-agent = callPackage ../servers/monitoring/icinga2 {
+    nameSuffix = "-agent";
+    withMysql = false;
+    withNotification = false;
+    withIcingadb = false;
+  };

  munin = callPackage ../servers/monitoring/munin { };

+  nagios = callPackage ../servers/monitoring/nagios { };
+
  monitoring-plugins = callPackage ../servers/monitoring/plugins { };

  inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { })
@@ -30192,7 +30201,8 @@ in
    nix
    nixStable
    nixUnstable
-    nixFlakes;
+    nixFlakes
+    nixExperimental;

  nixStatic = pkgsStatic.nix;