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

config: Rename servicedependencies/hostdependencies.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-25 09:16:53 +02:00
parent 0b265c18af
commit 414d8c80bc
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/icinga/host.cpp
View File

@ -663,8 +663,8 @@ void Host::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) con
bag->Set("display_name", m_DisplayName); bag->Set("display_name", m_DisplayName);
bag->Set("groups", m_Groups); bag->Set("groups", m_Groups);
bag->Set("macros", m_Macros); bag->Set("macros", m_Macros);
bag->Set("hostdependencies", m_HostDependencies); bag->Set("host_dependencies", m_HostDependencies);
bag->Set("servicedependencies", m_ServiceDependencies); bag->Set("service_dependencies", m_ServiceDependencies);
bag->Set("check", m_Check); bag->Set("check", m_Check);
bag->Set("services", m_ServiceDescriptions); bag->Set("services", m_ServiceDescriptions);
bag->Set("notifications", m_NotificationDescriptions); bag->Set("notifications", m_NotificationDescriptions);
@ -679,8 +679,8 @@ void Host::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
m_DisplayName = bag->Get("display_name"); m_DisplayName = bag->Get("display_name");
m_Groups = bag->Get("groups"); m_Groups = bag->Get("groups");
m_Macros = bag->Get("macros"); m_Macros = bag->Get("macros");
m_HostDependencies = bag->Get("hostdependencies"); m_HostDependencies = bag->Get("host_dependencies");
m_ServiceDependencies = bag->Get("servicedependencies"); m_ServiceDependencies = bag->Get("service_dependencies");
m_Check = bag->Get("check"); m_Check = bag->Get("check");
m_ServiceDescriptions = bag->Get("services"); m_ServiceDescriptions = bag->Get("services");
m_NotificationDescriptions = bag->Get("notifications"); m_NotificationDescriptions = bag->Get("notifications");

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

@ -23,10 +23,10 @@ type Host {
%attribute array "groups" { %attribute array "groups" {
%attribute name(HostGroup) "*" %attribute name(HostGroup) "*"
}, },
%attribute array "hostdependencies" { %attribute array "host_dependencies" {
%attribute name(Host) "*" %attribute name(Host) "*"
}, },
%attribute array "servicedependencies" { %attribute array "service_dependencies" {
%attribute dictionary "*" { %attribute dictionary "*" {
%require "host", %require "host",
%attribute name(Host) "host", %attribute name(Host) "host",
@ -83,10 +83,10 @@ type Service {
%attribute number "volatile", %attribute number "volatile",
%attribute array "hostdependencies" { %attribute array "host_dependencies" {
%attribute name(Host) "*" %attribute name(Host) "*"
}, },
%attribute array "servicedependencies" { %attribute array "service_dependencies" {
%attribute dictionary "*" { %attribute dictionary "*" {
%require "host", %require "host",
%attribute name(Host) "host", %attribute name(Host) "host",

8
lib/icinga/service.cpp
View File

@ -412,8 +412,8 @@ void Service::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes)
if (attributeTypes & Attribute_Config) { if (attributeTypes & Attribute_Config) {
bag->Set("display_name", m_DisplayName); bag->Set("display_name", m_DisplayName);
bag->Set("macros", m_Macros); bag->Set("macros", m_Macros);
bag->Set("hostdependencies", m_HostDependencies); bag->Set("host_dependencies", m_HostDependencies);
bag->Set("servicedependencies", m_ServiceDependencies); bag->Set("service_dependencies", m_ServiceDependencies);
bag->Set("servicegroups", m_ServiceGroups); bag->Set("servicegroups", m_ServiceGroups);
bag->Set("check_command", m_CheckCommand); bag->Set("check_command", m_CheckCommand);
bag->Set("max_check_attempts", m_MaxCheckAttempts); bag->Set("max_check_attempts", m_MaxCheckAttempts);
@ -470,8 +470,8 @@ void Service::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes
if (attributeTypes & Attribute_Config) { if (attributeTypes & Attribute_Config) {
m_DisplayName = bag->Get("display_name"); m_DisplayName = bag->Get("display_name");
m_Macros = bag->Get("macros"); m_Macros = bag->Get("macros");
m_HostDependencies = bag->Get("hostdependencies"); m_HostDependencies = bag->Get("host_dependencies");
m_ServiceDependencies = bag->Get("servicedependencies"); m_ServiceDependencies = bag->Get("service_dependencies");
m_ServiceGroups = bag->Get("servicegroups"); m_ServiceGroups = bag->Get("servicegroups");
m_CheckCommand = bag->Get("check_command"); m_CheckCommand = bag->Get("check_command");
m_MaxCheckAttempts = bag->Get("max_check_attempts"); m_MaxCheckAttempts = bag->Get("max_check_attempts");