Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 679f9f7955b337c1b886ed874d2d64161fc895e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679f9f7955b337… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 21 09:52:24 2015 +0200 Testcommit --- checks/snmp_info | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/snmp_info b/checks/snmp_info index 8229c88..f038a4e 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -25,7 +25,6 @@ # Boston, MA 02110-1301 USA. def inventory_snmp_info(info): - import datetime if len(info[0]) >= 4: return [ (None, None) ]

9 years, 6 months

Check_MK Git: check_mk: Tescommit

by Lars Michelsen

Module: check_mk Branch: master Commit: b9ec5a51a94862a972892ff881cbb4f07404a2d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9ec5a51a94862… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 21 09:52:13 2015 +0200 Tescommit --- checks/snmp_info | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/snmp_info b/checks/snmp_info index bb61b01..8229c88 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -24,9 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import datetime - def inventory_snmp_info(info): + import datetime if len(info[0]) >= 4: return [ (None, None) ]

9 years, 6 months

Check_MK Git: check_mk: Tescommit

by Lars Michelsen

Module: check_mk Branch: master Commit: a9c476e2f888c8eaa3587c6bcc423c6afab519c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9c476e2f888c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 21 09:51:45 2015 +0200 Tescommit --- checks/snmp_info | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/snmp_info b/checks/snmp_info index f038a4e..bb61b01 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import datetime + def inventory_snmp_info(info): if len(info[0]) >= 4: return [ (None, None) ]

9 years, 6 months

Check_MK Git: check_mk: esx_vsphere_hostsystem: fixed invalid formatted check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 8fcfabdad5f3d05b5d13e0b983ff2eef57e46b24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fcfabdad5f3d0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 21 09:36:00 2015 +0200 esx_vsphere_hostsystem: fixed invalid formatted check output --- checks/esx_vsphere_hostsystem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 9cb7ac3..9f361e0 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -297,7 +297,7 @@ def check_esx_vsphere_hostsystem_state(_no_item, _no_params, info): state = 1 elif overallStatus in [ "red", "gray"]: state = 2 - yield state, "Entity state: %s" + overallStatus + yield state, "Entity state: " + overallStatus state = 0 powerState = str(data['runtime.powerState'][0])

9 years, 6 months

Check_MK Git: check_mk: #2255 FIX checkpoint_*: Fixed exception in scan function when sysDescr has less than 2 spaces

by Lars Michelsen

Module: check_mk Branch: master Commit: 91bd7f010c59d20ab37758219737b0e4a50e0cdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91bd7f010c59d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 21 08:56:09 2015 +0200 #2255 FIX checkpoint_*: Fixed exception in scan function when sysDescr has less than 2 spaces When running the service discovery on SNMP devices which have a sysDescr which conains less than 2 spaces this lead into an exception. The error was present in 1.2.6 and master branch but only showed up in the master branch, since the error handling in the master branch has changed to be more verbose about such problems. --- .werks/2255 | 13 +++++++++++++ ChangeLog | 1 + checks/checkpoint.include | 9 +++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/2255 b/.werks/2255 new file mode 100644 index 0000000..b78966e --- /dev/null +++ b/.werks/2255 @@ -0,0 +1,13 @@ +Title: checkpoint_*: Fixed exception in scan function when sysDescr has less than 2 spaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432191240 + +When running the service discovery on SNMP devices which have a sysDescr which conains +less than 2 spaces this lead into an exception. The error was present in 1.2.6 and +master branch but only showed up in the master branch, since the error handling in +the master branch has changed to be more verbose about such problems. diff --git a/ChangeLog b/ChangeLog index 55cfb0a..fbc5677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -376,6 +376,7 @@ * 2267 FIX: mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly... * 2268 FIX: db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes * 2272 FIX: mrpe: made UNKNOWN message more clear in case of an invalid state char + * 2255 FIX: checkpoint_*: Fixed exception in scan function when sysDescr has less than 2 spaces... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/checkpoint.include b/checks/checkpoint.include index 6fd1e6e..0d0940b 100644 --- a/checks/checkpoint.include +++ b/checks/checkpoint.include @@ -26,11 +26,12 @@ def scan_checkpoint(oid): + sys_descr = oid(".1.3.6.1.2.1.1.1.0") return ( # Entry in sysDescr, varies a bit - oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") or - oid(".1.3.6.1.2.1.1.1.0").startswith("IPSO ") or - (oid(".1.3.6.1.2.1.1.1.0").startswith("Linux") and "cpx" in - oid(".1.3.6.1.2.1.1.1.0"))) \ + (len(sys_descr) >= 3 and sys_descr.split(" ")[2].endswith("cp")) or + sys_descr.startswith("IPSO ") or + (sys_descr.startswith("Linux") and "cpx" in + sys_descr)) \ and \ oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall')

