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

Add {Host,Service}Group attributes: notes, notes_url, action_url.

Browse Source 
Fixes #6057
This commit is contained in:
Michael Friedrich 2014-04-24 14:48:57 +02:00
parent 097e0bf4f4
commit 2b70b282ad
12 changed files with 82 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/compat/statusdatawriter.cpp
View File

@ -564,9 +564,23 @@ void StatusDataWriter::UpdateObjectsCache(void)
std::ostringstream tempobjectfp; std::ostringstream tempobjectfp;
tempobjectfp << std::fixed; 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" tempobjectfp << "define hostgroup {" "\n"
"\t" "hostgroup_name" "\t" << hg->GetName() << "\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); DumpCustomAttributes(tempobjectfp, hg);
tempobjectfp << "\t" "members" "\t"; tempobjectfp << "\t" "members" "\t";
@ -581,9 +595,23 @@ void StatusDataWriter::UpdateObjectsCache(void)
std::ostringstream tempobjectfp; std::ostringstream tempobjectfp;
tempobjectfp << std::fixed; 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" tempobjectfp << "define servicegroup {" "\n"
"\t" "servicegroup_name" "\t" << sg->GetName() << "\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); DumpCustomAttributes(tempobjectfp, sg);
tempobjectfp << "\t" "members" "\t"; tempobjectfp << "\t" "members" "\t";

6
components/db_ido_mysql/schema/mysql.sql
View File

@ -600,6 +600,9 @@ CREATE TABLE IF NOT EXISTS icinga_hostgroups (
config_type smallint default 0, config_type smallint default 0,
hostgroup_object_id bigint unsigned default 0, hostgroup_object_id bigint unsigned default 0,
alias TEXT character set latin1 default '', alias TEXT character set latin1 default '',
notes TEXT character set latin1 default NULL,
notes_url TEXT character set latin1 default NULL,
action_url TEXT character set latin1 default NULL,
PRIMARY KEY (hostgroup_id), PRIMARY KEY (hostgroup_id),
UNIQUE KEY instance_id (instance_id,hostgroup_object_id) UNIQUE KEY instance_id (instance_id,hostgroup_object_id)
) ENGINE=InnoDB COMMENT='Hostgroup definitions'; ) ENGINE=InnoDB COMMENT='Hostgroup definitions';
@ -1086,6 +1089,9 @@ CREATE TABLE IF NOT EXISTS icinga_servicegroups (
config_type smallint default 0, config_type smallint default 0,
servicegroup_object_id bigint unsigned default 0, servicegroup_object_id bigint unsigned default 0,
alias TEXT character set latin1 default '', alias TEXT character set latin1 default '',
notes TEXT character set latin1 default NULL,
notes_url TEXT character set latin1 default NULL,
action_url TEXT character set latin1 default NULL,
PRIMARY KEY (servicegroup_id), PRIMARY KEY (servicegroup_id),
UNIQUE KEY instance_id (instance_id,config_type,servicegroup_object_id) UNIQUE KEY instance_id (instance_id,config_type,servicegroup_object_id)
) ENGINE=InnoDB COMMENT='Servicegroup definitions'; ) ENGINE=InnoDB COMMENT='Servicegroup definitions';

8
components/db_ido_mysql/schema/upgrade/0.0.10.sql Normal file
View File

@ -0,0 +1,8 @@
ALTER TABLE icinga_hostgroups ADD COLUMN notes TEXT character set latin1 default NULL;
ALTER TABLE icinga_hostgroups ADD COLUMN notes_url TEXT character set latin1 default NULL;
ALTER TABLE icinga_hostgroups ADD COLUMN action_url TEXT character set latin1 default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN notes TEXT character set latin1 default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN notes_url TEXT character set latin1 default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN action_url TEXT character set latin1 default NULL;

6
components/db_ido_pgsql/schema/pgsql.sql
View File

@ -627,6 +627,9 @@ CREATE TABLE icinga_hostgroups (
config_type INTEGER default 0, config_type INTEGER default 0,
hostgroup_object_id bigint default 0, hostgroup_object_id bigint default 0,
alias TEXT default '', alias TEXT default '',
notes TEXT default NULL,
notes_url TEXT default NULL,
action_url TEXT default NULL,
CONSTRAINT PK_hostgroup_id PRIMARY KEY (hostgroup_id) , CONSTRAINT PK_hostgroup_id PRIMARY KEY (hostgroup_id) ,
CONSTRAINT UQ_hostgroups UNIQUE (instance_id,hostgroup_object_id) CONSTRAINT UQ_hostgroups UNIQUE (instance_id,hostgroup_object_id)
) ; ) ;
@ -1113,6 +1116,9 @@ CREATE TABLE icinga_servicegroups (
config_type INTEGER default 0, config_type INTEGER default 0,
servicegroup_object_id bigint default 0, servicegroup_object_id bigint default 0,
alias TEXT default '', alias TEXT default '',
notes TEXT default NULL,
notes_url TEXT default NULL,
action_url TEXT default NULL,
CONSTRAINT PK_servicegroup_id PRIMARY KEY (servicegroup_id) , CONSTRAINT PK_servicegroup_id PRIMARY KEY (servicegroup_id) ,
CONSTRAINT UQ_servicegroups UNIQUE (instance_id,config_type,servicegroup_object_id) CONSTRAINT UQ_servicegroups UNIQUE (instance_id,config_type,servicegroup_object_id)
) ; ) ;

8
components/db_ido_pgsql/schema/upgrade/0.0.10.sql Normal file
View File

@ -0,0 +1,8 @@
ALTER TABLE icinga_hostgroups ADD COLUMN notes TEXT default NULL;
ALTER TABLE icinga_hostgroups ADD COLUMN notes_url TEXT default NULL;
ALTER TABLE icinga_hostgroups ADD COLUMN action_url TEXT default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN notes TEXT default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN notes_url TEXT default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN action_url TEXT default NULL;

