tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-21 12:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cli: Write ApiListener config in 'agent setup' command

Browse Source 
fixes #7438
refs #7248
This commit is contained in:
Michael Friedrich 2014-10-28 21:13:15 +01:00
parent 2e6a604706
commit b344743a9f
1 changed files with 84 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
lib/cli/agentsetupcommand.cpp
View File

@ -172,19 +172,56 @@ int AgentSetupCommand::SetupMaster(const boost::program_options::variables_map&
AgentUtility::GenerateAgentMasterIcingaConfig(cn); AgentUtility::GenerateAgentMasterIcingaConfig(cn);
/* enable the ApiListener config (verify its data) */ /* enable the ApiListener config */
Log(LogInformation, "cli", "Enabling the APIListener feature."); Log(LogInformation, "cli", "Updating the APIListener feature.");
String api_path = FeatureUtility::GetFeaturesEnabledPath() + "/api.conf";
//TODO: verify that the correct attributes are set on the ApiListener object
//by reading the configuration (CompileFile) and fetching the object
std::vector<std::string> enable; std::vector<std::string> enable;
enable.push_back("api"); enable.push_back("api");
FeatureUtility::EnableFeatures(enable); FeatureUtility::EnableFeatures(enable);
//TODO read --listen and set that as bind_host,port on ApiListener String apipath = FeatureUtility::GetFeaturesAvailablePath() + "/api.conf";
AgentUtility::CreateBackupFile(apipath);
String apipathtmp = apipath + ".tmp";
std::ofstream fp;
fp.open(apipathtmp.CStr(), std::ofstream::out | std::ofstream::trunc);
fp << "/**\n"
<< " * The API listener is used for distributed monitoring setups.\n"
<< " */\n"
<< "object ApiListener \"api\" {\n"
<< " cert_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".crt\"\n"
<< " key_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".key\"\n"
<< " ca_path = SysconfDir + \"/icinga2/pki/ca.crt\"\n";
if (vm.count("listen")) {
std::vector<String> tokens;
boost::algorithm::split(tokens, vm["listen"].as<std::string>(), boost::is_any_of(","));
if (tokens.size() > 0)
fp << " bind_host = \"" << tokens[0] << "\"\n";
if (tokens.size() > 1)
fp << " bind_port = " << tokens[1] << "\n";
}
fp << "\n"
<< " ticket_salt = TicketSalt\n"
<< "}\n";
fp.close();
#ifdef _WIN32
_unlink(apipath.CStr());
#endif /* _WIN32 */
if (rename(apipathtmp.CStr(), apipath.CStr()) < 0) {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("rename")
<< boost::errinfo_errno(errno)
<< boost::errinfo_file_name(apipathtmp));
}
/* update constants.conf with NodeName = CN + TicketSalt = random value */ /* update constants.conf with NodeName = CN + TicketSalt = random value */
if (cn != Utility::GetFQDN()) { if (cn != Utility::GetFQDN()) {
@ -203,7 +240,7 @@ int AgentSetupCommand::SetupMaster(const boost::program_options::variables_map&
AgentUtility::UpdateConstant("TicketSalt", salt); AgentUtility::UpdateConstant("TicketSalt", salt);
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Edit the api feature config file '" << api_path << "' and set a secure 'ticket_salt' attribute."; << "Edit the api feature config file '" << apipath << "' and set a secure 'ticket_salt' attribute.";
/* tell the user to reload icinga2 */ /* tell the user to reload icinga2 */
@ -298,30 +335,56 @@ int AgentSetupCommand::SetupAgent(const boost::program_options::variables_map& v
return 1; return 1;
} }
/* enable the ApiListener config (verify its data) */ /* enable the ApiListener config */
Log(LogInformation, "cli", "Enabling the APIListener feature."); Log(LogInformation, "cli", "Updating the APIListener feature.");
std::vector<std::string> enable; std::vector<std::string> enable;
enable.push_back("api"); enable.push_back("api");
FeatureUtility::EnableFeatures(enable); FeatureUtility::EnableFeatures(enable);
String api_path = FeatureUtility::GetFeaturesEnabledPath() + "/api.conf"; String apipath = FeatureUtility::GetFeaturesAvailablePath() + "/api.conf";
//TODO: verify that the correct attributes are set on the ApiListener object AgentUtility::CreateBackupFile(apipath);
//by reading the configuration (CompileFile) and fetching the object
/* String apipathtmp = apipath + ".tmp";
ConfigCompilerContext::GetInstance()->Reset();
ConfigCompiler::CompileFile(api_path);
DynamicType::Ptr dt = DynamicType::GetByName("ApiListener"); std::ofstream fp;
fp.open(apipathtmp.CStr(), std::ofstream::out | std::ofstream::trunc);
BOOST_FOREACH(const DynamicObject::Ptr& object, dt->GetObjects()) { fp << "/**\n"
std::cout << JsonSerialize(object) << std::endl; << " * The API listener is used for distributed monitoring setups.\n"
}*/ << " */\n"
<< "object ApiListener \"api\" {\n"
<< " cert_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".crt\"\n"
<< " key_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".key\"\n"
<< " ca_path = SysconfDir + \"/icinga2/pki/ca.crt\"\n";
if (vm.count("listen")) {
std::vector<String> tokens;
boost::algorithm::split(tokens, vm["listen"].as<std::string>(), boost::is_any_of(","));
//TODO read --listen and set that as bind_host,port on ApiListener if (tokens.size() > 0)
fp << " bind_host = \"" << tokens[0] << "\"\n";
if (tokens.size() > 1)
fp << " bind_port = " << tokens[1] << "\n";
}
fp << "\n"
<< " ticket_salt = TicketSalt\n"
<< "}\n";
fp.close();
#ifdef _WIN32
_unlink(apipath.CStr());
#endif /* _WIN32 */
if (rename(apipathtmp.CStr(), apipath.CStr()) < 0) {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("rename")
<< boost::errinfo_errno(errno)
<< boost::errinfo_file_name(apipathtmp));
}
/* generate local zones.conf with zone+endpoint */ /* generate local zones.conf with zone+endpoint */