Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 1cff9a756d00aa10903aab85b52b4a1f2f45ec51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cff9a756d00aa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 8 08:37:08 2015 +0100 Fixed #include guards. --- livestatus/src/HostSpecialDoubleColumn.h | 6 +++--- livestatus/src/TimeperiodsCache.h | 6 +++--- livestatus/src/store_c.h | 7 +++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/livestatus/src/HostSpecialDoubleColumn.h b/livestatus/src/HostSpecialDoubleColumn.h index 13b8c22..78de1ed 100644 --- a/livestatus/src/HostSpecialDoubleColumn.h +++ b/livestatus/src/HostSpecialDoubleColumn.h @@ -22,8 +22,8 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -#ifndef ServiceSpecialDoubleColumn_h -#define ServiceSpecialDoubleColumn_h +#ifndef HostSpecialDoubleColumn_h +#define HostSpecialDoubleColumn_h #include "config.h" // IWYU pragma: keep #include <string> @@ -42,4 +42,4 @@ public: double getValue(void *data); }; -#endif // ServiceSpecialDoubleColumn_h +#endif // HostSpecialDoubleColumn_h diff --git a/livestatus/src/TimeperiodsCache.h b/livestatus/src/TimeperiodsCache.h index 4b4534d..d9b901c 100644 --- a/livestatus/src/TimeperiodsCache.h +++ b/livestatus/src/TimeperiodsCache.h @@ -22,8 +22,8 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -#ifndef _TimeperiodsCache_h -#define _TimeperiodsCache_h +#ifndef TimeperiodsCache_h +#define TimeperiodsCache_h #include "config.h" // IWYU pragma: keep #include <time.h> @@ -50,4 +50,4 @@ private: void logTransition(char *name, int from, int to); }; -#endif // _TimeperiodsCache_h +#endif // TimeperiodsCache_h diff --git a/livestatus/src/store_c.h b/livestatus/src/store_c.h index f5e935c..1e885a2 100644 --- a/livestatus/src/store_c.h +++ b/livestatus/src/store_c.h @@ -22,8 +22,8 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -#ifndef store_h -#define store_h +#ifndef store_c_h +#define store_c_h #include "config.h" // IWYU pragma: keep #include <time.h> @@ -57,5 +57,4 @@ extern "C" } #endif -#endif /* store_h */ - +#endif /* store_c_h */

8 years, 9 months

#1311 netapp_api_volumes: Added option to configure inode levels in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: ac5c38f4e6e64e7ffbd08354ec550ba6292f8445 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac5c38f4e6e64e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 7 14:50:05 2015 +0100 #1311 netapp_api_volumes: Added option to configure inode levels in wato --- .werks/1311 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/.werks/1311 b/.werks/1311 new file mode 100644 index 0000000..90d9887 --- /dev/null +++ b/.werks/1311 @@ -0,0 +1,9 @@ +Title: netapp_api_volumes: Added option to configure inode levels in wato +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1449496150 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9d2097d..f505452 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,6 +176,7 @@ * 2442 WATO remove host: improved cleanup of obsolete host files... * 2785 WATO Web-API: i18n of error messages and intitial validation of incoming request... * 1302 Added new WATO permission to deactivate the function rename of hosts... + * 1311 netapp_api_volumes: Added option to configure inode levels in wato * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 738c569..a8025fa 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6863,6 +6863,38 @@ register_check_parameters( elements = [ Percentage(title = _("Warning if above"), unit = _("% usage"), allow_int = True, default_value=50), Percentage(title = _("Critical if above"), unit = _("% usage"), allow_int = True, default_value=60)])), + ( "inodes_levels", + Alternative( + title = _("Levels for Inodes"), + help = _("The number of remaining inodes on the filesystem. " + "Please note that this setting has no effect on some filesystem checks."), + elements = [ + Tuple(title = _("Percentage free"), + elements = [ + Percentage(title = _("Warning if less than")), + Percentage(title = _("Critical if less than")), + ] + ), + Tuple(title = _("Absolute free"), + elements = [ + Integer(title = _("Warning if less than"), size = 10, unit = _("inodes"), minvalue = 0, default_value = 10000), + Integer(title = _("Critical if less than"), size = 10, unit = _("inodes"), minvalue = 0, default_value = 5000), + ] + ) + ], + default_value = (10.0, 5.0), + ) + ), + ( "show_inodes", + DropdownChoice( + title = _("Display inode usage in check output..."), + choices = [ + ( "onproblem", _("Only in case of a problem")), + ( "onlow", _("Only in case of a problem or if inodes are below 50%")), + ( "always", _("Always")), + ], + default_value = "onlow", + )), ( "trend_range", Optional( Integer(

