Merge branch 'master' into feature/deduplicate-puppet-code-6842
This commit is contained in:
commit
fbe603c23f
|
@ -45,22 +45,22 @@ object HostGroup "all-hosts" {
|
||||||
assign where true
|
assign where true
|
||||||
}
|
}
|
||||||
|
|
||||||
host_types = ["ok", "random", "down", "up", "unreachable", "pending"]
|
local host_types = ["ok", "random", "down", "up", "unreachable", "pending"]
|
||||||
|
|
||||||
__for (host_type in host_types) {
|
__for (host_type in host_types) {
|
||||||
object HostGroup "all-" + host_type {
|
object HostGroup "all-" + host_type use (host_type) {
|
||||||
display_name = "All " + host_type + " hosts"
|
display_name = "All " + host_type + " hosts"
|
||||||
assign where regex("^test-" + host_type, host.name)
|
assign where host.vars.check_type == host_type
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
service_types = ["ok", "warning", "critical", "unknown", "flapping", "pending"]
|
local service_types = ["ok", "warning", "critical", "unknown", "flapping", "pending"]
|
||||||
|
|
||||||
// Servicegroups
|
// Servicegroups
|
||||||
__for (service_type in service_types) {
|
__for (service_type in service_types) {
|
||||||
object ServiceGroup "service-" + service_type {
|
object ServiceGroup "service-" + service_type use (service_type) {
|
||||||
display_name = "All " + service_type + " services"
|
display_name = "All " + service_type + " services"
|
||||||
assign where regex("^service-" + service_type, service.name)
|
assign where service.vars.check_type == service_type
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ __for (service_type in service_types) {
|
||||||
// ---------------------------------------------------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
__function createService(service_type, num) {
|
__function createService(service_type, num) {
|
||||||
apply Service "service-" + service_type + "-" + string(num + 1) {
|
apply Service "service-" + service_type + "-" + string(num + 1) use (service_type) {
|
||||||
import "generic-service"
|
import "generic-service"
|
||||||
|
|
||||||
check_command = "dummy-service"
|
check_command = "dummy-service"
|
||||||
|
@ -91,7 +91,7 @@ __for (num in range(4)) {
|
||||||
// ---------------------------------------------------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
__function createHost(checkType, checkConfig, num, checkEnabled) {
|
__function createHost(checkType, checkConfig, num, checkEnabled) {
|
||||||
object Host "test-" + checkType + "-" + string(num + 1) {
|
object Host "test-" + checkType + "-" + string(num + 1) use (checkEnabled, checkType, checkConfig) {
|
||||||
import "generic-host"
|
import "generic-host"
|
||||||
address = "127.0.0.1"
|
address = "127.0.0.1"
|
||||||
check_command = "dummy-host"
|
check_command = "dummy-host"
|
||||||
|
|
Loading…
Reference in New Issue