diff --git a/components/compat/compatlogger.cpp b/components/compat/compatlogger.cpp index 4b3e402f2..f5b3f73e5 100644 --- a/components/compat/compatlogger.cpp +++ b/components/compat/compatlogger.cpp @@ -434,7 +434,7 @@ void CompatLogger::ReopenFile(bool rotate) if (rotate) { 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()); } } @@ -536,7 +536,7 @@ void CompatLogger::ScheduleNextRotation(void) 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) + "'"); m_RotationTimer->Reschedule(ts); } diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp index f00dd250e..4f57796e1 100644 --- a/components/db_ido_pgsql/idopgsqlconnection.cpp +++ b/components/db_ido_pgsql/idopgsqlconnection.cpp @@ -96,7 +96,8 @@ void IdoPgsqlConnection::Pause(void) 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); diff --git a/components/livestatus/listener.cpp b/components/livestatus/listener.cpp index a3fae53b6..cb8b4e36d 100644 --- a/components/livestatus/listener.cpp +++ b/components/livestatus/listener.cpp @@ -123,7 +123,7 @@ void LivestatusListener::ServerThreadProc(const Socket::Ptr& server) for (;;) { Socket::Ptr client = server->Accept(); - Log(LogInformation, "livestatus", "Client connected"); + Log(LogNotice, "livestatus", "Client connected"); Utility::QueueAsyncCallback(boost::bind(&LivestatusListener::ClientHandler, this, client)); } diff --git a/components/livestatus/logtable.cpp b/components/livestatus/logtable.cpp index 12a6bf76e..a6e239937 100644 --- a/components/livestatus/logtable.cpp +++ b/components/livestatus/logtable.cpp @@ -91,7 +91,7 @@ String LogTable::GetName(void) const 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 */ LogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex); diff --git a/components/livestatus/statehisttable.cpp b/components/livestatus/statehisttable.cpp index 8927f10e5..9fb4cb79b 100644 --- a/components/livestatus/statehisttable.cpp +++ b/components/livestatus/statehisttable.cpp @@ -252,7 +252,7 @@ String StateHistTable::GetName(void) const 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 */ LogUtility::CreateLogIndex(m_CompatLogPath, m_LogFileIndex); diff --git a/components/perfdata/graphitewriter.cpp b/components/perfdata/graphitewriter.cpp index 3412e7000..796f91dfb 100644 --- a/components/perfdata/graphitewriter.cpp +++ b/components/perfdata/graphitewriter.cpp @@ -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 << DiagnosticInformation(ex); - Log(LogCritical, "base", msgbuf.str()); + Log(LogCritical, "perfdata", msgbuf.str()); m_Stream.reset(); } diff --git a/lib/base/application.cpp b/lib/base/application.cpp index f4edb5c41..0a0d8b30d 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -241,7 +241,7 @@ mainloop: Utility::Sleep(2.5); if (m_RequestReopenLogs) { - Log(LogInformation, "base", "Reopening log files"); + Log(LogNotice, "base", "Reopening log files"); m_RequestReopenLogs = false; OnReopenLogs(); } diff --git a/lib/base/process.cpp b/lib/base/process.cpp index c4d5eb5f0..e64413cfa 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -426,7 +426,7 @@ void Process::Run(const boost::function& callback) m_FD = outReadPipe; m_PID = pi.dwProcessId; - Log(LogInformation, "base", "Running command '" + m_Arguments + + Log(LogNotice, "base", "Running command '" + m_Arguments + "': PID " + Convert::ToString(m_PID)); #else /* _WIN32 */ @@ -531,7 +531,7 @@ void Process::Run(const boost::function& callback) 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)); m_Arguments.clear(); diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index 790259acb..456192058 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -289,7 +289,7 @@ void ThreadPool::ManagerThreadProc(void) if (tthreads != 0) { std::ostringstream msgbuf; msgbuf << "Thread pool; current: " << alive << "; adjustment: " << tthreads; - Log(LogDebug, "base", msgbuf.str()); + Log(LogNotice, "base", msgbuf.str()); } 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" << "; Threads: " << total_alive << "; Pool utilization: " << (total_utilization / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "%"; - Log(LogDebug, "base", msgbuf.str()); + Log(LogNotice, "base", msgbuf.str()); } } } diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index a3e50a6c0..10b994f8d 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -325,7 +325,7 @@ void ExternalCommandProcessor::ProcessHostCheckResult(double time, const std::ve result->SetExecutionEnd(time); 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); { @@ -361,7 +361,7 @@ void ExternalCommandProcessor::ProcessServiceCheckResult(double time, const std: result->SetExecutionEnd(time); 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); { @@ -384,12 +384,12 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector 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)"); 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()) planned_check = Utility::GetTime(); @@ -408,7 +408,7 @@ void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector if (!host) 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); @@ -428,12 +428,12 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector 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)"); 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()) planned_check = Utility::GetTime(); @@ -452,7 +452,7 @@ void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector< if (!service) 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); @@ -469,7 +469,7 @@ void ExternalCommandProcessor::EnableHostCheck(double, const std::vector if (!host) 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); @@ -485,7 +485,7 @@ void ExternalCommandProcessor::DisableHostCheck(double, const std::vector& if (!service) 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); @@ -517,7 +517,7 @@ void ExternalCommandProcessor::DisableSvcCheck(double, const std::vector if (!service) 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); @@ -528,13 +528,13 @@ void ExternalCommandProcessor::DisableSvcCheck(double, const std::vector void ExternalCommandProcessor::ShutdownProcess(double, const std::vector&) { - Log(LogInformation, "icinga", "Shutting down Icinga via external command."); + Log(LogNotice, "icinga", "Shutting down Icinga via external command."); Application::RequestShutdown(); } void ExternalCommandProcessor::RestartProcess(double, const std::vector&) { - Log(LogInformation, "icinga", "Restarting Icinga via external command."); + Log(LogNotice, "icinga", "Restarting Icinga via external command."); 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_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); @@ -573,12 +573,12 @@ void ExternalCommandProcessor::ScheduleHostSvcChecks(double, const std::vectorGetServices()) { 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)"); continue; } - Log(LogInformation, "icinga", "Rescheduling next check for service '" + service->GetName() + "'"); + Log(LogNotice, "icinga", "Rescheduling next check for service '" + service->GetName() + "'"); { ObjectLock olock(service); @@ -596,7 +596,7 @@ void ExternalCommandProcessor::EnableHostSvcChecks(double, const std::vectorGetServices()) { - Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); + Log(LogNotice, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); service->SetEnableActiveChecks(true); } } @@ -609,7 +609,7 @@ void ExternalCommandProcessor::DisableHostSvcChecks(double, const std::vectorGetServices()) { - Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); + Log(LogNotice, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); { ObjectLock olock(service); @@ -631,7 +631,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblem(double, const std::vectorGetState() == ServiceOK) 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->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal); @@ -650,7 +650,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve if (service->GetState() == ServiceOK) 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->AcknowledgeProblem(arguments[6], arguments[7], sticky ? AcknowledgementSticky : AcknowledgementNormal, timestamp); @@ -663,7 +663,7 @@ void ExternalCommandProcessor::RemoveSvcAcknowledgement(double, const std::vecto if (!service) 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); @@ -682,7 +682,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblem(double, const std::vector< if (!host) 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) 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) 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) 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) 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); @@ -735,7 +735,7 @@ void ExternalCommandProcessor::EnableHostgroupSvcChecks(double, const std::vecto BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { 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); @@ -755,7 +755,7 @@ void ExternalCommandProcessor::DisableHostgroupSvcChecks(double, const std::vect BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { 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); @@ -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_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); @@ -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_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); @@ -809,7 +809,7 @@ void ExternalCommandProcessor::EnablePassiveHostChecks(double, const std::vector if (!host) 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); @@ -825,7 +825,7 @@ void ExternalCommandProcessor::DisablePassiveHostChecks(double, const std::vecto if (!host) 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); @@ -841,7 +841,7 @@ void ExternalCommandProcessor::EnablePassiveSvcChecks(double, const std::vector< if (!service) 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); @@ -857,7 +857,7 @@ void ExternalCommandProcessor::DisablePassiveSvcChecks(double, const std::vector if (!service) 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); @@ -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_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); @@ -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_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); @@ -911,7 +911,7 @@ void ExternalCommandProcessor::EnableHostgroupPassiveSvcChecks(double, const std BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { 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); @@ -931,7 +931,7 @@ void ExternalCommandProcessor::DisableHostgroupPassiveSvcChecks(double, const st BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { 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); @@ -957,7 +957,7 @@ void ExternalCommandProcessor::ProcessFile(double, const std::vector& ar std::getline(ifp, line); try { - Log(LogInformation, "compat", "Executing external command: " + line); + Log(LogNotice, "compat", "Executing external command: " + line); Execute(line); } catch (const std::exception& ex) { @@ -985,7 +985,7 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vectorGetName()); + Log(LogNotice, "icinga", "Creating downtime for service " + service->GetName()); (void) service->AddDowntime(arguments[7], arguments[8], Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[3]), Convert::ToBool(arguments[4]), triggeredBy, Convert::ToDouble(arguments[6])); @@ -994,7 +994,7 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector& arguments) { 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); Service::RemoveDowntime(rid, true); } @@ -1011,7 +1011,7 @@ void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vectorGetName()); + Log(LogNotice, "icinga", "Creating downtime for host " + host->GetName()); (void) host->AddDowntime(arguments[6], arguments[7], Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), @@ -1021,7 +1021,7 @@ void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vector& arguments) { 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); Service::RemoveDowntime(rid, true); } @@ -1039,7 +1039,7 @@ void ExternalCommandProcessor::ScheduleHostSvcDowntime(double, const std::vector triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); 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], Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); @@ -1059,7 +1059,7 @@ void ExternalCommandProcessor::ScheduleHostgroupHostDowntime(double, const std:: triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); 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], 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) { - 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], Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), 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) { - 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], Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); @@ -1143,7 +1143,7 @@ void ExternalCommandProcessor::ScheduleServicegroupSvcDowntime(double, const std triggeredBy = Service::GetDowntimeIDFromLegacyID(triggeredByLegacy); 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], Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToBool(arguments[3]), triggeredBy, Convert::ToDouble(arguments[5])); @@ -1157,14 +1157,14 @@ void ExternalCommandProcessor::AddHostComment(double, const std::vector& if (!host) 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 ExternalCommandProcessor::DelHostComment(double, const std::vector& arguments) { 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); Service::RemoveComment(rid); } @@ -1176,14 +1176,14 @@ void ExternalCommandProcessor::AddSvcComment(double, const std::vector& if (!service) 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 ExternalCommandProcessor::DelSvcComment(double, const std::vector& arguments) { 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); Service::RemoveComment(rid); @@ -1196,7 +1196,7 @@ void ExternalCommandProcessor::DelAllHostComments(double, const std::vectorGetName()); + Log(LogNotice, "icinga", "Removing all comments for host " + host->GetName()); host->RemoveAllComments(); } @@ -1207,7 +1207,7 @@ void ExternalCommandProcessor::DelAllSvcComments(double, const std::vectorGetName()); + Log(LogNotice, "icinga", "Removing all comments for service " + service->GetName()); service->RemoveAllComments(); } @@ -1220,7 +1220,7 @@ void ExternalCommandProcessor::SendCustomHostNotification(double, const std::vec 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) { ObjectLock olock(host); host->SetForceNextNotification(true); @@ -1238,7 +1238,7 @@ void ExternalCommandProcessor::SendCustomSvcNotification(double, const std::vect 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) { ObjectLock olock(service); @@ -1255,7 +1255,7 @@ void ExternalCommandProcessor::DelayHostNotification(double, const std::vectorGetName() + "'"); + Log(LogNotice, "icinga", "Delaying notifications for host '" + host->GetName() + "'"); BOOST_FOREACH(const Notification::Ptr& notification, host->GetNotifications()) { ObjectLock olock(notification); @@ -1271,7 +1271,7 @@ void ExternalCommandProcessor::DelaySvcNotification(double, const std::vectorGetName()); + Log(LogNotice, "icinga", "Delaying notifications for service " + service->GetName()); BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) { ObjectLock olock(notification); @@ -1287,7 +1287,7 @@ void ExternalCommandProcessor::EnableHostNotifications(double, const std::vector if (!host) 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); @@ -1303,7 +1303,7 @@ void ExternalCommandProcessor::DisableHostNotifications(double, const std::vecto if (!host) 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); @@ -1319,7 +1319,7 @@ void ExternalCommandProcessor::EnableSvcNotifications(double, const std::vector< if (!service) 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); @@ -1335,7 +1335,7 @@ void ExternalCommandProcessor::DisableSvcNotifications(double, const std::vector if (!service) 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); @@ -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_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); @@ -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_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); @@ -1390,7 +1390,7 @@ void ExternalCommandProcessor::DisableServicegroupHostChecks(double, const std:: BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { 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); @@ -1410,7 +1410,7 @@ void ExternalCommandProcessor::DisableServicegroupPassiveHostChecks(double, cons BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { 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); @@ -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_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); @@ -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_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); @@ -1466,7 +1466,7 @@ void ExternalCommandProcessor::EnableServicegroupHostChecks(double, const std::v BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { 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); @@ -1486,7 +1486,7 @@ void ExternalCommandProcessor::EnableServicegroupPassiveHostChecks(double, const BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { 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); @@ -1503,7 +1503,7 @@ void ExternalCommandProcessor::EnableHostFlapping(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally enabling notifications."); + Log(LogNotice, "icinga", "Globally enabling notifications."); IcingaApplication::GetInstance()->SetEnableNotifications(true); } void ExternalCommandProcessor::DisableNotifications(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally disabling notifications."); + Log(LogNotice, "icinga", "Globally disabling notifications."); IcingaApplication::GetInstance()->SetEnableNotifications(false); } void ExternalCommandProcessor::EnableFlapDetection(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally enabling flap detection."); + Log(LogNotice, "icinga", "Globally enabling flap detection."); IcingaApplication::GetInstance()->SetEnableFlapping(true); } void ExternalCommandProcessor::DisableFlapDetection(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally disabling flap detection."); + Log(LogNotice, "icinga", "Globally disabling flap detection."); IcingaApplication::GetInstance()->SetEnableFlapping(false); } void ExternalCommandProcessor::EnableEventHandlers(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally enabling event handlers."); + Log(LogNotice, "icinga", "Globally enabling event handlers."); IcingaApplication::GetInstance()->SetEnableEventHandlers(true); } void ExternalCommandProcessor::DisableEventHandlers(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally disabling event handlers."); + Log(LogNotice, "icinga", "Globally disabling event handlers."); IcingaApplication::GetInstance()->SetEnableEventHandlers(false); } void ExternalCommandProcessor::EnablePerformanceData(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally enabling performance data processing."); + Log(LogNotice, "icinga", "Globally enabling performance data processing."); IcingaApplication::GetInstance()->SetEnablePerfdata(true); } void ExternalCommandProcessor::DisablePerformanceData(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally disabling performance data processing."); + Log(LogNotice, "icinga", "Globally disabling performance data processing."); IcingaApplication::GetInstance()->SetEnablePerfdata(false); } void ExternalCommandProcessor::StartExecutingSvcChecks(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally enabling service checks."); + Log(LogNotice, "icinga", "Globally enabling service checks."); IcingaApplication::GetInstance()->SetEnableServiceChecks(true); } void ExternalCommandProcessor::StopExecutingSvcChecks(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally disabling service checks."); + Log(LogNotice, "icinga", "Globally disabling service checks."); IcingaApplication::GetInstance()->SetEnableServiceChecks(false); } void ExternalCommandProcessor::StartExecutingHostChecks(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally enabling host checks."); + Log(LogNotice, "icinga", "Globally enabling host checks."); IcingaApplication::GetInstance()->SetEnableHostChecks(true); } void ExternalCommandProcessor::StopExecutingHostChecks(double, const std::vector&) { - Log(LogInformation, "icinga", "Globally disabling host checks."); + Log(LogNotice, "icinga", "Globally disabling host checks."); IcingaApplication::GetInstance()->SetEnableHostChecks(false); } @@ -1653,7 +1653,7 @@ void ExternalCommandProcessor::ChangeSvcModattr(double, const std::vectorGetName() + "'"); + Log(LogNotice, "icinga", "Updating modified attributes for command '" + command->GetName() + "'"); { ObjectLock olock(command); @@ -1748,7 +1748,7 @@ void ExternalCommandProcessor::ChangeNormalSvcCheckInterval(double, const std::v 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); @@ -1764,7 +1764,7 @@ void ExternalCommandProcessor::ChangeNormalHostCheckInterval(double, const std:: if (!host) 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]); @@ -1784,7 +1784,7 @@ void ExternalCommandProcessor::ChangeRetrySvcCheckInterval(double, const std::ve 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); @@ -1800,7 +1800,7 @@ void ExternalCommandProcessor::ChangeRetryHostCheckInterval(double, const std::v if (!host) 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]); @@ -1818,7 +1818,7 @@ void ExternalCommandProcessor::EnableHostEventHandler(double, const std::vector< if (!host) 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); @@ -1834,7 +1834,7 @@ void ExternalCommandProcessor::DisableHostEventHandler(double, const std::vector if (!host) 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); @@ -1850,7 +1850,7 @@ void ExternalCommandProcessor::EnableSvcEventHandler(double, const std::vectorSet(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); @@ -2089,7 +2089,7 @@ void ExternalCommandProcessor::ChangeCustomSvcVar(double, const std::vectorSet(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] + "'"); { @@ -2115,7 +2115,7 @@ void ExternalCommandProcessor::ChangeCustomUserVar(double, const std::vectorSet(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); @@ -2165,7 +2165,7 @@ void ExternalCommandProcessor::ChangeCustomCommandVarInternal(const Command::Ptr 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); @@ -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_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); @@ -2201,7 +2201,7 @@ void ExternalCommandProcessor::EnableHostgroupSvcNotifications(double, const std BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { 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); @@ -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_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); @@ -2239,7 +2239,7 @@ void ExternalCommandProcessor::DisableHostgroupSvcNotifications(double, const st BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { 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); @@ -2260,7 +2260,7 @@ void ExternalCommandProcessor::EnableServicegroupHostNotifications(double, const BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { 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); @@ -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_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); @@ -2298,7 +2298,7 @@ void ExternalCommandProcessor::DisableServicegroupHostNotifications(double, cons BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { 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); @@ -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_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); diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index a235f0bb4..3a0afe76e 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -303,7 +303,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe if (!CheckNotificationUserFilters(type, user, force)) 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)); /* collect all notified users */ diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp index 0799515af..d7e25e6b2 100644 --- a/lib/remote/apiclient.cpp +++ b/lib/remote/apiclient.cpp @@ -85,9 +85,11 @@ void ApiClient::SendMessage(const Dictionary::Ptr& message) if (message->Get("method") != "log::SetLogPosition") m_Seen = Utility::GetTime(); } catch (const std::exception& ex) { - std::ostringstream msgbuf; - msgbuf << "Error while sending JSON-RPC message for identity '" << m_Identity << "': " << DiagnosticInformation(ex); - Log(LogWarning, "remote", msgbuf.str()); + std::ostringstream info, debug; + info << "Error while sending JSON-RPC message for identity '" << m_Identity << "'"; + debug << info << std::endl << DiagnosticInformation(ex); + Log(LogWarning, "remote", info.str()); + Log(LogDebug, "remote", debug.str()); Disconnect(); } diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 5037ee306..d575855bb 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -133,7 +133,7 @@ void ApiListener::AddListener(const String& service) std::ostringstream s; s << "Adding new listener: port " << service; - Log(LogInformation, "agent", s.str()); + Log(LogInformation, "remote", s.str()); TcpSocket::Ptr server = make_shared(); server->Bind(service, AF_INET6); @@ -265,7 +265,7 @@ void ApiListener::ApiTimerHandler(void) if (!need) { 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()); } } @@ -325,7 +325,7 @@ void ApiListener::ApiTimerHandler(void) BOOST_FOREACH(const ApiClient::Ptr& client, endpoint->GetClients()) 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)); } @@ -545,7 +545,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client) if (ts < peer_ts) continue; - Log(LogInformation, "cluster", "Replaying log: " + path); + Log(LogNotice, "remote", "Replaying log: " + path); std::fstream *fp = new std::fstream(path.CStr(), std::fstream::in); StdioStream::Ptr logStream = make_shared(fp, true); @@ -560,7 +560,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client) pmessage = JsonDeserialize(message); } 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. */ break; @@ -578,7 +578,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client) logStream->Close(); } - Log(LogInformation, "cluster", "Replayed " + Convert::ToString(count) + " messages."); + Log(LogNotice, "remote", "Replayed " + Convert::ToString(count) + " messages."); if (last_sync) { {