]> granicus.if.org Git - icinga2/blobdiff - components/compat/statusdatawriter.cpp
Remove the HostUnreachable state.
[icinga2] / components / compat / statusdatawriter.cpp
index 9a79a2b3ce2f187bf7b294d24108298b48e28c23..2a739e155cf35f2843a69bcd735cb7e70f4c8890 100644 (file)
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/)   *
+ * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -27,6 +27,7 @@
 #include "icinga/timeperiod.h"
 #include "icinga/notificationcommand.h"
 #include "icinga/compatutility.h"
+#include "icinga/dependency.h"
 #include "base/dynamictype.h"
 #include "base/objectlock.h"
 #include "base/convert.h"
@@ -34,6 +35,7 @@
 #include "base/exception.h"
 #include "base/application.h"
 #include "base/context.h"
+#include "base/statsfunction.h"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -43,6 +45,21 @@ using namespace icinga;
 
 REGISTER_TYPE(StatusDataWriter);
 
+REGISTER_STATSFUNCTION(StatusDataWriterStats, &StatusDataWriter::StatsFunc);
+
+Value StatusDataWriter::StatsFunc(Dictionary::Ptr& status, Dictionary::Ptr& perfdata)
+{
+       Dictionary::Ptr nodes = make_shared<Dictionary>();
+
+       BOOST_FOREACH(const StatusDataWriter::Ptr& statusdatawriter, DynamicType::GetObjects<StatusDataWriter>()) {
+               nodes->Set(statusdatawriter->GetName(), 1); //add more stats
+       }
+
+       status->Set("statusdatawriter", nodes);
+
+       return 0;
+}
+
 /**
  * Hint: The reason why we're using "\n" rather than std::endl is because
  * std::endl also _flushes_ the output stream which severely degrades
@@ -65,12 +82,13 @@ void StatusDataWriter::Start(void)
        Utility::QueueAsyncCallback(boost::bind(&StatusDataWriter::UpdateObjectsCache, this));
 }
 
-void StatusDataWriter::DumpComments(std::ostream& fp, const Service::Ptr& owner, CompatObjectType type)
+void StatusDataWriter::DumpComments(std::ostream& fp, const Checkable::Ptr& checkable)
 {
-       Service::Ptr service;
-       Dictionary::Ptr comments = owner->GetComments();
+       Dictionary::Ptr comments = checkable->GetComments();
 
-       Host::Ptr host = owner->GetHost();
+       Host::Ptr host;
+       Service::Ptr service;
+       tie(host, service) = GetHostService(checkable);
 
        ObjectLock olock(comments);
 
@@ -80,31 +98,31 @@ void StatusDataWriter::DumpComments(std::ostream& fp, const Service::Ptr& owner,
                if (comment->IsExpired())
                        continue;
 
-               if (type == CompatTypeHost)
-                       fp << "hostcomment {" << "\n";
-               else
+               if (service)
                        fp << "servicecomment {" << "\n"
-                          << "\t" << "service_description=" << owner->GetShortName() << "\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";
+               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";
+       fp << "define timeperiod {" "\n"
+             "\t" "timeperiod_name" "\t" << tp->GetName() << "\n"
+             "\t" "alias" "\t" << tp->GetName() << "\n";
 
        Dictionary::Ptr ranges = tp->GetRanges();
 
@@ -115,14 +133,14 @@ void StatusDataWriter::DumpTimePeriod(std::ostream& fp, const TimePeriod::Ptr& t
                }
        }
 
-       fp << "\t" << "}" << "\n"
-          << "\n";
+       fp << "\t" "}" "\n"
+             "\n";
 }
 
 void StatusDataWriter::DumpCommand(std::ostream& fp, const Command::Ptr& command)
 {
-       fp << "define command {" << "\n"
-          << "\t" << "command_name\t";
+       fp << "define command {" "\n"
+             "\t" "command_name\t";
 
 
        if (command->GetType() == DynamicType::GetByName("CheckCommand"))
@@ -134,37 +152,23 @@ void StatusDataWriter::DumpCommand(std::ostream& fp, const Command::Ptr& command
 
        fp << command->GetName() << "\n";
 
-       fp << "\t" << "command_line\t";
-
-       Value commandLine = command->GetCommandLine();
-
-       if (commandLine.IsObjectType<Array>()) {
-               Array::Ptr args = commandLine;
-
-               ObjectLock olock(args);
-               String arg;
-               BOOST_FOREACH(arg, args) {
-                       // This is obviously incorrect for non-trivial cases.
-                       fp << " \"" << CompatUtility::EscapeString(arg) << "\"";
-               }
-       } else if (!commandLine.IsEmpty()) {
-               fp << CompatUtility::EscapeString(commandLine);
-       } else {
-               fp << "<internal>";
-       }
+       fp << "\t" "command_line" "\t" << CompatUtility::GetCommandLine(command);
 
        fp << "\n";
 
-       fp << "\t" << "}" << "\n"
-          << "\n";
+       DumpCustomAttributes(fp, command);
 
+       fp << "\n" "\t" "}" "\n"
+             "\n";
 }
 
-void StatusDataWriter::DumpDowntimes(std::ostream& fp, const Service::Ptr& owner, CompatObjectType type)
+void StatusDataWriter::DumpDowntimes(std::ostream& fp, const Checkable::Ptr& checkable)
 {
-       Host::Ptr host = owner->GetHost();
+       Dictionary::Ptr downtimes = checkable->GetDowntimes();
 
-       Dictionary::Ptr downtimes = owner->GetDowntimes();
+       Host::Ptr host;
+       Service::Ptr service;
+       tie(host, service) = GetHostService(checkable);
 
        ObjectLock olock(downtimes);
 
@@ -174,11 +178,11 @@ void StatusDataWriter::DumpDowntimes(std::ostream& fp, const Service::Ptr& owner
                if (downtime->IsExpired())
                        continue;
 
-               if (type == CompatTypeHost)
-                       fp << "hostdowntime {" << "\n";
-               else
+               if (service)
                        fp << "servicedowntime {" << "\n"
-                          << "\t" << "service_description=" << owner->GetShortName() << "\n";
+                             "\t" "service_description=" << service->GetShortName() << "\n";
+               else
+                       fp << "hostdowntime {" "\n";
 
                Downtime::Ptr triggeredByObj = Service::GetDowntimeByID(downtime->GetTriggeredBy());
                int triggeredByLegacy = 0;
@@ -186,19 +190,19 @@ void StatusDataWriter::DumpDowntimes(std::ostream& fp, const Service::Ptr& owner
                        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<long>(downtime->GetFixed()) << "\n"
-                  << "\t" << "duration=" << static_cast<long>(downtime->GetDuration()) << "\n"
-                  << "\t" << "is_in_effect=" << (downtime->IsActive() ? 1 : 0) << "\n"
-                  << "\t" << "author=" << downtime->GetAuthor() << "\n"
-                  << "\t" << "comment=" << downtime->GetComment() << "\n"
-                  << "\t" << "trigger_time=" << downtime->GetTriggerTime() << "\n"
-                  << "\t" << "}" << "\n"
-                  << "\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<long>(downtime->GetFixed()) << "\n"
+                     "\t" "duration=" << static_cast<long>(downtime->GetDuration()) << "\n"
+                     "\t" "is_in_effect=" << (downtime->IsActive() ? 1 : 0) << "\n"
+                     "\t" "author=" << downtime->GetAuthor() << "\n"
+                     "\t" "comment=" << downtime->GetComment() << "\n"
+                     "\t" "trigger_time=" << downtime->GetTriggerTime() << "\n"
+                     "\t" "}" "\n"
+                     "\n";
        }
 }
 
@@ -207,99 +211,96 @@ void StatusDataWriter::DumpHostStatus(std::ostream& fp, const Host::Ptr& host)
        fp << "hoststatus {" << "\n"
           << "\t" << "host_name=" << host->GetName() << "\n";
 
-       Service::Ptr hc = host->GetCheckService();
-       ObjectLock olock(hc);
-
-       if (hc)
-               DumpServiceStatusAttrs(fp, hc, CompatTypeHost);
+       {
+               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" "last_time_up=" << host->GetLastStateUp() << "\n"
+             "\t" "last_time_down=" << host->GetLastStateDown() << "\n"
+             "\t" "last_time_unreachable=" << host->GetLastStateUnreachable() << "\n";
 
-       fp << "\t" << "}" << "\n"
-          << "\n";
+       fp << "\t" "}" "\n"
+             "\n";
 
-       if (hc) {
-               DumpDowntimes(fp, hc, CompatTypeHost);
-               DumpComments(fp, hc, CompatTypeHost);
-       }
+       DumpDowntimes(fp, host);
+       DumpComments(fp, host);
 }
 
 void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
 {
-       fp << "define host {" << "\n"
-          << "\t" << "host_name" << "\t" << host->GetName() << "\n"
-          << "\t" << "display_name" << "\t" << host->GetDisplayName() << "\n"
-          << "\t" << "alias" << "\t" << host->GetDisplayName() << "\n";
-
-       Dictionary::Ptr macros = host->GetMacros();
-
-       if (macros) {
-               fp << "\t" << "address" << "\t" << macros->Get("address") << "\n"
-                  << "\t" << "address6" << "\t" << macros->Get("address6") << "\n";
-       }
-
-       std::set<Host::Ptr> parents = host->GetParentHosts();
+       String notes = CompatUtility::GetCustomAttributeConfig(host, "notes");
+       String notes_url = CompatUtility::GetCustomAttributeConfig(host, "notes_url");
+       String action_url = CompatUtility::GetCustomAttributeConfig(host, "action_url");
+       String icon_image = CompatUtility::GetCustomAttributeConfig(host, "icon_image");
+       String icon_image_alt = CompatUtility::GetCustomAttributeConfig(host, "icon_image_alt");
+       String statusmap_image = CompatUtility::GetCustomAttributeConfig(host, "statusmap_image");
+
+       fp << "define host {" "\n"
+             "\t" "host_name" "\t" << host->GetName() << "\n"
+             "\t" "display_name" "\t" << host->GetDisplayName() << "\n"
+             "\t" "alias" "\t" << host->GetDisplayName() << "\n"
+             "\t" "address" "\t" << CompatUtility::GetHostAddress(host) << "\n"
+             "\t" "address6" "\t" << CompatUtility::GetHostAddress6(host) << "\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";
+       if (!statusmap_image.IsEmpty())
+             fp << "\t" "statusmap_image" "\t" << statusmap_image << "\n";
+
+       std::set<Checkable::Ptr> parents = host->GetParents();
 
        if (!parents.empty()) {
-               fp << "\t" << "parents" << "\t";
+               fp << "\t" "parents" "\t";
                DumpNameList(fp, parents);
                fp << "\n";
        }
 
-       Service::Ptr hc = host->GetCheckService();
-       if (hc) {
-               ObjectLock olock(hc);
-
-               fp << "\t" << "check_interval" << "\t" << hc->GetCheckInterval() / 60.0 << "\n"
-                  << "\t" << "retry_interval" << "\t" << hc->GetRetryInterval() / 60.0 << "\n"
-                  << "\t" << "max_check_attempts" << "\t" << hc->GetMaxCheckAttempts() << "\n"
-                  << "\t" << "active_checks_enabled" << "\t" << (hc->GetEnableActiveChecks() ? 1 : 0) << "\n"
-                  << "\t" << "passive_checks_enabled" << "\t" << (hc->GetEnablePassiveChecks() ? 1 : 0) << "\n"
-                  << "\t" << "notifications_enabled" << "\t" << (hc->GetEnableNotifications() ? 1 : 0) << "\n"
-                  << "\t" << "notification_options" << "\t" << "d,u,r" << "\n"
-                  << "\t" << "notification_interval" << "\t" << 1 << "\n"
-                  << "\t" << "event_handler_enabled" << "\t" << (hc->GetEnableEventHandler() ? 1 : 0) << "\n";
-
-               CheckCommand::Ptr checkcommand = hc->GetCheckCommand();
-               if (checkcommand)
-                       fp << "\t" << "check_command" << "\t" << "check_" << checkcommand->GetName() << "\n";
+       ObjectLock olock(host);
 
-               EventCommand::Ptr eventcommand = hc->GetEventCommand();
-               if (eventcommand)
-                       fp << "\t" << "event_handler" << "\t" << "event_" << eventcommand->GetName() << "\n";
+       fp << "\t" "check_interval" "\t" << CompatUtility::GetCheckableCheckInterval(host) << "\n"
+             "\t" "retry_interval" "\t" << CompatUtility::GetCheckableRetryInterval(host) << "\n"
+             "\t" "max_check_attempts" "\t" << host->GetMaxCheckAttempts() << "\n"
+             "\t" "active_checks_enabled" "\t" << CompatUtility::GetCheckableActiveChecksEnabled(host) << "\n"
+             "\t" "passive_checks_enabled" "\t" << CompatUtility::GetCheckablePassiveChecksEnabled(host) << "\n"
+             "\t" "notifications_enabled" "\t" << CompatUtility::GetCheckableNotificationsEnabled(host) << "\n"
+             "\t" "notification_options" "\t" << "d,u,r" << "\n"
+             "\t" "notification_interval" "\t" << CompatUtility::GetCheckableNotificationNotificationInterval(host) << "\n"
+             "\t" "event_handler_enabled" "\t" << CompatUtility::GetCheckableEventHandlerEnabled(host) << "\n";
 
-               TimePeriod::Ptr check_period = hc->GetCheckPeriod();
-               if (check_period)
-                       fp << "\t" << "check_period" << "\t" << check_period->GetName() << "\n";
+       CheckCommand::Ptr checkcommand = host->GetCheckCommand();
+       if (checkcommand)
+               fp << "\t" "check_command" "\t" "check_" << checkcommand->GetName() << "\n";
 
-               fp << "\t" << "contacts" << "\t";
-               DumpNameList(fp, CompatUtility::GetServiceNotificationUsers(hc));
-               fp << "\n";
+       EventCommand::Ptr eventcommand = host->GetEventCommand();
+       if (eventcommand)
+               fp << "\t" "event_handler" "\t" "event_" << eventcommand->GetName() << "\n";
 
-               fp << "\t" << "contact_groups" << "\t";
-               DumpNameList(fp, CompatUtility::GetServiceNotificationUserGroups(hc));
-               fp << "\n";
+       fp << "\t" "check_period" "\t" << CompatUtility::GetCheckableCheckPeriod(host) << "\n";
 
-               fp << "\t" << "initial_state" << "\t" << "o" << "\n"
-                  << "\t" << "low_flap_threshold" << "\t" << hc->GetFlappingThreshold() << "\n"
-                  << "\t" << "high_flap_threshold" << "\t" << hc->GetFlappingThreshold() << "\n"
-                  << "\t" << "process_perf_data" << "\t" << 1 << "\n"
-                  << "\t" << "check_freshness" << "\t" << 1 << "\n";
+       fp << "\t" "contacts" "\t";
+       DumpNameList(fp, CompatUtility::GetCheckableNotificationUsers(host));
+       fp << "\n";
 
-       } else {
-               fp << "\t" << "check_interval" << "\t" << 60 << "\n"
-                  << "\t" << "retry_interval" << "\t" << 60 << "\n"
-                  << "\t" << "max_check_attempts" << "\t" << 1 << "\n"
-                  << "\t" << "active_checks_enabled" << "\t" << 0 << "\n"
-                  << "\t" << "passive_checks_enabled" << "\t" << 0 << "\n"
-                  << "\t" << "notifications_enabled" << "\t" << 0 << "\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->GetFlappingThreshold() << "\n"
+             "\t" "high_flap_threshold" "\t" << host->GetFlappingThreshold() << "\n"
+             "\t" "process_perf_data" "\t" << CompatUtility::GetCheckableProcessPerformanceData(host) << "\n"
+             "\t" "check_freshness" "\t" "1" "\n";
 
-       fp << "\t" << "host_groups" << "\t";
+       fp << "\t" "host_groups" "\t";
        bool first = true;
 
         Array::Ptr groups = host->GetGroups();
@@ -325,144 +326,157 @@ void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
 
        DumpCustomAttributes(fp, host);
 
-       fp << "\t" << "}" << "\n"
-          << "\n";
+       fp << "\t" "}" "\n"
+             "\n";
 }
 
-void StatusDataWriter::DumpServiceStatusAttrs(std::ostream& fp, const Service::Ptr& service, CompatObjectType type)
+void StatusDataWriter::DumpCheckableStatusAttrs(std::ostream& fp, const Checkable::Ptr& checkable)
 {
-       Dictionary::Ptr attrs = CompatUtility::GetServiceStatusAttributes(service, type);
-
-       fp << "\t" << "check_command=" << attrs->Get("check_command") << "\n"
-          << "\t" << "event_handler=" << attrs->Get("event_handler") << "\n"
-          << "\t" << "check_period=" << attrs->Get("check_period") << "\n"
-          << "\t" << "check_interval=" << static_cast<double>(attrs->Get("check_interval")) << "\n"
-          << "\t" << "retry_interval=" << static_cast<double>(attrs->Get("retry_interval")) << "\n"
-          << "\t" << "has_been_checked=" << attrs->Get("has_been_checked") << "\n"
-          << "\t" << "should_be_scheduled=" << attrs->Get("should_be_scheduled") << "\n"
-          << "\t" << "check_execution_time=" << static_cast<double>(attrs->Get("check_execution_time")) << "\n"
-          << "\t" << "check_latency=" << static_cast<double>(attrs->Get("check_latency")) << "\n"
-          << "\t" << "current_state=" << attrs->Get("current_state") << "\n"
-          << "\t" << "state_type=" << attrs->Get("state_type") << "\n"
-          << "\t" << "plugin_output=" << attrs->Get("plugin_output") << "\n"
-          << "\t" << "long_plugin_output=" << attrs->Get("long_plugin_output") << "\n"
-          << "\t" << "performance_data=" << attrs->Get("performance_data") << "\n"
-          << "\t" << "check_source=" << attrs->Get("check_source") << "\n"
-          << "\t" << "last_check=" << static_cast<long>(attrs->Get("last_check")) << "\n"
-          << "\t" << "next_check=" << static_cast<long>(attrs->Get("next_check")) << "\n"
-          << "\t" << "current_attempt=" << attrs->Get("current_attempt") << "\n"
-          << "\t" << "max_attempts=" << attrs->Get("max_attempts") << "\n"
-          << "\t" << "last_state_change=" << static_cast<long>(attrs->Get("last_state_change")) << "\n"
-          << "\t" << "last_hard_state_change=" << static_cast<long>(attrs->Get("last_hard_state_change")) << "\n"
-          << "\t" << "last_time_ok=" << static_cast<long>(attrs->Get("last_time_ok")) << "\n"
-          << "\t" << "last_time_warn=" << static_cast<long>(attrs->Get("last_time_warn")) << "\n"
-          << "\t" << "last_time_critical=" << static_cast<long>(attrs->Get("last_time_critical")) << "\n"
-          << "\t" << "last_time_unknown=" << static_cast<long>(attrs->Get("last_time_unknown")) << "\n"
-          << "\t" << "last_update=" << static_cast<long>(attrs->Get("last_update")) << "\n"
-          << "\t" << "notifications_enabled=" << attrs->Get("notifications_enabled") << "\n"
-          << "\t" << "active_checks_enabled=" << attrs->Get("active_checks_enabled") << "\n"
-          << "\t" << "passive_checks_enabled=" << attrs->Get("passive_checks_enabled") << "\n"
-          << "\t" << "flap_detection_enabled=" << attrs->Get("flap_detection_enabled") << "\n"
-          << "\t" << "is_flapping=" << attrs->Get("is_flapping") << "\n"
-          << "\t" << "percent_state_change=" << attrs->Get("percent_state_change") << "\n"
-          << "\t" << "problem_has_been_acknowledged=" << attrs->Get("problem_has_been_acknowledged") << "\n"
-          << "\t" << "acknowledgement_type=" << attrs->Get("acknowledgement_type") << "\n"
-          << "\t" << "acknowledgement_end_time=" << attrs->Get("acknowledgement_end_time") << "\n"
-          << "\t" << "scheduled_downtime_depth=" << attrs->Get("scheduled_downtime_depth") << "\n"
-          << "\t" << "last_notification=" << static_cast<long>(attrs->Get("last_notification")) << "\n"
-          << "\t" << "next_notification=" << static_cast<long>(attrs->Get("next_notification")) << "\n"
-          << "\t" << "current_notification_number=" << attrs->Get("current_notification_number") << "\n"
-          << "\t" << "modified_attributes=" << attrs->Get("modified_attributes") << "\n";
+       CheckResult::Ptr cr = checkable->GetLastCheckResult();
+
+       fp << "\t" << "check_command=check_" << CompatUtility::GetCheckableCheckCommand(checkable) << "\n"
+             "\t" "event_handler=event_" << CompatUtility::GetCheckableEventHandler(checkable) << "\n"
+             "\t" "check_period=" << CompatUtility::GetCheckableCheckPeriod(checkable) << "\n"
+             "\t" "check_interval=" << CompatUtility::GetCheckableCheckInterval(checkable) << "\n"
+             "\t" "retry_interval=" << CompatUtility::GetCheckableRetryInterval(checkable) << "\n"
+             "\t" "has_been_checked=" << CompatUtility::GetCheckableHasBeenChecked(checkable) << "\n"
+             "\t" "should_be_scheduled=" << CompatUtility::GetCheckableShouldBeScheduled(checkable) << "\n";
+
+       if (cr) {
+          fp << "\t" << "check_execution_time=" << Convert::ToString(Service::CalculateExecutionTime(cr)) << "\n"
+                "\t" "check_latency=" << Convert::ToString(Service::CalculateLatency(cr)) << "\n";
+       }
+
+       Host::Ptr host;
+       Service::Ptr service;
+       tie(host, service) = GetHostService(checkable);
+
+       if (service)
+               fp << "\t" << "current_state=" << service->GetState() << "\n";
+       else
+               fp << "\t" << "current_state=" << (host->IsReachable() ? host->GetState() : 2) << "\n";
+
+       fp << "\t" "state_type=" << checkable->GetStateType() << "\n"
+             "\t" "plugin_output=" << CompatUtility::GetCheckResultOutput(cr) << "\n"
+             "\t" "long_plugin_output=" << CompatUtility::GetCheckResultLongOutput(cr) << "\n"
+             "\t" "performance_data=" << CompatUtility::GetCheckResultPerfdata(cr) << "\n";
+
+       if (cr) {
+          fp << "\t" << "check_source=" << cr->GetCheckSource() << "\n"
+                "\t" "last_check=" << static_cast<long>(cr->GetScheduleEnd()) << "\n";
+       }
+
+       fp << "\t" << "next_check=" << static_cast<long>(checkable->GetNextCheck()) << "\n"
+             "\t" "current_attempt=" << checkable->GetCheckAttempt() << "\n"
+             "\t" "max_attempts=" << checkable->GetMaxCheckAttempts() << "\n"
+             "\t" "last_state_change=" << static_cast<long>(checkable->GetLastStateChange()) << "\n"
+             "\t" "last_hard_state_change=" << static_cast<long>(checkable->GetLastHardStateChange()) << "\n"
+             "\t" "last_time_ok=" << static_cast<int>(checkable->GetLastStateOK()) << "\n"
+             "\t" "last_time_warn=" << static_cast<int>(checkable->GetLastStateWarning()) << "\n"
+             "\t" "last_time_critical=" << static_cast<int>(checkable->GetLastStateCritical()) << "\n"
+             "\t" "last_time_unknown=" << static_cast<int>(checkable->GetLastStateUnknown()) << "\n"
+             "\t" "last_update=" << static_cast<long>(time(NULL)) << "\n"
+             "\t" "notifications_enabled=" << CompatUtility::GetCheckableNotificationsEnabled(checkable) << "\n"
+             "\t" "active_checks_enabled=" << CompatUtility::GetCheckableActiveChecksEnabled(checkable) << "\n"
+             "\t" "passive_checks_enabled=" << CompatUtility::GetCheckablePassiveChecksEnabled(checkable) << "\n"
+             "\t" "flap_detection_enabled=" << CompatUtility::GetCheckableFlapDetectionEnabled(checkable) << "\n"
+             "\t" "is_flapping=" << CompatUtility::GetCheckableIsFlapping(checkable) << "\n"
+             "\t" "percent_state_change=" << CompatUtility::GetCheckablePercentStateChange(checkable) << "\n"
+             "\t" "problem_has_been_acknowledged=" << CompatUtility::GetCheckableProblemHasBeenAcknowledged(checkable) << "\n"
+             "\t" "acknowledgement_type=" << CompatUtility::GetCheckableAcknowledgementType(checkable) << "\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" "modified_attributes=" << checkable->GetModifiedAttributes() << "\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";
+       fp << "servicestatus {" "\n"
+             "\t" "host_name=" << host->GetName() << "\n"
+             "\t" "service_description=" << service->GetShortName() << "\n";
 
        {
                ObjectLock olock(service);
-               DumpServiceStatusAttrs(fp, service, CompatTypeService);
+               DumpCheckableStatusAttrs(fp, service);
        }
 
-       fp << "\t" << "}" << "\n"
-          << "\n";
+       fp << "\t" "}" "\n"
+             "\n";
 
-       DumpDowntimes(fp, service, CompatTypeService);
-       DumpComments(fp, service, CompatTypeService);
+       DumpDowntimes(fp, service);
+       DumpComments(fp, service);
 }
 
 void StatusDataWriter::DumpServiceObject(std::ostream& fp, const Service::Ptr& service)
 {
        Host::Ptr host = service->GetHost();
 
-        String check_period_str;
-        TimePeriod::Ptr check_period = service->GetCheckPeriod();
-        if (check_period)
-                check_period_str = check_period->GetName();
-        else
-                check_period_str = "24x7";
-
-       double notification_interval = -1;
-       BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) {
-               if (notification_interval == -1 || notification->GetNotificationInterval() < notification_interval)
-                       notification_interval = notification->GetNotificationInterval();
-       }
-
-       if (notification_interval == -1)
-               notification_interval = 60;
-
        {
                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_period" << "\t" << check_period_str << "\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" << (service->GetEnableActiveChecks() ? 1 : 0) << "\n"
-                  << "\t" << "passive_checks_enabled" << "\t" << (service->GetEnablePassiveChecks() ? 1 : 0) << "\n"
-                  << "\t" << "flap_detection_enabled" << "\t" << (service->GetEnableFlapping() ? 1 : 0) << "\n"
-                  << "\t" << "is_volatile" << "\t" << (service->GetVolatile() ? 1 : 0) << "\n"
-                  << "\t" << "notifications_enabled" << "\t" << (service->GetEnableNotifications() ? 1 : 0) << "\n"
-                  << "\t" << "notification_options" << "\t" << "u,w,c,r" << "\n"
-                  << "\t" << "notification_interval" << "\t" << notification_interval / 60.0 << "\n"
-                  << "\t" << "event_handler_enabled" << "\t" << (service->GetEnableEventHandler() ? 1 : 0) << "\n";
+               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_period" "\t" << CompatUtility::GetCheckableCheckPeriod(service) << "\n"
+                     "\t" "check_interval" "\t" << CompatUtility::GetCheckableCheckInterval(service) << "\n"
+                     "\t" "retry_interval" "\t" << CompatUtility::GetCheckableRetryInterval(service) << "\n"
+                     "\t" "max_check_attempts" "\t" << service->GetMaxCheckAttempts() << "\n"
+                     "\t" "active_checks_enabled" "\t" << CompatUtility::GetCheckableActiveChecksEnabled(service) << "\n"
+                     "\t" "passive_checks_enabled" "\t" << CompatUtility::GetCheckablePassiveChecksEnabled(service) << "\n"
+                     "\t" "flap_detection_enabled" "\t" << CompatUtility::GetCheckableFlapDetectionEnabled(service) << "\n"
+                     "\t" "is_volatile" "\t" << CompatUtility::GetCheckableIsVolatile(service) << "\n"
+                     "\t" "notifications_enabled" "\t" << CompatUtility::GetCheckableNotificationsEnabled(service) << "\n"
+                     "\t" "notification_options" "\t" << CompatUtility::GetCheckableNotificationNotificationOptions(service) << "\n"
+                     "\t" "notification_interval" "\t" << CompatUtility::GetCheckableNotificationNotificationInterval(service) << "\n"
+                     "\t" "notification_period" "\t" << CompatUtility::GetCheckableNotificationNotificationPeriod(service) << "\n"
+                     "\t" "event_handler_enabled" "\t" << CompatUtility::GetCheckableEventHandlerEnabled(service) << "\n";
 
                CheckCommand::Ptr checkcommand = service->GetCheckCommand();
                if (checkcommand)
-                       fp << "\t" << "check_command" << "\t" << "check_" << checkcommand->GetName() << "\n";
+                       fp << "\t" "check_command" "\t" "check_" << checkcommand->GetName() << "\n";
 
                EventCommand::Ptr eventcommand = service->GetEventCommand();
                if (eventcommand)
-                       fp << "\t" << "event_handler" << "\t" << "event_" << eventcommand->GetName() << "\n";
-
-                TimePeriod::Ptr check_period = service->GetCheckPeriod();
-                if (check_period)
-                        fp << "\t" << "check_period" << "\t" << check_period->GetName() << "\n";
+                       fp << "\t" "event_handler" "\t" "event_" << eventcommand->GetName() << "\n";
 
-                fp << "\t" << "contacts" << "\t";
-                DumpNameList(fp, CompatUtility::GetServiceNotificationUsers(service));
+                fp << "\t" "contacts" "\t";
+                DumpNameList(fp, CompatUtility::GetCheckableNotificationUsers(service));
                 fp << "\n";
 
-                fp << "\t" << "contact_groups" << "\t";
-                DumpNameList(fp, CompatUtility::GetServiceNotificationUserGroups(service));
+                fp << "\t" "contact_groups" "\t";
+                DumpNameList(fp, CompatUtility::GetCheckableNotificationUserGroups(service));
                 fp << "\n";
 
-                fp << "\t" << "initial_state" << "\t" << "o" << "\n"
-                   << "\t" << "low_flap_threshold" << "\t" << service->GetFlappingThreshold() << "\n"
-                   << "\t" << "high_flap_threshold" << "\t" << service->GetFlappingThreshold() << "\n"
-                   << "\t" << "process_perf_data" << "\t" << 1 << "\n"
-                   << "\t" << "check_freshness" << "\t" << 1 << "\n";
+               String notes = CompatUtility::GetCustomAttributeConfig(service, "notes");
+               String notes_url = CompatUtility::GetCustomAttributeConfig(service, "notes_url");
+               String action_url = CompatUtility::GetCustomAttributeConfig(service, "action_url");
+               String icon_image = CompatUtility::GetCustomAttributeConfig(service, "icon_image");
+               String icon_image_alt = CompatUtility::GetCustomAttributeConfig(service, "icon_image_alt");
+
+                fp << "\t" "initial_state" "\t" "o" "\n"
+                      "\t" "low_flap_threshold" "\t" << service->GetFlappingThreshold() << "\n"
+                      "\t" "high_flap_threshold" "\t" << service->GetFlappingThreshold() << "\n"
+                      "\t" "process_perf_data" "\t" << CompatUtility::GetCheckableProcessPerformanceData(service) << "\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";
+       fp << "\t" "service_groups" "\t";
        bool first = true;
 
         Array::Ptr groups = service->GetGroups();
@@ -488,43 +502,23 @@ void StatusDataWriter::DumpServiceObject(std::ostream& fp, const Service::Ptr& s
 
        DumpCustomAttributes(fp, service);
 
-       fp << "\t" << "}" << "\n"
-          << "\n";
-
-       BOOST_FOREACH(const Service::Ptr& parent, service->GetParentServices()) {
-               Host::Ptr host = service->GetHost();
-
-               Host::Ptr parent_host = parent->GetHost();
-
-               if (!parent_host)
-                       continue;
-
-               fp << "define servicedependency {" << "\n"
-                  << "\t" << "dependent_host_name" << "\t" << host->GetName() << "\n"
-                  << "\t" << "dependent_service_description" << "\t" << service->GetShortName() << "\n"
-                  << "\t" << "host_name" << "\t" << parent_host->GetName() << "\n"
-                  << "\t" << "service_description" << "\t" << parent->GetShortName() << "\n"
-                  << "\t" << "execution_failure_criteria" << "\t" << "n" << "\n"
-                  << "\t" << "notification_failure_criteria" << "\t" << "w,u,c" << "\n"
-                  << "\t" << "}" << "\n"
-                  << "\n";
-       }
+       fp << "\t" "}" "\n"
+             "\n";
 }
 
 void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const DynamicObject::Ptr& object)
 {
-       Dictionary::Ptr custom = object->GetCustom();
+       Dictionary::Ptr vars = object->GetVars();
 
-       if (!custom)
+       if (!vars)
                return;
 
-       ObjectLock olock(custom);
-       BOOST_FOREACH(const Dictionary::Pair& kv, custom) {
+       ObjectLock olock(vars);
+       BOOST_FOREACH(const Dictionary::Pair& kv, vars) {
                if (!kv.first.IsEmpty()) {
                        fp << "\t";
 
-                       if (kv.first != "notes" && kv.first != "action_url" && kv.first != "notes_url" &&
-                           kv.first != "icon_image" && kv.first != "icon_image_alt" && kv.first != "statusmap_image" && kv.first != "2d_coords")
+                       if (!CompatUtility::IsLegacyAttribute(object, kv.first))
                                fp << "_";
 
                        fp << kv.first << "\t" << kv.second << "\n";
@@ -544,51 +538,51 @@ void StatusDataWriter::UpdateObjectsCache(void)
 
        objectfp << std::fixed;
 
-       objectfp << "# Icinga objects cache file" << "\n"
-                << "# This file is auto-generated. Do not modify this file." << "\n"
-                << "\n";
+       objectfp << "# Icinga objects cache file" "\n"
+                   "# This file is auto-generated. Do not modify this file." "\n"
+                   "\n";
 
        BOOST_FOREACH(const Host::Ptr& host, DynamicType::GetObjects<Host>()) {
                std::ostringstream tempobjectfp;
                tempobjectfp << std::fixed;
                DumpHostObject(tempobjectfp, host);
                objectfp << tempobjectfp.str();
+
+               BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
+                       std::ostringstream tempobjectfp;
+                       tempobjectfp << std::fixed;
+                       DumpServiceObject(tempobjectfp, service);
+                       objectfp << tempobjectfp.str();
+               }
        }
 
        BOOST_FOREACH(const HostGroup::Ptr& hg, DynamicType::GetObjects<HostGroup>()) {
                std::ostringstream tempobjectfp;
                tempobjectfp << std::fixed;
 
-               tempobjectfp << "define hostgroup {" << "\n"
-                        << "\t" << "hostgroup_name" << "\t" << hg->GetName() << "\n";
+               tempobjectfp << "define hostgroup {" "\n"
+                               "\t" "hostgroup_name" "\t" << hg->GetName() << "\n";
 
                DumpCustomAttributes(tempobjectfp, hg);
 
-               tempobjectfp << "\t" << "members" << "\t";
+               tempobjectfp << "\t" "members" "\t";
                DumpNameList(tempobjectfp, hg->GetMembers());
                tempobjectfp << "\n"
-                            << "\t" << "}" << "\n";
+                               "\t" "}" "\n";
 
                objectfp << tempobjectfp.str();
        }
 
-       BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
-               std::ostringstream tempobjectfp;
-               tempobjectfp << std::fixed;
-               DumpServiceObject(tempobjectfp, service);
-               objectfp << tempobjectfp.str();
-       }
-
        BOOST_FOREACH(const ServiceGroup::Ptr& sg, DynamicType::GetObjects<ServiceGroup>()) {
                std::ostringstream tempobjectfp;
                tempobjectfp << std::fixed;
 
-               tempobjectfp << "define servicegroup {" << "\n"
-                        << "\t" << "servicegroup_name" << "\t" << sg->GetName() << "\n";
+               tempobjectfp << "define servicegroup {" "\n"
+                               "\t" "servicegroup_name" "\t" << sg->GetName() << "\n";
 
                DumpCustomAttributes(tempobjectfp, sg);
 
-               tempobjectfp << "\t" << "members" << "\t";
+               tempobjectfp << "\t" "members" "\t";
 
                std::vector<String> sglist;
                BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) {
@@ -601,7 +595,7 @@ void StatusDataWriter::UpdateObjectsCache(void)
                DumpStringList(tempobjectfp, sglist);
 
                tempobjectfp << "\n"
-                        << "}" << "\n";
+                               "}" "\n";
 
                objectfp << tempobjectfp.str();
        }
@@ -610,15 +604,15 @@ void StatusDataWriter::UpdateObjectsCache(void)
                std::ostringstream tempobjectfp;
                tempobjectfp << std::fixed;
 
-               tempobjectfp << "define contact {" << "\n"
-                        << "\t" << "contact_name" << "\t" << user->GetName() << "\n"
-                        << "\t" << "alias" << "\t" << user->GetDisplayName() << "\n"
-                        << "\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";
+               tempobjectfp << "define contact {" "\n"
+                               "\t" "contact_name" "\t" << user->GetName() << "\n"
+                               "\t" "alias" "\t" << user->GetDisplayName() << "\n"
+                               "\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();
        }
@@ -627,14 +621,14 @@ void StatusDataWriter::UpdateObjectsCache(void)
                std::ostringstream tempobjectfp;
                tempobjectfp << std::fixed;
 
-               tempobjectfp << "define contactgroup {" << "\n"
-                        << "\t" << "contactgroup_name" << "\t" << ug->GetName() << "\n"
-                        << "\t" << "alias" << "\t" << ug->GetDisplayName() << "\n";
+               tempobjectfp << "define contactgroup {" "\n"
+                               "\t" "contactgroup_name" "\t" << ug->GetName() << "\n"
+                               "\t" "alias" "\t" << ug->GetDisplayName() << "\n";
 
-               tempobjectfp << "\t" << "members" << "\t";
+               tempobjectfp << "\t" "members" "\t";
                DumpNameList(tempobjectfp, ug->GetMembers());
                tempobjectfp << "\n"
-                            << "\t" << "}" << "\n";
+                               "\t" "}" "\n";
 
                objectfp << tempobjectfp.str();
        }
@@ -655,6 +649,42 @@ void StatusDataWriter::UpdateObjectsCache(void)
                DumpTimePeriod(objectfp, tp);
        }
 
+       BOOST_FOREACH(const Dependency::Ptr& dep, DynamicType::GetObjects<Dependency>()) {
+               Checkable::Ptr parent = dep->GetParent();
+
+               if (!parent)
+                       continue;
+
+               Host::Ptr parent_host;
+               Service::Ptr parent_service;
+               tie(parent_host, parent_service) = GetHostService(parent);
+
+               if (!parent_service)
+                       continue;
+
+               Checkable::Ptr child = dep->GetChild();
+
+               if (!child)
+                       continue;
+
+               Host::Ptr child_host;
+               Service::Ptr child_service;
+               tie(child_host, child_service) = GetHostService(child);
+
+               if (!child_service)
+                       continue;
+
+               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" "n" "\n"
+                           "\t" "notification_failure_criteria" "\t" "w,u,c" "\n"
+                           "\t" "}" "\n"
+                           "\n";
+       }
+
        objectfp.close();
 
 #ifdef _WIN32
@@ -684,49 +714,52 @@ void StatusDataWriter::StatusTimerHandler(void)
 
        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::GetVersion() << "\n"
-                << "\t" << "}" << "\n"
-                << "\n";
-
-       statusfp << "programstatus {" << "\n"
-                << "\t" << "icinga_pid=" << Utility::GetPid() << "\n"
-                << "\t" << "daemon_mode=1" << "\n"
-                << "\t" << "program_start=" << static_cast<long>(Application::GetStartTime()) << "\n"
-                << "\t" << "active_service_checks_enabled=" << (IcingaApplication::GetInstance()->GetEnableChecks() ? 1 : 0) << "\n"
-                << "\t" << "passive_service_checks_enabled=1" << "\n"
-                << "\t" << "active_host_checks_enabled=1" << "\n"
-                << "\t" << "passive_host_checks_enabled=1" << "\n"
-                << "\t" << "check_service_freshness=1" << "\n"
-                << "\t" << "check_host_freshness=1" << "\n"
-                << "\t" << "enable_notifications=" << (IcingaApplication::GetInstance()->GetEnableNotifications() ? 1 : 0) << "\n"
-                << "\t" << "enable_flap_detection=" << (IcingaApplication::GetInstance()->GetEnableFlapping() ? 1 : 0) << "\n"
-                << "\t" << "enable_failure_prediction=0" << "\n"
-                << "\t" << "process_performance_data=" << (IcingaApplication::GetInstance()->GetEnablePerfdata() ? 1 : 0) << "\n"
-                << "\t" << "active_scheduled_service_check_stats=" << CIB::GetActiveChecksStatistics(60) << "," << CIB::GetActiveChecksStatistics(5 * 60) << "," << CIB::GetActiveChecksStatistics(15 * 60) << "\n"
-                << "\t" << "passive_service_check_stats=" << CIB::GetPassiveChecksStatistics(60) << "," << CIB::GetPassiveChecksStatistics(5 * 60) << "," << CIB::GetPassiveChecksStatistics(15 * 60) << "\n"
-                << "\t" << "next_downtime_id=" << Service::GetNextDowntimeID() << "\n"
-                << "\t" << "next_comment_id=" << Service::GetNextCommentID() << "\n"
-                << "\t" << "}" << "\n"
-                << "\n";
+       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::GetVersion() << "\n"
+                   "\t" "}" "\n"
+                   "\n";
+
+       statusfp << "programstatus {" "\n"
+                   "\t" "icinga_pid=" << Utility::GetPid() << "\n"
+                   "\t" "daemon_mode=1" "\n"
+                   "\t" "program_start=" << static_cast<long>(Application::GetStartTime()) << "\n"
+                   "\t" "active_service_checks_enabled=" << (IcingaApplication::GetInstance()->GetEnableChecks() ? 1 : 0) << "\n"
+                   "\t" "passive_service_checks_enabled=1" "\n"
+                   "\t" "active_host_checks_enabled=1" "\n"
+                   "\t" "passive_host_checks_enabled=1" "\n"
+                   "\t" "check_service_freshness=1" "\n"
+                   "\t" "check_host_freshness=1" "\n"
+                   "\t" "enable_notifications=" << (IcingaApplication::GetInstance()->GetEnableNotifications() ? 1 : 0) << "\n"
+                   "\t" "enable_flap_detection=" << (IcingaApplication::GetInstance()->GetEnableFlapping() ? 1 : 0) << "\n"
+                   "\t" "enable_failure_prediction=0" "\n"
+                   "\t" "process_performance_data=" << (IcingaApplication::GetInstance()->GetEnablePerfdata() ? 1 : 0) << "\n"
+                   "\t" "active_scheduled_service_check_stats=" << CIB::GetActiveChecksStatistics(60) << "," << CIB::GetActiveChecksStatistics(5 * 60) << "," << CIB::GetActiveChecksStatistics(15 * 60) << "\n"
+                   "\t" "passive_service_check_stats=" << CIB::GetPassiveChecksStatistics(60) << "," << CIB::GetPassiveChecksStatistics(5 * 60) << "," << CIB::GetPassiveChecksStatistics(15 * 60) << "\n"
+                   "\t" "next_downtime_id=" << Service::GetNextDowntimeID() << "\n"
+                   "\t" "next_comment_id=" << Service::GetNextCommentID() << "\n";
+
+       DumpCustomAttributes(statusfp, IcingaApplication::GetInstance());
+
+       statusfp << "\t" "}" "\n"
+                   "\n";
 
        BOOST_FOREACH(const Host::Ptr& host, DynamicType::GetObjects<Host>()) {
                std::ostringstream tempstatusfp;
                tempstatusfp << std::fixed;
                DumpHostStatus(tempstatusfp, host);
                statusfp << tempstatusfp.str();
-       }
 
-       BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
-               std::ostringstream tempstatusfp;
-               tempstatusfp << std::fixed;
-               DumpServiceStatus(tempstatusfp, service);
-               statusfp << tempstatusfp.str();
+               BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
+                       std::ostringstream tempstatusfp;
+                       tempstatusfp << std::fixed;
+                       DumpServiceStatus(tempstatusfp, service);
+                       statusfp << tempstatusfp.str();
+               }
        }
 
        statusfp.close();