Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

preliminary version of wut_webtherm check

by Simon Betz

Module: check_mk Branch: master Commit: 3a30759f77758f36bcac3d8dff47ce425ff1c187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a30759f77758f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 23 14:41:00 2015 +0200 preliminary version of wut_webtherm check --- checks/wut_webtherm | 152 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 61 deletions(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index fd142c5..96932f8 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def detect_webtherm(oid): return oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.5040.1.2.1", @@ -36,6 +37,81 @@ def detect_webtherm(oid): ".1.3.6.1.4.1.5040.1.2.16", ".1.3.6.1.4.1.5040.1.2.18" ] + +def parse_wut_webtherm(info): + map_sensor_type = { + "1" : "temp", + "2" : "humid", + "3" : "air_pressure", + } + parsed = {} + for index, reading in info: + webtherm_type, sensor_id = index.split(".") + # Dependent on webtherm_type we have to determine + # which sensors are available. Feel free to + # declare more sensor types here. + if "---" not in reading: + # We have only temperature sensors + if webtherm_type == "6": + parsed[sensor_id] = { + "type" : "temp", + "reading" : float(reading), + } + # Here we have three different types of sensors: + # 1 = temp, 2 = humid, 3 = air pressure + elif webtherm_type == "16": + parsed[sensor_id] = { + "type" : map_sensor_type[sensor_id], + "reading" : float(reading), + } + + return parsed + + +# .--Temperature---------------------------------------------------------. +# | _____ _ | +# | |_ _|__ _ __ ___ _ __ ___ _ __ __ _| |_ _ _ _ __ ___ | +# | | |/ _ \ '_ ` _ \| '_ \ / _ \ '__/ _` | __| | | | '__/ _ \ | +# | | | __/ | | | | | |_) | __/ | | (_| | |_| |_| | | | __/ | +# | |_|\___|_| |_| |_| .__/ \___|_| \__,_|\__|\__,_|_| \___| | +# | |_| | +# +----------------------------------------------------------------------+ +# | main check | +# '----------------------------------------------------------------------' + + +factory_settings["wut_webtherm_defaultlevels"] = { + "levels" : (30, 35), +} + + +def inventory_wut_webtherm(parsed): + return [ (sensor_id, {}) for sensor_id, values in parsed.items() \ + if values["type"] == "temp" ] + + +def check_wut_webtherm(item, params, parsed): + if item in parsed: + return check_temperature(parsed[item]["reading"], params) + + +check_info["wut_webtherm"] = { + 'default_levels_variable' : "wut_webtherm_defaultlevels", + 'parse_function' : parse_wut_webtherm, + 'inventory_function' : inventory_wut_webtherm, + 'check_function' : check_wut_webtherm, + 'service_description' : 'Temperature %s', + 'has_perfdata' : True, + 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18'], [ + '1.2.1.1', # sensorNo + '1.8.1.1' # valuePkt + ]), + 'snmp_scan_function' : detect_webtherm, + 'group' : 'temperature', + 'includes' : [ 'temperature.include' ], +} + +#. # .--Air Pressure--------------------------------------------------------. # | _ _ ____ | # | / \ (_)_ __ | _ \ _ __ ___ ___ ___ _ _ _ __ ___ | @@ -45,17 +121,14 @@ def detect_webtherm(oid): # | | # '----------------------------------------------------------------------' -def inventory_wut_webtherm_pressure(info): - for index, reading in info: - if index.split(".")[1] == "3": - return [ ("3", None) ] +def inventory_wut_webtherm_pressure(parsed): + return [ (sensor_id, None) for sensor_id, values in parsed.items() \ + if values["type"] == "air_pressure" ] -def check_wut_webtherm_pressure(item, _no_params, info): - for index, reading in info: - if index.split(".")[1] == item: - pressure = float(reading.replace(",",".")) # This value is in hPa - return 0, "%.2f hPa" % pressure +def check_wut_webtherm_pressure(item, _no_params, parsed): + if item in parsed: + return 0, "%.2f hPa" % parsed[item]["reading"] check_info["wut_webtherm.pressure"] = { @@ -64,6 +137,7 @@ check_info["wut_webtherm.pressure"] = { "service_description" : "Pressure %s", } + #. # .--Humidity------------------------------------------------------------. # | _ _ _ _ _ _ | @@ -74,19 +148,18 @@ check_info["wut_webtherm.pressure"] = { # | |___/ | # '----------------------------------------------------------------------' + wut_webtherm_humidity_defaultlevels = (35, 40, 60, 65) -def inventory_wut_webtherm_humidity(info): - for index, reading in info: - if index.split(".")[1] == "2": - return [ ("2", "wut_webtherm_humidity_defaultlevels") ] +def inventory_wut_webtherm_humidity(parsed): + return [ (sensor_id, "wut_webtherm_humidity_defaultlevels") \ + for sensor_id, values in parsed.items() if values["type"] == "humid" ] -def check_wut_webtherm_humidity(item, params, info): - for index, reading in info: - if index.split(".")[1] == item: - humidity = float(reading.replace(",",".")) - return check_humidity(humidity, params) + +def check_wut_webtherm_humidity(item, params, parsed): + if item in parsed: + return check_humidity(parsed[item]["reading"], params) check_info["wut_webtherm.humidity"] = { @@ -96,46 +169,3 @@ check_info["wut_webtherm.humidity"] = { "includes" : [ "humidity.include" ], "group" : "humidity", } - -#. -# .--Temperature---------------------------------------------------------. -# | _____ _ | -# | |_ _|__ _ __ ___ _ __ ___ _ __ __ _| |_ _ _ _ __ ___ | -# | | |/ _ \ '_ ` _ \| '_ \ / _ \ '__/ _` | __| | | | '__/ _ \ | -# | | | __/ | | | | | |_) | __/ | | (_| | |_| |_| | | | __/ | -# | |_|\___|_| |_| |_| .__/ \___|_| \__,_|\__|\__,_|_| \___| | -# | |_| | -# '----------------------------------------------------------------------' - -factory_settings["wut_webtherm_defaultlevels"] = { - "levels" : (30, 35), -} - -def inventory_wut_webtherm(info): - # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1, 16.1 or 18.1 depending on MIB variant. We chop - # of the first part in order to get independent of that. - for index, reading in info: - if index.split(".")[1] == "1": - return [ ("1", {}) ] - -def check_wut_webtherm(item, params, info): - for line in info: - if line[0].split(".")[1] == item: - temp = float(line[1].replace(",", ".")) - return check_temperature(temp, params) - - -check_info["wut_webtherm"] = { - 'default_levels_variable' : "wut_webtherm_defaultlevels", - 'inventory_function' : inventory_wut_webtherm, - 'check_function' : check_wut_webtherm, - 'service_description' : 'Temperature %s', - 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', - ['1', '2', '3', '6', '7', '8', '9', '16', '18'], - ['1.2.1.1', '1.3.1.1'] - ), - 'snmp_scan_function' : detect_webtherm, - 'group' : 'temperature', - 'includes' : [ 'temperature.include' ], -}

8 years, 8 months

#2690 FIX ps: Fixed processing of old inventory_processes rules in discovery function

by Lars Michelsen

Module: check_mk Branch: master Commit: 2092e8798c06f68080b58730d46f6aace6b09d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2092e8798c06f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 14:09:27 2015 +0200 #2690 FIX ps: Fixed processing of old inventory_processes rules in discovery function Fixed exception "TypeError: can only concatenate tuple (not "list") to tuple" during service discovery when having legacy inventory_processes rules defined. --- .werks/2690 | 11 +++++++++++ ChangeLog | 1 + checks/ps.include | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2690 b/.werks/2690 new file mode 100644 index 0000000..10bc20f --- /dev/null +++ b/.werks/2690 @@ -0,0 +1,11 @@ +Title: ps: Fixed processing of old inventory_processes rules in discovery function +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445602090 + +Fixed exception "TypeError: can only concatenate tuple (not "list") to tuple" during +service discovery when having legacy inventory_processes rules defined. diff --git a/ChangeLog b/ChangeLog index 334dff9..3465668 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 2662 FIX: windows agent: fixed inventory running every time when ipv6 was activated... * 2697 FIX: hp_msa_controller.io, hp_msa_disk.io, hp_msa_volume.io: fixed broken I/O calculation * 1296 FIX: aix_memory: Check can now handle systems without swap partition + * 2690 FIX: ps: Fixed processing of old inventory_processes rules in discovery function... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ps.include b/checks/ps.include index 09e7b8c..d6761b4 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -61,7 +61,7 @@ def inventory_ps_common(invdata, invrules, info): inv_entry += ([],) default_levels = inv_entry[3:7] - entries.append(inv_entry[:3] + [None] + ({ "levels" : default_levels },)) + entries.append(inv_entry[:3] + (None,) + ({ "levels" : default_levels },)) # Handle new WATO style inventory rules for rule in invrules:

8 years, 8 months

Fixed incorrect usage of 'inline'.

by Sven Panne

Module: check_mk Branch: master Commit: d32f4daaf846d59bf645de8c40d8d0fb9a2f15c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d32f4daaf846d5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 23 13:55:53 2015 +0200 Fixed incorrect usage of 'inline'. --- livestatus/src/HostlistStateColumn.cc | 2 +- livestatus/src/LogEntry.cc | 16 ++++++++-------- livestatus/src/Logfile.cc | 2 +- livestatus/src/TableStateHistory.cc | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/livestatus/src/HostlistStateColumn.cc b/livestatus/src/HostlistStateColumn.cc index 60558d4..087d5b6 100644 --- a/livestatus/src/HostlistStateColumn.cc +++ b/livestatus/src/HostlistStateColumn.cc @@ -31,7 +31,7 @@ extern TableServices *g_table_hosts; -inline bool hst_state_is_worse(int32_t state1, int32_t state2) +static inline bool hst_state_is_worse(int32_t state1, int32_t state2) { if (state1 == 0) return false; // UP is worse than nothing else if (state2 == 0) return true; // everything else is worse then UP diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 015decf..c1f5dce 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -92,7 +92,7 @@ LogEntry::~LogEntry() -inline bool LogEntry::handleStatusEntry() +bool LogEntry::handleStatusEntry() { //// TODO: check if its worth of implementing //// Most lines are status entries anyway... @@ -276,7 +276,7 @@ inline bool LogEntry::handleStatusEntry() // HOST NOTIFICATION: omdadmin;localhost;check-mk-notify;DOWNTIMESTOPPED (UP);mk // HOST NOTIFICATION: omdadmin;localhost;CUSTOM (UP);check-mk-notify;OK - 127.0.0.1: rta 0.055ms, lost 0%;omdadmin;TEST // HOST NOTIFICATION: omdadmin;localhost;DOWN;check-mk-notify;Manually set to Down by omdadmin -inline bool LogEntry::handleNotificationEntry() +bool LogEntry::handleNotificationEntry() { if (!strncmp(_text, "HOST NOTIFICATION: ", 19) || !strncmp(_text, "SERVICE NOTIFICATION: ", 22)) @@ -321,7 +321,7 @@ inline bool LogEntry::handleNotificationEntry() return false; } -inline bool LogEntry::handlePassiveCheckEntry() +bool LogEntry::handlePassiveCheckEntry() { if (!strncmp(_text, "PASSIVE SERVICE CHECK: ", 23) || !strncmp(_text, "PASSIVE HOST CHECK: ", 20)) @@ -343,7 +343,7 @@ inline bool LogEntry::handlePassiveCheckEntry() return false; } -inline bool LogEntry::handleExternalCommandEntry() +bool LogEntry::handleExternalCommandEntry() { if (!strncmp(_text, "EXTERNAL COMMAND:", 17)) { @@ -359,7 +359,7 @@ inline bool LogEntry::handleExternalCommandEntry() return false; } -inline bool LogEntry::handleTextEntry() +bool LogEntry::handleTextEntry() { if (!strncmp(_text, "LOG VERSION: 2.0", 16)) { @@ -377,7 +377,7 @@ inline bool LogEntry::handleTextEntry() return false; } -inline bool LogEntry::handleProgrammEntry() +bool LogEntry::handleProgrammEntry() { if (strstr(_text, "starting...") || strstr(_text, "active mode...")) @@ -403,7 +403,7 @@ inline bool LogEntry::handleProgrammEntry() } -inline int LogEntry::serviceStateToInt(char *s) +int LogEntry::serviceStateToInt(char *s) { if (!s) return 3; // can happen at garbled log line @@ -424,7 +424,7 @@ inline int LogEntry::serviceStateToInt(char *s) } -inline int LogEntry::hostStateToInt(char *s) +int LogEntry::hostStateToInt(char *s) { if (!s) return 2; // can happen at garbled log line diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index f445475..cddb486 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -180,7 +180,7 @@ long Logfile::freeMessages(unsigned logclasses) return freed; } -inline bool Logfile::processLogLine(uint32_t lineno, unsigned logclasses) +bool Logfile::processLogLine(uint32_t lineno, unsigned logclasses) { LogEntry *entry = new LogEntry(lineno, _linebuffer); // ignored invalid lines diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 02887c9..1c92df1 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -637,7 +637,7 @@ bool TableStateHistory::objectFilteredOut(Query *query, void *entry) return false; } -inline int TableStateHistory::updateHostServiceState(Query *query, const LogEntry *entry, HostServiceState *hs_state, const bool only_update){ +int TableStateHistory::updateHostServiceState(Query *query, const LogEntry *entry, HostServiceState *hs_state, const bool only_update){ int state_changed = 1; // Revive host / service if it was unmonitored @@ -814,7 +814,7 @@ inline int TableStateHistory::updateHostServiceState(Query *query, const LogEntr } -inline void TableStateHistory::process(Query *query, HostServiceState *hs_state) +void TableStateHistory::process(Query *query, HostServiceState *hs_state) { hs_state->_duration = hs_state->_until - hs_state->_from; hs_state->_duration_part = (double)hs_state->_duration / (double)_query_timeframe;

8 years, 8 months

#2438 FIX Manpage icons: fixed manpage links for active checks

by Andreas Boesl

Module: check_mk Branch: master Commit: 3df763bf2e88928e8ab201b765144ed958d3da53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df763bf2e8892… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 23 11:49:21 2015 +0200 #2438 FIX Manpage icons: fixed manpage links for active checks --- .werks/2438 | 9 +++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2438 b/.werks/2438 new file mode 100644 index 0000000..72448bd --- /dev/null +++ b/.werks/2438 @@ -0,0 +1,9 @@ +Title: Manpage icons: fixed manpage links for active checks +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1445593727 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index aab48fd..334dff9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 2686 FIX: Fixed showing graphs for cluster ping services * 2687 FIX: Quicksearch: Improved error handling * 2689 FIX: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings + * 2438 FIX: Manpage icons: fixed manpage links for active checks WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 738a6b4..955a994 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -220,7 +220,10 @@ def paint_manpage_icon(what, row, tags, host_custom_vars): if command.startswith("check_mk-"): check_type = command[9:] elif command.startswith("check_mk_active-"): - check_type = "check_" + command[16:] + check_name = command[16:].split("!")[0] + if check_name == "cmk_inv": + return + check_type = "check_" + check_name else: return urlvars = [("mode", "check_manpage"), ("check_type", check_type)]

8 years, 8 months

#2689 FIX LDAP: Fixed broken sync when using "Filter Group" in the user sync settings

by Lars Michelsen

Module: check_mk Branch: master Commit: d9bc5273e4181635bfc086ddb0dcb7c7c618b972 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9bc5273e41816… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 11:37:37 2015 +0200 #2689 FIX LDAP: Fixed broken sync when using "Filter Group" in the user sync settings --- .werks/2689 | 10 ++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2689 b/.werks/2689 new file mode 100644 index 0000000..4f9dc2b --- /dev/null +++ b/.werks/2689 @@ -0,0 +1,10 @@ +Title: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445593025 + + diff --git a/ChangeLog b/ChangeLog index c3a9ad3..aab48fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 2685 FIX: LDAP: Fixed failing synchronization when migrating some old configs... * 2686 FIX: Fixed showing graphs for cluster ping services * 2687 FIX: Quicksearch: Improved error handling + * 2689 FIX: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 90b7012..f596c27 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -621,7 +621,7 @@ class LDAPUserConnector(UserConnector): # Apply configured group ldap filter try: - group = self.ldap_search(self.replace_macros(filter_group_dn), [member_attr], 'base') + group = self.ldap_search(self.replace_macros(filter_group_dn), columns=[member_attr], scope='base') except MKLDAPException: group = None

8 years, 8 months

Fix comment header

by Mathias Kettner

Module: check_mk Branch: master Commit: 6db76b210dd63bc58b227aba5c08a31e3394709a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6db76b210dd63b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 23 09:21:23 2015 +0200 Fix comment header --- modules/check_mk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index ebb2979..86fb81d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -467,7 +467,6 @@ def active_check_service_description(act_info, params): # +----------------------------------------------------------------------+ # | Helper functions for dealing with hosts. | # '----------------------------------------------------------------------' -#. # Returns a list of all host names, regardless if currently # disabled or monitored on a remote site. Does not return @@ -1120,7 +1119,7 @@ def check_icmp_arguments_of(hostname, add_defaults=True, family=None): return " ".join(args) - +#. # .--Host tags-----------------------------------------------------------. # | _ _ _ _ | # | | | | | ___ ___| |_ | |_ __ _ __ _ ___ |

8 years, 8 months

Refactor: new function load_module() instead of execfile

by Mathias Kettner

Module: check_mk Branch: master Commit: 2de15ad6e3646b883140655e4677337bd4f8fd98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2de15ad6e3646b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 23 09:20:40 2015 +0200 Refactor: new function load_module() instead of execfile --- modules/check_mk.py | 39 +++++++++++++++++++++++---------------- modules/nagios.py | 1 - 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e62b6e3..ebb2979 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -261,9 +261,17 @@ old_service_descriptions = { # | Load the other modules | # '----------------------------------------------------------------------' +def module_exists(name): + path = modules_dir + "/" + name + ".py" + return os.path.exists(path) + +def load_module(name): + path = modules_dir + "/" + name + ".py" + execfile(path, globals()) + known_vars = set(vars().keys()) known_vars.add('known_vars') -execfile(modules_dir + '/config.py') +load_module("config") config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). @@ -271,9 +279,8 @@ try: modules = [ 'check_mk_base', 'discovery', 'snmp', 'agent_simulator', 'notify', 'events', 'alert_handling', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] for module in modules: - filename = modules_dir + "/" + module + ".py" - if os.path.exists(filename): - execfile(filename) + if module_exists(module): + load_module(module) except Exception, e: sys.stderr.write("Cannot read file %s: %s\n" % (filename, e)) @@ -2386,7 +2393,7 @@ def list_all_manuals(): print_table(['Check type', 'Title'], [tty_bold, tty_normal], table) def read_manpage_catalog(): - execfile(modules_dir + "/catalog.py", globals()) + load_module("catalog") global g_manpage_catalog g_manpage_catalog = {} for checkname, path in all_manuals().items(): @@ -3741,7 +3748,7 @@ def do_create_config(with_agents=True): if monitoring_core == "cmc": do_create_cmc_config(opt_cmc_relfilename, False) # do not use rushed ahead config else: - execfile(modules_dir + '/nagios.py', globals()) + load_module("nagios") out = file(nagios_objects_file, "w") create_nagios_config(out) sys.stdout.write(tty_ok + "\n") @@ -4942,14 +4949,14 @@ try: sys.stderr.write("'generate_hostconf = False' in main.mk.\n") done = True elif o == '-N': - execfile(modules_dir + '/nagios.py', globals()) + load_module("nagios") do_output_nagios_conf(args) done = True elif o == '-B': do_update(with_precompile=False) done = True elif o in [ '-C', '--compile' ]: - execfile(modules_dir + '/nagios.py', globals()) + load_module("nagios") precompile_hostchecks() done = True elif o in [ '-U', '--update' ] : @@ -4977,11 +4984,11 @@ try: show_paths() done = True elif o in ['-P', '--package']: - execfile(modules_dir + "/packaging.py") + load_module("packaging") do_packaging(args) done = True elif o in ['--localize']: - execfile(modules_dir + "/localize.py") + load_module("localize") do_localize(args) done = True elif o == '--donate': @@ -5040,11 +5047,11 @@ try: do_scan_parents(args) done = True elif o == '--automation': - execfile(modules_dir + "/automation.py") + load_module("automation") do_automation(a, args) done = True elif o in [ '-i', '--inventory' ]: - execfile(modules_dir + "/inventory.py") + load_module("inventory") if args: hostnames = parse_hostname_list(args, with_clusters = False) else: @@ -5052,7 +5059,7 @@ try: do_inv(hostnames) done = True elif o == '--inventory-as-check': - execfile(modules_dir + "/inventory.py") + load_module("inventory") do_inv_check(a) done = True elif o == '--handle-alerts': @@ -5063,16 +5070,16 @@ try: sys.exit(do_notify(args)) elif o == '--create-rrd': read_config_files(with_conf_d=True, validate_hosts=False) - execfile(modules_dir + "/rrd.py") + load_module("rrd") do_create_rrd(args) done = True elif o == '--convert-rrds': read_config_files(with_conf_d=True) - execfile(modules_dir + "/rrd.py") + load_module("rrd") do_convert_rrds(args) done = True elif o == '--compress-history': - execfile(modules_dir + "/compresslog.py") + load_module("compresslog") do_compress_history(args) done = True elif o in [ '-A', '--bake-agents' ]: diff --git a/modules/nagios.py b/modules/nagios.py index 2e14abc..ba9e488 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -40,7 +40,6 @@ def do_output_nagios_conf(args): if len(args) == 0: args = None - execfile(modules_dir + '/nagios.py', globals()) create_nagios_config(sys.stdout, args)

8 years, 8 months

Move code needed for Nagios config generation into own file

by Mathias Kettner

Module: check_mk Branch: master Commit: e2de004be187e8e885b34deca6f8c28757eb114e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2de004be187e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 23 09:13:03 2015 +0200 Move code needed for Nagios config generation into own file --- modules/check_mk.py | 4147 ++++++++++++++++++--------------------------------- modules/nagios.py | 1316 ++++++++++++++++ 2 files changed, 2756 insertions(+), 2707 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2de004be1…

8 years, 8 months

Hiding password var values from debug html var output

by Lars Michelsen

Module: check_mk Branch: master Commit: 18565554206537a01b37098c5c2af610b59ea350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18565554206537… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 22 17:24:59 2015 +0200 Hiding password var values from debug html var output --- web/htdocs/htmllib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index add2ca0..41ae97d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1109,6 +1109,8 @@ class html: self.write('<table %s class=debug_vars>' % hover) self.write("<tr><th colspan=2>"+_("POST / GET Variables")+"</th></tr>") for name, value in sorted(vars.items()): + if name in [ "_password", "password" ]: + value = "***" if not prefix or name.startswith(prefix): self.write("<tr><td class=left>%s</td><td class=right>%s</td></tr>\n" % (self.attrencode(name), self.attrencode(value)))

8 years, 8 months

#2703 logwatch.ec: now transfers the service level to the event console

by Sebastian Herbord

Module: check_mk Branch: master Commit: 13f5e2fa6fa7d8d8797bd4fe57c86453c52d7ee1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f5e2fa6fa7d8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 22 16:41:37 2015 +0200 #2703 logwatch.ec: now transfers the service level to the event console if a service level is configured for a logwatch->ec forwarding service, that service level will now appear in the event console. --- .werks/2703 | 10 ++++++++++ ChangeLog | 1 + checks/logwatch | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2703 b/.werks/2703 new file mode 100644 index 0000000..359ff96 --- /dev/null +++ b/.werks/2703 @@ -0,0 +1,10 @@ +Title: logwatch.ec: now transfers the service level to the event console +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1445524766 +Class: feature + +if a service level is configured for a logwatch->ec forwarding service, that service level will now +appear in the event console. diff --git a/ChangeLog b/ChangeLog index f135ad1..c3a9ad3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 2663 knuerr_rms_temp: switch to new generic temperature logic, allow e.g. lower levels... NOTE: Please refer to the migration notes! * 2688 mssql agent plugin can now handle clustered MSSQL instances + * 2703 logwatch.ec: now transfers the service level to the event console... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/logwatch b/checks/logwatch index 65c7d98..34e7707 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -731,7 +731,8 @@ def check_logwatch_ec(item, params, info): continue msg = '<%d>' % (facility + logwatch_to_prio(rclfd_level or line[0]),) - msg += '@%s %s %s: %s' % (cur_time, g_hostname, logfile, line[2:]) + msg += '@%s;%d;; %s %s: "%s"' % (cur_time, params.get("service_level", 0), g_hostname, logfile, line[2:]) + messages.append(msg) forwarded_logfiles.add(logfile) @@ -800,6 +801,8 @@ def check_logwatch_ec(item, params, info): def logwatch_ec_precompile(hostname, item, params): params = params.copy() + params["service_level"] = get_effective_service_level() + # HACK: opt_keepalive is used to detect cmc if (opt_keepalive or not params.get("logwatch_reclassify")): params.update({"logwatch_patterns": []}) @@ -846,6 +849,7 @@ def logwatch_ec_precompile(hostname, item, params): return params precompile_params['logwatch.ec'] = logwatch_ec_precompile +precompile_params['logwatch.ec_single'] = logwatch_ec_precompile check_info['logwatch.ec'] = { 'check_function': check_logwatch_ec,

8 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015