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

Cli: 'agent update-config': Don't skip service creation if host already exists 

refs #7249
This commit is contained in:
Michael Friedrich 2014-10-29 11:53:24 +01:00
parent e7c07fb66b
commit 6866bd0dec
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/cli/agentupdateconfigcommand.cpp
View File

@ -99,7 +99,7 @@ int AgentUpdateConfigCommand::Run(const boost::program_options::variables_map& v
BOOST_FOREACH(const Dictionary::Pair& kv, repository) { BOOST_FOREACH(const Dictionary::Pair& kv, repository) {
String host = kv.first; String host = kv.first;
String host_pattern = host + ".conf"; String host_pattern = host + ".conf";
bool skip = false; bool skip_host = false;
if (host == "localhost") { if (host == "localhost") {
Log(LogWarning, "cli") Log(LogWarning, "cli")
@ -111,34 +111,32 @@ int AgentUpdateConfigCommand::Run(const boost::program_options::variables_map& v
if (object_path.Contains(host_pattern)) { if (object_path.Contains(host_pattern)) {
Log(LogWarning, "cli") Log(LogWarning, "cli")
<< "Host '" << host << "' already existing. Skipping its creation."; << "Host '" << host << "' already existing. Skipping its creation.";
skip = true; skip_host = true;
break; break;
} }
} }
if (skip) if (!skip_host) {
continue; /* add a new host to the config repository */
Dictionary::Ptr host_attrs = make_shared<Dictionary>();
host_attrs->Set("__name", host);
host_attrs->Set("name", host);
/* add a new host to the config repository */ if (host == zone)
Dictionary::Ptr host_attrs = make_shared<Dictionary>(); host_attrs->Set("check_command", "cluster-zone");
host_attrs->Set("__name", host); else {
host_attrs->Set("name", host); host_attrs->Set("check_command", "dummy");
host_attrs->Set("zone", zone);
}
if (host == zone) Array::Ptr host_imports = make_shared<Array>();
host_attrs->Set("check_command", "cluster-zone"); host_imports->Add("agent-host"); //default host agent template
else { host_attrs->Set("import", host_imports);
host_attrs->Set("check_command", "dummy");
host_attrs->Set("zone", zone);
}
Array::Ptr host_imports = make_shared<Array>(); if (!RepositoryUtility::AddObject(host, "Host", host_attrs)) {
host_imports->Add("agent-host"); //default host agent template Log(LogCritical, "cli")
host_attrs->Set("import", host_imports); << "Cannot add agent host '" << host << "' to the config repository!\n";
}
if (!RepositoryUtility::AddObject(host, "Host", host_attrs)) {
Log(LogCritical, "cli")
<< "Cannot add agent host '" << host << "' to the config repository!\n";
continue;
} }
Array::Ptr services = kv.second; Array::Ptr services = kv.second;
@ -151,20 +149,20 @@ int AgentUpdateConfigCommand::Run(const boost::program_options::variables_map& v
ObjectLock xlock(services); ObjectLock xlock(services);
BOOST_FOREACH(const String& service, services) { BOOST_FOREACH(const String& service, services) {
bool skip_service = false;
String service_pattern = host + "/" + service + ".conf"; String service_pattern = host + "/" + service + ".conf";
bool skip = false;
BOOST_FOREACH(const String& object_path, object_paths) { BOOST_FOREACH(const String& object_path, object_paths) {
if (object_path.Contains(service_pattern)) { if (object_path.Contains(service_pattern)) {
Log(LogWarning, "cli") Log(LogWarning, "cli")
<< "Service '" << service << "' on Host '" << host << "' already existing. Skipping its creation."; << "Service '" << service << "' on Host '" << host << "' already existing. Skipping its creation.";
skip = true; skip_service = true;
break; break;
} }
} }
if (skip) if (skip_service)
continue; continue;
/* add a new service for this host to the config repository */ /* add a new service for this host to the config repository */
@ -286,6 +284,12 @@ int AgentUpdateConfigCommand::Run(const boost::program_options::variables_map& v
String old_host = kv.first; String old_host = kv.first;
if (!new_agent_repository->Contains(old_host)) { if (!new_agent_repository->Contains(old_host)) {
if (old_host == "localhost") {
Log(LogWarning, "cli")
<< "Ignoring host '" << old_host << "'. Please make sure to configure a unique name on your agent '" << old_agent << "'.";
continue;
}
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Agent update found old host '" << old_host << "' on agent '" << old_agent_name << "'. Removing it."; << "Agent update found old host '" << old_host << "' on agent '" << old_agent_name << "'. Removing it.";