8 years, 9 months

#2893 FIX Improved error handling of sending mails via Event Console

by Lars Michelsen

Module: check_mk Branch: master Commit: ea5a64c70cadb0d860c77a0ec5be1e3b1df28356 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea5a64c70cadb0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 7 11:30:28 2015 +0100 #2893 FIX Improved error handling of sending mails via Event Console --- .werks/2893 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2893 b/.werks/2893 new file mode 100644 index 0000000..eb60290 --- /dev/null +++ b/.werks/2893 @@ -0,0 +1,9 @@ +Title: Improved error handling of sending mails via Event Console +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1449484212 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e237aed..9d2097d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -203,6 +203,7 @@ * 2757 FIX: Events Check: Fixed check finding too many events (host search was infix search instead of full match)... * 2795 FIX: mkeventd: send email action did not work if message text contains umlauts... * 2862 FIX: Fixed handling of umlauts in mails send by the EC + * 2893 FIX: Improved error handling of sending mails via Event Console Livestatus: * 2743 FIX: Fixed handling of column types in "GET columns"...

8 years, 9 months

#2862 FIX Fixed handling of umlauts in mails send by the EC

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ea57fbbebf36ce89e3437adee9703b1f20fdc21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea57fbbebf36c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 7 11:29:54 2015 +0100 #2862 FIX Fixed handling of umlauts in mails send by the EC --- .werks/2862 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 43 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/.werks/2862 b/.werks/2862 new file mode 100644 index 0000000..6cd4355 --- /dev/null +++ b/.werks/2862 @@ -0,0 +1,9 @@ +Title: Fixed handling of umlauts in mails send by the EC +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1449484145 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c0ec42c..2b55848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -200,6 +200,7 @@ * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... * 2757 FIX: Events Check: Fixed check finding too many events (host search was infix search instead of full match)... * 2795 FIX: mkeventd: send email action did not work if message text contains umlauts... + * 2862 FIX: Fixed handling of umlauts in mails send by the EC Livestatus: * 2743 FIX: Fixed handling of column types in "GET columns"... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6dd2160..e17ad39 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3244,14 +3244,15 @@ def do_event_actions(actions, event, is_cancelling): # not hang for more than a couple of ms. def do_event_action(action, event, user=""): if action["disabled"]: + log("Skipping disabled action %s." % action["id"]) return try: action_type, settings = action["action"] if action_type == 'email': - to = substitute_event_tags(settings["to"], event) + to = substitute_event_tags(settings["to"], event) subject = substitute_event_tags(settings["subject"], event) - body = to_utf8(substitute_event_tags(settings["body"], event)) + body = substitute_event_tags(settings["body"], event) send_email(to, subject, body) log_event_history(event, "EMAIL", user, "%s|%s" % (to, subject)) elif action_type == 'script': @@ -3363,11 +3364,40 @@ def substitute_event_tags(text, event): text = text.replace('$%s$' % key.upper(), value) return text + def quote_shell_string(s): return "'" + s.replace("'", "'\"'\"'") + "'" + def send_email(to, subject, body): - os.popen("mail -s %s %s" % (quote_shell_string(subject), quote_shell_string(to)), "w").write(body) + # -S sendcharsets=utf-8 is "nail" specific. Nail is delivered with OMD. Hope + # it does not cause problems with other mail commands. Otherwise we need + # to find another solution for sending mails containing special chars. + # At least nail fails without this header when the mail contains such chars. + command_utf8 = "mail -S sendcharsets=utf-8 " \ + "-s %s %s" % (quote_shell_string(subject.encode("utf-8")), + quote_shell_string(to.encode("utf-8"))) + + if g_config["debug_rules"]: + log(" Executing: %s" % command_utf8) + + p = subprocess.Popen(command_utf8, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, stdin=subprocess.PIPE) + # FIXME: This may lock on too large buffer. We should move all "mail sending" code + # to a general place and fix this for all our components (notification plugins, + # notify.py, this one, ...) + stdout_txt, stderr_txt = p.communicate(body.encode("utf-8")) + exitcode = p.returncode + + log(' Exitcode: %d' % exitcode) + if exitcode != 0: + log(" Error: Failed to send the mail.") + for line in (stdout_txt + stderr_txt).splitlines(): + log(" Output: %s" % line.rstrip()) + return False + + return True + def execute_script(body): p = subprocess.Popen( @@ -3379,10 +3409,9 @@ def execute_script(body): output = p.stdout.read() exitcode = p.wait() - if g_config["debug_rules"]: - if output: - log(' Output: %s' % output) - log(' Exitcode: %d' % exitcode) + log(' Exitcode: %d' % exitcode) + if output: + log(' Output: %s' % output) #.

