Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Updated bug entries #0065, #0802, #0771, #0060, #0790

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fac9c7ad6bddae12cedd1f513b05f741baed5d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fac9c7ad6bdda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 9 15:00:30 2012 +0200 Updated bug entries #0065, #0802, #0771, #0060, #0790 --- .bugs/60 | 7 ++++++- .bugs/65 | 6 ++++++ .bugs/771 | 10 ++++------ .bugs/790 | 22 ++++++++++++++++++++++ .bugs/802 | 11 +++++------ 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/.bugs/60 b/.bugs/60 index 6633c82..2a3c554 100644 --- a/.bugs/60 +++ b/.bugs/60 @@ -1,4 +1,4 @@ -Title: Warnung im Logfile, wenn environment_macros an sind +Title: Livestatus-Warnung im Logfile, wenn environment_macros an sind Component: livestatus State: open Date: 2010-12-21 22:18:56 @@ -6,3 +6,8 @@ Class: feature Analog zu den broker options wäre das eine für die Stabilität wichtige Sache. + +Diese Variable kann man sicher irgendwie als globale Variable auslesen +und dann ins Nagios-Log schreiben (da wo auch die broker-Options +getestet werden). + diff --git a/.bugs/65 b/.bugs/65 index e08634d..0a8b0ed 100644 --- a/.bugs/65 +++ b/.bugs/65 @@ -7,3 +7,9 @@ Class: feature Ählich zu den expandierten notes_url. Damit könnte man sehen, welches Kommando wirklich ausgeführt wird. Und das zum rausschneiden und auf der Kommandozeile pasten. + +Dazu einen passenden Multisite-Painter, damit man das Kommando ansehen +kann. Diesen könnte man evtl. auch direkt in der Service-Details-View +anzeigen anstelle des jetzigen? + +Das gleiche dann natürlich auchbei den Host. diff --git a/.bugs/771 b/.bugs/771 index b342a7a..51c9dc1 100644 --- a/.bugs/771 +++ b/.bugs/771 @@ -5,9 +5,7 @@ Date: 2012-06-14 13:29:43 Targetversion: 1.2.0 Class: nastiness -When adding service columns to host tables the column -headers of those columns should be the service name, -not the title of the painter. The latter one is -for example "Perf-O-Meter". Better would be "CPU load". -(if this is not specified by the user in the first -place). +When adding service columns to host tables the column headers of those +columns should be the service name, not the title of the painter. The latter +one is for example "Perf-O-Meter". Better would be "CPU load". (if this is +not specified by the user in the first place). diff --git a/.bugs/790 b/.bugs/790 new file mode 100644 index 0000000..5e8b21f --- /dev/null +++ b/.bugs/790 @@ -0,0 +1,22 @@ +Title: Three Livecheck issues +Component: livecheck +State: open +Date: 2012-10-09 14:20:28 +Targetversion: 1.2.0 +Class: bug + +1. In livecheck.c:53, int bytes_read = read(fd[0], output, sizeof(output)); +does not guarantee a valid 0-byte terminated string. I propose a single +codeline after it: if (bytes_read > 0) output[bytes_read - 1] = 0; This +fixed an issue for me, where there was a lot of garbage behind output lines. + +2. In livecheck.c:190, check_type should always be 0. check_type determines +wether it is active(0) or passive(1), not host/service. Since livecheck is +always run actively on the host that it puts the checkfile. This doesn't +have to be variable. + +3. Somewhere before livecheck.c:188 the output charbuffer needs to be newline +escaped, there is a nagios function for this called escape_newlines. This +is necessary for long plugin output to be functional. + +Ticket #442 diff --git a/.bugs/802 b/.bugs/802 index 4098a21..1674986 100644 --- a/.bugs/802 +++ b/.bugs/802 @@ -5,9 +5,8 @@ Date: 2012-09-20 18:17:19 Targetversion: future Class: nastiness -If you add a simulated state for a given service (using foldable) -it will be reflected on the top-level, but not on the nodes. -So you see a lot of green items and but the main state stays as -configured to be simulated -it's very irritating, since the correct subaggrs and services -are in fact displayed, just not with their simulated states. +If you add a simulated state for a given service (using foldable) it will be +reflected on the top-level, but not on the nodes. So you see a lot of green +items and but the main state stays as configured to be simulated it's very +irritating, since the correct subaggrs and services are in fact displayed, +just not with their simulated states.

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 098f0df0e8f6008d7c04c975c03884360f1c327d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=098f0df0e8f600… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 9 15:00:33 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ce47572507ec9118e3cb9e9ab12537fb7d03ce8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce47572507ec91… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 9 14:20:10 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: checks/ups* now recognize more device oids

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c3497f7dc79bcb713c47624cf4b5e2d91c23a64e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3497f7dc79bcb… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 9 14:18:14 2012 +0200 checks/ups* now recognize more device oids --- checks/ups_bat_temp | 2 +- checks/ups_capacity | 2 +- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 1404ee0..00dae3c 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -57,7 +57,7 @@ check_info['ups_bat_temp'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), } diff --git a/checks/ups_capacity b/checks/ups_capacity index 9ea822d..0e3684c 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -74,5 +74,5 @@ check_info["ups_capacity"] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index c9f1cfb..fb9bbac 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -57,5 +57,5 @@ check_info['ups_in_freq'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] \ } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 4168ae2..ae86dbc 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -56,5 +56,5 @@ check_info['ups_in_voltage'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index 59e06c1..686412e 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -56,5 +56,5 @@ check_info['ups_out_load'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index d1fe868..f29764b 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -56,5 +56,5 @@ check_info['ups_out_voltage'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_power b/checks/ups_power index 9d0d417..53434e4 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,5 +60,5 @@ check_info['ups_power'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33" ] + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] }

11 years, 11 months

Check_MK Git: check_mk: livestatus: code reformatting

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b169257393266809cf6283280ababd5401560970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1692573932668… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 13:00:53 2012 +0200 livestatus: code reformatting --- livestatus/src/module.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 8bef4f3..1100c47 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -499,10 +499,8 @@ int broker_event(int event_type __attribute__ ((__unused__)), void *data) if( ts->event_type == EVENT_LOG_ROTATION){ if( g_thread_running == 1 ){ livestatus_log_initial_states(); - } else { - if ( log_initial_states == 1 ) - write_to_all_logs("logging intitial states", LG_INFO); - } + } else if (log_initial_states == 1) + write_to_all_logs("logging intitial states", LG_INFO); } update_timeperiods_cache(ts->timestamp.tv_sec);

11 years, 11 months

Check_MK Git: check_mk: livestatus: improved handling of log_initial_states

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 292dcad0cadbeb08b8f89348d617571deaf52d32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292dcad0cadbeb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 12:56:57 2012 +0200 livestatus: improved handling of log_initial_states --- livestatus/src/LogEntry.cc | 4 +++ livestatus/src/LogEntry.h | 3 +- livestatus/src/TableLog.cc | 13 ---------- livestatus/src/TableStateHistory.cc | 46 ++++++++++++++-------------------- livestatus/src/module.c | 8 +++++- 5 files changed, 32 insertions(+), 42 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index db538c6..d554b9c 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -300,6 +300,10 @@ bool LogEntry::handleProgrammEntry() { _logclass = LOGCLASS_PROGRAM; return true; + }else if (strstr(_text, "logging intitial states")){ + _logclass = LOGCLASS_PROGRAM; + _type = LOG_INITIAL_STATES; + return true; } return false; } diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 274b8d2..8229224 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -48,7 +48,8 @@ enum LogEntryType { NONE, FLAPPING_SERVICE, TIMEPERIOD_TRANSITION, NAGIOS_STARTING, - LOG_VERSION + LOG_VERSION, + LOG_INITIAL_STATES, }; struct LogEntry diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 883cb59..36e5443 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -56,19 +56,6 @@ TableLog::TableLog() addColumns(this, "", -1); } -// Debugging logging is hard if debug messages are logged themselves... -void debug_log(const char *loginfo, ...) -{ - FILE *x = fopen("/tmp/livestatus_log.log", "a+"); - va_list ap; - va_start(ap, loginfo); - vfprintf(x, loginfo, ap); - fputc('\n', x); - va_end(ap); - fclose(x); -} - - void TableLog::addColumns(Table *table, string prefix, int indirect_offset, bool add_host, bool add_services) { LogEntry *ref = 0; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index e9e8ac7..8428a0b 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -44,18 +44,14 @@ #define CHECK_MEM_CYCLE 1000 /* Check memory every N'th new message */ -extern int g_debug_level; extern Store *g_store; -extern int log_initial_states; #define CLASSMASK_STATEHIST 70 // Debugging logging is hard if debug messages are logged themselves... void debug_statehist(const char *loginfo, ...) { - if (g_debug_level < 2) - return; - + return; FILE *x = fopen("/tmp/livestatus_state.log", "a+"); va_list ap; va_start(ap, loginfo); @@ -365,22 +361,19 @@ void TableStateHistory::answerQuery(Query *query) } break; } - case NAGIOS_STARTING: + case LOG_INITIAL_STATES: { // This feature is only available if log_initial_states is set to 1 // If log_initial_states is set, each nagios startup logs the initial states of all known // hosts and services. Therefore we can detect if a host is no longer available after // a nagios startup. If it still exists an INITIAL HOST/SERVICE state entry will follow up shortly. // If it reappaers again after multiple nagios restarts an unmonitored state entry is generated - if (log_initial_states) - { - state_info_t::iterator it_hst = state_info.begin(); - while (it_hst != state_info.end()) { - if (it_hst->second->_no_longer_exists == 0) - it_hst->second->_last_known_time = entry->_time; - it_hst->second->_no_longer_exists++; - it_hst++; - } + state_info_t::iterator it_hst = state_info.begin(); + while (it_hst != state_info.end()) { + if (it_hst->second->_no_longer_exists == 0) + it_hst->second->_last_known_time = entry->_time; + it_hst->second->_no_longer_exists++; + it_hst++; } break; } @@ -395,18 +388,17 @@ void TableStateHistory::answerQuery(Query *query) //hst->_debug_info = "LOG FINAL"; // No trace since the last two nagios startup -> host/service has vanished - if (log_initial_states) - if (hst->_no_longer_exists > 1) { - // Log last known state up to nagios restart - hst->_time = hst->_last_known_time; - hst->_until = hst->_last_known_time; - process(query, hst); - - // Log absent state - hst->_state = -1; - hst->_until = hst->_time; - hst->_debug_info = "UNMONITORED"; - } + if (hst->_no_longer_exists > 1) { + // Log last known state up to nagios restart + hst->_time = hst->_last_known_time; + hst->_until = hst->_last_known_time; + process(query, hst); + + // Log absent state + hst->_state = -1; + hst->_until = hst->_time; + hst->_debug_info = "UNMONITORED"; + } hst->_time = _until - 1; hst->_until = hst->_time; diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 2d60382..8bef4f3 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -102,6 +102,8 @@ int g_data_encoding = ENCODING_UTF8; extern struct host *host_list; extern struct service *service_list; extern scheduled_downtime *scheduled_downtime_list; +extern int log_initial_states; + int g_num_hosts; int g_num_services; @@ -466,6 +468,7 @@ void livestatus_log_initial_states(){ // Log DOWNTIME hosts host *h = (host *)host_list; char buffer[8192]; + while (h) { if (h->scheduled_downtime_depth > 0) { sprintf(buffer,"HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, get_downtime_comment(h->name, NULL)); @@ -496,7 +499,10 @@ int broker_event(int event_type __attribute__ ((__unused__)), void *data) if( ts->event_type == EVENT_LOG_ROTATION){ if( g_thread_running == 1 ){ livestatus_log_initial_states(); - } + } else { + if ( log_initial_states == 1 ) + write_to_all_logs("logging intitial states", LG_INFO); + } } update_timeperiods_cache(ts->timestamp.tv_sec);

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 131d985a67567309bec58e9cb591b577e7e083b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=131d985a675673… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 12:57:04 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9035dd9af22af384ba96761568a9d1b918a0616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9035dd9af22af… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 9 10:33:57 2012 +0200 Add new bug entry --- .bugs/805 | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/.bugs/805 b/.bugs/805 new file mode 100644 index 0000000..a4b6505 --- /dev/null +++ b/.bugs/805 @@ -0,0 +1,19 @@ +Title: Custom notification text does not show up +Component: core +State: open +Date: 2012-10-09 10:30:07 +Targetversion: 1.2.0 +Class: todo + +If you create a custom notification using Multisite it allwos you to include some text in there +This text is not passed through to the actual notification, either missing from the +template or not handled in notify.py + + +Address: 149.154.154.26 +State: UP -> UP (RECOVERY) +Command: check-mk-ping!-n 9 -t 20 -w 1500.00,80.00% -c 3000.00,100.00% +Output: OK - 149.154.154.26: rta 22.841ms, lost 0% +Perfdata: rta=22.841ms;1500.000;3000.000;0; pl=0%;80;100;; rtmax=28.768ms;;;; rtmin=20.972ms;;;; + +We could generally enable those comments, right?

11 years, 11 months

Check_MK Git: check_mk: Checks cbl_airlaser: Handle cases where one of two main PSUs is missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 899d7f84e5e1e910a61f00b5e3ad62da15004deb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=899d7f84e5e1e9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Oct 8 17:28:14 2012 +0200 Checks cbl_airlaser: Handle cases where one of two main PSUs is missing --- checks/cbl_airlaser | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/checks/cbl_airlaser b/checks/cbl_airlaser index 8fef745..650bc58 100644 --- a/checks/cbl_airlaser +++ b/checks/cbl_airlaser @@ -145,6 +145,12 @@ def check_cbl_airlaser_hw(item, params, info): # if this sensor wasn't in the params, then we don't alert on it. perfdata.append(("%s" % sensor, "%d" % val, '', '', 0, 90)), + # HACK: for the main PSUs the status 3 is not "warning" but + # not_detected (3) + if sensor in [ "psStatus48V", "psStatus230V" ] \ + and val == "warning": + state = max(state, 0) + else: if val == "failure": state = 2

11 years, 11 months

Check_MK Git: check_mk: New feature of hiding certain actions from the commands in the status GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aa633cbd191d7e7b7b6008869825d1ec9763348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aa633cbd191d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 15:23:50 2012 +0200 New feature of hiding certain actions from the commands in the status GUI --- ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 5 +++-- mkeventd/web/plugins/views/mkeventd.py | 4 ++-- mkeventd/web/plugins/wato/mkeventd.py | 9 +++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765d398..f6ab0b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Moved source of Event Console into Check_MK project * New button for resetting all rule hits counters * When saving a rule then its hits counter is always reset + * New feature of hiding certain actions from the commands in the status GUI Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 7868eb9..6994caa 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -66,13 +66,14 @@ def service_levels(): except: return [(0, "(no service level)")] -def action_choices(): +def action_choices(omit_hidden = False): # The possible actions are configured in mkeventd.mk, # not in multisite.mk (like the service levels). That # way we have not direct access to them but need # to load them from the configuration. return [ (a["id"], a["title"]) - for a in eventd_configuration().get("actions", []) ] + for a in eventd_configuration().get("actions", []) + if not omit_hidden or not a.get("hidden") ] cached_config = None def eventd_configuration(): diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index de458c6..c8c0873 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -639,12 +639,12 @@ if mkeventd_enabled: [ "user", "admin" ]) def render_mkeventd_actions(): - for action_id, title in mkeventd.action_choices(): + for action_id, title in mkeventd.action_choices(omit_hidden = True): html.button("_action_" + action_id, title) html.write("<br>") def command_mkeventd_action(cmdtag, spec, row): - for action_id, title in mkeventd.action_choices(): + for action_id, title in mkeventd.action_choices(omit_hidden = True): if html.var("_action_" + action_id): return "ACTION;%s;%s;%s" % (row["event_id"], config.user_id, action_id), \ (_("execute that action "%s&quot") % title) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 84a5fc2..0ba0fa1 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -103,6 +103,15 @@ vs_mkeventd_actions = \ label = _("Current disable execution of this action"), ) ), + ( "hidden", + Checkbox( + title = _("Hide from Status GUI"), + label = _("Do not offer this action as a command on open events"), + help = _("If you enabled this option, then this action will not " + "be available as an interactive user command. It is usable " + "as an ad-hoc action when a rule fires, nevertheless."), + ), + ), ( "action", CascadingDropdown( title = _("Type of Action"),

11 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012