tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove superfluous commas in the ITL. 

Fixes #6071
This commit is contained in:
Gunnar Beutner 2014-04-29 10:44:09 +02:00
parent 1c9e985f1d
commit 7be95a180d
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
itl/command-common.conf
View File

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

4
itl/timeperiod.conf
View File

@ -18,7 +18,5 @@
******************************************************************************/ ******************************************************************************/
template TimePeriod "legacy-timeperiod" { template TimePeriod "legacy-timeperiod" {
methods = { methods.update = "LegacyTimePeriod"
update = "LegacyTimePeriod"
}
} }