Remove superfluous commas in the ITL.

Fixes #6071

diff --git a/itl/command-common.conf b/itl/command-common.conf
index 16502c3c097c0f14c21fbc6636f4abe170d4e3ce..6869014fceb867b6151f246068f2ca4520a7cfc9 100644 (file)
--- a/itl/command-common.conf
+++ b/itl/command-common.conf
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 template CheckCommand "ping-common" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = [
                PluginDir + "/check_ping"
@@ -39,7 +39,7 @@ template CheckCommand "ping-common" {
 }
 
 object CheckCommand "ping4" {
-       import "ping-common",
+       import "ping-common"
 
        command += [ "-4" ]
 
@@ -47,7 +47,7 @@ object CheckCommand "ping4" {
 }
 
 object CheckCommand "ping6" {
-       import "ping-common",
+       import "ping-common"
 
        command += [ "-6" ]
 
@@ -57,15 +57,15 @@ object CheckCommand "ping6" {
 object CheckCommand "hostalive" {
        import "ping4"
 
-       vars.ping_wrta = 3000.0,
-       vars.ping_wpl = 80,
+       vars.ping_wrta = 3000.0
+       vars.ping_wpl = 80
 
-       vars.ping_crta = 5000.0,
+       vars.ping_crta = 5000.0
        vars.ping_cpl = 100
 }
 
 object CheckCommand "dummy" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = [
                PluginDir + "/check_dummy",
@@ -73,19 +73,19 @@ object CheckCommand "dummy" {
                "$dummy_text$"
        ],
 
-       vars.dummy_state = 0,
+       vars.dummy_state = 0
        vars.dummy_text = "Check was successful."
 }
 
 object CheckCommand "passive" {
-       import "dummy",
+       import "dummy"
 
-       vars.dummy_state = 3,
+       vars.dummy_state = 3
        vars.dummy_text = "No Passive Check Result Received."
 }
 
 object CheckCommand "tcp" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = [
                PluginDir + "/check_tcp",
@@ -97,7 +97,7 @@ object CheckCommand "tcp" {
 }
 
 object CheckCommand "udp" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = [
                PluginDir + "/check_udp",
@@ -109,7 +109,7 @@ object CheckCommand "udp" {
 }
 
 object CheckCommand "http" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_http"
        
@@ -184,7 +184,7 @@ object CheckCommand "ssh" {
 }
 
 object CheckCommand "disk" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_disk"
 
@@ -198,7 +198,7 @@ object CheckCommand "disk" {
 }
 
 object CheckCommand "users" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_users"
 
@@ -212,7 +212,7 @@ object CheckCommand "users" {
 }
 
 object CheckCommand "procs" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_procs"
 
@@ -222,11 +222,11 @@ object CheckCommand "procs" {
        }
 
        vars.procs_wgreater = 250
-       vars.procs_cgreater = 400,
+       vars.procs_cgreater = 400
 }
 
 object CheckCommand "swap" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_swap"
 
@@ -240,7 +240,7 @@ object CheckCommand "swap" {
 }
 
 object CheckCommand "load" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_load"
 
@@ -259,7 +259,7 @@ object CheckCommand "load" {
 }
 
 object CheckCommand "snmp" {
-       import "plugin-check-command",
+       import "plugin-check-command"
 
        command = PluginDir + "/check_snmp"
 
@@ -274,7 +274,7 @@ object CheckCommand "snmp" {
 }
 
 object CheckCommand "snmp-uptime" {
-       import "snmp",
+       import "snmp"
 
        vars.snmp_oid = "1.3.6.1.2.1.1.3.0"
 }
@@ -288,11 +288,11 @@ object CheckCommand "apt" {
 }
 
 object CheckCommand "icinga" {
-       import "icinga-check-command",
+       import "icinga-check-command"
 }
 
 object CheckCommand "cluster" {
-       import "cluster-check-command",
+       import "cluster-check-command"
 }
 
 object CheckCommand "agent" {

diff --git a/itl/timeperiod.conf b/itl/timeperiod.conf
index 2c6b6a66797eca7e7f6a311d6fc59f5bf3cf0752..263998316a62c0a77b264dbb860c25d8ce8e6c49 100644 (file)
--- a/itl/timeperiod.conf
+++ b/itl/timeperiod.conf
@@ -18,7 +18,5 @@
  ******************************************************************************/
 
 template TimePeriod "legacy-timeperiod" {
-       methods = {
-               update = "LegacyTimePeriod"
-       }
+       methods.update = "LegacyTimePeriod"
 }