tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-29 08:34:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary imports from unit test config

Browse Source 
refs #12575
This commit is contained in:
Gunnar Beutner 2016-08-28 10:41:01 +02:00
parent 78cd56e277
commit 4876a78ab5
9 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/db_ido/db_ido-itl.conf
View File

@ -20,11 +20,11 @@
System.assert(Internal.run_with_activation_context(function() { System.assert(Internal.run_with_activation_context(function() {
var _Internal = Internal.clone() var _Internal = Internal.clone()
template CheckCommand "ido-check-command" { template CheckCommand "ido-check-command" use (_Internal) {
execute = _Internal.IdoCheck execute = _Internal.IdoCheck
} }
object CheckCommand "ido" use (_Internal) { object CheckCommand "ido" {
import "ido-check-command" import "ido-check-command"
} }
})) }))

1
test/config/2742.conf
View File

@ -1,6 +1,5 @@
object CheckCommand "2742-macro-command" { object CheckCommand "2742-macro-command" {
import "plugin-check-command"
command = "echo UPTIME: $icinga.uptime$ SERVICES warn: $icinga.num_services_warning$ crit: $icinga.num_services_critical$ unknown: $icinga.num_services_unknown$ ackd: $icinga.num_services_acknowledged$ HOST: down: $icinga.num_hosts_down$ unreachable: $icinga.num_hosts_unreachable$" command = "echo UPTIME: $icinga.uptime$ SERVICES warn: $icinga.num_services_warning$ crit: $icinga.num_services_critical$ unknown: $icinga.num_services_unknown$ ackd: $icinga.num_services_acknowledged$ HOST: down: $icinga.num_hosts_down$ unreachable: $icinga.num_hosts_unreachable$"
} }

1
test/config/5926.conf
View File

@ -1,7 +1,6 @@
object CheckCommand "5926-macro-test" { object CheckCommand "5926-macro-test" {
import "plugin-check-command"
command = "echo \"address: $address$ address_service: $service.vars.address$ foo: $foo$ keks: $keks$ god: $god$\"" command = "echo \"address: $address$ address_service: $service.vars.address$ foo: $foo$ keks: $keks$ god: $god$\""
//command = "echo \"address: $address$ address_service: $service.vars.address$\"" //command = "echo \"address: $address$ address_service: $service.vars.address$\""
} }

2
test/config/5927.conf
View File

@ -1,11 +1,9 @@
object EventCommand "5927-handle" { object EventCommand "5927-handle" {
import "plugin-event-command"
command = "echo \"event handler triggered.\"" command = "echo \"event handler triggered.\""
} }
object NotificationCommand "5927-notification" { object NotificationCommand "5927-notification" {
import "plugin-notification-command"
command = "echo \"notification triggered.\"" command = "echo \"notification triggered.\""
} }

2
test/config/6479.conf
View File

@ -1,11 +1,9 @@
object EventCommand "6479-handle" { object EventCommand "6479-handle" {
import "plugin-event-command"
command = "echo \"event handler triggered.\"" command = "echo \"event handler triggered.\""
} }
object NotificationCommand "6479-notification" { object NotificationCommand "6479-notification" {
import "plugin-notification-command"
command = "echo \"notification triggered.\"" command = "echo \"notification triggered.\""
} }

3
test/config/6968.conf
View File

@ -12,9 +12,8 @@ object Service "6968-test" {
} }
object CheckCommand "6968-check_vmware" { object CheckCommand "6968-check_vmware" {
import "plugin-check-command"
command = [ PluginDir + "/check_vmware.pl" ] command = [ PluginDir + "/check_vmware.pl" ]
arguments = { arguments = {
"--server" = "$address$" "--server" = "$address$"
"--username" = "***" "--username" = "***"

2
test/config/8063.conf
View File

@ -1,6 +1,4 @@
object CheckCommand "8063-my-disk" { object CheckCommand "8063-my-disk" {
import "plugin-check-command"
command = [ PluginDir + "/check_disk" ] command = [ PluginDir + "/check_disk" ]
arguments = { arguments = {

3
test/config/templates.conf
View File

@ -65,9 +65,8 @@ object UserGroup "test-icingaadmins" {
/* timeperiods */ /* timeperiods */
object TimePeriod "test-24x7" { object TimePeriod "test-24x7" {
import "legacy-timeperiod"
display_name = "Test Icinga 2 24x7 TimePeriod" display_name = "Test Icinga 2 24x7 TimePeriod"
ranges = { ranges = {
"monday" = "00:00-24:00" "monday" = "00:00-24:00"
"tuesday" = "00:00-24:00" "tuesday" = "00:00-24:00"

3
test/livestatus-test.cpp
View File

@ -53,7 +53,6 @@ struct LivestatusFixture
{ {
String config = R"CONFIG( String config = R"CONFIG(
object CheckCommand "dummy" { object CheckCommand "dummy" {
import "plugin-check-command"
command = "/bin/echo" command = "/bin/echo"
} }
@ -67,7 +66,7 @@ object Host "test-02" {
check_command = "dummy" check_command = "dummy"
} }
apply Service "livestatus"{ apply Service "livestatus" {
check_command = "dummy" check_command = "dummy"
notes = "test livestatus" notes = "test livestatus"
assign where match("test-*", host.name) assign where match("test-*", host.name)