[checkmk-commits] Check_MK Git: check_mk: #1975 FIX check_bi_aggr: Ignoring proxy settings from environment now

Module: check_mk Branch: master Commit: 61c8b1573d5ff863b27224b6632978c2dcdb44a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c8b1573d5ff8… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Feb 4 15:12:44 2015 +0100 #1975 FIX check_bi_aggr: Ignoring proxy settings from environment now --- .werks/1975 | 10 ++++++++++ ChangeLog | 3 ++- doc/treasures/active_checks/check_bi_aggr | 5 ++++- web/plugins/wato/active_checks.py | 4 +++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/1975 b/.werks/1975 new file mode 100644 index 0000000..fe568ce --- /dev/null +++ b/.werks/1975 @@ -0,0 +1,10 @@ +Title: check_bi_aggr: Ignoring proxy settings from environment now +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423059135 + + diff --git a/ChangeLog b/ChangeLog index 30b68a6..ecda0ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,9 +71,9 @@ * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 1220 if,if64: Discovery can now be based on port description... - * 1860 df and other filesystem checks: process total fs size as perfdata... * 1930 Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery)... * 1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown'... + * 1860 df and other filesystem checks: process total fs size as perfdata... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... @@ -141,6 +141,7 @@ NOTE: Please refer to the migration notes! * 1931 FIX: agent_vsphere: no longer crashes when host has no license information * 1932 FIX: check_http: Check SSL Certificate: did not work when SNI Option was set... + * 1975 FIX: check_bi_aggr: Ignoring proxy settings from environment now Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/doc/treasures/active_checks/check_bi_aggr b/doc/treasures/active_checks/check_bi_aggr index 668b961..7e686cb 100755 --- a/doc/treasures/active_checks/check_bi_aggr +++ b/doc/treasures/active_checks/check_bi_aggr @@ -26,6 +26,9 @@ import sys, getopt, urllib2, traceback +# tell urllib2 not to honour "http(s)_proxy" env variables +urllib2.getproxies = lambda: {} + def usage(): sys.stderr.write(""" USAGE: check_bi_aggr -b <BASE_URL> -a <AGGR_NAME> -u <USER> -s <SECRET> @@ -130,7 +133,7 @@ except urllib2.socket.timeout: sys.stdout.write('ERROR: Socket timeout while opening URL: %s\n' % (url)) sys.exit(3) except urllib2.URLError: - sys.stdout.write("UNKNOWN: Nagios not available.\n") + sys.stdout.write("UNKNOWN: Core not available.\n") sys.exit(3) except Exception, e: sys.stdout.write('ERROR: Exception while opening URL (%s): %s\n' % diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1488d43..52f63fe 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1388,7 +1388,9 @@ register_rule(group, ), TextAscii( title = _("Aggregation Name"), - help = _("The name of the aggregation to fetch. It will be added to the service description."), + help = _("The name of the aggregation to fetch. It will be added to the service description. You can use " + "macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this parameter to make them be replaced by " + "the hosts values."), allow_empty = False ), TextAscii(