Module: check_mk
Branch: master
Commit: d6134cbfaaa9d7d98143d8bb3977103bbfc58d7c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6134cbfaaa9d7…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Feb 14 15:21:51 2018 +0100
Fixed merge bug.
Change-Id: I05fe52047b05747aa361c0933066bfb0c9cee91f
---
bin/mkeventd | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/mkeventd b/bin/mkeventd
index b173ac8..2c2ace5 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -207,19 +207,19 @@ def convert_history_line(values):
else:
values[22] = unsplit(values[22])
if num_values <= 23: # event_ipaddress
- values.append(history_columns[24][1])
+ values.append(StatusTableHistory.columns[24][1])
if num_values <= 24: # event_orig_host
- values.append(history_columns[25][1])
+ values.append(StatusTableHistory.columns[25][1])
if num_values <= 25: # event_contact_groups_precedence
- values.append(history_columns[26][1])
+ values.append(StatusTableHistory.columns[26][1])
if num_values <= 26: # event_core_host
- values.append(history_columns[27][1])
+ values.append(StatusTableHistory.columns[27][1])
if num_values <= 27: # event_host_in_downtime
- values.append(history_columns[28][1])
+ values.append(StatusTableHistory.columns[28][1])
else:
values[27] = values[27] == "1"
if num_values <= 28: # event_match_groups_syslog_application
- values.append(history_columns[29][1])
+ values.append(StatusTableHistory.columns[29][1])
else:
values[28] = unsplit(values[28])