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

Change the most chatting log messages to 'notice' severity. 

Refs #6070
This commit is contained in:
Michael Friedrich 2014-05-22 16:07:14 +02:00
parent 0713918c5e
commit 4296ec3987
13 changed files with 142 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/compat/compatlogger.cpp
View File

@ -434,7 +434,7 @@ void CompatLogger::ReopenFile(bool rotate)
if (rotate) { if (rotate) {
String archiveFile = GetLogDir() + "/archives/icinga-" + Utility::FormatDateTime("%m-%d-%Y-%H", Utility::GetTime()) + ".log"; String archiveFile = GetLogDir() + "/archives/icinga-" + Utility::FormatDateTime("%m-%d-%Y-%H", Utility::GetTime()) + ".log";
Log(LogInformation, "compat", "Rotating compat log file '" + tempFile + "' -> '" + archiveFile + "'"); Log(LogNotice, "compat", "Rotating compat log file '" + tempFile + "' -> '" + archiveFile + "'");
(void) rename(tempFile.CStr(), archiveFile.CStr()); (void) rename(tempFile.CStr(), archiveFile.CStr());
} }
} }
@ -536,7 +536,7 @@ void CompatLogger::ScheduleNextRotation(void)
time_t ts = mktime(&tmthen); time_t ts = mktime(&tmthen);
Log(LogInformation, "compat", "Rescheduling rotation timer for compat log '" Log(LogNotice, "compat", "Rescheduling rotation timer for compat log '"
+ GetName() + "' to '" + Utility::FormatDateTime("%Y/%m/%d %H:%M:%S %z", ts) + "'"); + GetName() + "' to '" + Utility::FormatDateTime("%Y/%m/%d %H:%M:%S %z", ts) + "'");
m_RotationTimer->Reschedule(ts); m_RotationTimer->Reschedule(ts);
} }

3
components/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -96,7 +96,8 @@ void IdoPgsqlConnection::Pause(void)
void IdoPgsqlConnection::ExceptionHandler(boost::exception_ptr exp) void IdoPgsqlConnection::ExceptionHandler(boost::exception_ptr exp)
{ {
Log(LogCritical, "db_ido_pgsql", "Exception during database operation: " + DiagnosticInformation(exp)); Log(LogCritical, "db_ido_pgsql", "Exception during database operation: '" + ErrorInformation(exp) + "'");
Log(LogDebug, "db_ido_pgsql", "Exception during database operation: " + DiagnosticInformation(exp));
boost::mutex::scoped_lock lock(m_ConnectionMutex); boost::mutex::scoped_lock lock(m_ConnectionMutex);

2
components/livestatus/listener.cpp
View File

@ -123,7 +123,7 @@ void LivestatusListener::ServerThreadProc(const Socket::Ptr& server)
for (;;) { for (;;) {
Socket::Ptr client = server->Accept(); Socket::Ptr client = server->Accept();
Log(LogInformation, "livestatus", "Client connected"); Log(LogNotice, "livestatus", "Client connected");
Utility::QueueAsyncCallback(boost::bind(&LivestatusListener::ClientHandler, this, client)); Utility::QueueAsyncCallback(boost::bind(&LivestatusListener::ClientHandler, this, client));
} }

2
components/livestatus/logtable.cpp
View File

@ -91,7 +91,7 @@ String LogTable::GetName(void) const
void LogTable::FetchRows(const AddRowFunction& addRowFn) void LogTable::FetchRows(const AddRowFunction& addRowFn)
{ {
Log(LogInformation, "livestatus", "Pre-selecting log file from " + Convert::ToString(m_TimeFrom) + " until " + Convert::ToString(m_TimeUntil)); Log(LogNotice, "livestatus", "Pre-selecting log file from " + Convert::ToString(m_TimeFrom) + " until " + Convert::ToString(m_TimeUntil));
/* create log file index */ /* create log file index */
LogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex); LogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex);

2
components/livestatus/statehisttable.cpp
View File

@ -252,7 +252,7 @@ String StateHistTable::GetName(void) const
void StateHistTable::FetchRows(const AddRowFunction& addRowFn) void StateHistTable::FetchRows(const AddRowFunction& addRowFn)
{ {
Log(LogInformation, "livestatus", "Pre-selecting log file from " + Convert::ToString(m_TimeFrom) + " until " + Convert::ToString(m_TimeUntil)); Log(LogNotice, "livestatus", "Pre-selecting log file from " + Convert::ToString(m_TimeFrom) + " until " + Convert::ToString(m_TimeUntil));
/* create log file index */ /* create log file index */
LogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex); LogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex);

2
components/perfdata/graphitewriter.cpp
View File

@ -177,7 +177,7 @@ void GraphiteWriter::SendMetric(const String& prefix, const String& name, double
msgbuf << "Exception thrown while writing to the Graphite socket: " << std::endl msgbuf << "Exception thrown while writing to the Graphite socket: " << std::endl
<< DiagnosticInformation(ex); << DiagnosticInformation(ex);
Log(LogCritical, "base", msgbuf.str()); Log(LogCritical, "perfdata", msgbuf.str());
m_Stream.reset(); m_Stream.reset();
} }

2
lib/base/application.cpp
View File

@ -241,7 +241,7 @@ mainloop:
Utility::Sleep(2.5); Utility::Sleep(2.5);
if (m_RequestReopenLogs) { if (m_RequestReopenLogs) {
Log(LogInformation, "base", "Reopening log files"); Log(LogNotice, "base", "Reopening log files");
m_RequestReopenLogs = false; m_RequestReopenLogs = false;
OnReopenLogs(); OnReopenLogs();
} }

4
lib/base/process.cpp
View File

@ -426,7 +426,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
m_FD = outReadPipe; m_FD = outReadPipe;
m_PID = pi.dwProcessId; m_PID = pi.dwProcessId;
Log(LogInformation, "base", "Running command '" + m_Arguments + Log(LogNotice, "base", "Running command '" + m_Arguments +
"': PID " + Convert::ToString(m_PID)); "': PID " + Convert::ToString(m_PID));
#else /* _WIN32 */ #else /* _WIN32 */
@ -531,7 +531,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
m_PID = m_Process; m_PID = m_Process;
Log(LogInformation, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") + Log(LogNotice, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") +
"': PID " + Convert::ToString(m_PID)); "': PID " + Convert::ToString(m_PID));
m_Arguments.clear(); m_Arguments.clear();

4
lib/base/threadpool.cpp
View File