21
components/livestatus/hostgroupstable.cpp
View File

@ -85,32 +85,17 @@ Value HostGroupsTable::AliasAccessor(const Value& row)
Value HostGroupsTable::NotesAccessor(const Value& row) Value HostGroupsTable::NotesAccessor(const Value& row)
{ {
Dictionary::Ptr vars = static_cast<HostGroup::Ptr>(row)->GetVars(); return static_cast<HostGroup::Ptr>(row)->GetNotes();
if (!vars)
return Empty;
return vars->Get("notes");
} }
Value HostGroupsTable::NotesUrlAccessor(const Value& row) Value HostGroupsTable::NotesUrlAccessor(const Value& row)
{ {
Dictionary::Ptr vars = static_cast<HostGroup::Ptr>(row)->GetVars(); return static_cast<HostGroup::Ptr>(row)->GetNotesUrl();
if (!vars)
return Empty;
return vars->Get("notes_url");
} }
Value HostGroupsTable::ActionUrlAccessor(const Value& row) Value HostGroupsTable::ActionUrlAccessor(const Value& row)
{ {
Dictionary::Ptr vars = static_cast<HostGroup::Ptr>(row)->GetVars(); return static_cast<HostGroup::Ptr>(row)->GetActionUrl();
if (!vars)
return Empty;
return vars->Get("action_url");
} }
Value HostGroupsTable::MembersAccessor(const Value& row) Value HostGroupsTable::MembersAccessor(const Value& row)

21
components/livestatus/servicegroupstable.cpp
View File

@ -76,32 +76,17 @@ Value ServiceGroupsTable::AliasAccessor(const Value& row)
Value ServiceGroupsTable::NotesAccessor(const Value& row) Value ServiceGroupsTable::NotesAccessor(const Value& row)
{ {
Dictionary::Ptr vars = static_cast<ServiceGroup::Ptr>(row)->GetVars(); return static_cast<ServiceGroup::Ptr>(row)->GetNotes();
if (!vars)
return Empty;
return vars->Get("notes");
} }
Value ServiceGroupsTable::NotesUrlAccessor(const Value& row) Value ServiceGroupsTable::NotesUrlAccessor(const Value& row)
{ {
Dictionary::Ptr vars = static_cast<ServiceGroup::Ptr>(row)->GetVars(); return static_cast<ServiceGroup::Ptr>(row)->GetNotesUrl();
if (!vars)
return Empty;
return vars->Get("notes_url");
} }
Value ServiceGroupsTable::ActionUrlAccessor(const Value& row) Value ServiceGroupsTable::ActionUrlAccessor(const Value& row)
{ {
Dictionary::Ptr vars = static_cast<ServiceGroup::Ptr>(row)->GetVars(); return static_cast<ServiceGroup::Ptr>(row)->GetActionUrl();
if (!vars)
return Empty;
return vars->Get("action_url");
} }
Value ServiceGroupsTable::MembersAccessor(const Value& row) Value ServiceGroupsTable::MembersAccessor(const Value& row)

3
lib/db_ido/hostgroupdbobject.cpp
View File

@ -39,6 +39,9 @@ Dictionary::Ptr HostGroupDbObject::GetConfigFields(void) const
HostGroup::Ptr group = static_pointer_cast<HostGroup>(GetObject()); HostGroup::Ptr group = static_pointer_cast<HostGroup>(GetObject());
fields->Set("alias", group->GetDisplayName()); fields->Set("alias", group->GetDisplayName());
fields->Set("notes", group->GetNotes());
fields->Set("notes_url", group->GetNotesUrl());
fields->Set("action_url", group->GetActionUrl());
return fields; return fields;
} }

3
lib/db_ido/servicegroupdbobject.cpp
View File

@ -38,6 +38,9 @@ Dictionary::Ptr ServiceGroupDbObject::GetConfigFields(void) const
ServiceGroup::Ptr group = static_pointer_cast<ServiceGroup>(GetObject()); ServiceGroup::Ptr group = static_pointer_cast<ServiceGroup>(GetObject());
fields->Set("alias", group->GetDisplayName()); fields->Set("alias", group->GetDisplayName());
fields->Set("notes", group->GetNotes());
fields->Set("notes_url", group->GetNotesUrl());
fields->Set("action_url", group->GetActionUrl());
return fields; return fields;
} }

3
lib/icinga/hostgroup.ti
View File

@ -15,6 +15,9 @@ class HostGroup : DynamicObject
}; };
[config] Array::Ptr groups; [config] Array::Ptr groups;
[config] String notes;
[config] String notes_url;
[config] String action_url;
}; };
} }

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

@ -76,6 +76,10 @@
%attribute %array "groups" { %attribute %array "groups" {
%attribute %name(HostGroup) "*" %attribute %name(HostGroup) "*"
}, },
%attribute %string "notes",
%attribute %string "notes_url",
%attribute %string "action_url",
} }
%type Service %inherits Checkable { %type Service %inherits Checkable {
@ -95,6 +99,10 @@
%attribute %array "groups" { %attribute %array "groups" {
%attribute %name(ServiceGroup) "*" %attribute %name(ServiceGroup) "*"
}, },
%attribute %string "notes",
%attribute %string "notes_url",
%attribute %string "action_url",
} }
%type Notification { %type Notification {

3
lib/icinga/servicegroup.ti
View File

@ -15,6 +15,9 @@ class ServiceGroup : DynamicObject
}; };
[config] Array::Ptr groups; [config] Array::Ptr groups;
[config] String notes;
[config] String notes_url;
[config] String action_url;
}; };
} }