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

Compat: Only dump host address{,6}, alias if set. 

Fixes #6013
This commit is contained in:
Michael Friedrich 2014-04-14 21:49:39 +02:00
parent 9fc5e6217a
commit 3b2f931dcb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/compat/statusdatawriter.cpp
View File

@ -236,13 +236,20 @@ void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
String icon_image = CompatUtility::GetCustomAttributeConfig(host, "icon_image"); String icon_image = CompatUtility::GetCustomAttributeConfig(host, "icon_image");
String icon_image_alt = CompatUtility::GetCustomAttributeConfig(host, "icon_image_alt"); String icon_image_alt = CompatUtility::GetCustomAttributeConfig(host, "icon_image_alt");
String statusmap_image = CompatUtility::GetCustomAttributeConfig(host, "statusmap_image"); String statusmap_image = CompatUtility::GetCustomAttributeConfig(host, "statusmap_image");
String display_name = host->GetDisplayName();
String address = host->GetAddress();
String address6 = host->GetAddress6();
fp << "define host {" "\n" fp << "define host {" "\n"
"\t" "host_name" "\t" << host->GetName() << "\n" "\t" "host_name" "\t" << host->GetName() << "\n";
"\t" "display_name" "\t" << host->GetDisplayName() << "\n" if (!display_name.IsEmpty()) {
"\t" "alias" "\t" << host->GetDisplayName() << "\n" fp << "\t" "display_name" "\t" << host->GetDisplayName() << "\n"
"\t" "address" "\t" << host->GetAddress() << "\n" "\t" "alias" "\t" << host->GetDisplayName() << "\n";
"\t" "address6" "\t" << host->GetAddress6() << "\n"; }
if (!address.IsEmpty())
fp << "\t" "address" "\t" << address << "\n";
if (!address6.IsEmpty())
fp << "\t" "address6" "\t" << address6 << "\n";
if (!notes.IsEmpty()) if (!notes.IsEmpty())
fp << "\t" "notes" "\t" << notes << "\n"; fp << "\t" "notes" "\t" << notes << "\n";
if (!notes_url.IsEmpty()) if (!notes_url.IsEmpty())