[checkmk-commits] 3301 FIX mrpe: Fixed exception "urllib not defined" when using Nagios as core

Module: check_mk Branch: master Commit: 755a99f7621e78e2af7a9440f9c06bd74c350470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=755a99f7621e78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 13:30:28 2016 +0100 3301 FIX mrpe: Fixed exception "urllib not defined" when using Nagios as core --- .werks/3301 | 10 ++++++++++ ChangeLog | 1 + checks/mrpe | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/3301 b/.werks/3301 new file mode 100644 index 0000000..652b58c --- /dev/null +++ b/.werks/3301 @@ -0,0 +1,10 @@ +Title: mrpe: Fixed exception "urllib not defined" when using Nagios as core +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458563402 + + diff --git a/ChangeLog b/ChangeLog index 5536aff..1407d2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 3298 FIX: winperf_processor.util: Fixed exception when CPU counters were not matched * 3299 FIX: mssql_backup: Fixed exception in case of invalid agent output * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section + * 3301 FIX: mrpe: Fixed exception "urllib not defined" when using Nagios as core Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mrpe b/checks/mrpe index d9232f3..118fbeb 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. def inventory_mrpe(info): + import urllib items = [] for line in info: # New Linux agent sends (check_name) in first column. Stay @@ -45,6 +46,7 @@ def mrpe_parse_perfdata(perfinfo): def check_mrpe(item, params, info): + import urllib # This check is cluster-aware. An item might be found # more than once. In that case we use the best of the # multiple statuses.