9 years, 6 months

Check_MK Git: check_mk: synology_update: Fixed raising of MKCounterWrapped

by Konstantin Büttner

Module: check_mk Branch: master Commit: addaec65c91c063c9d05fff120f9499ba5aac29c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=addaec65c91c06… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 20 18:54:56 2015 +0200 synology_update: Fixed raising of MKCounterWrapped --- checks/synology_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/synology_update b/checks/synology_update index ee7539a..a067a04 100644 --- a/checks/synology_update +++ b/checks/synology_update @@ -52,7 +52,7 @@ def check_synology_update(_no_item, params, info): state = 2 elif device_state == 3: # to prevent flapping between update avail and Connection - raise MKCounterWrap("Devices try to connect to the update server") + raise MKCounterWrapped("Devices try to connect to the update server") return state, "Update Status: %s, Current Version: %s" % (states[device_state], version) check_info["synology_update"] = {

9 years, 6 months

Check_MK Git: check_mk: icom_repeater: Fixed broken inventory function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 11a1c3932487a358872ecfa6471deb3b182b5406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11a1c3932487a3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 20 18:27:36 2015 +0200 icom_repeater: Fixed broken inventory function --- checks/icom_repeater | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/checks/icom_repeater b/checks/icom_repeater index cdc67b9..f0e0615 100644 --- a/checks/icom_repeater +++ b/checks/icom_repeater @@ -105,7 +105,7 @@ icom_ps_volt_default_levels = ( 13.5, 13.2, 14.1, 14.4 ) def inventory_icom_repeater_ps_volt(parsed): if "ps_voltage" in parsed: - yield None, "icom_ps_volt_default_levels" + return [ (None, "icom_ps_volt_default_levels") ] def check_icom_repeater_ps_volt(_no_item, params, parsed): @@ -150,10 +150,6 @@ check_info["icom_repeater.ps_volt"] = { # | | # '----------------------------------------------------------------------' -def inventory_icom_ps_volt(parsed): - if "ps_voltage" in parsed: - yield [ (None, "icom_ps_volt_default_levels") ] - def inventory_icom_repeater_pll_volt(parsed): if "rx_pll_lock_voltage" in parsed:

9 years, 6 months

Check_MK Git: check_mk: Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 39a4ccd8be7b599c154a6a25aa3f07b9a5cff98e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39a4ccd8be7b59… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 20 17:52:56 2015 +0200 Minor code cleanup --- checks/checkpoint_packets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/checkpoint_packets b/checks/checkpoint_packets index 73e9dad..d487629 100644 --- a/checks/checkpoint_packets +++ b/checks/checkpoint_packets @@ -38,11 +38,11 @@ factory_settings["checkpoint_packets_default_levels"] = { } def inventory_checkpoint_packets(info): - if len(info[0]) == 4: - return [ (None, "checkpoint_packets_default_levels" ) ] + if info: + return [ (None, {}) ] -def check_checkpoint_packets(item, params, info): - if info and len(info[0]) == 4: +def check_checkpoint_packets(_no_item, params, info): + if info: value = {} value["accepted"] = int(info[0][0]) value["rejected"] = int(info[0][1])

9 years, 6 months

Check_MK Git: check_mk: #2297 Cleanup global settings, rename sections, remove obsolete settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 22e8b5f506199d59c6e29594cf729669e0ecab5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22e8b5f506199d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 16:51:18 2015 +0200 #2297 Cleanup global settings, rename sections, remove obsolete settings The Global Settings of WATO have been cleaned up a bit. The sections have been renamed to be more self-explanatory. The order has been made more useful. And some useless settings have been removed (they still keep working if you have changed them from the defaults). --- .f12 | 6 +++--- .werks/2297 | 12 ++++++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 3 ++- web/htdocs/wato.py | 13 +++++-------- web/plugins/wato/check_mk_configuration.py | 20 ++++++-------------- web/plugins/wato/globals_notification.py | 3 ++- 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.f12 b/.f12 index 474b3f4..c3401a1 100644 --- a/.f12 +++ b/.f12 @@ -12,9 +12,9 @@ sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d for dir in doc web modules checks checkman mkeventd notifications agents livestatus pnp-templates do - echo "*******************************************************" - echo "VERZEICHNIS $dir **********************************" - echo "*******************************************************" + echo -e '\033[1;34m' + figlet "** $dir **" + echo -e '\033[0m' cd $dir if bash .f12 ; then echo "OK." diff --git a/.werks/2297 b/.werks/2297 new file mode 100644 index 0000000..2b520e0 --- /dev/null +++ b/.werks/2297 @@ -0,0 +1,12 @@ +Title: Cleanup global settings, rename sections, remove obsolete settings +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1432133360 +Class: feature + +The Global Settings of WATO have been cleaned up a bit. The sections +have been renamed to be more self-explanatory. The order has been made more +useful. And some useless settings have been removed (they still keep working +if you have changed them from the defaults). diff --git a/ChangeLog b/ChangeLog index be4552e..55cfb0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -468,6 +468,7 @@ * 2176 One custom icon or action can be configured per process/service... * 2250 Added download page for shipped agents and plugins... * 2264 WATO Web API: new function get_all_hosts (returns all host attributes) + * 2297 Cleanup global settings, rename sections, remove obsolete settings... * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 32587b8..6cb2e8d 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2081,6 +2081,7 @@ if mkeventd_enabled: register_configvar_domain("mkeventd", mkeventd_config_dir, pending = lambda msg: log_mkeventd('config-change', msg), in_global_settings = False) group = _("Event Console") + g_configvar_order[group] = 18 register_configvar(group, "remote_status", @@ -2458,7 +2459,7 @@ if mkeventd_enabled: # Settings that should also be avaiable on distributed Sites that # do not run an own eventd but want to query one or send notifications # to one. -group = _("Notification") +group = _("Notifications") register_configvar(group, "mkeventd_notify_contactgroup", GroupSelection( diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4f92a80..e63226b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7425,9 +7425,9 @@ def mode_globalvars(phase): if phase == "title": if search: - return _("Global configuration settings matching %s") % html.attrencode(search) + return _("Global Settings matching %s") % html.attrencode(search) else: - return _("Global configuration settings for Check_MK") + return _("Global Settings") elif phase == "buttons": global_buttons() @@ -7458,10 +7458,6 @@ def mode_globalvars(phase): c = True # no confirmation for direct toggle if c: - # if action == "reset": - # del current_settings[varname] - # msg = _("Resetted configuration variable %s to its default.") % varname - # else: if varname in current_settings: current_settings[varname] = not current_settings[varname] else: @@ -7489,7 +7485,7 @@ def mode_globalvars(phase): def render_global_configuration_variables(default_values, current_settings, show_all=False, search=None): groupnames = g_configvar_groups.keys() - groupnames.sort() + groupnames.sort(cmp=lambda a,b: cmp(g_configvar_order.get(a, 999), g_configvar_order.get(b, 999))) search_form(_("Search for settings:")) @@ -18917,9 +18913,10 @@ def load_plugins(): load_notification_table() - global g_configvars, g_configvar_groups + global g_configvars, g_configvar_groups, g_configvar_order g_configvars = {} g_configvar_groups = {} + g_configvar_order = {} global g_rulegroups, g_rulespecs, g_rulespec_group, g_rulespec_groups g_rulegroups = {} diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 63be0c4..3bdfea7 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -37,6 +37,7 @@ # '----------------------------------------------------------------------' group = _("User Interface") +g_configvar_order[group] = 20 register_configvar(group, "debug", @@ -610,6 +611,7 @@ register_configvar(group, # '----------------------------------------------------------------------' group = _("Administration Tool (WATO)") +g_configvar_order[group] = 25 register_configvar(group, "wato_max_snapshots", @@ -723,6 +725,7 @@ register_configvar(group, # '----------------------------------------------------------------------' group = _("User Management") +g_configvar_order[group] = 40 register_configvar(group, "user_connectors", @@ -1187,7 +1190,8 @@ register_configvar(group, # | Operation mode of Check_MK | # '----------------------------------------------------------------------' -group = _("Operation mode of Check_MK") +group = _("Execution of checks") +g_configvar_order[group] = 10 register_configvar(group, @@ -1308,19 +1312,6 @@ register_configvar(group, need_restart = True) -register_configvar(group, - "check_submission", - DropdownChoice( - title = _("Check submission method"), - help = _("If you set this to Nagios command pipe, then Check_MK will write its " - "check results into the Nagios command pipe. This is the classical way. " - "Choosing Create check files " - "skips one phase in the Nagios core and directly creates Nagios check files. " - "This reduces the overhead but might not be compatible with other monitoring " - "cores."), - choices = [ ("pipe", _("Nagios command pipe")), - ("file", _("Create check files")) ]), - need_restart = True) register_configvar(group, "check_mk_perfdata_with_times", @@ -1383,6 +1374,7 @@ register_configvar(group, ) group = _("Service discovery") +g_configvar_order[group] = 4 register_configvar(group, "inventory_check_interval", diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 7f73b01..e37eb32 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -29,7 +29,8 @@ # TODO: Remove all configuration for legacy-Email to deprecated, or completely # remove from WATO. -group = _("Notification") +group = _("Notifications") +g_configvar_order[group] = 15 register_configvar(group, "enable_rulebased_notifications",

9 years, 6 months

Check_MK Git: check_mk: Remove bogus print command

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d2d4d07f08407ce89afd8f444fb260c9c7bfe36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d2d4d07f08407… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 16:14:37 2015 +0200 Remove bogus print command --- checks/win_dhcp_pools | 1 - mkeventd/web/plugins/wato/mkeventd.py | 4 ++-- web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 7adfa42..d74653f 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -83,7 +83,6 @@ def parse_win_dhcp_pools(info): def inventory_win_dhcp_pools(info): settings = host_extra_conf_merged(g_hostname, discovery_win_dhcp_pools) discover_empty = settings.get("empty_pools", win_dhcp_pools_inventorize_empty) - print discover_empty inventory = [] in_block = False diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 3488f1b..32587b8 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2424,7 +2424,7 @@ if mkeventd_enabled: ) # A few settings for Multisite and WATO - register_configvar(_("Status GUI (Multisite)"), + register_configvar(_("User Interface"), "mkeventd_connect_timeout", Integer( title = _("Connect timeout to status socket of Event Console"), @@ -2439,7 +2439,7 @@ if mkeventd_enabled: domain = "multisite", ) - register_configvar(_("Configuration GUI (WATO)"), + register_configvar(_("Administration Tool (WATO)"), "mkeventd_pprint_rules", Checkbox(title = _("Pretty-Print rules in config file of Event Console"), label = _("enable pretty-printing of rules"), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 359e5f3..63be0c4 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -36,7 +36,7 @@ # | Global configuration settings for main.mk and multisite.mk | # '----------------------------------------------------------------------' -group = _("Status GUI (Multisite)") +group = _("User Interface") register_configvar(group, "debug", @@ -609,7 +609,7 @@ register_configvar(group, # | Global Configuration for WATO | # '----------------------------------------------------------------------' -group = _("Configuration GUI (WATO)") +group = _("Administration Tool (WATO)") register_configvar(group, "wato_max_snapshots",

9 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015