8 years, 9 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 2eedeb9044b1c6f996392906569ac7e3249de926 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eedeb9044b1c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 7 11:30:05 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a8eeb4f..b2b918f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2893 +2913

8 years, 9 months

#2884 mssql_blocked_sessions: the state of the blocked sessions is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: 8a5846d2e6a7f5994126e125013e7b01b46889e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a5846d2e6a7f5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 7 11:10:12 2015 +0100 #2884 mssql_blocked_sessions: the state of the blocked sessions is now configurable --- .werks/2884 | 9 +++++++++ ChangeLog | 1 + checkman/mssql_blocked_sessions | 6 +++--- checks/mssql_blocked_sessions | 13 +++++++++---- web/plugins/wato/check_parameters.py | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.werks/2884 b/.werks/2884 new file mode 100644 index 0000000..97f97a8 --- /dev/null +++ b/.werks/2884 @@ -0,0 +1,9 @@ +Title: mssql_blocked_sessions: the state of the blocked sessions is now configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449482942 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0a2671b..613a44c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 2874 netstat_an.bat: Restrict output of connections to TCP, safes performance * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... * 2867 check_http: client certificate and private key file parameters can now be set in wato... + * 2884 mssql_blocked_sessions: the state of the blocked sessions is now configurable * 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/checkman/mssql_blocked_sessions b/checkman/mssql_blocked_sessions index 5617a78..26a8f2a 100644 --- a/checkman/mssql_blocked_sessions +++ b/checkman/mssql_blocked_sessions @@ -4,12 +4,12 @@ catalog: app/mssql license: GPL distribution: check_mk description: - This Checks lists all bolcked sessions on a MSSQL Server. As long at least one session is blocked, - it will be {CRITICAL}. + This check lists all blocked sessions on a MSSQL Server. As long at least one session is blocked, + it will be {CRITICAL}. This state is configurable. The default value is {CRITICAL}. This check needs the Check_MK mssql.vbs -plugin installed in the agent. Please refer to the online documentation for how to install that plugin. inventory: - One Check per Host will be created + One check per host will be created diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index 033e3e9..eb04e71 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -34,11 +34,15 @@ def inventory_mssql_blocked_sessions(info): return [(None, None)] -def check_mssql_blocked_sessions(item, params, info): +def check_mssql_blocked_sessions(_no_item, params, info): if len(info) > 1: - for session_id, wait_duration_ms, wait_type, blocking_session_id in info[1:]: - yield 2, "Session %s blocked by %s (Wait %s ms, Type: %s)" % \ - ( session_id, blocking_session_id, wait_duration_ms, wait_type ) + state = 2 + if params: + state = params.get("state", 2) + for session_id, wait_duration_ms, wait_type, blocking_session_id in info[1:]: + yield state, \ + "Session %s blocked by %s (Wait %s ms, Type: %s)" % \ + ( session_id, blocking_session_id, wait_duration_ms, wait_type ) else: yield 0, "No blocked sessions" @@ -47,4 +51,5 @@ check_info['mssql_blocked_sessions'] = { 'check_function' : check_mssql_blocked_sessions, 'inventory_function' : inventory_mssql_blocked_sessions, 'service_description' : "MSSQL Blocked Sessions", + 'group' : "mssql_blocked_sessions", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8997979..738c569 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5342,6 +5342,22 @@ register_check_parameters( match_type = "dict", ) +register_check_parameters( + subgroup_applications, + "mssql_blocked_sessions", + _("MSSQL Blocked Sessions"), + Dictionary( + elements = [ + ( "state", + MonitoringState( + title = _("State of MSSQL Blocked Sessions is treated as"), + default_value = 2, + )), + ], + ), + None, + "dict", +) register_check_parameters( subgroup_applications,

8 years, 9 months

#2867 check_http: client certificate and private key file parameters can now be set in wato

by Sebastian Herbord