@ -289,7 +289,7 @@ void ThreadPool::ManagerThreadProc(void)
if (tthreads != 0) { if (tthreads != 0) {
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "Thread pool; current: " << alive << "; adjustment: " << tthreads; msgbuf << "Thread pool; current: " << alive << "; adjustment: " << tthreads;
Log(LogDebug, "base", msgbuf.str()); Log(LogNotice, "base", msgbuf.str());
} }
for (int i = 0; i < -tthreads; i++) for (int i = 0; i < -tthreads; i++)
@ -319,7 +319,7 @@ void ThreadPool::ManagerThreadProc(void)
<< (long)(total_avg_latency * 1000 / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "ms" << (long)(total_avg_latency * 1000 / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "ms"
<< "; Threads: " << total_alive << "; Threads: " << total_alive
<< "; Pool utilization: " << (total_utilization / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "%"; << "; Pool utilization: " << (total_utilization / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "%";
Log(LogDebug, "base", msgbuf.str()); Log(LogNotice, "base", msgbuf.str());
} }
} }
} }

234
lib/icinga/externalcommandprocessor.cpp
View File

@ -325,7 +325,7 @@ void ExternalCommandProcessor::ProcessHostCheckResult(double time, const std::ve
result->SetExecutionEnd(time); result->SetExecutionEnd(time);
result->SetActive(false); result->SetActive(false);
Log(LogInformation, "icinga", "Processing passive check result for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Processing passive check result for host '" + arguments[0] + "'");
host->ProcessCheckResult(result); host->ProcessCheckResult(result);
{ {
@ -361,7 +361,7 @@ void ExternalCommandProcessor::ProcessServiceCheckResult(double time, const std:
result->SetExecutionEnd(time); result->SetExecutionEnd(time);
result->SetActive(false); result->SetActive(false);
Log(LogInformation, "icinga", "Processing passive check result for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Processing passive check result for service '" + arguments[1] + "'");
service->ProcessCheckResult(result); service->ProcessCheckResult(result);
{ {
@ -384,12 +384,12 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector<Strin
double planned_check = Convert::ToDouble(arguments[1]); double planned_check = Convert::ToDouble(arguments[1]);
if (planned_check > host->GetNextCheck()) { if (planned_check > host->GetNextCheck()) {
Log(LogInformation, "icinga", "Ignoring reschedule request for host '" + Log(LogNotice, "icinga", "Ignoring reschedule request for host '" +
arguments[0] + "' (next check is already sooner than requested check time)"); arguments[0] + "' (next check is already sooner than requested check time)");
return; return;
} }
Log(LogInformation, "icinga", "Rescheduling next check for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Rescheduling next check for host '" + arguments[0] + "'");
if (planned_check < Utility::GetTime()) if (planned_check < Utility::GetTime())
planned_check = Utility::GetTime(); planned_check = Utility::GetTime();
@ -408,7 +408,7 @@ void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced host check for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced host check for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Rescheduling next check for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Rescheduling next check for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -428,12 +428,12 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector<String
double planned_check = Convert::ToDouble(arguments[2]); double planned_check = Convert::ToDouble(arguments[2]);
if (planned_check > service->GetNextCheck()) { if (planned_check > service->GetNextCheck()) {
Log(LogInformation, "icinga", "Ignoring reschedule request for service '" + Log(LogNotice, "icinga", "Ignoring reschedule request for service '" +
arguments[1] + "' (next check is already sooner than requested check time)"); arguments[1] + "' (next check is already sooner than requested check time)");
return; return;
} }
Log(LogInformation, "icinga", "Rescheduling next check for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Rescheduling next check for service '" + arguments[1] + "'");
if (planned_check < Utility::GetTime()) if (planned_check < Utility::GetTime())
planned_check = Utility::GetTime(); planned_check = Utility::GetTime();
@ -452,7 +452,7 @@ void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector<
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Rescheduling next check for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Rescheduling next check for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -469,7 +469,7 @@ void ExternalCommandProcessor::EnableHostCheck(double, const std::vector<String>
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host checks for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host checks for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling active checks for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Enabling active checks for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -485,7 +485,7 @@ void ExternalCommandProcessor::DisableHostCheck(double, const std::vector<String
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host check non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host check non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling active checks for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Disabling active checks for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -501,7 +501,7 @@ void ExternalCommandProcessor::EnableSvcCheck(double, const std::vector<String>&
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling active checks for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Enabling active checks for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -517,7 +517,7 @@ void ExternalCommandProcessor::DisableSvcCheck(double, const std::vector<String>
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling active checks for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Disabling active checks for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -528,13 +528,13 @@ void ExternalCommandProcessor::DisableSvcCheck(double, const std::vector<String>
void ExternalCommandProcessor::ShutdownProcess(double, const std::vector<String>&) void ExternalCommandProcessor::ShutdownProcess(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Shutting down Icinga via external command."); Log(LogNotice, "icinga", "Shutting down Icinga via external command.");
Application::RequestShutdown(); Application::RequestShutdown();
} }
void ExternalCommandProcessor::RestartProcess(double, const std::vector<String>&) void ExternalCommandProcessor::RestartProcess(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Restarting Icinga via external command."); Log(LogNotice, "icinga", "Restarting Icinga via external command.");
Application::RequestRestart(); Application::RequestRestart();
} }
@ -548,7 +548,7 @@ void ExternalCommandProcessor::ScheduleForcedHostSvcChecks(double, const std::ve
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced host service checks for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced host service checks for non-existent host '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Rescheduling next check for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Rescheduling next check for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -573,12 +573,12 @@ void ExternalCommandProcessor::ScheduleHostSvcChecks(double, const std::vector<S
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
if (planned_check > service->GetNextCheck()) { if (planned_check > service->GetNextCheck()) {
Log(LogInformation, "icinga", "Ignoring reschedule request for service '" + Log(LogNotice, "icinga", "Ignoring reschedule request for service '" +
service->GetName() + "' (next check is already sooner than requested check time)"); service->GetName() + "' (next check is already sooner than requested check time)");
continue; continue;
} }
Log(LogInformation, "icinga", "Rescheduling next check for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Rescheduling next check for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -596,7 +596,7 @@ void ExternalCommandProcessor::EnableHostSvcChecks(double, const std::vector<Str
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host service checks for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host service checks for non-existent host '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling active checks for service '" + service->GetName() + "'");
service->SetEnableActiveChecks(true); service->SetEnableActiveChecks(true);
} }
} }
@ -609,7 +609,7 @@ void ExternalCommandProcessor::DisableHostSvcChecks(double, const std::vector<St
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host service checks for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host service checks for non-existent host '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling active checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -631,7 +631,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblem(double, const std::vector<S
if (service->GetState() == ServiceOK) if (service->GetState() == ServiceOK)
BOOST_THROW_EXCEPTION(std::invalid_argument("The service '" + arguments[1] + "' is OK.")); BOOST_THROW_EXCEPTION(std::invalid_argument("The service '" + arguments[1] + "' is OK."));
Log(LogInformation, "icinga", "Setting acknowledgement for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Setting acknowledgement for service '" + service->GetName() + "'");
service->AddComment(CommentAcknowledgement, arguments[5], arguments[6], 0); service->AddComment(CommentAcknowledgement, arguments[5], arguments[6], 0);
service->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal); service->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal);
@ -650,7 +650,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve
if (service->GetState() == ServiceOK) if (service->GetState() == ServiceOK)
BOOST_THROW_EXCEPTION(std::invalid_argument("The service '" + arguments[1] + "' is OK.")); BOOST_THROW_EXCEPTION(std::invalid_argument("The service '" + arguments[1] + "' is OK."));
Log(LogInformation, "icinga", "Setting timed acknowledgement for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Setting timed acknowledgement for service '" + service->GetName() + "'");
service->AddComment(CommentAcknowledgement, arguments[6], arguments[7], 0); service->AddComment(CommentAcknowledgement, arguments[6], arguments[7], 0);
service->AcknowledgeProblem(arguments[6], arguments[7], sticky ? AcknowledgementSticky : AcknowledgementNormal, timestamp); service->AcknowledgeProblem(arguments[6], arguments[7], sticky ? AcknowledgementSticky : AcknowledgementNormal, timestamp);
@ -663,7 +663,7 @@ void ExternalCommandProcessor::RemoveSvcAcknowledgement(double, const std::vecto
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot remove service acknowledgement for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot remove service acknowledgement for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Removing acknowledgement for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Removing acknowledgement for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -682,7 +682,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblem(double, const std::vector<
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge host problem for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge host problem for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Setting acknowledgement for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Setting acknowledgement for host '" + host->GetName() + "'");
if (host->GetState() == HostUp) if (host->GetState() == HostUp)
BOOST_THROW_EXCEPTION(std::invalid_argument("The host '" + arguments[0] + "' is OK.")); BOOST_THROW_EXCEPTION(std::invalid_argument("The host '" + arguments[0] + "' is OK."));
@ -701,7 +701,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::v
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge host problem with expire time for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge host problem with expire time for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Setting timed acknowledgement for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Setting timed acknowledgement for host '" + host->GetName() + "'");
if (host->GetState() == HostUp) if (host->GetState() == HostUp)
BOOST_THROW_EXCEPTION(std::invalid_argument("The host '" + arguments[0] + "' is OK.")); BOOST_THROW_EXCEPTION(std::invalid_argument("The host '" + arguments[0] + "' is OK."));
@ -717,7 +717,7 @@ void ExternalCommandProcessor::RemoveHostAcknowledgement(double, const std::vect
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot remove acknowledgement for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot remove acknowledgement for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Removing acknowledgement for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Removing acknowledgement for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -735,7 +735,7 @@ void ExternalCommandProcessor::EnableHostgroupSvcChecks(double, const std::vecto
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling active checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -755,7 +755,7 @@ void ExternalCommandProcessor::DisableHostgroupSvcChecks(double, const std::vect
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling active checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -774,7 +774,7 @@ void ExternalCommandProcessor::EnableServicegroupSvcChecks(double, const std::ve
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup service checks for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup service checks for non-existent servicegroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling active checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -792,7 +792,7 @@ void ExternalCommandProcessor::DisableServicegroupSvcChecks(double, const std::v
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup service checks for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup service checks for non-existent servicegroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling active checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -809,7 +809,7 @@ void ExternalCommandProcessor::EnablePassiveHostChecks(double, const std::vector
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable passive host checks for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable passive host checks for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling passive checks for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Enabling passive checks for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -825,7 +825,7 @@ void ExternalCommandProcessor::DisablePassiveHostChecks(double, const std::vecto
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable passive host checks for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable passive host checks for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling passive checks for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Disabling passive checks for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -841,7 +841,7 @@ void ExternalCommandProcessor::EnablePassiveSvcChecks(double, const std::vector<
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service checks for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service checks for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling passive checks for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Enabling passive checks for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -857,7 +857,7 @@ void ExternalCommandProcessor::DisablePassiveSvcChecks(double, const std::vector
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service checks for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service checks for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling passive checks for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Disabling passive checks for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -874,7 +874,7 @@ void ExternalCommandProcessor::EnableServicegroupPassiveSvcChecks(double, const
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup passive service checks for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup passive service checks for non-existent servicegroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Enabling passive checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling passive checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -892,7 +892,7 @@ void ExternalCommandProcessor::DisableServicegroupPassiveSvcChecks(double, const
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup passive service checks for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup passive service checks for non-existent servicegroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Disabling passive checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling passive checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -911,7 +911,7 @@ void ExternalCommandProcessor::EnableHostgroupPassiveSvcChecks(double, const std
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Enabling passive checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling passive checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -931,7 +931,7 @@ void ExternalCommandProcessor::DisableHostgroupPassiveSvcChecks(double, const st
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Disabling passive checks for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling passive checks for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -957,7 +957,7 @@ void ExternalCommandProcessor::ProcessFile(double, const std::vector<String>& ar
std::getline(ifp, line); std::getline(ifp, line);
try { try {
Log(LogInformation, "compat", "Executing external command: " + line); Log(LogNotice, "compat", "Executing external command: " + line);
Execute(line); Execute(line);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
@ -985,7 +985,7 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector<Str
if (triggeredByLegacy != 0) if (triggeredByLegacy != 0)
triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy);
Log(LogInformation, "icinga", "Creating downtime for service " + service->GetName()); Log(LogNotice, "icinga", "Creating downtime for service " + service->GetName());
(void) service->AddDowntime(arguments[7], arguments[8], (void) service->AddDowntime(arguments[7], arguments[8],
Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[3]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[3]),
Convert::ToBool(arguments[4]), triggeredBy, Convert::ToDouble(arguments[6])); Convert::ToBool(arguments[4]), triggeredBy, Convert::ToDouble(arguments[6]));
@ -994,7 +994,7 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector<Str
void ExternalCommandProcessor::DelSvcDowntime(double, const std::vector<String>& arguments) void ExternalCommandProcessor::DelSvcDowntime(double, const std::vector<String>& arguments)
{ {
int id = Convert::ToLong(arguments[0]); int id = Convert::ToLong(arguments[0]);
Log(LogInformation, "icinga", "Removing downtime ID " + arguments[0]); Log(LogNotice, "icinga", "Removing downtime ID " + arguments[0]);
String rid = Service::GetDowntimeIDFromLegacyID(id); String rid = Service::GetDowntimeIDFromLegacyID(id);
Service::RemoveDowntime(rid, true); Service::RemoveDowntime(rid, true);
} }
@ -1011,7 +1011,7 @@ void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vector<St
if (triggeredByLegacy != 0) if (triggeredByLegacy != 0)
triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy);
Log(LogInformation, "icinga", "Creating downtime for host " + host->GetName()); Log(LogNotice, "icinga", "Creating downtime for host " + host->GetName());
(void) host->AddDowntime(arguments[6], arguments[7], (void) host->AddDowntime(arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
@ -1021,7 +1021,7 @@ void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vector<St
void ExternalCommandProcessor::DelHostDowntime(double, const std::vector<String>& arguments) void ExternalCommandProcessor::DelHostDowntime(double, const std::vector<String>& arguments)
{ {
int id = Convert::ToLong(arguments[0]); int id = Convert::ToLong(arguments[0]);
Log(LogInformation, "icinga", "Removing downtime ID " + arguments[0]); Log(LogNotice, "icinga", "Removing downtime ID " + arguments[0]);
String rid = Service::GetDowntimeIDFromLegacyID(id); String rid = Service::GetDowntimeIDFromLegacyID(id);
Service::RemoveDowntime(rid, true); Service::RemoveDowntime(rid, true);
} }
@ -1039,7 +1039,7 @@ void ExternalCommandProcessor::ScheduleHostSvcDowntime(double, const std::vector
triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy);
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Creating downtime for service " + service->GetName()); Log(LogNotice, "icinga", "Creating downtime for service " + service->GetName());
(void) service->AddDowntime(arguments[6], arguments[7], (void) service->AddDowntime(arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5]));
@ -1059,7 +1059,7 @@ void ExternalCommandProcessor::ScheduleHostgroupHostDowntime(double, const std::
triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy);
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Creating downtime for host " + host->GetName()); Log(LogNotice, "icinga", "Creating downtime for host " + host->GetName());
(void) host->AddDowntime(arguments[6], arguments[7], (void) host->AddDowntime(arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
@ -1092,7 +1092,7 @@ void ExternalCommandProcessor::ScheduleHostgroupSvcDowntime(double, const std::v
} }
BOOST_FOREACH(const Service::Ptr& service, services) { BOOST_FOREACH(const Service::Ptr& service, services) {
Log(LogInformation, "icinga", "Creating downtime for service " + service->GetName()); Log(LogNotice, "icinga", "Creating downtime for service " + service->GetName());
(void) service->AddDowntime(arguments[6], arguments[7], (void) service->AddDowntime(arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5]));
@ -1123,7 +1123,7 @@ void ExternalCommandProcessor::ScheduleServicegroupHostDowntime(double, const st
} }
BOOST_FOREACH(const Host::Ptr& host, hosts) { BOOST_FOREACH(const Host::Ptr& host, hosts) {
Log(LogInformation, "icinga", "Creating downtime for host " + host->GetName()); Log(LogNotice, "icinga", "Creating downtime for host " + host->GetName());
(void) host->AddDowntime(arguments[6], arguments[7], (void) host->AddDowntime(arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5]));
@ -1143,7 +1143,7 @@ void ExternalCommandProcessor::ScheduleServicegroupSvcDowntime(double, const std
triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy);
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Creating downtime for service " + service->GetName()); Log(LogNotice, "icinga", "Creating downtime for service " + service->GetName());
(void) service->AddDowntime(arguments[6], arguments[7], (void) service->AddDowntime(arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5]));
@ -1157,14 +1157,14 @@ void ExternalCommandProcessor::AddHostComment(double, const std::vector<String>&
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot add host comment for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot add host comment for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Creating comment for host " + host->GetName()); Log(LogNotice, "icinga", "Creating comment for host " + host->GetName());
(void) host->AddComment(CommentUser, arguments[2], arguments[3], 0); (void) host->AddComment(CommentUser, arguments[2], arguments[3], 0);
} }
void ExternalCommandProcessor::DelHostComment(double, const std::vector<String>& arguments) void ExternalCommandProcessor::DelHostComment(double, const std::vector<String>& arguments)
{ {
int id = Convert::ToLong(arguments[0]); int id = Convert::ToLong(arguments[0]);
Log(LogInformation, "icinga", "Removing comment ID " + arguments[0]); Log(LogNotice, "icinga", "Removing comment ID " + arguments[0]);
String rid = Service::GetCommentIDFromLegacyID(id); String rid = Service::GetCommentIDFromLegacyID(id);
Service::RemoveComment(rid); Service::RemoveComment(rid);
} }
@ -1176,14 +1176,14 @@ void ExternalCommandProcessor::AddSvcComment(double, const std::vector<String>&
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot add service comment for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot add service comment for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Creating comment for service " + service->GetName()); Log(LogNotice, "icinga", "Creating comment for service " + service->GetName());
(void) service->AddComment(CommentUser, arguments[3], arguments[4], 0); (void) service->AddComment(CommentUser, arguments[3], arguments[4], 0);
} }
void ExternalCommandProcessor::DelSvcComment(double, const std::vector<String>& arguments) void ExternalCommandProcessor::DelSvcComment(double, const std::vector<String>& arguments)
{ {
int id = Convert::ToLong(arguments[0]); int id = Convert::ToLong(arguments[0]);
Log(LogInformation, "icinga", "Removing comment ID " + arguments[0]); Log(LogNotice, "icinga", "Removing comment ID " + arguments[0]);
String rid = Service::GetCommentIDFromLegacyID(id); String rid = Service::GetCommentIDFromLegacyID(id);
Service::RemoveComment(rid); Service::RemoveComment(rid);
@ -1196,7 +1196,7 @@ void ExternalCommandProcessor::DelAllHostComments(double, const std::vector<Stri
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delete all host comments for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delete all host comments for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Removing all comments for host " + host->GetName()); Log(LogNotice, "icinga", "Removing all comments for host " + host->GetName());
host->RemoveAllComments(); host->RemoveAllComments();
} }
@ -1207,7 +1207,7 @@ void ExternalCommandProcessor::DelAllSvcComments(double, const std::vector<Strin
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delete all service comments for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delete all service comments for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Removing all comments for service " + service->GetName()); Log(LogNotice, "icinga", "Removing all comments for service " + service->GetName());
service->RemoveAllComments(); service->RemoveAllComments();
} }
@ -1220,7 +1220,7 @@ void ExternalCommandProcessor::SendCustomHostNotification(double, const std::vec
int options = Convert::ToLong(arguments[1]); int options = Convert::ToLong(arguments[1]);
Log(LogInformation, "icinga", "Sending custom notification for host " + host->GetName()); Log(LogNotice, "icinga", "Sending custom notification for host " + host->GetName());
if (options & 2) { if (options & 2) {
ObjectLock olock(host); ObjectLock olock(host);
host->SetForceNextNotification(true); host->SetForceNextNotification(true);
@ -1238,7 +1238,7 @@ void ExternalCommandProcessor::SendCustomSvcNotification(double, const std::vect
int options = Convert::ToLong(arguments[2]); int options = Convert::ToLong(arguments[2]);
Log(LogInformation, "icinga", "Sending custom notification for service " + service->GetName()); Log(LogNotice, "icinga", "Sending custom notification for service " + service->GetName());
if (options & 2) { if (options & 2) {
ObjectLock olock(service); ObjectLock olock(service);
@ -1255,7 +1255,7 @@ void ExternalCommandProcessor::DelayHostNotification(double, const std::vector<S
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delay host notification for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delay host notification for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Delaying notifications for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Delaying notifications for host '" + host->GetName() + "'");
BOOST_FOREACH(const Notification::Ptr& notification, host->GetNotifications()) { BOOST_FOREACH(const Notification::Ptr& notification, host->GetNotifications()) {
ObjectLock olock(notification); ObjectLock olock(notification);
@ -1271,7 +1271,7 @@ void ExternalCommandProcessor::DelaySvcNotification(double, const std::vector<St
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delay service notification for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot delay service notification for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Delaying notifications for service " + service->GetName()); Log(LogNotice, "icinga", "Delaying notifications for service " + service->GetName());
BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) { BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) {
ObjectLock olock(notification); ObjectLock olock(notification);
@ -1287,7 +1287,7 @@ void ExternalCommandProcessor::EnableHostNotifications(double, const std::vector
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host notifications for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host notifications for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling notifications for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Enabling notifications for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1303,7 +1303,7 @@ void ExternalCommandProcessor::DisableHostNotifications(double, const std::vecto
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host notifications for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host notifications for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling notifications for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Disabling notifications for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1319,7 +1319,7 @@ void ExternalCommandProcessor::EnableSvcNotifications(double, const std::vector<
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service notifications for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service notifications for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling notifications for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Enabling notifications for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1335,7 +1335,7 @@ void ExternalCommandProcessor::DisableSvcNotifications(double, const std::vector
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service notifications for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service notifications for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling notifications for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Disabling notifications for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1352,7 +1352,7 @@ void ExternalCommandProcessor::DisableHostgroupHostChecks(double, const std::vec
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup host checks for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup host checks for non-existent hostgroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Disabling active checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Disabling active checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1370,7 +1370,7 @@ void ExternalCommandProcessor::DisableHostgroupPassiveHostChecks(double, const s
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup passive host checks for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup passive host checks for non-existent hostgroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Disabling passive checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Disabling passive checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1390,7 +1390,7 @@ void ExternalCommandProcessor::DisableServicegroupHostChecks(double, const std::
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
Log(LogInformation, "icinga", "Disabling active checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Disabling active checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1410,7 +1410,7 @@ void ExternalCommandProcessor::DisableServicegroupPassiveHostChecks(double, cons
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
Log(LogInformation, "icinga", "Disabling passive checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Disabling passive checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1428,7 +1428,7 @@ void ExternalCommandProcessor::EnableHostgroupHostChecks(double, const std::vect
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup host checks for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup host checks for non-existent hostgroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Enabling active checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Enabling active checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1446,7 +1446,7 @@ void ExternalCommandProcessor::EnableHostgroupPassiveHostChecks(double, const st
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup passive host checks for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup passive host checks for non-existent hostgroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Enabling passive checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Enabling passive checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1466,7 +1466,7 @@ void ExternalCommandProcessor::EnableServicegroupHostChecks(double, const std::v
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
Log(LogInformation, "icinga", "Enabling active checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Enabling active checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1486,7 +1486,7 @@ void ExternalCommandProcessor::EnableServicegroupPassiveHostChecks(double, const
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
Log(LogInformation, "icinga", "Enabling passive checks for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Enabling passive checks for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1503,7 +1503,7 @@ void ExternalCommandProcessor::EnableHostFlapping(double, const std::vector<Stri
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host flapping for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host flapping for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling flapping detection for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Enabling flapping detection for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1519,7 +1519,7 @@ void ExternalCommandProcessor::DisableHostFlapping(double, const std::vector<Str
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host flapping for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host flapping for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling flapping detection for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Disabling flapping detection for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1535,7 +1535,7 @@ void ExternalCommandProcessor::EnableSvcFlapping(double, const std::vector<Strin
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service flapping for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service flapping for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling flapping detection for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Enabling flapping detection for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1551,7 +1551,7 @@ void ExternalCommandProcessor::DisableSvcFlapping(double, const std::vector<Stri
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service flapping for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service flapping for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling flapping detection for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Disabling flapping detection for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1562,84 +1562,84 @@ void ExternalCommandProcessor::DisableSvcFlapping(double, const std::vector<Stri
void ExternalCommandProcessor::EnableNotifications(double, const std::vector<String>&) void ExternalCommandProcessor::EnableNotifications(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally enabling notifications."); Log(LogNotice, "icinga", "Globally enabling notifications.");
IcingaApplication::GetInstance()->SetEnableNotifications(true); IcingaApplication::GetInstance()->SetEnableNotifications(true);
} }
void ExternalCommandProcessor::DisableNotifications(double, const std::vector<String>&) void ExternalCommandProcessor::DisableNotifications(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally disabling notifications."); Log(LogNotice, "icinga", "Globally disabling notifications.");
IcingaApplication::GetInstance()->SetEnableNotifications(false); IcingaApplication::GetInstance()->SetEnableNotifications(false);
} }
void ExternalCommandProcessor::EnableFlapDetection(double, const std::vector<String>&) void ExternalCommandProcessor::EnableFlapDetection(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally enabling flap detection."); Log(LogNotice, "icinga", "Globally enabling flap detection.");
IcingaApplication::GetInstance()->SetEnableFlapping(true); IcingaApplication::GetInstance()->SetEnableFlapping(true);
} }
void ExternalCommandProcessor::DisableFlapDetection(double, const std::vector<String>&) void ExternalCommandProcessor::DisableFlapDetection(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally disabling flap detection."); Log(LogNotice, "icinga", "Globally disabling flap detection.");
IcingaApplication::GetInstance()->SetEnableFlapping(false); IcingaApplication::GetInstance()->SetEnableFlapping(false);
} }
void ExternalCommandProcessor::EnableEventHandlers(double, const std::vector<String>&) void ExternalCommandProcessor::EnableEventHandlers(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally enabling event handlers."); Log(LogNotice, "icinga", "Globally enabling event handlers.");
IcingaApplication::GetInstance()->SetEnableEventHandlers(true); IcingaApplication::GetInstance()->SetEnableEventHandlers(true);
} }
void ExternalCommandProcessor::DisableEventHandlers(double, const std::vector<String>&) void ExternalCommandProcessor::DisableEventHandlers(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally disabling event handlers."); Log(LogNotice, "icinga", "Globally disabling event handlers.");
IcingaApplication::GetInstance()->SetEnableEventHandlers(false); IcingaApplication::GetInstance()->SetEnableEventHandlers(false);
} }
void ExternalCommandProcessor::EnablePerformanceData(double, const std::vector<String>&) void ExternalCommandProcessor::EnablePerformanceData(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally enabling performance data processing."); Log(LogNotice, "icinga", "Globally enabling performance data processing.");
IcingaApplication::GetInstance()->SetEnablePerfdata(true); IcingaApplication::GetInstance()->SetEnablePerfdata(true);
} }
void ExternalCommandProcessor::DisablePerformanceData(double, const std::vector<String>&) void ExternalCommandProcessor::DisablePerformanceData(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally disabling performance data processing."); Log(LogNotice, "icinga", "Globally disabling performance data processing.");
IcingaApplication::GetInstance()->SetEnablePerfdata(false); IcingaApplication::GetInstance()->SetEnablePerfdata(false);
} }
void ExternalCommandProcessor::StartExecutingSvcChecks(double, const std::vector<String>&) void ExternalCommandProcessor::StartExecutingSvcChecks(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally enabling service checks."); Log(LogNotice, "icinga", "Globally enabling service checks.");
IcingaApplication::GetInstance()->SetEnableServiceChecks(true); IcingaApplication::GetInstance()->SetEnableServiceChecks(true);
} }
void ExternalCommandProcessor::StopExecutingSvcChecks(double, const std::vector<String>&) void ExternalCommandProcessor::StopExecutingSvcChecks(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally disabling service checks."); Log(LogNotice, "icinga", "Globally disabling service checks.");
IcingaApplication::GetInstance()->SetEnableServiceChecks(false); IcingaApplication::GetInstance()->SetEnableServiceChecks(false);
} }
void ExternalCommandProcessor::StartExecutingHostChecks(double, const std::vector<String>&) void ExternalCommandProcessor::StartExecutingHostChecks(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally enabling host checks."); Log(LogNotice, "icinga", "Globally enabling host checks.");
IcingaApplication::GetInstance()->SetEnableHostChecks(true); IcingaApplication::GetInstance()->SetEnableHostChecks(true);
} }
void ExternalCommandProcessor::StopExecutingHostChecks(double, const std::vector<String>&) void ExternalCommandProcessor::StopExecutingHostChecks(double, const std::vector<String>&)
{ {
Log(LogInformation, "icinga", "Globally disabling host checks."); Log(LogNotice, "icinga", "Globally disabling host checks.");
IcingaApplication::GetInstance()->SetEnableHostChecks(false); IcingaApplication::GetInstance()->SetEnableHostChecks(false);
} }
@ -1653,7 +1653,7 @@ void ExternalCommandProcessor::ChangeSvcModattr(double, const std::vector<String
int modifiedAttributes = Convert::ToLong(arguments[2]); int modifiedAttributes = Convert::ToLong(arguments[2]);
Log(LogInformation, "icinga", "Updating modified attributes for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Updating modified attributes for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1669,7 +1669,7 @@ void ExternalCommandProcessor::ChangeHostModattr(double, const std::vector<Strin
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Updating modified attributes for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Updating modified attributes for host '" + arguments[0] + "'");
int modifiedAttributes = Convert::ToLong(arguments[1]); int modifiedAttributes = Convert::ToLong(arguments[1]);
@ -1687,7 +1687,7 @@ void ExternalCommandProcessor::ChangeUserModattr(double, const std::vector<Strin
if (!user) if (!user)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent user '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent user '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Updating modified attributes for user '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Updating modified attributes for user '" + arguments[0] + "'");
int modifiedAttributes = Convert::ToLong(arguments[1]); int modifiedAttributes = Convert::ToLong(arguments[1]);
@ -1730,7 +1730,7 @@ void ExternalCommandProcessor::ChangeNotificationcommandModattr(double, const st
void ExternalCommandProcessor::ChangeCommandModattrInternal(const Command::Ptr& command, int mod_attr) void ExternalCommandProcessor::ChangeCommandModattrInternal(const Command::Ptr& command, int mod_attr)
{ {
Log(LogInformation, "icinga", "Updating modified attributes for command '" + command->GetName() + "'"); Log(LogNotice, "icinga", "Updating modified attributes for command '" + command->GetName() + "'");
{ {
ObjectLock olock(command); ObjectLock olock(command);
@ -1748,7 +1748,7 @@ void ExternalCommandProcessor::ChangeNormalSvcCheckInterval(double, const std::v
double interval = Convert::ToDouble(arguments[2]); double interval = Convert::ToDouble(arguments[2]);
Log(LogInformation, "icinga", "Updating check interval for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Updating check interval for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1764,7 +1764,7 @@ void ExternalCommandProcessor::ChangeNormalHostCheckInterval(double, const std::
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update check interval for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update check interval for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Updating check interval for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Updating check interval for host '" + arguments[0] + "'");
double interval = Convert::ToDouble(arguments[1]); double interval = Convert::ToDouble(arguments[1]);
@ -1784,7 +1784,7 @@ void ExternalCommandProcessor::ChangeRetrySvcCheckInterval(double, const std::ve
double interval = Convert::ToDouble(arguments[2]); double interval = Convert::ToDouble(arguments[2]);
Log(LogInformation, "icinga", "Updating retry interval for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Updating retry interval for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1800,7 +1800,7 @@ void ExternalCommandProcessor::ChangeRetryHostCheckInterval(double, const std::v
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update retry interval for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update retry interval for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Updating retry interval for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Updating retry interval for host '" + arguments[0] + "'");
double interval = Convert::ToDouble(arguments[1]); double interval = Convert::ToDouble(arguments[1]);
@ -1818,7 +1818,7 @@ void ExternalCommandProcessor::EnableHostEventHandler(double, const std::vector<
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable event handler for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable event handler for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling event handler for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Enabling event handler for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1834,7 +1834,7 @@ void ExternalCommandProcessor::DisableHostEventHandler(double, const std::vector
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable event handler for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable event handler for non-existent host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling event handler for host '" + arguments[0] + "'"); Log(LogNotice, "icinga", "Disabling event handler for host '" + arguments[0] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1850,7 +1850,7 @@ void ExternalCommandProcessor::EnableSvcEventHandler(double, const std::vector<S
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable event handler for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable event handler for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Enabling event handler for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Enabling event handler for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1866,7 +1866,7 @@ void ExternalCommandProcessor::DisableSvcEventHandler(double, const std::vector<
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable event handler for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable event handler for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
Log(LogInformation, "icinga", "Disabling event handler for service '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Disabling event handler for service '" + arguments[1] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1891,7 +1891,7 @@ void ExternalCommandProcessor::ChangeHostEventHandler(double, const std::vector<
if (!command) if (!command)
BOOST_THROW_EXCEPTION(std::invalid_argument("Event command '" + arguments[1] + "' does not exist.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Event command '" + arguments[1] + "' does not exist."));
Log(LogInformation, "icinga", "Changing event handler for host '" + arguments[0] + "' to '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Changing event handler for host '" + arguments[0] + "' to '" + arguments[1] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1917,7 +1917,7 @@ void ExternalCommandProcessor::ChangeSvcEventHandler(double, const std::vector<S
if (!command) if (!command)
BOOST_THROW_EXCEPTION(std::invalid_argument("Event command '" + arguments[2] + "' does not exist.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Event command '" + arguments[2] + "' does not exist."));
Log(LogInformation, "icinga", "Changing event handler for service '" + arguments[1] + "' to '" + arguments[2] + "'"); Log(LogNotice, "icinga", "Changing event handler for service '" + arguments[1] + "' to '" + arguments[2] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1939,7 +1939,7 @@ void ExternalCommandProcessor::ChangeHostCheckCommand(double, const std::vector<
if (!command) if (!command)
BOOST_THROW_EXCEPTION(std::invalid_argument("Check command '" + arguments[1] + "' does not exist.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Check command '" + arguments[1] + "' does not exist."));
Log(LogInformation, "icinga", "Changing check command for host '" + arguments[0] + "' to '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Changing check command for host '" + arguments[0] + "' to '" + arguments[1] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1960,7 +1960,7 @@ void ExternalCommandProcessor::ChangeSvcCheckCommand(double, const std::vector<S
if (!command) if (!command)
BOOST_THROW_EXCEPTION(std::invalid_argument("Check command '" + arguments[2] + "' does not exist.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Check command '" + arguments[2] + "' does not exist."));
Log(LogInformation, "icinga", "Changing check command for service '" + arguments[1] + "' to '" + arguments[2] + "'"); Log(LogNotice, "icinga", "Changing check command for service '" + arguments[1] + "' to '" + arguments[2] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -1978,7 +1978,7 @@ void ExternalCommandProcessor::ChangeMaxHostCheckAttempts(double, const std::vec
int attempts = Convert::ToLong(arguments[1]); int attempts = Convert::ToLong(arguments[1]);
Log(LogInformation, "icinga", "Changing max check attempts for host '" + arguments[0] + "' to '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Changing max check attempts for host '" + arguments[0] + "' to '" + arguments[1] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -1996,7 +1996,7 @@ void ExternalCommandProcessor::ChangeMaxSvcCheckAttempts(double, const std::vect
int attempts = Convert::ToLong(arguments[2]); int attempts = Convert::ToLong(arguments[2]);
Log(LogInformation, "icinga", "Changing max check attempts for service '" + arguments[1] + "' to '" + arguments[2] + "'"); Log(LogNotice, "icinga", "Changing max check attempts for service '" + arguments[1] + "' to '" + arguments[2] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -2017,7 +2017,7 @@ void ExternalCommandProcessor::ChangeHostCheckTimeperiod(double, const std::vect
if (!tp) if (!tp)
BOOST_THROW_EXCEPTION(std::invalid_argument("Time period '" + arguments[1] + "' does not exist.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Time period '" + arguments[1] + "' does not exist."));
Log(LogInformation, "icinga", "Changing check period for host '" + arguments[0] + "' to '" + arguments[1] + "'"); Log(LogNotice, "icinga", "Changing check period for host '" + arguments[0] + "' to '" + arguments[1] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -2038,7 +2038,7 @@ void ExternalCommandProcessor::ChangeSvcCheckTimeperiod(double, const std::vecto
if (!tp) if (!tp)
BOOST_THROW_EXCEPTION(std::invalid_argument("Time period '" + arguments[2] + "' does not exist.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Time period '" + arguments[2] + "' does not exist."));
Log(LogInformation, "icinga", "Changing check period for service '" + arguments[1] + "' to '" + arguments[2] + "'"); Log(LogNotice, "icinga", "Changing check period for service '" + arguments[1] + "' to '" + arguments[2] + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -2063,7 +2063,7 @@ void ExternalCommandProcessor::ChangeCustomHostVar(double, const std::vector<Str
override_vars->Set(arguments[1], arguments[2]); override_vars->Set(arguments[1], arguments[2]);
Log(LogInformation, "icinga", "Changing custom var '" + arguments[1] + "' for host '" + arguments[0] + "' to value '" + arguments[2] + "'"); Log(LogNotice, "icinga", "Changing custom var '" + arguments[1] + "' for host '" + arguments[0] + "' to value '" + arguments[2] + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -2089,7 +2089,7 @@ void ExternalCommandProcessor::ChangeCustomSvcVar(double, const std::vector<Stri
override_vars->Set(arguments[2], arguments[3]); override_vars->Set(arguments[2], arguments[3]);
Log(LogInformation, "icinga", "Changing custom var '" + arguments[2] + "' for service '" + arguments[1] + "' on host '" + Log(LogNotice, "icinga", "Changing custom var '" + arguments[2] + "' for service '" + arguments[1] + "' on host '" +
arguments[0] + "' to value '" + arguments[3] + "'"); arguments[0] + "' to value '" + arguments[3] + "'");
{ {
@ -2115,7 +2115,7 @@ void ExternalCommandProcessor::ChangeCustomUserVar(double, const std::vector<Str
override_vars->Set(arguments[1], arguments[2]); override_vars->Set(arguments[1], arguments[2]);
Log(LogInformation, "icinga", "Changing custom var '" + arguments[1] + "' for user '" + arguments[0] + "' to value '" + arguments[2] + "'"); Log(LogNotice, "icinga", "Changing custom var '" + arguments[1] + "' for user '" + arguments[0] + "' to value '" + arguments[2] + "'");
{ {
ObjectLock olock(user); ObjectLock olock(user);
@ -2165,7 +2165,7 @@ void ExternalCommandProcessor::ChangeCustomCommandVarInternal(const Command::Ptr
override_vars->Set(name, value); override_vars->Set(name, value);
Log(LogInformation, "icinga", "Changing custom var '" + name + "' for command '" + command->GetName() + "' to value '" + Convert::ToString(value) + "'"); Log(LogNotice, "icinga", "Changing custom var '" + name + "' for command '" + command->GetName() + "' to value '" + Convert::ToString(value) + "'");
{ {
ObjectLock olock(command); ObjectLock olock(command);
@ -2182,7 +2182,7 @@ void ExternalCommandProcessor::EnableHostgroupHostNotifications(double, const st
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host notifications for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host notifications for non-existent hostgroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Enabling notifications for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Enabling notifications for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -2201,7 +2201,7 @@ void ExternalCommandProcessor::EnableHostgroupSvcNotifications(double, const std
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Enabling notifications for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling notifications for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -2220,7 +2220,7 @@ void ExternalCommandProcessor::DisableHostgroupHostNotifications(double, const s
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host notifications for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host notifications for non-existent hostgroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
Log(LogInformation, "icinga", "Disabling notifications for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Disabling notifications for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -2239,7 +2239,7 @@ void ExternalCommandProcessor::DisableHostgroupSvcNotifications(double, const st
BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) {
BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
Log(LogInformation, "icinga", "Disabling notifications for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling notifications for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -2260,7 +2260,7 @@ void ExternalCommandProcessor::EnableServicegroupHostNotifications(double, const
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
Log(LogInformation, "icinga", "Enabling notifications for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Enabling notifications for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -2278,7 +2278,7 @@ void ExternalCommandProcessor::EnableServicegroupSvcNotifications(double, const
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service notifications for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service notifications for non-existent servicegroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Enabling notifications for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Enabling notifications for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);
@ -2298,7 +2298,7 @@ void ExternalCommandProcessor::DisableServicegroupHostNotifications(double, cons
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
Log(LogInformation, "icinga", "Disabling notifications for host '" + host->GetName() + "'"); Log(LogNotice, "icinga", "Disabling notifications for host '" + host->GetName() + "'");
{ {
ObjectLock olock(host); ObjectLock olock(host);
@ -2316,7 +2316,7 @@ void ExternalCommandProcessor::DisableServicegroupSvcNotifications(double, const
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service notifications for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service notifications for non-existent servicegroup '" + arguments[0] + "'"));
BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
Log(LogInformation, "icinga", "Disabling notifications for service '" + service->GetName() + "'"); Log(LogNotice, "icinga", "Disabling notifications for service '" + service->GetName() + "'");
{ {
ObjectLock olock(service); ObjectLock olock(service);

2
lib/icinga/notification.cpp
View File

@ -303,7 +303,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
if (!CheckNotificationUserFilters(type, user, force)) if (!CheckNotificationUserFilters(type, user, force))
continue; continue;
Log(LogDebug, "icinga", "Sending notification for user '" + user->GetName() + "'"); Log(LogInformation, "icinga", "Sending notification for user '" + user->GetName() + "'");
Utility::QueueAsyncCallback(boost::bind(&Notification::ExecuteNotificationHelper, this, type, user, cr, force, author, text)); Utility::QueueAsyncCallback(boost::bind(&Notification::ExecuteNotificationHelper, this, type, user, cr, force, author, text));
/* collect all notified users */ /* collect all notified users */

8
lib/remote/apiclient.cpp
View File

@ -85,9 +85,11 @@ void ApiClient::SendMessage(const Dictionary::Ptr& message)
if (message->Get("method") != "log::SetLogPosition") if (message->Get("method") != "log::SetLogPosition")
m_Seen = Utility::GetTime(); m_Seen = Utility::GetTime();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
std::ostringstream msgbuf; std::ostringstream info, debug;
msgbuf << "Error while sending JSON-RPC message for identity '" << m_Identity << "': " << DiagnosticInformation(ex); info << "Error while sending JSON-RPC message for identity '" << m_Identity << "'";
Log(LogWarning, "remote", msgbuf.str()); debug << info << std::endl << DiagnosticInformation(ex);
Log(LogWarning, "remote", info.str());
Log(LogDebug, "remote", debug.str());
Disconnect(); Disconnect();
} }

12
lib/remote/apilistener.cpp
View File

@ -133,7 +133,7 @@ void ApiListener::AddListener(const String& service)
std::ostringstream s; std::ostringstream s;
s << "Adding new listener: port " << service; s << "Adding new listener: port " << service;
Log(LogInformation, "agent", s.str()); Log(LogInformation, "remote", s.str());
TcpSocket::Ptr server = make_shared<TcpSocket>(); TcpSocket::Ptr server = make_shared<TcpSocket>();
server->Bind(service, AF_INET6); server->Bind(service, AF_INET6);
@ -265,7 +265,7 @@ void ApiListener::ApiTimerHandler(void)
if (!need) { if (!need) {
String path = GetApiDir() + "log/" + Convert::ToString(ts); String path = GetApiDir() + "log/" + Convert::ToString(ts);
Log(LogInformation, "remote", "Removing old log file: " + path); Log(LogNotice, "remote", "Removing old log file: " + path);
(void)unlink(path.CStr()); (void)unlink(path.CStr());
} }
} }
@ -325,7 +325,7 @@ void ApiListener::ApiTimerHandler(void)
BOOST_FOREACH(const ApiClient::Ptr& client, endpoint->GetClients()) BOOST_FOREACH(const ApiClient::Ptr& client, endpoint->GetClients())
client->SendMessage(lmessage); client->SendMessage(lmessage);
Log(LogInformation, "remote", "Setting log position for identity '" + endpoint->GetName() + "': " + Log(LogNotice, "remote", "Setting log position for identity '" + endpoint->GetName() + "': " +
Utility::FormatDateTime("%Y/%m/%d %H:%M:%S", ts)); Utility::FormatDateTime("%Y/%m/%d %H:%M:%S", ts));
} }
@ -545,7 +545,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
if (ts < peer_ts) if (ts < peer_ts)
continue; continue;
Log(LogInformation, "cluster", "Replaying log: " + path); Log(LogNotice, "remote", "Replaying log: " + path);
std::fstream *fp = new std::fstream(path.CStr(), std::fstream::in); std::fstream *fp = new std::fstream(path.CStr(), std::fstream::in);
StdioStream::Ptr logStream = make_shared<StdioStream>(fp, true); StdioStream::Ptr logStream = make_shared<StdioStream>(fp, true);
@ -560,7 +560,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
pmessage = JsonDeserialize(message); pmessage = JsonDeserialize(message);
} catch (const std::exception&) { } catch (const std::exception&) {
Log(LogWarning, "cluster", "Unexpected end-of-file for cluster log: " + path); Log(LogWarning, "remote", "Unexpected end-of-file for cluster log: " + path);
/* Log files may be incomplete or corrupted. This is perfectly OK. */ /* Log files may be incomplete or corrupted. This is perfectly OK. */
break; break;
@ -578,7 +578,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
logStream->Close(); logStream->Close();
} }
Log(LogInformation, "cluster", "Replayed " + Convert::ToString(count) + " messages."); Log(LogNotice, "remote", "Replayed " + Convert::ToString(count) + " messages.");
if (last_sync) { if (last_sync) {
{ {