From 2ab43a63cbddf6d19a04785c1ff5d087fecbdde7 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 31 Oct 2014 13:15:04 +0100 Subject: [PATCH] Rename templates "agent-{host,service}" to "satellite-{host,service}" refs #7525 --- etc/icinga2/conf.d/agent.conf | 16 ++++++++-------- lib/cli/nodeupdateconfigcommand.cpp | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/icinga2/conf.d/agent.conf b/etc/icinga2/conf.d/agent.conf index 3dd8067d7..01ba1af33 100644 --- a/etc/icinga2/conf.d/agent.conf +++ b/etc/icinga2/conf.d/agent.conf @@ -4,26 +4,26 @@ /** - * Provides settings for agent hosts managed by 'icinga2 repository'. - * Define your global agent attributes here, for example custom + * Provides settings for satellite hosts managed by 'icinga2 repository'. + * Define your global attributes here, for example custom * attributes used for notifications, etc. */ -template Host "agent-host" { +template Host "satellite-host" { } /** - * Provides settings for agent services managed by 'icinga2 repository'. - * Define your global agent attributes here, for example custom + * Provides settings for satellite services managed by 'icinga2 repository'. + * Define your global satellite attributes here, for example custom * attributes used for notifications, etc. */ -template Service "agent-service" { +template Service "satellite-service" { } -apply Dependency "agent-host" to Host { +apply Dependency "satellite-host" to Host { parent_host_name = host.zone - assign where host.zone != "" && "agent-host" in host.templates + assign where host.zone != "" && "satellite-host" in host.templates } diff --git a/lib/cli/nodeupdateconfigcommand.cpp b/lib/cli/nodeupdateconfigcommand.cpp index bb897e804..1a99b3bd7 100644 --- a/lib/cli/nodeupdateconfigcommand.cpp +++ b/lib/cli/nodeupdateconfigcommand.cpp @@ -104,7 +104,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm host_attrs->Set("name", zone); host_attrs->Set("check_command", "cluster-zone"); Array::Ptr host_imports = make_shared(); - host_imports->Add("node-host"); //default host node template + host_imports->Add("satellite-host"); //default host node template host_attrs->Set("import", host_imports); if (!RepositoryUtility::AddObject(zone, "Host", host_attrs)) { @@ -159,7 +159,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm } Array::Ptr host_imports = make_shared(); - host_imports->Add("node-host"); //default host node template + host_imports->Add("satellite-host"); //default host node template host_attrs->Set("import", host_imports); if (!RepositoryUtility::AddObject(host, "Host", host_attrs)) { @@ -213,7 +213,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm service_attrs->Set("zone", zone); Array::Ptr service_imports = make_shared(); - service_imports->Add("node-service"); //default service node template + service_imports->Add("satellite-service"); //default service node template service_attrs->Set("import", service_imports); if (!RepositoryUtility::AddObject(service, "Service", service_attrs)) { -- 2.40.0