Merge pull request #141 from Icinga:feature/update_configuration_with…

…_dsl_upgrades

Updates config to apply new array DSL parser

Update Icinga Director and Icinga 2 conf files with new DSL parser for array elements to properly escape string values with single quotes.

config/director/Invoke-IcingaCheckFirewall.json

@@ -1 +1 @@
-{"DataList":{"IcingaCheckFirewall Verbosity":{"list_name":"IcingaCheckFirewall Verbosity","originalId":"2","entries":[{"allowed_roles":null,"entry_value":"0","entry_name":"0","format":"string"},{"allowed_roles":null,"entry_value":"1","entry_name":"1","format":"string"},{"allowed_roles":null,"entry_value":"2","entry_name":"2","format":"string"},{"allowed_roles":null,"entry_value":"3","entry_name":"3","format":"string"}],"owner":"stein"}},"Command":{"Invoke-IcingaCheckFirewall":{"fields":[{"datafield_id":2,"is_required":"n","var_filter":null},{"datafield_id":3,"is_required":"n","var_filter":null},{"datafield_id":4,"is_required":"n","var_filter":null},{"datafield_id":5,"is_required":"n","var_filter":null}],"object_name":"Invoke-IcingaCheckFirewall","arguments":{"-Verbosity":{"value":"$IcingaCheckFirewall_Int32_Verbosity$","order":"3"},"-C":{"value":"try { Use-Icinga -Minimal; } catch { Write-Output \u0027The Icinga PowerShell Framework is either not installed on the system or not configured properly. Please check https://icinga.com/docs/windows for further details\u0027; exit 3; }; Exit-IcingaExecutePlugin -Command \u0027Invoke-IcingaCheckFirewall\u0027 ","order":"0"},"-Profile":{"value":{"body":"var arr = macro(\"$IcingaCheckFirewall_Array_Profile$\");\r\nif (len(arr) == 0) {\r\nreturn \"@()\";\r\n}\r\nreturn arr.join(\",\");","type":"Function"},"order":"2"},"-NoPerfData":{"set_if":"$IcingaCheckFirewall_Switchparameter_NoPerfData$","set_if_format":"string","order":"99"},"-Enabled":{"set_if":"$IcingaCheckFirewall_Switchparameter_Enabled$","set_if_format":"string","order":"99"}},"imports":["PowerShell Base"],"object_type":"object","vars":{"IcingaCheckFirewall_Switchparameter_Enabled":false,"IcingaCheckFirewall_Switchparameter_NoPerfData":false}},"PowerShell Base":{"methods_execute":"PluginCheck","object_name":"PowerShell Base","vars":{},"is_string":null,"command":"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","zone":null,"disabled":false,"fields":[],"arguments":{},"imports":[],"object_type":"object","timeout":"180"}},"Datafield":{"2":{"settings":{"visbility":"visible"},"description":"Used to specify an array of profiles to check. Available profiles are \u0027Domain\u0027, \u0027Public\u0027, \u0027Private\u0027","caption":"Profile","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeArray","originalId":"2","varname":"IcingaCheckFirewall_Array_Profile","format":null},"5":{"settings":{"datalist":"IcingaCheckFirewall Verbosity","behavior":"strict","data_type":"string"},"description":null,"caption":"Verbosity","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeDatalist","originalId":"5","varname":"IcingaCheckFirewall_Int32_Verbosity","format":null},"4":{"settings":{"visbility":"visible"},"description":null,"caption":"NoPerfData","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeBoolean","originalId":"4","varname":"IcingaCheckFirewall_Switchparameter_NoPerfData","format":null},"3":{"settings":{"visbility":"visible"},"description":"Used to specify whether the firewall profiles should be enabled or disabled.\n\n-Enabled $TRUE\ntranslates to enabled, while\nnot being specified\ntranslates to disabled.","caption":"Enabled","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeBoolean","originalId":"3","varname":"IcingaCheckFirewall_Switchparameter_Enabled","format":null}}}
+{"DataList":{"IcingaCheckFirewall Verbosity":{"list_name":"IcingaCheckFirewall Verbosity","originalId":"2","entries":[{"allowed_roles":null,"entry_value":"0","entry_name":"0","format":"string"},{"allowed_roles":null,"entry_value":"1","entry_name":"1","format":"string"},{"allowed_roles":null,"entry_value":"2","entry_name":"2","format":"string"},{"allowed_roles":null,"entry_value":"3","entry_name":"3","format":"string"}],"owner":"stein"}},"Command":{"Invoke-IcingaCheckFirewall":{"fields":[{"datafield_id":2,"is_required":"n","var_filter":null},{"datafield_id":3,"is_required":"n","var_filter":null},{"datafield_id":4,"is_required":"n","var_filter":null},{"datafield_id":5,"is_required":"n","var_filter":null}],"object_name":"Invoke-IcingaCheckFirewall","arguments":{"-Verbosity":{"value":"$IcingaCheckFirewall_Int32_Verbosity$","order":"3"},"-C":{"value":"try { Use-Icinga -Minimal; } catch { Write-Output \u0027The Icinga PowerShell Framework is either not installed on the system or not configured properly. Please check https://icinga.com/docs/windows for further details\u0027; exit 3; }; Exit-IcingaExecutePlugin -Command \u0027Invoke-IcingaCheckFirewall\u0027 ","order":"0"},"-Profile":{"value":{"body":"var arr = macro(\"$IcingaCheckFirewall_Array_Profile$\");\r\n    if (len(arr) == 0) {\r\n        return \"@()\";\r\n    }\r\n    return arr.map(\r\n        x =\u003e if (typeof(x) == String) {\r\n            var argLen = len(x);\r\n            if (argLen != 0 \u0026\u0026 x.substr(0,1) == \"\u0027\" \u0026\u0026 x.substr(argLen - 1, argLen) == \"\u0027\") {\r\n                x;\r\n            } else {\r\n                \"\u0027\" + x + \"\u0027\";\r\n            }\r\n        } else {\r\n            x;\r\n        }\r\n    ).join(\",\");","type":"Function"},"order":"2"},"-NoPerfData":{"set_if":"$IcingaCheckFirewall_Switchparameter_NoPerfData$","set_if_format":"string","order":"99"},"-Enabled":{"set_if":"$IcingaCheckFirewall_Switchparameter_Enabled$","set_if_format":"string","order":"99"}},"imports":["PowerShell Base"],"object_type":"object","vars":{"IcingaCheckFirewall_Switchparameter_Enabled":false,"IcingaCheckFirewall_Switchparameter_NoPerfData":false}},"PowerShell Base":{"methods_execute":"PluginCheck","object_name":"PowerShell Base","vars":{},"is_string":null,"command":"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","zone":null,"disabled":false,"fields":[],"arguments":{},"imports":[],"object_type":"object","timeout":"180"}},"Datafield":{"2":{"settings":{"visbility":"visible"},"description":"Used to specify an array of profiles to check. Available profiles are \u0027Domain\u0027, \u0027Public\u0027, \u0027Private\u0027","caption":"Profile","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeArray","originalId":"2","varname":"IcingaCheckFirewall_Array_Profile","format":null},"5":{"settings":{"datalist":"IcingaCheckFirewall Verbosity","behavior":"strict","data_type":"string"},"description":null,"caption":"Verbosity","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeDatalist","originalId":"5","varname":"IcingaCheckFirewall_Int32_Verbosity","format":null},"4":{"settings":{"visbility":"visible"},"description":null,"caption":"NoPerfData","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeBoolean","originalId":"4","varname":"IcingaCheckFirewall_Switchparameter_NoPerfData","format":null},"3":{"settings":{"visbility":"visible"},"description":"Used to specify whether the firewall profiles should be enabled or disabled.\n\n-Enabled $TRUE\ntranslates to enabled, while\nnot being specified\ntranslates to disabled.","caption":"Enabled","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeBoolean","originalId":"3","varname":"IcingaCheckFirewall_Switchparameter_Enabled","format":null}}}

