Livestatus: Add 'host_name' and 'service_description' columns for NagVis

These columns are used for filtering and seem to be not documented nor
supported. Only added for compatibility reasons.

fixes #6474

diff --git a/components/livestatus/hoststable.cpp b/components/livestatus/hoststable.cpp
index 797e8d8d34b7e529ffb593c29805e065fbb99fcb..f459229c3a3a100dd58d5f087102902af5e39b64 100644 (file)
--- a/components/livestatus/hoststable.cpp
+++ b/components/livestatus/hoststable.cpp
@@ -47,6 +47,7 @@ void HostsTable::AddColumns(Table *table, const String& prefix,
     const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "name", Column(&HostsTable::NameAccessor, objectAccessor));
+       table->AddColumn(prefix + "host_name", Column(&HostsTable::NameAccessor, objectAccessor)); //ugly compatibility hack
        table->AddColumn(prefix + "display_name", Column(&HostsTable::DisplayNameAccessor, objectAccessor));
        table->AddColumn(prefix + "alias", Column(&HostsTable::DisplayNameAccessor, objectAccessor));
        table->AddColumn(prefix + "address", Column(&HostsTable::AddressAccessor, objectAccessor));

diff --git a/components/livestatus/servicestable.cpp b/components/livestatus/servicestable.cpp
index 6ccfcde07aad2f3bf56680db6689725ff93acf15..3a7022be3b663ad84dc4564b9641a528a25bdd54 100644 (file)
--- a/components/livestatus/servicestable.cpp
+++ b/components/livestatus/servicestable.cpp
@@ -46,6 +46,7 @@ void ServicesTable::AddColumns(Table *table, const String& prefix,
     const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "description", Column(&ServicesTable::ShortNameAccessor, objectAccessor));
+       table->AddColumn(prefix + "service_description", Column(&ServicesTable::ShortNameAccessor, objectAccessor)); //ugly compatibility hack
        table->AddColumn(prefix + "display_name", Column(&ServicesTable::DisplayNameAccessor, objectAccessor));
        table->AddColumn(prefix + "check_command", Column(&ServicesTable::CheckCommandAccessor, objectAccessor));
        table->AddColumn(prefix + "check_command_expanded", Column(&ServicesTable::CheckCommandExpandedAccessor, objectAccessor));

diff --git a/test/livestatus/queries/host/host_nagvis b/test/livestatus/queries/host/host_nagvis
index 34cdc75fc049d0260f3249fe3b945dcb55f934a2..a09d0135927d15706f445a10b91b4d5e816f52bd 100644 (file)
--- a/test/livestatus/queries/host/host_nagvis
+++ b/test/livestatus/queries/host/host_nagvis
@@ -1,5 +1,5 @@
 GET hosts
-Columns: name alias
+Columns: name alias host_name
 OutputFormat:json
 KeepAlive: on
 ResponseHeader: fixed16