X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fmonitoring%2Fto_objects.nix;h=7b4b5233b0774dd99eb240d01aa2a67b13a1b23c;hp=5ad76e042b1074c553e0cbe29d0ae1d3a3013525;hb=e820134d38c3b7470ea5112f40a6dc967f039878;hpb=b22ce4895ef1e9723a02061f7293e528cfbf9754

diff --git a/modules/private/monitoring/to_objects.nix b/modules/private/monitoring/to_objects.nix
index 5ad76e0..7b4b523 100644
--- a/modules/private/monitoring/to_objects.nix
+++ b/modules/private/monitoring/to_objects.nix
@@ -17,7 +17,7 @@ let
     define service {
     ${builtins.concatStringsSep "\n" (mapAttrsToList (k: v:
       "  ${pad 30 k}   ${toStr k v}"
-    ) service)}
+    ) (filterAttrs (k: v: ! builtins.elem k ["passiveInfo" "filter"]) service))}
     }
     '';
   toServices = services: builtins.concatStringsSep "\n" (map toService services);
@@ -59,7 +59,7 @@ let
       then toCommands v
     else if keyname == "templates"
       then toTemplates v
-    else if builtins.elem keyname ["host" "contactgroup" "contact" "timeperiod"]
+    else if builtins.elem keyname ["hostgroup" "host" "contactgroup" "contact" "timeperiod" "servicegroup"]
       then toOthers keyname v
     else "";
   toObjects = v: builtins.concatStringsSep "\n" (mapAttrsToList toObjects' v);