config/director/Invoke-IcingaCheckNLA.json

@@ -1 +1 @@
-{"DataList":{"IcingaCheckNLA Profile":{"list_name":"IcingaCheckNLA Profile","originalId":"2","entries":[{"allowed_roles":null,"entry_value":"DomainAuthenticated","entry_name":"DomainAuthenticated","format":"string"},{"allowed_roles":null,"entry_value":"Public","entry_name":"Public","format":"string"},{"allowed_roles":null,"entry_value":"Private","entry_name":"Private","format":"string"}],"owner":"stein"},"IcingaCheckNLA Verbosity":{"list_name":"IcingaCheckNLA Verbosity","originalId":"2","entries":[{"allowed_roles":null,"entry_value":"0","entry_name":"0","format":"string"},{"allowed_roles":null,"entry_value":"1","entry_name":"1","format":"string"},{"allowed_roles":null,"entry_value":"2","entry_name":"2","format":"string"},{"allowed_roles":null,"entry_value":"3","entry_name":"3","format":"string"}],"owner":"stein"}},"Command":{"PowerShell Base":{"methods_execute":"PluginCheck","object_name":"PowerShell Base","vars":{},"is_string":null,"command":"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","zone":null,"disabled":false,"fields":[],"arguments":{},"imports":[],"object_type":"object","timeout":"180"},"Invoke-IcingaCheckNLA":{"fields":[{"datafield_id":2,"is_required":"n","var_filter":null},{"datafield_id":3,"is_required":"n","var_filter":null},{"datafield_id":4,"is_required":"n","var_filter":null}],"object_name":"Invoke-IcingaCheckNLA","arguments":{"-C":{"value":"try { Use-Icinga -Minimal; } catch { Write-Output \u0027The Icinga PowerShell Framework is either not installed on the system or not configured properly. Please check https://icinga.com/docs/windows for further details\u0027; exit 3; }; Exit-IcingaExecutePlugin -Command \u0027Invoke-IcingaCheckNLA\u0027 ","order":"0"},"-Profile":{"value":"$IcingaCheckNLA_String_Profile$","order":"2"},"-NICs":{"value":{"body":"var arr = macro(\"$IcingaCheckNLA_Array_NICs$\");\r\nif (len(arr) == 0) {\r\nreturn \"@()\";\r\n}\r\nreturn arr.join(\",\");","type":"Function"},"order":"4"},"-Verbosity":{"value":"$IcingaCheckNLA_Int32_Verbosity$","order":"3"}},"imports":["PowerShell Base"],"object_type":"object","vars":{}}},"Datafield":{"2":{"settings":{"datalist":"IcingaCheckNLA Profile","behavior":"strict","data_type":"string"},"description":"Used to specify the profile to check. Available profiles are \u0027DomainAuthenticated\u0027, \u0027Public\u0027, \u0027Private\u0027","caption":"Profile","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeDatalist","originalId":"2","varname":"IcingaCheckNLA_String_Profile","format":null},"4":{"settings":{"visbility":"visible"},"description":"Used to specify the NICs where to check the filewall profile. When not presented every nic which is active will be checked","caption":"NICs","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeArray","originalId":"4","varname":"IcingaCheckNLA_Array_NICs","format":null},"3":{"settings":{"datalist":"IcingaCheckNLA Verbosity","behavior":"strict","data_type":"string"},"description":null,"caption":"Verbosity","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeDatalist","originalId":"3","varname":"IcingaCheckNLA_Int32_Verbosity","format":null}}}
+{"DataList":{"IcingaCheckNLA Profile":{"list_name":"IcingaCheckNLA Profile","originalId":"2","entries":[{"allowed_roles":null,"entry_value":"DomainAuthenticated","entry_name":"DomainAuthenticated","format":"string"},{"allowed_roles":null,"entry_value":"Public","entry_name":"Public","format":"string"},{"allowed_roles":null,"entry_value":"Private","entry_name":"Private","format":"string"}],"owner":"stein"},"IcingaCheckNLA Verbosity":{"list_name":"IcingaCheckNLA Verbosity","originalId":"2","entries":[{"allowed_roles":null,"entry_value":"0","entry_name":"0","format":"string"},{"allowed_roles":null,"entry_value":"1","entry_name":"1","format":"string"},{"allowed_roles":null,"entry_value":"2","entry_name":"2","format":"string"},{"allowed_roles":null,"entry_value":"3","entry_name":"3","format":"string"}],"owner":"stein"}},"Command":{"PowerShell Base":{"methods_execute":"PluginCheck","object_name":"PowerShell Base","vars":{},"is_string":null,"command":"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe","zone":null,"disabled":false,"fields":[],"arguments":{},"imports":[],"object_type":"object","timeout":"180"},"Invoke-IcingaCheckNLA":{"fields":[{"datafield_id":2,"is_required":"n","var_filter":null},{"datafield_id":3,"is_required":"n","var_filter":null},{"datafield_id":4,"is_required":"n","var_filter":null}],"object_name":"Invoke-IcingaCheckNLA","arguments":{"-C":{"value":"try { Use-Icinga -Minimal; } catch { Write-Output \u0027The Icinga PowerShell Framework is either not installed on the system or not configured properly. Please check https://icinga.com/docs/windows for further details\u0027; exit 3; }; Exit-IcingaExecutePlugin -Command \u0027Invoke-IcingaCheckNLA\u0027 ","order":"0"},"-Profile":{"value":"$IcingaCheckNLA_String_Profile$","order":"2"},"-NICs":{"value":{"body":"var arr = macro(\"$IcingaCheckNLA_Array_NICs$\");\r\n    if (len(arr) == 0) {\r\n        return \"@()\";\r\n    }\r\n    return arr.map(\r\n        x =\u003e if (typeof(x) == String) {\r\n            var argLen = len(x);\r\n            if (argLen != 0 \u0026\u0026 x.substr(0,1) == \"\u0027\" \u0026\u0026 x.substr(argLen - 1, argLen) == \"\u0027\") {\r\n                x;\r\n            } else {\r\n                \"\u0027\" + x + \"\u0027\";\r\n            }\r\n        } else {\r\n            x;\r\n        }\r\n    ).join(\",\");","type":"Function"},"order":"4"},"-Verbosity":{"value":"$IcingaCheckNLA_Int32_Verbosity$","order":"3"}},"imports":["PowerShell Base"],"object_type":"object","vars":{}}},"Datafield":{"2":{"settings":{"datalist":"IcingaCheckNLA Profile","behavior":"strict","data_type":"string"},"description":"Used to specify the profile to check. Available profiles are \u0027DomainAuthenticated\u0027, \u0027Public\u0027, \u0027Private\u0027","caption":"Profile","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeDatalist","originalId":"2","varname":"IcingaCheckNLA_String_Profile","format":null},"4":{"settings":{"visbility":"visible"},"description":"Used to specify the NICs where to check the filewall profile. When not presented every nic which is active will be checked","caption":"NICs","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeArray","originalId":"4","varname":"IcingaCheckNLA_Array_NICs","format":null},"3":{"settings":{"datalist":"IcingaCheckNLA Verbosity","behavior":"strict","data_type":"string"},"description":null,"caption":"Verbosity","datatype":"Icinga\\Module\\Director\\DataType\\DataTypeDatalist","originalId":"3","varname":"IcingaCheckNLA_Int32_Verbosity","format":null}}}