event_contact_groups_precedence
Message-ID: <589da459.YU+tlbPkyGneR87u%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 5c029e7ac87db95c5e32420bcc7dd67ee0aebf9b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c029e7ac87db9…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 10 12:21:14 2017 +0100
Event Console: Added new events table colum: event_contact_groups_precedence
Change-Id: Id9ef0fecaa6bc325c23b9a13aa07e8e3c6734cda
---
bin/mkeventd | 43 ++++++++++++++++---------------
livestatus/src/TableEventConsoleEvents.cc | 3 +++
2 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/bin/mkeventd b/bin/mkeventd
index 099cac6..2a1eff6 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -92,27 +92,28 @@ syslog_facilities = [ "kern", "user",
"mail", "daemon", "auth", "syslog",
"lpr",
# - maybe add a field into the event simulator
event_columns = [
- ( "event_id", 1 ),
- ( "event_count", 1 ),
- ( "event_text", "" ),
- ( "event_first", 0.0 ),
- ( "event_last", 0.0 ),
- ( "event_comment", "" ),
- ( "event_sl", 0 ), # filter fehlt
- ( "event_host", "" ),
- ( "event_contact", "" ),
- ( "event_application", "" ),
- ( "event_pid", 0 ),
- ( "event_priority", 5 ),
- ( "event_facility", 1 ),
- ( "event_rule_id", "" ),
- ( "event_state", 0 ),
- ( "event_phase", "" ),
- ( "event_owner", "" ),
- ( "event_match_groups", "" ),
- ( "event_contact_groups", "" ),
- ( "event_ipaddress", "" ), # introduced in 1.2.7
- ( "event_orig_host", "" ),
+ ( "event_id", 1 ),
+ ( "event_count", 1 ),
+ ( "event_text", "" ),
+ ( "event_first", 0.0 ),
+ ( "event_last", 0.0 ),
+ ( "event_comment", "" ),
+ ( "event_sl", 0 ), # filter fehlt
+ ( "event_host", "" ),
+ ( "event_contact", "" ),
+ ( "event_application", "" ),
+ ( "event_pid", 0 ),
+ ( "event_priority", 5 ),
+ ( "event_facility", 1 ),
+ ( "event_rule_id", "" ),
+ ( "event_state", 0 ),
+ ( "event_phase", "" ),
+ ( "event_owner", "" ),
+ ( "event_match_groups", "" ),
+ ( "event_contact_groups", "" ),
+ ( "event_ipaddress", "" ), # introduced in
1.2.7
+ ( "event_orig_host", "" ),
+ ( "event_contact_groups_precedence", "host" ), # introduced in
1.4.0b1
]
grepping_filters = [
diff --git a/livestatus/src/TableEventConsoleEvents.cc
b/livestatus/src/TableEventConsoleEvents.cc
index f0972e2..2076e59 100644
--- a/livestatus/src/TableEventConsoleEvents.cc
+++ b/livestatus/src/TableEventConsoleEvents.cc
@@ -108,6 +108,9 @@ void TableEventConsoleEvents::addColumns(
table->addColumn(make_unique<ListEventConsoleColumn>("event_contact_groups",
"Contact groups"));
table->addColumn(make_unique<StringEventConsoleColumn>(
+ "event_contact_groups_precedence",
+ "Whether or not the host- or rule groups have precedence"));
+ table->addColumn(make_unique<StringEventConsoleColumn>(
"event_ipaddress", "The IP address where the event
originated"));
TableHosts::addColumns(table, "host_", DANGEROUS_OFFSETOF(Row, _host), -1,