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

compat: Make sure commands have unique names.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-07-02 09:35:03 +02:00
parent 049fbcb3cb
commit bf58700c10
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/compat/compatcomponent.cpp
View File

@ -253,7 +253,17 @@ void CompatComponent::DumpTimePeriod(std::ostream& fp, const TimePeriod::Ptr& tp
void CompatComponent::DumpCommand(std::ostream& fp, const Command::Ptr& command) void CompatComponent::DumpCommand(std::ostream& fp, const Command::Ptr& command)
{ {
fp << "define command {" << "\n" fp << "define command {" << "\n"
<< "\t" << "command_name\t" << command->GetName() << "\n"; << "\t" << "command_name\t";
if (command->GetType() == DynamicType::GetByName("CheckCommand"))
fp << "check_";
else if (command->GetType() == DynamicType::GetByName("NotificationCommand"))
fp << "notification_";
else if (command->GetType() == DynamicType::GetByName("EventCommand"))
fp << "event_";
fp << command->GetName() << "\n";
fp << "\t" << "command_line\t"; fp << "\t" << "command_line\t";
@ -406,8 +416,8 @@ void CompatComponent::DumpServiceStatusAttrs(std::ostream& fp, const Service::Pt
String output; String output;
String long_output; String long_output;
String perfdata; String perfdata;
String check_command = ""; String check_command;
String event_command = ""; String event_command;
double schedule_end = -1; double schedule_end = -1;
CheckCommand::Ptr checkcommand = service->GetCheckCommand(); CheckCommand::Ptr checkcommand = service->GetCheckCommand();
@ -472,9 +482,9 @@ void CompatComponent::DumpServiceStatusAttrs(std::ostream& fp, const Service::Pt
last_notification = notification->GetLastNotification(); last_notification = notification->GetLastNotification();
} }
fp << "\t" << "check_command=" << check_command << "\n" fp << "\t" << "check_command=check_" << check_command << "\n"
<< "\t" << "check_period=" << check_period_str << "\n" << "\t" << "check_period=" << check_period_str << "\n"
<< "\t" << "event_handler=" << event_command << "\n" << "\t" << "event_handler=event_" << event_command << "\n"
<< "\t" << "check_interval=" << service->GetCheckInterval() / 60.0 << "\n" << "\t" << "check_interval=" << service->GetCheckInterval() / 60.0 << "\n"
<< "\t" << "retry_interval=" << service->GetRetryInterval() / 60.0 << "\n" << "\t" << "retry_interval=" << service->GetRetryInterval() / 60.0 << "\n"
<< "\t" << "has_been_checked=" << (service->GetLastCheckResult() ? 1 : 0) << "\n" << "\t" << "has_been_checked=" << (service->GetLastCheckResult() ? 1 : 0) << "\n"
@ -536,12 +546,18 @@ void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& se
if (!host) if (!host)
return; return;
String check_command = ""; String check_command;
CheckCommand::Ptr checkcommand = service->GetCheckCommand(); CheckCommand::Ptr checkcommand = service->GetCheckCommand();
if (checkcommand) if (checkcommand)
check_command = checkcommand->GetName(); check_command = checkcommand->GetName();
String event_command;
EventCommand::Ptr eventcommand = service->GetEventCommand();
if (eventcommand)
event_command = eventcommand->GetName();
String check_period_str; String check_period_str;
TimePeriod::Ptr check_period = service->GetCheckPeriod(); TimePeriod::Ptr check_period = service->GetCheckPeriod();
if (check_period) if (check_period)
@ -566,7 +582,7 @@ void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& se
<< "\t" << "service_description" << "\t" << service->GetShortName() << "\n" << "\t" << "service_description" << "\t" << service->GetShortName() << "\n"
<< "\t" << "display_name" << "\t" << service->GetDisplayName() << "\n" << "\t" << "display_name" << "\t" << service->GetDisplayName() << "\n"
<< "\t" << "check_period" << "\t" << check_period_str << "\n" << "\t" << "check_period" << "\t" << check_period_str << "\n"
<< "\t" << "check_command" << "\t" << check_command << "\n" << "\t" << "check_command" << "\t" << "check_" << check_command << "\n"
<< "\t" << "check_interval" << "\t" << service->GetCheckInterval() / 60.0 << "\n" << "\t" << "check_interval" << "\t" << service->GetCheckInterval() / 60.0 << "\n"
<< "\t" << "retry_interval" << "\t" << service->GetRetryInterval() / 60.0 << "\n" << "\t" << "retry_interval" << "\t" << service->GetRetryInterval() / 60.0 << "\n"
<< "\t" << "max_check_attempts" << "\t" << service->GetMaxCheckAttempts() << "\n" << "\t" << "max_check_attempts" << "\t" << service->GetMaxCheckAttempts() << "\n"
@ -577,6 +593,9 @@ void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& se
<< "\t" << "notifications_enabled" << "\t" << (service->GetEnableNotifications() ? 1 : 0) << "\n" << "\t" << "notifications_enabled" << "\t" << (service->GetEnableNotifications() ? 1 : 0) << "\n"
<< "\t" << "notification_options" << "\t" << "u,w,c,r" << "\n" << "\t" << "notification_options" << "\t" << "u,w,c,r" << "\n"
<< "\t" << "notification_interval" << "\t" << notification_interval / 60.0 << "\n"; << "\t" << "notification_interval" << "\t" << notification_interval / 60.0 << "\n";
if (!event_command.IsEmpty())
fp << "\t" << "event_handler" << "\t" << "event_" << event_command << "\n";
} }
DumpCustomAttributes(fp, service); DumpCustomAttributes(fp, service);