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

diff --git a/modules/private/monitoring/to_objects.nix b/modules/private/monitoring/to_objects.nix
index 5ad76e0..12721d2 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);
@@ -38,7 +38,15 @@ let
     ) v)}
     }
     '';
+  toOtherNoName = keyname: v: ''
+    define ${keyname} {
+    ${builtins.concatStringsSep "\n" (mapAttrsToList (kk: vv:
+      "  ${pad 30 kk}   ${vv}"
+    ) v)}
+    }
+    '';
   toOthers = keyname: a: builtins.concatStringsSep "\n" (mapAttrsToList (toOther keyname) a);
+  toOthersArray = keyname: a: builtins.concatStringsSep "\n" (map (toOtherNoName keyname) a);
 
   toTemplate = keyname: k: v: ''
     define ${keyname} {
@@ -59,8 +67,10 @@ 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 if builtins.elem keyname ["servicedependency"]
+      then toOthersArray keyname v
     else "";
   toObjects = v: builtins.concatStringsSep "\n" (mapAttrsToList toObjects' v);
 in