Module: check_mk
Branch: master
Commit: 594d7b57e65c704d442394ed9e017ca886594475
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=594d7b57e65c70…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Oct 9 16:47:26 2012 +0200
Livestatus/Multisite: New livestatus columns and
multisite painters for check_command_expanded
---
ChangeLog | 7 +++++++
livestatus/src/TableHosts.cc | 2 ++
livestatus/src/TableServices.cc | 2 ++
web/plugins/views/painters.py | 14 ++++++++++++++
4 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f6ab0b1..fbf50d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,13 @@
* Quicksearch: Convert search text to regex when accessing livestatus
* FIX: WATO Folder filter not available when WATO disabled
* WATO Folder Filter no longer available in single host views
+ * Added new painters "Service check command expanded" and
+ "Host check command expanded"
+
+ Livestatus:
+ * Added new table statehist, used for SLA queries
+ * Added new column check_command_expanded in table hosts
+ * Added new column check_command_expanded in table services
BI:
* Added missing localizations
diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc
index c10440a..a141398 100644
--- a/livestatus/src/TableHosts.cc
+++ b/livestatus/src/TableHosts.cc
@@ -89,6 +89,8 @@ void TableHosts::addColumns(Table *table, string prefix, int
indirect_offset)
"IP address", (char *)(&hst.address) - ref,
indirect_offset));
table->addColumn(new OffsetStringColumn(prefix + "check_command",
"Nagios command for active host check of this host", (char
*)(&hst.host_check_command) - ref, indirect_offset));
+ table->addColumn(new OffsetStringHostMacroColumn(prefix +
"check_command_expanded",
+ "Nagios command for active host check of this host with the macros
expanded", (char *)(&hst.host_check_command) - ref, indirect_offset));
table->addColumn(new OffsetStringColumn(prefix + "event_handler",
"Nagios command used as event handler", (char
*)(&hst.event_handler) - ref, indirect_offset));
table->addColumn(new OffsetStringColumn(prefix + "notification_period",
diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc
index 11e6e12..8199373 100644
--- a/livestatus/src/TableServices.cc
+++ b/livestatus/src/TableServices.cc
@@ -194,6 +194,8 @@ void TableServices::addColumns(Table *table, string prefix, int
indirect_offset,
"An optional display name (not used by Nagios standard web
pages)", (char *)(&svc.display_name) - ref, indirect_offset));
table->addColumn(new OffsetStringColumn(prefix + "check_command",
"Nagios command used for active checks", (char
*)(&svc.service_check_command) - ref, indirect_offset));
+ table->addColumn(new OffsetStringServiceMacroColumn(prefix +
"check_command_expanded",
+ "Nagios command used for active checks with the macros
expanded", (char *)(&svc.service_check_command) - ref, indirect_offset));
table->addColumn(new OffsetStringColumn(prefix + "event_handler",
"Nagios command used as event handler", (char
*)(&svc.event_handler) - ref, indirect_offset));
table->addColumn(new OffsetStringColumn(prefix + "plugin_output",
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index 93038d7..2f96afb 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -460,6 +460,13 @@ multisite_painters["svc_check_command"] = {
"paint" : lambda row: (None, row["service_check_command"]),
}
+multisite_painters["svc_check_command_expanded"] = {
+ "title" : _("Service check command expanded"),
+ "short" : _("Check command expanded"),
+ "columns" : ["service_check_command_expanded"],
+ "paint" : lambda row: (None,
row["service_check_command_expanded"]),
+}
+
multisite_painters["svc_contacts"] = {
"title" : _("Service contacts"),
"short" : _("Contacts"),
@@ -810,6 +817,13 @@ multisite_painters["host_check_command"] = {
"paint" : lambda row: (None, row["host_check_command"]),
}
+multisite_painters["host_check_command_expanded"] = {
+ "title" : _("Host check command expanded"),
+ "short" : _("Check command expanded"),
+ "columns" : ["host_check_command_expanded"],
+ "paint" : lambda row: (None,
row["host_check_command_expanded"]),
+}
+
multisite_painters["host_state_age"] = {
"title" : _("The age of the current host state"),
"short" : _("Age"),