diff --git a/doc/09-object-types.md b/doc/09-object-types.md index cdb6db5fb8e..0d858f92a3b 100644 --- a/doc/09-object-types.md +++ b/doc/09-object-types.md @@ -1915,34 +1915,6 @@ When rotating the performance data file the current UNIX timestamp is appended t in `host_perfdata_path` and `service_perfdata_path` to generate a unique filename. -### StatusDataWriter - -Periodically writes status and configuration data files which are used by third-party tools. -This configuration object is available as [statusdata feature](14-features.md#status-data). - -> **Note** -> -> This feature is DEPRECATED and may be removed in future releases. -> Check the [roadmap](https://github.com/Icinga/icinga2/milestones). - -Example: - -``` -object StatusDataWriter "status" { - status_path = "/var/cache/icinga2/status.dat" - objects_path = "/var/cache/icinga2/objects.cache" - update_interval = 30s -} -``` - -Configuration Attributes: - - Name | Type | Description - --------------------------|-----------------------|---------------------------------- - status\_path | String | **Optional.** Path to the `status.dat` file. Defaults to CacheDir + "/status.dat". - objects\_path | String | **Optional.** Path to the `objects.cache` file. Defaults to CacheDir + "/objects.cache". - update\_interval | Duration | **Optional.** The interval in which the status files are updated. Defaults to `15s`. - ### SyslogLogger Specifies Icinga 2 logging to syslog. diff --git a/doc/14-features.md b/doc/14-features.md index e1b279c72f4..b1981e0f5b8 100644 --- a/doc/14-features.md +++ b/doc/14-features.md @@ -1157,25 +1157,6 @@ VACUUM > > Don't use `VACUUM FULL` as this has a severe impact on performance. -### Status Data Files - -> **Note** -> -> This feature is DEPRECATED and may be removed in future releases. -> Check the [roadmap](https://github.com/Icinga/icinga2/milestones). - -Icinga 1.x writes object configuration data and status data in a cyclic -interval to its `objects.cache` and `status.dat` files. Icinga 2 provides -the `StatusDataWriter` object which dumps all configuration objects and -status updates in a regular interval. - -```bash -icinga2 feature enable statusdata -``` - -If you are not using any web interface or addon which uses these files, -you can safely disable this feature. - ### Compat Log Files > **Note** diff --git a/doc/23-migrating-from-icinga-1x.md b/doc/23-migrating-from-icinga-1x.md index c9cfa5085d7..62b5667d4ca 100644 --- a/doc/23-migrating-from-icinga-1x.md +++ b/doc/23-migrating-from-icinga-1x.md @@ -1043,7 +1043,7 @@ In Icinga 2 notification commands are not directly associated with users. Instead the notification command is specified inside `Notification` objects next to user and user group relations. -The `StatusDataWriter`, `IdoMySqlConnection` and `LivestatusListener` types will +The `IdoMySqlConnection` and `LivestatusListener` types will provide the contact and contactgroups attributes for services for compatibility reasons. These values are calculated from all services, their notifications, and their users. @@ -1281,7 +1281,7 @@ provided separately. There is no output length restriction as known from Icinga 1.x using an [8KB static buffer](https://docs.icinga.com/latest/en/pluginapi.html#outputlengthrestrictions). -The `StatusDataWriter`, `IdoMysqlConnection` and `LivestatusListener` types +The `IdoMysqlConnection` and `LivestatusListener` types split the raw output into `output` (first line) and `long_output` (remaining lines) for compatibility reasons. @@ -1471,7 +1471,7 @@ chapter. Dependencies can be applied to hosts or services using the [apply rules](17-language-reference.md#apply). -The `StatusDataWriter`, `IdoMysqlConnection` and `LivestatusListener` types +The `IdoMysqlConnection` and `LivestatusListener` types support the Icinga 1.x schema with dependencies and parent attributes for compatibility reasons. diff --git a/etc/icinga2/features-available/statusdata.conf b/etc/icinga2/features-available/statusdata.conf deleted file mode 100644 index bb81c9617a1..00000000000 --- a/etc/icinga2/features-available/statusdata.conf +++ /dev/null @@ -1,8 +0,0 @@ -/** - * The StatusDataWriter type periodically updates the status.dat and objects.cache - * files. These are used by the Icinga 1.x CGIs to display the state of - * hosts and services. - */ - -object StatusDataWriter "status" { } - diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt index 84225c4f8a8..638f3c1932b 100644 --- a/lib/compat/CMakeLists.txt +++ b/lib/compat/CMakeLists.txt @@ -3,13 +3,11 @@ mkclass_target(checkresultreader.ti checkresultreader-ti.cpp checkresultreader-ti.hpp) mkclass_target(compatlogger.ti compatlogger-ti.cpp compatlogger-ti.hpp) mkclass_target(externalcommandlistener.ti externalcommandlistener-ti.cpp externalcommandlistener-ti.hpp) -mkclass_target(statusdatawriter.ti statusdatawriter-ti.cpp statusdatawriter-ti.hpp) set(compat_SOURCES checkresultreader.cpp checkresultreader.hpp checkresultreader-ti.hpp compatlogger.cpp compatlogger.hpp compatlogger-ti.hpp externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener-ti.hpp - statusdatawriter.cpp statusdatawriter.hpp statusdatawriter-ti.hpp ) if(ICINGA2_UNITY_BUILD) @@ -35,11 +33,6 @@ install_if_not_exists( ${ICINGA2_CONFIGDIR}/features-available ) -install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf - ${ICINGA2_CONFIGDIR}/features-available -) - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/compat/archives\")") install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}\")") install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}/cmd\")") diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp deleted file mode 100644 index 72eb55efb06..00000000000 --- a/lib/compat/statusdatawriter.cpp +++ /dev/null @@ -1,892 +0,0 @@ -/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */ - -#include "compat/statusdatawriter.hpp" -#include "compat/statusdatawriter-ti.cpp" -#include "icinga/icingaapplication.hpp" -#include "icinga/cib.hpp" -#include "icinga/hostgroup.hpp" -#include "icinga/servicegroup.hpp" -#include "icinga/checkcommand.hpp" -#include "icinga/eventcommand.hpp" -#include "icinga/timeperiod.hpp" -#include "icinga/notificationcommand.hpp" -#include "icinga/compatutility.hpp" -#include "icinga/pluginutility.hpp" -#include "icinga/dependency.hpp" -#include "base/atomic-file.hpp" -#include "base/configtype.hpp" -#include "base/objectlock.hpp" -#include "base/json.hpp" -#include "base/convert.hpp" -#include "base/logger.hpp" -#include "base/exception.hpp" -#include "base/application.hpp" -#include "base/context.hpp" -#include "base/statsfunction.hpp" -#include -#include -#include - -using namespace icinga; - -REGISTER_TYPE(StatusDataWriter); - -REGISTER_STATSFUNCTION(StatusDataWriter, &StatusDataWriter::StatsFunc); - -void StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&) -{ - DictionaryData nodes; - - for (const StatusDataWriter::Ptr& statusdatawriter : ConfigType::GetObjectsByType()) { - nodes.emplace_back(statusdatawriter->GetName(), 1); //add more stats - } - - status->Set("statusdatawriter", new Dictionary(std::move(nodes))); -} - -/** - * Hint: The reason why we're using "\n" rather than std::endl is because - * std::endl also _flushes_ the output stream which severely degrades - * performance (see https://stackoverflow.com/questions/213907/c-stdendl-vs-n). - */ - -/** - * Starts the component. - */ -void StatusDataWriter::Start(bool runtimeCreated) -{ - ObjectImpl::Start(runtimeCreated); - - Log(LogInformation, "StatusDataWriter") - << "'" << GetName() << "' started."; - - Log(LogWarning, "StatusDataWriter") - << "This feature is DEPRECATED and may be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; - - m_ObjectsCacheOutdated = true; - - m_StatusTimer = new Timer(); - m_StatusTimer->SetInterval(GetUpdateInterval()); - m_StatusTimer->OnTimerExpired.connect([this](const Timer * const&){ StatusTimerHandler(); }); - m_StatusTimer->Start(); - m_StatusTimer->Reschedule(0); - - ConfigObject::OnVersionChanged.connect([this](const ConfigObject::Ptr&, const Value&) { ObjectHandler(); }); - ConfigObject::OnActiveChanged.connect([this](const ConfigObject::Ptr&, const Value&) { ObjectHandler(); }); -} - -/** - * Stops the component. - */ -void StatusDataWriter::Stop(bool runtimeRemoved) -{ - Log(LogInformation, "StatusDataWriter") - << "'" << GetName() << "' stopped."; - - ObjectImpl::Stop(runtimeRemoved); -} - -void StatusDataWriter::DumpComments(std::ostream& fp, const Checkable::Ptr& checkable) -{ - Host::Ptr host; - Service::Ptr service; - tie(host, service) = GetHostService(checkable); - - for (const Comment::Ptr& comment : checkable->GetComments()) { - if (comment->IsExpired()) - continue; - - if (service) - fp << "servicecomment {" << "\n" - << "\t" << "service_description=" << service->GetShortName() << "\n"; - else - fp << "hostcomment {" << "\n"; - - fp << "\t" "host_name=" << host->GetName() << "\n" - "\t" "comment_id=" << comment->GetLegacyId() << "\n" - "\t" "entry_time=" << comment->GetEntryTime() << "\n" - "\t" "entry_type=" << comment->GetEntryType() << "\n" - "\t" "persistent=" "1" "\n" - "\t" "author=" << comment->GetAuthor() << "\n" - "\t" "comment_data=" << comment->GetText() << "\n" - "\t" "expires=" << (comment->GetExpireTime() != 0 ? 1 : 0) << "\n" - "\t" "expire_time=" << comment->GetExpireTime() << "\n" - "\t" "}" "\n" - "\n"; - } -} - -void StatusDataWriter::DumpTimePeriod(std::ostream& fp, const TimePeriod::Ptr& tp) -{ - fp << "define timeperiod {" "\n" - "\t" "timeperiod_name" "\t" << tp->GetName() << "\n" - "\t" "alias" "\t" << tp->GetName() << "\n"; - - Dictionary::Ptr ranges = tp->GetRanges(); - - if (ranges) { - ObjectLock olock(ranges); - for (const Dictionary::Pair& kv : ranges) { - fp << "\t" << kv.first << "\t" << kv.second << "\n"; - } - } - - fp << "\t" "}" "\n" "\n"; -} - -void StatusDataWriter::DumpCommand(std::ostream& fp, const Command::Ptr& command) -{ - fp << "define command {" "\n" - "\t" "command_name\t"; - - fp << CompatUtility::GetCommandName(command) << "\n"; - - fp << "\t" "command_line" "\t" << CompatUtility::GetCommandLine(command); - - fp << "\n"; - - DumpCustomAttributes(fp, command); - - fp << "\n" "\t" "}" "\n" "\n"; -} - -void StatusDataWriter::DumpDowntimes(std::ostream& fp, const Checkable::Ptr& checkable) -{ - Host::Ptr host; - Service::Ptr service; - tie(host, service) = GetHostService(checkable); - - for (const Downtime::Ptr& downtime : checkable->GetDowntimes()) { - if (downtime->IsExpired()) - continue; - - if (service) - fp << "servicedowntime {" << "\n" - "\t" "service_description=" << service->GetShortName() << "\n"; - else - fp << "hostdowntime {" "\n"; - - Downtime::Ptr triggeredByObj = Downtime::GetByName(downtime->GetTriggeredBy()); - int triggeredByLegacy = 0; - if (triggeredByObj) - triggeredByLegacy = triggeredByObj->GetLegacyId(); - - fp << "\t" << "host_name=" << host->GetName() << "\n" - "\t" "downtime_id=" << downtime->GetLegacyId() << "\n" - "\t" "entry_time=" << downtime->GetEntryTime() << "\n" - "\t" "start_time=" << downtime->GetStartTime() << "\n" - "\t" "end_time=" << downtime->GetEndTime() << "\n" - "\t" "triggered_by=" << triggeredByLegacy << "\n" - "\t" "fixed=" << static_cast(downtime->GetFixed()) << "\n" - "\t" "duration=" << static_cast(downtime->GetDuration()) << "\n" - "\t" "is_in_effect=" << (downtime->IsInEffect() ? 1 : 0) << "\n" - "\t" "author=" << downtime->GetAuthor() << "\n" - "\t" "comment=" << downtime->GetComment() << "\n" - "\t" "trigger_time=" << downtime->GetTriggerTime() << "\n" - "\t" "}" "\n" - "\n"; - } -} - -void StatusDataWriter::DumpHostStatus(std::ostream& fp, const Host::Ptr& host) -{ - fp << "hoststatus {" "\n" "\t" "host_name=" << host->GetName() << "\n"; - - { - ObjectLock olock(host); - DumpCheckableStatusAttrs(fp, host); - } - - /* ugly but cgis parse only that */ - fp << "\t" "last_time_up=" << host->GetLastStateUp() << "\n" - "\t" "last_time_down=" << host->GetLastStateDown() << "\n" - "\t" "last_time_unreachable=" << host->GetLastStateUnreachable() << "\n"; - - fp << "\t" "}" "\n" "\n"; - - DumpDowntimes(fp, host); - DumpComments(fp, host); -} - -void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host) -{ - String notes = host->GetNotes(); - String notes_url = host->GetNotesUrl(); - String action_url = host->GetActionUrl(); - String icon_image = host->GetIconImage(); - String icon_image_alt = host->GetIconImageAlt(); - String display_name = host->GetDisplayName(); - String address = host->GetAddress(); - String address6 = host->GetAddress6(); - - fp << "define host {" "\n" - "\t" "host_name" "\t" << host->GetName() << "\n"; - if (!display_name.IsEmpty()) { - fp << "\t" "display_name" "\t" << host->GetDisplayName() << "\n" - "\t" "alias" "\t" << host->GetDisplayName() << "\n"; - } - if (!address.IsEmpty()) - fp << "\t" "address" "\t" << address << "\n"; - if (!address6.IsEmpty()) - fp << "\t" "address6" "\t" << address6 << "\n"; - if (!notes.IsEmpty()) - fp << "\t" "notes" "\t" << notes << "\n"; - if (!notes_url.IsEmpty()) - fp << "\t" "notes_url" "\t" << notes_url << "\n"; - if (!action_url.IsEmpty()) - fp << "\t" "action_url" "\t" << action_url << "\n"; - if (!icon_image.IsEmpty()) - fp << "\t" "icon_image" "\t" << icon_image << "\n"; - if (!icon_image_alt.IsEmpty()) - fp << "\t" "icon_image_alt" "\t" << icon_image_alt << "\n"; - - std::set parents = host->GetParents(); - - if (!parents.empty()) { - fp << "\t" "parents" "\t"; - DumpNameList(fp, parents); - fp << "\n"; - } - - ObjectLock olock(host); - - fp << "\t" "check_interval" "\t" << (host->GetCheckInterval() / 60.0) << "\n" - "\t" "retry_interval" "\t" << (host->GetRetryInterval() / 60.0) << "\n" - "\t" "max_check_attempts" "\t" << host->GetMaxCheckAttempts() << "\n" - "\t" "active_checks_enabled" "\t" << Convert::ToLong(host->GetEnableActiveChecks()) << "\n" - "\t" "passive_checks_enabled" "\t" << Convert::ToLong(host->GetEnablePassiveChecks()) << "\n" - "\t" "notifications_enabled" "\t" << Convert::ToLong(host->GetEnableNotifications()) << "\n" - "\t" "notification_options" "\t" << GetNotificationOptions(host) << "\n" - "\t" "notification_interval" "\t" << CompatUtility::GetCheckableNotificationNotificationInterval(host) << "\n" - "\t" "event_handler_enabled" "\t" << Convert::ToLong(host->GetEnableEventHandler()) << "\n"; - - CheckCommand::Ptr checkcommand = host->GetCheckCommand(); - if (checkcommand) - fp << "\t" "check_command" "\t" << CompatUtility::GetCommandName(checkcommand) << "!" << CompatUtility::GetCheckableCommandArgs(host) << "\n"; - - EventCommand::Ptr eventcommand = host->GetEventCommand(); - if (eventcommand && host->GetEnableEventHandler()) - fp << "\t" "event_handler" "\t" << CompatUtility::GetCommandName(eventcommand) << "\n"; - - TimePeriod::Ptr checkPeriod = host->GetCheckPeriod(); - if (checkPeriod) - fp << "\t" "check_period" "\t" << checkPeriod->GetName() << "\n"; - - fp << "\t" "contacts" "\t"; - DumpNameList(fp, CompatUtility::GetCheckableNotificationUsers(host)); - fp << "\n"; - - fp << "\t" "contact_groups" "\t"; - DumpNameList(fp, CompatUtility::GetCheckableNotificationUserGroups(host)); - fp << "\n"; - - fp << "\t" << "initial_state" "\t" "o" "\n" - "\t" "low_flap_threshold" "\t" << host->GetFlappingThresholdLow() << "\n" - "\t" "high_flap_threshold" "\t" << host->GetFlappingThresholdHigh() << "\n" - "\t" "process_perf_data" "\t" << Convert::ToLong(host->GetEnablePerfdata()) << "\n" - "\t" "check_freshness" "\t" "1" "\n"; - - fp << "\t" "host_groups" "\t"; - bool first = true; - - Array::Ptr groups = host->GetGroups(); - - if (groups) { - ObjectLock olock(groups); - - for (const String& name : groups) { - HostGroup::Ptr hg = HostGroup::GetByName(name); - - if (hg) { - if (!first) - fp << ","; - else - first = false; - - fp << hg->GetName(); - } - } - } - - fp << "\n"; - - DumpCustomAttributes(fp, host); - - fp << "\t" "}" "\n" "\n"; -} - -void StatusDataWriter::DumpCheckableStatusAttrs(std::ostream& fp, const Checkable::Ptr& checkable) -{ - CheckResult::Ptr cr = checkable->GetLastCheckResult(); - - EventCommand::Ptr eventcommand = checkable->GetEventCommand(); - CheckCommand::Ptr checkcommand = checkable->GetCheckCommand(); - - fp << "\t" << "check_command=" << CompatUtility::GetCommandName(checkcommand) << "!" << CompatUtility::GetCheckableCommandArgs(checkable) << "\n" - "\t" "event_handler=" << CompatUtility::GetCommandName(eventcommand) << "\n" - "\t" "check_interval=" << (checkable->GetCheckInterval() / 60.0) << "\n" - "\t" "retry_interval=" << (checkable->GetRetryInterval() / 60.0) << "\n" - "\t" "has_been_checked=" << Convert::ToLong(checkable->HasBeenChecked()) << "\n" - "\t" "should_be_scheduled=" << checkable->GetEnableActiveChecks() << "\n" - "\t" "event_handler_enabled=" << Convert::ToLong(checkable->GetEnableEventHandler()) << "\n"; - - TimePeriod::Ptr checkPeriod = checkable->GetCheckPeriod(); - if (checkPeriod) - fp << "\t" "check_period" "\t" << checkPeriod->GetName() << "\n"; - - if (cr) { - fp << "\t" << "check_execution_time=" << Convert::ToString(cr->CalculateExecutionTime()) << "\n" - "\t" "check_latency=" << Convert::ToString(cr->CalculateLatency()) << "\n"; - } - - Host::Ptr host; - Service::Ptr service; - tie(host, service) = GetHostService(checkable); - - if (service) { - fp << "\t" "current_state=" << service->GetState() << "\n" - "\t" "last_hard_state=" << service->GetLastHardState() << "\n" - "\t" "last_time_ok=" << static_cast(service->GetLastStateOK()) << "\n" - "\t" "last_time_warn=" << static_cast(service->GetLastStateWarning()) << "\n" - "\t" "last_time_critical=" << static_cast(service->GetLastStateCritical()) << "\n" - "\t" "last_time_unknown=" << static_cast(service->GetLastStateUnknown()) << "\n"; - } else { - int currentState = host->GetState(); - - if (currentState != HostUp && !host->IsReachable()) - currentState = 2; /* hardcoded compat state */ - - fp << "\t" "current_state=" << currentState << "\n" - "\t" "last_hard_state=" << host->GetLastHardState() << "\n" - "\t" "last_time_up=" << static_cast(host->GetLastStateUp()) << "\n" - "\t" "last_time_down=" << static_cast(host->GetLastStateDown()) << "\n"; - } - - fp << "\t" "state_type=" << checkable->GetStateType() << "\n" - "\t" "last_check=" << static_cast(host->GetLastCheck()) << "\n"; - - if (cr) { - fp << "\t" "plugin_output=" << CompatUtility::GetCheckResultOutput(cr) << "\n" - "\t" "long_plugin_output=" << CompatUtility::GetCheckResultLongOutput(cr) << "\n" - "\t" "performance_data=" << PluginUtility::FormatPerfdata(cr->GetPerformanceData()) << "\n"; - } - - fp << "\t" << "next_check=" << static_cast(checkable->GetNextCheck()) << "\n" - "\t" "current_attempt=" << checkable->GetCheckAttempt() << "\n" - "\t" "max_attempts=" << checkable->GetMaxCheckAttempts() << "\n" - "\t" "last_state_change=" << static_cast(checkable->GetLastStateChange()) << "\n" - "\t" "last_hard_state_change=" << static_cast(checkable->GetLastHardStateChange()) << "\n" - "\t" "last_update=" << static_cast(Utility::GetTime()) << "\n" - "\t" "notifications_enabled=" << Convert::ToLong(checkable->GetEnableNotifications()) << "\n" - "\t" "active_checks_enabled=" << Convert::ToLong(checkable->GetEnableActiveChecks()) << "\n" - "\t" "passive_checks_enabled=" << Convert::ToLong(checkable->GetEnablePassiveChecks()) << "\n" - "\t" "flap_detection_enabled=" << Convert::ToLong(checkable->GetEnableFlapping()) << "\n" - "\t" "is_flapping=" << Convert::ToLong(checkable->IsFlapping()) << "\n" - "\t" "percent_state_change=" << checkable->GetFlappingCurrent() << "\n" - "\t" "problem_has_been_acknowledged=" << (checkable->GetAcknowledgement() != AcknowledgementNone ? 1 : 0) << "\n" - "\t" "acknowledgement_type=" << checkable->GetAcknowledgement() << "\n" - "\t" "acknowledgement_end_time=" << checkable->GetAcknowledgementExpiry() << "\n" - "\t" "scheduled_downtime_depth=" << checkable->GetDowntimeDepth() << "\n" - "\t" "last_notification=" << CompatUtility::GetCheckableNotificationLastNotification(checkable) << "\n" - "\t" "next_notification=" << CompatUtility::GetCheckableNotificationNextNotification(checkable) << "\n" - "\t" "current_notification_number=" << CompatUtility::GetCheckableNotificationNotificationNumber(checkable) << "\n" - "\t" "is_reachable=" << Convert::ToLong(checkable->IsReachable()) << "\n"; -} - -void StatusDataWriter::DumpServiceStatus(std::ostream& fp, const Service::Ptr& service) -{ - Host::Ptr host = service->GetHost(); - - fp << "servicestatus {" "\n" - "\t" "host_name=" << host->GetName() << "\n" - "\t" "service_description=" << service->GetShortName() << "\n"; - - { - ObjectLock olock(service); - DumpCheckableStatusAttrs(fp, service); - } - - fp << "\t" "}" "\n" "\n"; - - DumpDowntimes(fp, service); - DumpComments(fp, service); -} - -void StatusDataWriter::DumpServiceObject(std::ostream& fp, const Service::Ptr& service) -{ - Host::Ptr host = service->GetHost(); - - { - ObjectLock olock(service); - - fp << "define service {" "\n" - "\t" "host_name" "\t" << host->GetName() << "\n" - "\t" "service_description" "\t" << service->GetShortName() << "\n" - "\t" "display_name" "\t" << service->GetDisplayName() << "\n" - "\t" "check_interval" "\t" << (service->GetCheckInterval() / 60.0) << "\n" - "\t" "retry_interval" "\t" << (service->GetRetryInterval() / 60.0) << "\n" - "\t" "max_check_attempts" "\t" << service->GetMaxCheckAttempts() << "\n" - "\t" "active_checks_enabled" "\t" << Convert::ToLong(service->GetEnableActiveChecks()) << "\n" - "\t" "passive_checks_enabled" "\t" << Convert::ToLong(service->GetEnablePassiveChecks()) << "\n" - "\t" "flap_detection_enabled" "\t" << Convert::ToLong(service->GetEnableFlapping()) << "\n" - "\t" "is_volatile" "\t" << Convert::ToLong(service->GetVolatile()) << "\n" - "\t" "notifications_enabled" "\t" << Convert::ToLong(service->GetEnableNotifications()) << "\n" - "\t" "notification_options" "\t" << GetNotificationOptions(service) << "\n" - "\t" "notification_interval" "\t" << CompatUtility::GetCheckableNotificationNotificationInterval(service) << "\n" - "\t" "notification_period" "\t" << "" << "\n" - "\t" "event_handler_enabled" "\t" << Convert::ToLong(service->GetEnableEventHandler()) << "\n"; - - CheckCommand::Ptr checkcommand = service->GetCheckCommand(); - if (checkcommand) - fp << "\t" "check_command" "\t" << CompatUtility::GetCommandName(checkcommand) << "!" << CompatUtility::GetCheckableCommandArgs(service)<< "\n"; - - EventCommand::Ptr eventcommand = service->GetEventCommand(); - if (eventcommand && service->GetEnableEventHandler()) - fp << "\t" "event_handler" "\t" << CompatUtility::GetCommandName(eventcommand) << "\n"; - - TimePeriod::Ptr checkPeriod = service->GetCheckPeriod(); - if (checkPeriod) - fp << "\t" "check_period" "\t" << checkPeriod->GetName() << "\n"; - - fp << "\t" "contacts" "\t"; - DumpNameList(fp, CompatUtility::GetCheckableNotificationUsers(service)); - fp << "\n"; - - fp << "\t" "contact_groups" "\t"; - DumpNameList(fp, CompatUtility::GetCheckableNotificationUserGroups(service)); - fp << "\n"; - - String notes = service->GetNotes(); - String notes_url = service->GetNotesUrl(); - String action_url = service->GetActionUrl(); - String icon_image = service->GetIconImage(); - String icon_image_alt = service->GetIconImageAlt(); - - fp << "\t" "initial_state" "\t" "o" "\n" - "\t" "low_flap_threshold" "\t" << service->GetFlappingThresholdLow() << "\n" - "\t" "high_flap_threshold" "\t" << service->GetFlappingThresholdHigh() << "\n" - "\t" "process_perf_data" "\t" << Convert::ToLong(service->GetEnablePerfdata()) << "\n" - "\t" "check_freshness" << "\t" "1" "\n"; - - if (!notes.IsEmpty()) - fp << "\t" "notes" "\t" << notes << "\n"; - if (!notes_url.IsEmpty()) - fp << "\t" "notes_url" "\t" << notes_url << "\n"; - if (!action_url.IsEmpty()) - fp << "\t" "action_url" "\t" << action_url << "\n"; - if (!icon_image.IsEmpty()) - fp << "\t" "icon_image" "\t" << icon_image << "\n"; - if (!icon_image_alt.IsEmpty()) - fp << "\t" "icon_image_alt" "\t" << icon_image_alt << "\n"; - } - - fp << "\t" "service_groups" "\t"; - bool first = true; - - Array::Ptr groups = service->GetGroups(); - - if (groups) { - ObjectLock olock(groups); - - for (const String& name : groups) { - ServiceGroup::Ptr sg = ServiceGroup::GetByName(name); - - if (sg) { - if (!first) - fp << ","; - else - first = false; - - fp << sg->GetName(); - } - } - } - - fp << "\n"; - - DumpCustomAttributes(fp, service); - - fp << "\t" "}" "\n" "\n"; -} - -void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const CustomVarObject::Ptr& object) -{ - Dictionary::Ptr vars = object->GetVars(); - - if (!vars) - return; - - bool is_json = false; - - ObjectLock olock(vars); - for (const Dictionary::Pair& kv : vars) { - if (kv.first.IsEmpty()) - continue; - - Value value; - - if (kv.second.IsObjectType() || kv.second.IsObjectType()) { - value = JsonEncode(kv.second); - is_json = true; - } else - value = CompatUtility::EscapeString(kv.second); - - fp << "\t" "_" << kv.first << "\t" << value << "\n"; - } - - if (is_json) - fp << "\t" "_is_json" "\t" "1" "\n"; -} - -void StatusDataWriter::UpdateObjectsCache() -{ - CONTEXT("Writing objects.cache file"); - - /* Use the compat path here from the .ti generated class. */ - String objectsPath = GetObjectsPath(); - - AtomicFile objectfp (objectsPath, 0644); - - objectfp << std::fixed; - - objectfp << "# Icinga objects cache file" "\n" - "# This file is auto-generated. Do not modify this file." "\n" - "\n"; - - for (const Host::Ptr& host : ConfigType::GetObjectsByType()) { - std::ostringstream tempobjectfp; - tempobjectfp << std::fixed; - DumpHostObject(tempobjectfp, host); - objectfp << tempobjectfp.str(); - - for (const Service::Ptr& service : host->GetServices()) { - std::ostringstream tempobjectfp; - tempobjectfp << std::fixed; - DumpServiceObject(tempobjectfp, service); - objectfp << tempobjectfp.str(); - } - } - - for (const HostGroup::Ptr& hg : ConfigType::GetObjectsByType()) { - std::ostringstream tempobjectfp; - tempobjectfp << std::fixed; - - String display_name = hg->GetDisplayName(); - String notes = hg->GetNotes(); - String notes_url = hg->GetNotesUrl(); - String action_url = hg->GetActionUrl(); - - tempobjectfp << "define hostgroup {" "\n" - "\t" "hostgroup_name" "\t" << hg->GetName() << "\n"; - - if (!display_name.IsEmpty()) - tempobjectfp << "\t" "alias" "\t" << display_name << "\n"; - if (!notes.IsEmpty()) - tempobjectfp << "\t" "notes" "\t" << notes << "\n"; - if (!notes_url.IsEmpty()) - tempobjectfp << "\t" "notes_url" "\t" << notes_url << "\n"; - if (!action_url.IsEmpty()) - tempobjectfp << "\t" "action_url" "\t" << action_url << "\n"; - - DumpCustomAttributes(tempobjectfp, hg); - - tempobjectfp << "\t" "members" "\t"; - DumpNameList(tempobjectfp, hg->GetMembers()); - tempobjectfp << "\n" "\t" "}" "\n"; - - objectfp << tempobjectfp.str(); - } - - for (const ServiceGroup::Ptr& sg : ConfigType::GetObjectsByType()) { - std::ostringstream tempobjectfp; - tempobjectfp << std::fixed; - - String display_name = sg->GetDisplayName(); - String notes = sg->GetNotes(); - String notes_url = sg->GetNotesUrl(); - String action_url = sg->GetActionUrl(); - - tempobjectfp << "define servicegroup {" "\n" - "\t" "servicegroup_name" "\t" << sg->GetName() << "\n"; - - if (!display_name.IsEmpty()) - tempobjectfp << "\t" "alias" "\t" << display_name << "\n"; - if (!notes.IsEmpty()) - tempobjectfp << "\t" "notes" "\t" << notes << "\n"; - if (!notes_url.IsEmpty()) - tempobjectfp << "\t" "notes_url" "\t" << notes_url << "\n"; - if (!action_url.IsEmpty()) - tempobjectfp << "\t" "action_url" "\t" << action_url << "\n"; - - DumpCustomAttributes(tempobjectfp, sg); - - tempobjectfp << "\t" "members" "\t"; - - std::vector sglist; - for (const Service::Ptr& service : sg->GetMembers()) { - Host::Ptr host = service->GetHost(); - - sglist.emplace_back(host->GetName()); - sglist.emplace_back(service->GetShortName()); - } - - DumpStringList(tempobjectfp, sglist); - - tempobjectfp << "\n" "}" "\n"; - - objectfp << tempobjectfp.str(); - } - - for (const User::Ptr& user : ConfigType::GetObjectsByType()) { - std::ostringstream tempobjectfp; - tempobjectfp << std::fixed; - - String email = user->GetEmail(); - String pager = user->GetPager(); - String alias = user->GetDisplayName(); - - tempobjectfp << "define contact {" "\n" - "\t" "contact_name" "\t" << user->GetName() << "\n"; - - if (!alias.IsEmpty()) - tempobjectfp << "\t" "alias" "\t" << alias << "\n"; - if (!email.IsEmpty()) - tempobjectfp << "\t" "email" "\t" << email << "\n"; - if (!pager.IsEmpty()) - tempobjectfp << "\t" "pager" "\t" << pager << "\n"; - - tempobjectfp << "\t" "service_notification_options" "\t" "w,u,c,r,f,s" "\n" - "\t" "host_notification_options""\t" "d,u,r,f,s" "\n" - "\t" "host_notifications_enabled" "\t" "1" "\n" - "\t" "service_notifications_enabled" "\t" "1" "\n" - "\t" "}" "\n" - "\n"; - - objectfp << tempobjectfp.str(); - } - - for (const UserGroup::Ptr& ug : ConfigType::GetObjectsByType()) { - std::ostringstream tempobjectfp; - tempobjectfp << std::fixed; - - tempobjectfp << "define contactgroup {" "\n" - "\t" "contactgroup_name" "\t" << ug->GetName() << "\n" - "\t" "alias" "\t" << ug->GetDisplayName() << "\n"; - - tempobjectfp << "\t" "members" "\t"; - DumpNameList(tempobjectfp, ug->GetMembers()); - tempobjectfp << "\n" - "\t" "}" "\n"; - - objectfp << tempobjectfp.str(); - } - - for (const Command::Ptr& command : ConfigType::GetObjectsByType()) { - DumpCommand(objectfp, command); - } - - for (const Command::Ptr& command : ConfigType::GetObjectsByType()) { - DumpCommand(objectfp, command); - } - - for (const Command::Ptr& command : ConfigType::GetObjectsByType()) { - DumpCommand(objectfp, command); - } - - for (const TimePeriod::Ptr& tp : ConfigType::GetObjectsByType()) { - DumpTimePeriod(objectfp, tp); - } - - for (const Dependency::Ptr& dep : ConfigType::GetObjectsByType()) { - Checkable::Ptr parent = dep->GetParent(); - - if (!parent) { - Log(LogDebug, "StatusDataWriter") - << "Missing parent for dependency '" << dep->GetName() << "'."; - continue; - } - - Host::Ptr parent_host; - Service::Ptr parent_service; - tie(parent_host, parent_service) = GetHostService(parent); - - Checkable::Ptr child = dep->GetChild(); - - if (!child) { - Log(LogDebug, "StatusDataWriter") - << "Missing child for dependency '" << dep->GetName() << "'."; - continue; - } - - Host::Ptr child_host; - Service::Ptr child_service; - tie(child_host, child_service) = GetHostService(child); - - int state_filter = dep->GetStateFilter(); - std::vector failure_criteria; - if (state_filter & StateFilterOK || state_filter & StateFilterUp) - failure_criteria.emplace_back("o"); - if (state_filter & StateFilterWarning) - failure_criteria.emplace_back("w"); - if (state_filter & StateFilterCritical) - failure_criteria.emplace_back("c"); - if (state_filter & StateFilterUnknown) - failure_criteria.emplace_back("u"); - if (state_filter & StateFilterDown) - failure_criteria.emplace_back("d"); - - String criteria = boost::algorithm::join(failure_criteria, ","); - - /* Icinga 1.x only allows host->host, service->service dependencies */ - if (!child_service && !parent_service) { - objectfp << "define hostdependency {" "\n" - "\t" "dependent_host_name" "\t" << child_host->GetName() << "\n" - "\t" "host_name" "\t" << parent_host->GetName() << "\n" - "\t" "execution_failure_criteria" "\t" << criteria << "\n" - "\t" "notification_failure_criteria" "\t" << criteria << "\n" - "\t" "}" "\n" - "\n"; - } else if (child_service && parent_service){ - - objectfp << "define servicedependency {" "\n" - "\t" "dependent_host_name" "\t" << child_service->GetHost()->GetName() << "\n" - "\t" "dependent_service_description" "\t" << child_service->GetShortName() << "\n" - "\t" "host_name" "\t" << parent_service->GetHost()->GetName() << "\n" - "\t" "service_description" "\t" << parent_service->GetShortName() << "\n" - "\t" "execution_failure_criteria" "\t" << criteria << "\n" - "\t" "notification_failure_criteria" "\t" << criteria << "\n" - "\t" "}" "\n" - "\n"; - } - } - - objectfp.Commit(); -} - -/** - * Periodically writes the status.dat and objects.cache files. - */ -void StatusDataWriter::StatusTimerHandler() -{ - if (m_ObjectsCacheOutdated) { - UpdateObjectsCache(); - m_ObjectsCacheOutdated = false; - } - - double start = Utility::GetTime(); - - String statusPath = GetStatusPath(); - - AtomicFile statusfp (statusPath, 0644); - - statusfp << std::fixed; - - statusfp << "# Icinga status file" "\n" - "# This file is auto-generated. Do not modify this file." "\n" - "\n"; - - statusfp << "info {" "\n" - "\t" "created=" << Utility::GetTime() << "\n" - "\t" "version=" << Application::GetAppVersion() << "\n" - "\t" "}" "\n" - "\n"; - - statusfp << "programstatus {" "\n" - "\t" "icinga_pid=" << Utility::GetPid() << "\n" - "\t" "daemon_mode=1" "\n" - "\t" "program_start=" << static_cast(Application::GetStartTime()) << "\n" - "\t" "active_host_checks_enabled=" << Convert::ToLong(IcingaApplication::GetInstance()->GetEnableHostChecks()) << "\n" - "\t" "passive_host_checks_enabled=1" "\n" - "\t" "active_service_checks_enabled=" << Convert::ToLong(IcingaApplication::GetInstance()->GetEnableServiceChecks()) << "\n" - "\t" "passive_service_checks_enabled=1" "\n" - "\t" "check_service_freshness=1" "\n" - "\t" "check_host_freshness=1" "\n" - "\t" "enable_notifications=" << Convert::ToLong(IcingaApplication::GetInstance()->GetEnableNotifications()) << "\n" - "\t" "enable_event_handlers=" << Convert::ToLong(IcingaApplication::GetInstance()->GetEnableEventHandlers()) << "\n" - "\t" "enable_flap_detection=" << Convert::ToLong(IcingaApplication::GetInstance()->GetEnableFlapping()) << "\n" - "\t" "enable_failure_prediction=0" "\n" - "\t" "process_performance_data=" << Convert::ToLong(IcingaApplication::GetInstance()->GetEnablePerfdata()) << "\n" - "\t" "active_scheduled_host_check_stats=" << CIB::GetActiveHostChecksStatistics(60) << "," << CIB::GetActiveHostChecksStatistics(5 * 60) << "," << CIB::GetActiveHostChecksStatistics(15 * 60) << "\n" - "\t" "passive_host_check_stats=" << CIB::GetPassiveHostChecksStatistics(60) << "," << CIB::GetPassiveHostChecksStatistics(5 * 60) << "," << CIB::GetPassiveHostChecksStatistics(15 * 60) << "\n" - "\t" "active_scheduled_service_check_stats=" << CIB::GetActiveServiceChecksStatistics(60) << "," << CIB::GetActiveServiceChecksStatistics(5 * 60) << "," << CIB::GetActiveServiceChecksStatistics(15 * 60) << "\n" - "\t" "passive_service_check_stats=" << CIB::GetPassiveServiceChecksStatistics(60) << "," << CIB::GetPassiveServiceChecksStatistics(5 * 60) << "," << CIB::GetPassiveServiceChecksStatistics(15 * 60) << "\n" - "\t" "next_downtime_id=" << Downtime::GetNextDowntimeID() << "\n" - "\t" "next_comment_id=" << Comment::GetNextCommentID() << "\n"; - - statusfp << "\t" "}" "\n" - "\n"; - - for (const Host::Ptr& host : ConfigType::GetObjectsByType()) { - std::ostringstream tempstatusfp; - tempstatusfp << std::fixed; - DumpHostStatus(tempstatusfp, host); - statusfp << tempstatusfp.str(); - - for (const Service::Ptr& service : host->GetServices()) { - std::ostringstream tempstatusfp; - tempstatusfp << std::fixed; - DumpServiceStatus(tempstatusfp, service); - statusfp << tempstatusfp.str(); - } - } - - statusfp.Commit(); - - Log(LogNotice, "StatusDataWriter") - << "Writing status.dat file took " << Utility::FormatDuration(Utility::GetTime() - start); -} - -void StatusDataWriter::ObjectHandler() -{ - m_ObjectsCacheOutdated = true; -} - -String StatusDataWriter::GetNotificationOptions(const Checkable::Ptr& checkable) -{ - Host::Ptr host; - Service::Ptr service; - tie(host, service) = GetHostService(checkable); - - unsigned long notification_type_filter = 0; - unsigned long notification_state_filter = 0; - - for (const Notification::Ptr& notification : checkable->GetNotifications()) { - notification_type_filter |= notification->GetTypeFilter(); - notification_state_filter |= notification->GetStateFilter(); - } - - std::vector notification_options; - - /* notification state filters */ - if (service) { - if (notification_state_filter & ServiceWarning) { - notification_options.push_back("w"); - } - if (notification_state_filter & ServiceUnknown) { - notification_options.push_back("u"); - } - if (notification_state_filter & ServiceCritical) { - notification_options.push_back("c"); - } - } else { - if (notification_state_filter & HostDown) { - notification_options.push_back("d"); - } - } - - /* notification type filters */ - if (notification_type_filter & NotificationRecovery) { - notification_options.push_back("r"); - } - if ((notification_type_filter & NotificationFlappingStart) || - (notification_type_filter & NotificationFlappingEnd)) { - notification_options.push_back("f"); - } - if ((notification_type_filter & NotificationDowntimeStart) || - (notification_type_filter & NotificationDowntimeEnd) || - (notification_type_filter & NotificationDowntimeRemoved)) { - notification_options.push_back("s"); - } - - return boost::algorithm::join(notification_options, ","); -} diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp deleted file mode 100644 index 31a5efe5452..00000000000 --- a/lib/compat/statusdatawriter.hpp +++ /dev/null @@ -1,89 +0,0 @@ -/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */ - -#ifndef STATUSDATAWRITER_H -#define STATUSDATAWRITER_H - -#include "compat/statusdatawriter-ti.hpp" -#include "icinga/customvarobject.hpp" -#include "icinga/host.hpp" -#include "icinga/service.hpp" -#include "icinga/command.hpp" -#include "icinga/compatutility.hpp" -#include "base/timer.hpp" -#include "base/utility.hpp" -#include - -namespace icinga -{ - -/** - * @ingroup compat - */ -class StatusDataWriter final : public ObjectImpl -{ -public: - DECLARE_OBJECT(StatusDataWriter); - DECLARE_OBJECTNAME(StatusDataWriter); - - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - -protected: - void Start(bool runtimeCreated) override; - void Stop(bool runtimeRemoved) override; - -private: - Timer::Ptr m_StatusTimer; - bool m_ObjectsCacheOutdated; - - void DumpCommand(std::ostream& fp, const Command::Ptr& command); - void DumpTimePeriod(std::ostream& fp, const TimePeriod::Ptr& tp); - void DumpDowntimes(std::ostream& fp, const Checkable::Ptr& owner); - void DumpComments(std::ostream& fp, const Checkable::Ptr& owner); - void DumpHostStatus(std::ostream& fp, const Host::Ptr& host); - void DumpHostObject(std::ostream& fp, const Host::Ptr& host); - - void DumpCheckableStatusAttrs(std::ostream& fp, const Checkable::Ptr& checkable); - - template - void DumpNameList(std::ostream& fp, const T& list) - { - bool first = true; - for (const auto& obj : list) { - if (!first) - fp << ","; - else - first = false; - - fp << obj->GetName(); - } - } - - template - void DumpStringList(std::ostream& fp, const T& list) - { - bool first = true; - for (const auto& str : list) { - if (!first) - fp << ","; - else - first = false; - - fp << str; - } - } - - void DumpServiceStatus(std::ostream& fp, const Service::Ptr& service); - void DumpServiceObject(std::ostream& fp, const Service::Ptr& service); - - void DumpCustomAttributes(std::ostream& fp, const CustomVarObject::Ptr& object); - - void UpdateObjectsCache(); - void StatusTimerHandler(); - void ObjectHandler(); - - static String GetNotificationOptions(const Checkable::Ptr& checkable); -}; - -} - -#endif /* STATUSDATAWRITER_H */ diff --git a/lib/compat/statusdatawriter.ti b/lib/compat/statusdatawriter.ti deleted file mode 100644 index cc7eb113f4d..00000000000 --- a/lib/compat/statusdatawriter.ti +++ /dev/null @@ -1,26 +0,0 @@ -/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */ - -#include "base/configobject.hpp" -#include "base/application.hpp" - -library compat; - -namespace icinga -{ - -class StatusDataWriter : ConfigObject -{ - activation_priority 100; - - [config] String status_path { - default {{{ return Configuration::CacheDir + "/status.dat"; }}} - }; - [config] String objects_path { - default {{{ return Configuration::CacheDir + "/objects.cache"; }}} - }; - [config] double update_interval { - default {{{ return 15; }}} - }; -}; - -} diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp index 40c01f39750..344e95797dd 100644 --- a/lib/icinga/compatutility.cpp +++ b/lib/icinga/compatutility.cpp @@ -15,7 +15,7 @@ using namespace icinga; -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ String CompatUtility::GetCommandLine(const Command::Ptr& command) { Value commandLine = command->GetCommandLine(); @@ -56,7 +56,7 @@ String CompatUtility::GetCommandNamePrefix(const Command::Ptr& command) } String CompatUtility::GetCommandName(const Command::Ptr& command) -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ { if (!command) return Empty; @@ -64,7 +64,7 @@ String CompatUtility::GetCommandName(const Command::Ptr& command) return GetCommandNamePrefix(command) + command->GetName(); } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ String CompatUtility::GetCheckableCommandArgs(const Checkable::Ptr& checkable) { CheckCommand::Ptr command = checkable->GetCheckCommand(); @@ -130,7 +130,7 @@ String CompatUtility::GetCheckableCommandArgs(const Checkable::Ptr& checkable) return Empty; } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ int CompatUtility::GetCheckableNotificationLastNotification(const Checkable::Ptr& checkable) { double last_notification = 0.0; @@ -142,7 +142,7 @@ int CompatUtility::GetCheckableNotificationLastNotification(const Checkable::Ptr return static_cast(last_notification); } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ int CompatUtility::GetCheckableNotificationNextNotification(const Checkable::Ptr& checkable) { double next_notification = 0.0; @@ -154,7 +154,7 @@ int CompatUtility::GetCheckableNotificationNextNotification(const Checkable::Ptr return static_cast(next_notification); } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ int CompatUtility::GetCheckableNotificationNotificationNumber(const Checkable::Ptr& checkable) { int notification_number = 0; @@ -166,7 +166,7 @@ int CompatUtility::GetCheckableNotificationNotificationNumber(const Checkable::P return notification_number; } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ double CompatUtility::GetCheckableNotificationNotificationInterval(const Checkable::Ptr& checkable) { double notification_interval = -1; @@ -210,7 +210,7 @@ int CompatUtility::GetCheckableNotificationStateFilter(const Checkable::Ptr& che return notification_state_filter; } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ std::set CompatUtility::GetCheckableNotificationUsers(const Checkable::Ptr& checkable) { /* Service -> Notifications -> (Users + UserGroups -> Users) */ @@ -233,7 +233,7 @@ std::set CompatUtility::GetCheckableNotificationUsers(const Checkable return allUsers; } -/* Used in DB IDO, StatusDataWriter and Livestatus. */ +/* Used in DB IDO and Livestatus. */ std::set CompatUtility::GetCheckableNotificationUserGroups(const Checkable::Ptr& checkable) { std::set usergroups; @@ -249,7 +249,7 @@ std::set CompatUtility::GetCheckableNotificationUserGroups(const return usergroups; } -/* Used in DB IDO, StatusDataWriter, Livestatus, CompatLogger, GelfWriter, IcingaDB. */ +/* Used in DB IDO, Livestatus, CompatLogger, GelfWriter, IcingaDB. */ String CompatUtility::GetCheckResultOutput(const CheckResult::Ptr& cr) { if (!cr) @@ -264,7 +264,7 @@ String CompatUtility::GetCheckResultOutput(const CheckResult::Ptr& cr) return raw_output.SubStr(0, line_end); } -/* Used in DB IDO, StatusDataWriter and Livestatus, IcingaDB. */ +/* Used in DB IDO, Livestatus and IcingaDB. */ String CompatUtility::GetCheckResultLongOutput(const CheckResult::Ptr& cr) { if (!cr) @@ -285,7 +285,7 @@ String CompatUtility::GetCheckResultLongOutput(const CheckResult::Ptr& cr) return Empty; } -/* Helper for DB IDO, StatusDataWriter and Livestatus. Used in StatusDataWriter. */ +/* Helper for DB IDO and Livestatus. */ String CompatUtility::EscapeString(const String& str) { String result = str; diff --git a/tools/syntax/nano/icinga2.nanorc b/tools/syntax/nano/icinga2.nanorc index 359790e9c06..6f682891bd4 100644 --- a/tools/syntax/nano/icinga2.nanorc +++ b/tools/syntax/nano/icinga2.nanorc @@ -8,7 +8,7 @@ icolor brightgreen "object[ \t]+(host|hostgroup|service|servicegroup|user|user icolor brightgreen "object[ \t]+(checkcommand|notificationcommand|eventcommand|notification)" icolor brightgreen "object[ \t]+(timeperiod|scheduleddowntime|dependency|perfdatawriter)" icolor brightgreen "object[ \t]+(graphitewriter|idomysqlconnection|idomysqlconnection)" -icolor brightgreen "object[ \t]+(livestatuslistener|statusdatawriter|externalcommandlistener)" +icolor brightgreen "object[ \t]+(livestatuslistener|externalcommandlistener)" icolor brightgreen "object[ \t]+(compatlogger|checkresultreader|checkcomponent|notificationcomponent)" icolor brightgreen "object[ \t]+(filelogger|sysloglogger|journaldlogger|apilistener|endpoint|zone)"