Module: check_mk Branch: master Commit: dc53cb4d19abb62d55e29865e48188268a39b0f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc53cb4d19abb6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Dec 7 10:41:39 2015 +0100 #2867 check_http: client certificate and private key file parameters can now be set in wato Users of these parameters should take extra care to verify the file names specified are valid. --- .werks/2867 | 9 +++++++++ ChangeLog | 1 + checks/check_http | 6 ++++++ web/plugins/wato/active_checks.py | 15 +++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/.werks/2867 b/.werks/2867 new file mode 100644 index 0000000..94afa52 --- /dev/null +++ b/.werks/2867 @@ -0,0 +1,9 @@ +Title: check_http: client certificate and private key file parameters can now be set in wato +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449481056 +Class: feature + +Users of these parameters should take extra care to verify the file names specified are valid. diff --git a/ChangeLog b/ChangeLog index c0ec42c..0a2671b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 2780 cisco_vss: detect this check on newer (15.1) devices * 2874 netstat_an.bat: Restrict output of connections to TCP, safes performance * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... + * 2867 check_http: client certificate and private key file parameters can now be set in wato... * 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/check_http b/checks/check_http index 85f882d..d1adddc 100644 --- a/checks/check_http +++ b/checks/check_http @@ -145,6 +145,12 @@ def check_http_arguments(params): if settings.get("urlize"): args += ' -L' + if "client_certificate" in settings: + args += ' -J %s' % settings["client_certificate"] + + if "private_key" in settings: + args += ' -K %s' % settings["private_key"] + if not omit_ip: args = " -I " + address + args return args diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 8f798f7..6aa2d3c 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -973,6 +973,21 @@ register_rule(group, "to the checked URL and this clickable."), ) ), + ( "client_certificate", + Filename( + title = _("Client Certificate File"), + help = _("Set the certificate the client uses to identify itself to the https server. " + "Needs to be in PEM format. " + "Please be very careful to enter a valid filename."), + ) + ), + ( "private_key", + Filename( + title = _("Private Key File"), + help = _("Set the private key file (PEM format) matching the client certificate. " + "Please be very careful to enter a valid filename."), + ) + ), ] ),

8 years, 9 months

#2861 FIX hivemanager_devices: Fixed configuration of states to treat as WARN

by Lars Michelsen

Module: check_mk Branch: master Commit: 76d4ca4286c4b9653eda65475b8036620351ce40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76d4ca4286c4b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 7 10:09:37 2015 +0100 #2861 FIX hivemanager_devices: Fixed configuration of states to treat as WARN --- .werks/2861 | 10 ++++++++++ ChangeLog | 1 + checks/hivemanager_devices | 10 ++-------- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.werks/2861 b/.werks/2861 new file mode 100644 index 0000000..7379c23 --- /dev/null +++ b/.werks/2861 @@ -0,0 +1,10 @@ +Title: hivemanager_devices: Fixed configuration of states to treat as WARN +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449479346 + + diff --git a/ChangeLog b/ChangeLog index 8ab52d8..c0ec42c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -140,6 +140,7 @@ * 1310 FIX: blade_bx_powerfan: Check now uses better default leves... * 2807 FIX: check_mail_loop: POP3 protocol wasn't working at all * 2808 FIX: db2_connections: added missing connections performance data + * 2861 FIX: hivemanager_devices: Fixed configuration of states to treat as WARN Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index b6751ed..e3052fb 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -31,7 +31,6 @@ #BBSA-WIFI-LSN-Hald-F2-1|24|Cleared|True|57 Days, 3 Hrs 24 Mins 22 Secs - factory_settings['hivemanger_devices'] = { 'alert_on_loss' : True, 'max_clients' : (25, 50), @@ -48,7 +47,6 @@ def check_hivemanager_devices(item, params, info): for line in info: infos = dict([ x.split('::') for x in line ]) if infos['hostName'] == item: - # Check for Alarm State alarmstate = "Alarm state: " + infos['alarm'] if infos['alarm'] in params['warn_states']: @@ -76,7 +74,6 @@ def check_hivemanager_devices(item, params, info): else: yield 0, infotext, perfdata - # Uptime state = 0 warn, crit = 0, 0 @@ -100,9 +97,8 @@ def check_hivemanager_devices(item, params, info): additional_informations = [ 'eth0LLDPPort', 'eth0LLDPSysName', 'hive', 'hiveOS', 'hwmodel', 'serialNumber', 'nodeId', 'location', 'networkPolicy'] - yield 0, ", ".join(["%s: %s" % (x,y ) for x, y in infos.items() \ - if x in additional_informations ]) - + yield 0, ", ".join(["%s: %s" % (x, y) for x, y in infos.items() \ + if x in additional_informations and y != "-"]) check_info["hivemanager_devices"] = { @@ -112,6 +108,4 @@ check_info["hivemanager_devices"] = { "default_levels_variable" : "hivemanger_devices", "group" : "hivemanager_devices", "has_perfdata" : True, - } - diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a2e9b37..8997979 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2433,7 +2433,7 @@ register_check_parameters( totext = "", title = _("Do not alert on connection loss"), )), - ( "war_states", + ( "warn_states", ListChoice( title = _("States treated as warning"), choices = hivemanger_states,

