Squash changes containing private information

[perso/Immae/Config/Nix.git] / flakes / private / monitoring / to_objects.nix

diff --git a/modules/private/monitoring/to_objects.nix b/flakes/private/monitoring/to_objects.nix
similarity index 88%
rename from modules/private/monitoring/to_objects.nix
rename to flakes/private/monitoring/to_objects.nix
index 12721d2ff6015a5bc08e51c687c494f9befcb530..57a71ade82a3414f537e72ffbe1f3d3baa3419df 100644 (file)
--- a/modules/private/monitoring/to_objects.nix
+++ b/flakes/private/monitoring/to_objects.nix
@@ -11,13 +11,13 @@ let
   toStr = k: v:
     if k == "check_command" && builtins.isList v
     then builtins.concatStringsSep "!" v
-    else v;
+    else builtins.toString v;
 
   toService = service: ''
     define service {
     ${builtins.concatStringsSep "\n" (mapAttrsToList (k: v:
       "  ${pad 30 k}   ${toStr k v}"
-    ) (filterAttrs (k: v: ! builtins.elem k ["passiveInfo" "filter"]) service))}
+    ) (filterAttrs (k: v: ! hasPrefix "__passive_" k) service))}
     }
     '';
   toServices = services: builtins.concatStringsSep "\n" (map toService services);
@@ -53,7 +53,7 @@ let
       ${pad 30 "name"}   ${k}
       ${pad 30 "register"}   0
     ${builtins.concatStringsSep "\n" (mapAttrsToList (kk: vv:
-      "  ${pad 30 kk}   ${vv}"
+      "  ${pad 30 kk}   ${builtins.toString vv}"
     ) v)}
     }
     '';
@@ -69,9 +69,9 @@ let
       then toTemplates v
     else if builtins.elem keyname ["hostgroup" "host" "contactgroup" "contact" "timeperiod" "servicegroup"]
       then toOthers keyname v
-    else if builtins.elem keyname ["servicedependency"]
+    else if builtins.elem keyname ["servicedependency" "hostdependency"]
       then toOthersArray keyname v
-    else "";
+    else builtins.trace ("Warning: unknown object type " + keyname) "";
   toObjects = v: builtins.concatStringsSep "\n" (mapAttrsToList toObjects' v);
 in
   toObjects