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

config: Rename host_name to host.

This commit is contained in:
Gunnar Beutner 2013-09-25 09:19:25 +02:00
parent 414d8c80bc
commit 03c047f4a7
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/host.cpp
View File

@ -208,7 +208,7 @@ void Host::UpdateSlaveServices(void)
ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(di); ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(di);
builder->SetType("Service"); builder->SetType("Service");
builder->SetName(name); builder->SetName(name);
builder->AddExpression("host_name", OperatorSet, GetName()); builder->AddExpression("host", OperatorSet, GetName());
builder->AddExpression("display_name", OperatorSet, svcname); builder->AddExpression("display_name", OperatorSet, svcname);
builder->AddExpression("short_name", OperatorSet, svcname); builder->AddExpression("short_name", OperatorSet, svcname);

11
lib/icinga/icinga-type.conf
View File

@ -58,8 +58,8 @@ type IcingaApplication {
} }
type Service { type Service {
%require "host_name", %require "host",
%attribute string "host_name", %attribute string "host",
%attribute string "short_name", %attribute string "short_name",
@ -86,7 +86,8 @@ type Service {
%attribute array "host_dependencies" { %attribute array "host_dependencies" {
%attribute name(Host) "*" %attribute name(Host) "*"
}, },
%attribute array "service_dependencies" { %attribute array "service_
dependencies" {
%attribute dictionary "*" { %attribute dictionary "*" {
%require "host", %require "host",
%attribute name(Host) "host", %attribute name(Host) "host",
@ -115,8 +116,8 @@ type ServiceGroup {
} }
type Notification { type Notification {
%require "host_name", %require "host",
%attribute name(Host) "host_name", %attribute name(Host) "host",
%attribute string "service", %attribute string "service",
%attribute dictionary "macros" { %attribute dictionary "macros" {

4
lib/icinga/notification.cpp
View File

@ -389,7 +389,7 @@ void Notification::InternalSerialize(const Dictionary::Ptr& bag, int attributeTy
bag->Set("times", m_Times); bag->Set("times", m_Times);
bag->Set("notification_type_filter", m_NotificationTypeFilter); bag->Set("notification_type_filter", m_NotificationTypeFilter);
bag->Set("notification_state_filter", m_NotificationStateFilter); bag->Set("notification_state_filter", m_NotificationStateFilter);
bag->Set("host_name", m_HostName); bag->Set("host", m_HostName);
bag->Set("export_macros", m_ExportMacros); bag->Set("export_macros", m_ExportMacros);
bag->Set("service", m_Service); bag->Set("service", m_Service);
} }
@ -415,7 +415,7 @@ void Notification::InternalDeserialize(const Dictionary::Ptr& bag, int attribute
m_Times = bag->Get("times"); m_Times = bag->Get("times");
m_NotificationTypeFilter = bag->Get("notification_type_filter"); m_NotificationTypeFilter = bag->Get("notification_type_filter");
m_NotificationStateFilter = bag->Get("notification_state_filter"); m_NotificationStateFilter = bag->Get("notification_state_filter");
m_HostName = bag->Get("host_name"); m_HostName = bag->Get("host");
m_ExportMacros = bag->Get("export_macros"); m_ExportMacros = bag->Get("export_macros");
m_Service = bag->Get("service"); m_Service = bag->Get("service");
} }

2
lib/icinga/service-notification.cpp
View File

@ -132,7 +132,7 @@ void Service::UpdateSlaveNotifications(void)
ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(di); ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(di);
builder->SetType("Notification"); builder->SetType("Notification");
builder->SetName(name); builder->SetName(name);
builder->AddExpression("host_name", OperatorSet, GetHost()->GetName()); builder->AddExpression("host", OperatorSet, GetHost()->GetName());
builder->AddExpression("service", OperatorSet, GetShortName()); builder->AddExpression("service", OperatorSet, GetShortName());
if (!nfcdesc.IsObjectType<Dictionary>()) if (!nfcdesc.IsObjectType<Dictionary>())

4
lib/icinga/service.cpp
View File

@ -423,7 +423,7 @@ void Service::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes)
bag->Set("event_command", m_EventCommand); bag->Set("event_command", m_EventCommand);
bag->Set("volatile", m_Volatile); bag->Set("volatile", m_Volatile);
bag->Set("short_name", m_ShortName); bag->Set("short_name", m_ShortName);
bag->Set("host_name", m_HostName); bag->Set("host", m_HostName);
bag->Set("flapping_threshold", m_FlappingThreshold); bag->Set("flapping_threshold", m_FlappingThreshold);
bag->Set("notifications", m_NotificationDescriptions); bag->Set("notifications", m_NotificationDescriptions);
} }
@ -481,7 +481,7 @@ void Service::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes
m_EventCommand = bag->Get("event_command"); m_EventCommand = bag->Get("event_command");
m_Volatile = bag->Get("volatile"); m_Volatile = bag->Get("volatile");
m_ShortName = bag->Get("short_name"); m_ShortName = bag->Get("short_name");
m_HostName = bag->Get("host_name"); m_HostName = bag->Get("host");
m_FlappingThreshold = bag->Get("flapping_threshold"); m_FlappingThreshold = bag->Get("flapping_threshold");
m_NotificationDescriptions = bag->Get("notifications"); m_NotificationDescriptions = bag->Get("notifications");
} }