8 years, 9 months

mk_jolokia: added basic preemptive authentication mode

by Sebastian Herbord

Module: check_mk Branch: master Commit: 90dee6c1c7d086305062da91f7d387e21e8c2e95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90dee6c1c7d086… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Dec 4 13:41:15 2015 +0100 mk_jolokia: added basic preemptive authentication mode in this mode, the client will not wait for the server to request authentication, it will instead send its credentials with the first request --- agents/cfg_examples/jolokia.cfg | 3 +++ agents/plugins/mk_jolokia | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/agents/cfg_examples/jolokia.cfg b/agents/cfg_examples/jolokia.cfg index 75abc26..fb4ab60 100644 --- a/agents/cfg_examples/jolokia.cfg +++ b/agents/cfg_examples/jolokia.cfg @@ -30,6 +30,9 @@ # user = "monitoring" # password = None # mode = "digest" +# use "basic_preemptive" if server responds with 403 forbidden even +# though user/password are correct +# mode = "basic_preemptive" suburi = "jolokia" instance = None diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index ea94ab5..c36c323 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -24,10 +24,30 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import urllib2, sys, os, socket, pprint +import urllib2, sys, os, socket, pprint, base64 opt_debug = '--debug' in sys.argv + +class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): + """ + sends basic authentication with the first request, + before the server even asks for it + """ + + def http_request(self, req): + url = req.get_full_url() + realm = None + user, pw = self.passwd.find_user_password(realm, url) + if pw: + raw = "%s:%s" % (user, pw) + auth = 'Basic %s' % base64.b64encode(raw).strip() + req.add_unredirected_header(self.auth_header, auth) + return req + + https_request = http_request + + def fetch_var(server, port, path, suburi, itemspec): url = "http://%s:%d/%s/%s" % (server, port, suburi, path) if opt_debug: @@ -124,6 +144,8 @@ def query_instance(inst): (inst["server"], inst["port"]), inst["user"], inst["password"]) if inst["mode"] == 'digest': authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr) + elif inst["mode"] == "basic_preemptive": + authhandler = PreemptiveBasicAuthHandler(passwdmngr) else: authhandler = urllib2.HTTPBasicAuthHandler(passwdmngr) opener = urllib2.build_opener(authhandler)

8 years, 9 months

#2808 FIX db2_connections: added missing connections performance data

by Andreas Boesl

Module: check_mk Branch: master Commit: 11ec93b6d6d03b5170404752950e4dc0aee149d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11ec93b6d6d03b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 4 12:43:43 2015 +0100 #2808 FIX db2_connections: added missing connections performance data --- .werks/2808 | 9 +++++++++ ChangeLog | 1 + checks/db2_connections | 9 +++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2808 b/.werks/2808 new file mode 100644 index 0000000..84ee7c4 --- /dev/null +++ b/.werks/2808 @@ -0,0 +1,9 @@ +Title: db2_connections: added missing connections performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449229404 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b700825..8ab52d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ NOTE: Please refer to the migration notes! * 1310 FIX: blade_bx_powerfan: Check now uses better default leves... * 2807 FIX: check_mail_loop: POP3 protocol wasn't working at all + * 2808 FIX: db2_connections: added missing connections performance data Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/db2_connections b/checks/db2_connections index b0b58c4..6b69922 100644 --- a/checks/db2_connections +++ b/checks/db2_connections @@ -48,12 +48,13 @@ def check_db2_connections(item, params, parsed): warn, crit = params["levels_total"] connections = int(data["connections"]) + state = 0 if connections >= crit: - yield 2, "Connections: %s" % connections, [("connections", connections)] + state = 2 elif connections >= warn: - yield 1, "Connections: %s" % connections, [("connections", connections)] - else: - yield 0, "Connections: %s" % connections, [("connections", connections)] + state = 1 + yield state, "Connections: %s" % connections, [("connections", connections, warn, crit)] + yield 0, "Port: %s" % data["port"] if "latency" in data:

8 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015