Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

by Bastian Kuhn

Module: check_mk Branch: master Commit: d8af1a8a2e715ba228f7e643858a8d077805e4fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8af1a8a2e715b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 20:23:44 2014 +0200 merge conflict ---

10 years, 5 months

Check_MK Git: check_mk: FIX brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure

by Andreas Boesl

Module: check_mk Branch: master Commit: ae858ccc7fe80ccdbb1724c2ca384470f166c1f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae858ccc7fe80c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 29 17:06:44 2014 +0200 FIX brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure Power supply failures now get reported as CRIT --- .werks/910 | 9 +++++++++ ChangeLog | 1 + checks/brocade | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/910 b/.werks/910 new file mode 100644 index 0000000..d01f6fa --- /dev/null +++ b/.werks/910 @@ -0,0 +1,9 @@ +Title: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398783896 + +Power supply failures now get reported as CRIT diff --git a/ChangeLog b/ChangeLog index 23ef272..e0393e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 0155 FIX: mssql_counters: harded check agains odd agent output * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... * 0608 FIX: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 + * 0910 FIX: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/brocade b/checks/brocade index d71057d..eb4d659 100644 --- a/checks/brocade +++ b/checks/brocade @@ -37,7 +37,7 @@ def brocade_sensor_convert(info, what): return_list = [] for state, name in info: - if name.startswith(what) and saveint(state) > 0: + if name.startswith(what) and (saveint(state) > 0 or what == "Power"): sensor_id = name.split('#')[-1] return_list.append([sensor_id, name, state]) return return_list

10 years, 5 months

Check_MK Git: check_mk: FIX mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers

by Götz Golla

Module: check_mk Branch: master Commit: 6e8b43f3b7dc9e8f5adc8079d4fb309218aa3548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e8b43f3b7dc9e… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Apr 29 14:01:40 2014 +0200 FIX mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers --- .werks/609 | 8 ++++++++ ChangeLog | 1 + notifications/mail | 42 +++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.werks/609 b/.werks/609 new file mode 100644 index 0000000..3a78d35 --- /dev/null +++ b/.werks/609 @@ -0,0 +1,8 @@ +Title: mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers +Level: 1 +Component: notifications +Version: 1.2.5i3 +Date: 1398772813 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 54cc516..23ef272 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * 0883 Added Date / Time to HTML notification email * 0752 FIX: FIX: compute correct state transitions for notifications... * 0753 FIX: FIX: correctly show original state in HTML notification mails... + * 0609 FIX: mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... diff --git a/notifications/mail b/notifications/mail index 11a4c32..ddfaef7 100755 --- a/notifications/mail +++ b/notifications/mail @@ -22,7 +22,7 @@ tmpl_head_html = ''' <title>$SUBJECT$</title> <style> body { - background-color: #FFFFFF; + background-color: #ffffff; padding: 5px; font-family: arial,helvetica,sans-serif; font-size: 10px; @@ -39,10 +39,10 @@ table { table th { font-weight: normal; - border-right: 1px solid #ccc; - background-color: #999; + border-right: 1px solid #cccccc; + background-color: #999999; text-align: center; - color: #fff; + color: #ffffff; vertical-align: middle; font-size: 9pt; height: 14px; @@ -52,7 +52,7 @@ table th:last-child { } table tr > td { - border-right: 1px solid #ccc; + border-right: 1px solid #cccccc; padding: 2px 4px; height: 22px; vertical-align: middle; @@ -85,23 +85,23 @@ table tr td.left { padding-right: 20px; } table tr.even0 td.left { - background-color: #bbb; + background-color: #bbbbbb; } table tr.odd0 td.left { - background-color: #ccc; + background-color: #cccccc; } -tr.odd0 { background-color: #eee; } -tr.even0 { background-color: #ddd; } +tr.odd0 { background-color: #eeeeee; } +tr.even0 { background-color: #dddddd; } -td.odd0 { background-color: #eee; } -td.even0 { background-color: #ddd; } +td.odd0 { background-color: #eeeeee; } +td.even0 { background-color: #dddddd; } -tr.odd1 { background-color: #ffc; } -tr.even1 { background-color: #ffa; } +tr.odd1 { background-color: #ffffcc; } +tr.even1 { background-color: #ffffaa; } -tr.odd2 { background-color: #fcc; } -tr.even2 { background-color: #faa; } +tr.odd2 { background-color: #ffcccc; } +tr.even2 { background-color: #ffaaaa; } tr.odd3 { background-color: #ffe0a0; } tr.even3 { background-color: #ffefaf; } @@ -111,27 +111,27 @@ td.state { } .state0, .stateOK, .hstate0, .hstateUP, .state0 a, .hstate0 a { - background-color: #0b3; color: #fff; + background-color: #0b3; color: #ffffff; } .state1, .stateWARNING, .state1 a, tr.groupheader td.state1 { - background-color: #ff0; color: #000; + background-color: #ffff00; color: #000000; } .state2, .stateCRITICAL, .hstate1, .hstateDOWN, .state2 a, .hstate2 a { - background-color: #f00; color: #fff; + background-color: #ff0000; color: #ffffff; } .state3, .stateUNKNOWN, .hstate2, .hstateUNREACHABLE, .state3 a, .hstate2 a { - background-color: #f80; color: #fff; + background-color: #ff8800; color: #ffffff; } .statep, .statePENDING, .hstatep, .hstatePENDING, .statep a, .hstatep a { - background-color: #888; color: #fff; + background-color: #888888; color: #ffffff; } .stated, .stateDOWNTIME, .hstated, .hstateDOWNTIME, .stated a, .hstated a { - background-color: #0af; color: #fff; + background-color: #00aaff; color: #ffffff; } td.graphs {

10 years, 5 months

Check_MK Git: check_mk: FIX oracle_asm_diskgroup: check now also handles older oracle version 11.1.0

by Götz Golla

Module: check_mk Branch: master Commit: 05c4bb360438b43603ff3e23a33a28c2bc6f677d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c4bb360438b4… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Apr 29 12:32:12 2014 +0200 FIX oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 --- .werks/608 | 8 ++++++++ ChangeLog | 1 + checks/oracle_asm_diskgroup | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/608 b/.werks/608 new file mode 100644 index 0000000..ad1d9d7 --- /dev/null +++ b/.werks/608 @@ -0,0 +1,8 @@ +Title: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398767431 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 462998b..54cc516 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 0154 FIX: zfsget: Fixed inventory of filesystems * 0155 FIX: mssql_counters: harded check agains odd agent output * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... + * 0608 FIX: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index d2528db..1535795 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -35,12 +35,20 @@ def inventory_oracle_asm_diskgroup(info): def check_oracle_asm_diskgroup(item, params, info): - for state, typ, rebal, sector, block, au, total_mb, \ - free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ - voting_files, name in info: + for line in info: + if len(line) == 13: + state, typ, rebal, sector, block, au, total_mb, \ + free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ + voting_files, name = line + elif len(line) == 12: + state, typ, rebal, sector, block, au, total_mb, \ + free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ + name = line + else: + name = "" if name.rstrip('/') == item: return df_check_filesystem(g_hostname, item, int(total_mb), - int(free_mb), params) + int(free_mb), params) return (3, "Disk group not found")

10 years, 5 months

Check_MK Git: check_mk: FIX Fixed handling of exceptions occuring before login in debug mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b8c68ab3d0659955cbb013ed41fe004e30427f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b8c68ab3d0659… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 29 01:01:04 2014 +0200 FIX Fixed handling of exceptions occuring before login in debug mode --- .werks/811 | 8 ++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 6 ++++-- web/htdocs/index.py | 1 + web/htdocs/login.py | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/811 b/.werks/811 new file mode 100644 index 0000000..7a0acfc --- /dev/null +++ b/.werks/811 @@ -0,0 +1,8 @@ +Title: Fixed handling of exceptions occuring before login in debug mode +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398726038 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e7698e8..e193e5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) * 0887 Add new column painter "Host Notifications Enabled"... + * 0811 FIX: Fixed handling of exceptions occuring before login in debug mode WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 488852f..18765ed 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1095,7 +1095,8 @@ class html: self.lowlevel_write("<tr><th colspan=2>POST / GET Variables</th></tr>") for name, value in sorted(self.vars.items()): if not prefix or name.startswith(prefix): - self.write("<tr><td class=left>%s</td><td class=right>%s</td></tr>\n" % (name, value)) + self.write("<tr><td class=left>%s</td><td class=right>%s</td></tr>\n" % + (self.attrencode(name), self.attrencode(value))) self.write("</table>") def var(self, varname, deflt = None): @@ -1240,7 +1241,8 @@ class html: def begin_foldable_container(self, treename, id, isopen, title, indent=True, first=False, icon=None, fetch_url=None): self.folding_indent = indent - isopen = self.foldable_container_is_open(treename, id, isopen) + if self.user: + isopen = self.foldable_container_is_open(treename, id, isopen) img_num = isopen and "90" or "00" onclick = ' onclick="toggle_foldable_container(\'%s\', \'%s\', \'%s\')"' % ( diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 0f1b25e..3c97a02 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -104,6 +104,7 @@ def handler(req, fields = None, profiling = True): config.load_config() # load multisite.mk if html.var("debug"): # Debug flag may be set via URL config.debug = True + html.enable_debug = config.debug html.set_buffering(config.buffered_http_stream) # profiling can be enabled in multisite.mk diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 55452c0..00aa5dc 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -131,7 +131,7 @@ def check_auth_automation(): # Auth with automation secret succeeded - mark transid as unneeded in this case html.set_ignore_transids() return user - raise MKAuthException(_("Invalid automation secret for user %s") % user) + raise MKAuthException(_("Invalid automation secret for user %s") % html.attrencode(user)) def check_auth(): if html.var("_secret"):

10 years, 5 months

Check_MK Git: check_mk: FIX Table checkboxes: Fixed bug where selected checkboxes got ignored

by Andreas Boesl

Module: check_mk Branch: master Commit: 64e29ea9d67cb0beef5404837181e36a72322aeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64e29ea9d67cb0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 28 16:30:11 2014 +0200 FIX Table checkboxes: Fixed bug where selected checkboxes got ignored Sometimes not all selected lines of a multisite table where actually processed. This happened especially often when the monitoring server had a high disk I/O. --- .werks/909 | 9 +++++++++ ChangeLog | 1 + web/htdocs/weblib.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/909 b/.werks/909 new file mode 100644 index 0000000..fdb2036 --- /dev/null +++ b/.werks/909 @@ -0,0 +1,9 @@ +Title: Table checkboxes: Fixed bug where selected checkboxes got ignored +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398694950 +Class: fix + +Sometimes not all selected lines of a multisite table where actually processed. +This happened especially often when the monitoring server had a high disk I/O. diff --git a/ChangeLog b/ChangeLog index e4b6a1e..8061e53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 0887 Add new column painter "Host Notifications Enabled"... * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... * 0906 FIX: Improved transaction handling in Web GUI... + * 0909 FIX: Table checkboxes: Fixed bug where selected checkboxes got ignored... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index 0123f58..f3c6022 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -85,7 +85,7 @@ def get_rowselection(ident): return vo.get(ident, []) def set_rowselection(ident, rows, action): - vo = config.load_user_file("rowselection/%s" % selection_id(), {}) + vo = config.load_user_file("rowselection/%s" % selection_id(), {}, True) if action == 'set': vo[ident] = rows @@ -102,7 +102,7 @@ def set_rowselection(ident, rows, action): if not os.path.exists(config.user_confdir + '/rowselection'): make_nagios_directory(config.user_confdir + '/rowselection') - config.save_user_file("rowselection/%s" % selection_id(), vo) + config.save_user_file("rowselection/%s" % selection_id(), vo, True) def ajax_set_rowselection(): ident = html.var('id')

10 years, 5 months

Check_MK Git: check_mk: Check event state: New option "Less Verbose Output"

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f9c3ac06729226b9bf6b9c2805650a94378a2b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f9c3ac0672922… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 28 15:18:16 2014 +0200 Check event state: New option "Less Verbose Output" If enabled the check reports less information in its output. You will see no information regarding the worst state or unacknowledged events. For example a default output without this option <tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt> Output with less verbosity <tt>WARN - 1 events (Worst line: Incomplete Content)</tt> --- .werks/908 | 14 ++++++++++++++ ChangeLog | 1 + mkeventd/checks/check_mkevents | 4 ++++ mkeventd/lib/check_mkevents | 24 ++++++++++++++++++------ mkeventd/web/plugins/wato/mkeventd.py | 15 ++++++++++++++- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/.werks/908 b/.werks/908 new file mode 100644 index 0000000..357662c --- /dev/null +++ b/.werks/908 @@ -0,0 +1,14 @@ +Title: Check event state: New option "Less Verbose Output" +Level: 1 +Component: wato +Version: 1.2.5i3 +Date: 1398690971 +Class: feature + +If enabled the check reports less information in its output. +You will see no information regarding the worst state or unacknowledged events. + For example a default output without this option +<tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt> +Output with less verbosity +<tt>WARN - 1 events (Worst line: Incomplete Content)</tt> + diff --git a/ChangeLog b/ChangeLog index 40d3f51..e4b6a1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 0784 Improved security of WATO bulk inventory by using transaction ids * 0880 Added support for 389 Directory Server to LDAP connector * 0607 online help text for host creation in WATO now also explains hostname caching + * 0908 Check event state: New option "Less Verbose Output"... * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... * 0904 FIX: Fixed exception in host parameter overview... diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents index aa9a3f3..b8575b2 100644 --- a/mkeventd/checks/check_mkevents +++ b/mkeventd/checks/check_mkevents @@ -11,6 +11,10 @@ def check_mkevents_arguments(params): args += "-H %s " % quote_shell_string(remote) if params.get("ignore_acknowledged"): args += "-a " + + if params.get("less_verbose"): + args += "-l " + args += params.get("hostspec", "$HOSTADDRESS$") if "application" in params: args += " " + quote_shell_string(params["application"]) diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 563b779..8d745d9 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -56,6 +56,12 @@ try: except: opt_ignore_acknowledged = False + try: + del sys.argv[sys.argv.index('-l')] + opt_less_verbose = True + except: + opt_less_verbose = False + if sys.argv[1] == '-H': remote_host = sys.argv[2] del sys.argv[1:3] @@ -65,8 +71,9 @@ try: else: application = None except: - sys.stdout.write("Usage: check_mkevents [-H (REMOTE:PORT|/path/to/unix/socket)] [-a] HOST [APPLICATION]\n") + sys.stdout.write("Usage: check_mkevents [-H (REMOTE:PORT|/path/to/unix/socket)] [-a] [-l] HOST [APPLICATION]\n") sys.stdout.write("\n -a do not take into account acknowledged events.\n") + sys.stdout.write("\n -l less verbose output.\n") sys.stdout.write("\n") sys.exit(3) @@ -112,11 +119,16 @@ if count == 0 and application: elif count == 0: sys.stdout.write("OK - no events for %s\n" % host_name) else: - sys.stdout.write(nagios_state_names[worst_state] + \ - " - %d events (%d unacknowledged)" % (count, unhandled)) - if worst_row: - sys.stdout.write(", worst state is %s (Last line: %s)" % \ - (nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) + if opt_less_verbose: + sys.stdout.write(nagios_state_names[worst_state] + " - %d events" % (count)) + if worst_row: + sys.stdout.write(" (Worst line: %s)" % (worst_row['event_text'].encode('utf-8'))) + else: + sys.stdout.write(nagios_state_names[worst_state] + \ + " - %d events (%d unacknowledged)" % (count, unhandled)) + if worst_row: + sys.stdout.write(", worst state is %s (Last line: %s)" % \ + (nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) sys.stdout.write("\n") sys.exit(worst_state) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 0366a9e..b8ca802 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1938,6 +1938,19 @@ register_rule( totext = _("acknowledged events will not be honored"), ) ), + ( "less_verbose", + FixedValue( + True, + title = _("Less Verbose Output"), + help = _("If enabled the check reports less information in its output. " + "You will see no information regarding the worst state or unacknowledged events. " + " For example a default output without this option " + "<tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt> " + "Output with less verbosity " + "<tt>WARN - 1 events (Worst line: Incomplete Content)</tt> " + ), + ) + ), ( "remote", Alternative( title = _("Access to the Event Console"), @@ -1976,7 +1989,7 @@ register_rule( ) ), ], - optional_keys = [ "application", "remote", "ignore_acknowledged", "item" ], + optional_keys = [ "application", "remote", "ignore_acknowledged", "less_verbose", "item" ], ), match = 'all', )

10 years, 5 months

Check_MK Git: check_mk: FIX windows agent: register_service:

by Andreas Boesl

fixed ImagePath registry entry Message-ID: <535e2a60.nd1s0/8vMinFypx2%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7dbb31ce42a0ecc6e4184e602f7e9f150f45d390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dbb31ce42a0ec… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 28 12:15:51 2014 +0200 FIX windows agent: register_service: fixed ImagePath registry entry The registry key ImagePath in <tt>HKEY_LOCAL_MACHINE\System\CurentControlSet\Services\Check_MK_Agent</tt> was not quoted correctly. This could trigger a warning on some vulnerability scanners. --- .werks/907 | 11 +++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 204800 -> 204800 bytes agents/windows/check_mk_agent.cc | 4 +++- agents/windows/check_mk_agent.exe | Bin 175104 -> 175104 bytes agents/windows/install_agent-64.exe | Bin 158157 -> 158175 bytes agents/windows/install_agent.exe | Bin 151408 -> 155326 bytes 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/907 b/.werks/907 new file mode 100644 index 0000000..2f2ac15 --- /dev/null +++ b/.werks/907 @@ -0,0 +1,11 @@ +Title: windows agent: register_service: fixed ImagePath registry entry +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398679973 +Class: fix + + +The registry key ImagePath in <tt>HKEY_LOCAL_MACHINE\System\CurentControlSet\Services\Check_MK_Agent</tt> +was not quoted correctly. This could trigger a warning on some vulnerability scanners. + diff --git a/ChangeLog b/ChangeLog index c88bed1..40d3f51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore * 0154 FIX: zfsget: Fixed inventory of filesystems * 0155 FIX: mssql_counters: harded check agains odd agent output + * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b5313de..f54c406 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 204b993..615a546 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3152,10 +3152,12 @@ void InstallService() char path[ _MAX_PATH + 1 ]; if ( GetModuleFileName( 0, path, sizeof(path)/sizeof(path[0]) ) > 0 ) { + char quoted_path[1024]; + snprintf(quoted_path, sizeof(quoted_path), "\"%s\"", path); SC_HANDLE service = CreateService( serviceControlManager, gszServiceName, gszServiceName, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, - SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path, + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, quoted_path, 0, 0, 0, 0, 0 ); if ( service ) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b5cc3f8..75ecbc5 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e5ca176..783a9a1 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6dda9ec..a0acc6c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 5 months

Check_MK Git: check_mk: akcp_daisy_temp: Added missing perfdata gadgets

by Bastian Kuhn

Module: check_mk Branch: master Commit: 157602c45357ab3b3dffb4bf123ee6ea9dba2a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=157602c45357ab… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Apr 25 13:12:38 2014 +0200 akcp_daisy_temp: Added missing perfdata gadgets --- pnp-templates/check_mk-akcp_daisy_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 2 files changed, 2 insertions(+) diff --git a/pnp-templates/check_mk-akcp_daisy_temp.php b/pnp-templates/check_mk-akcp_daisy_temp.php new file mode 120000 index 0000000..99402f6 --- /dev/null +++ b/pnp-templates/check_mk-akcp_daisy_temp.php @@ -0,0 +1 @@ +check_mk-akcp_sensor_temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 186cf9c..6efb53a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -277,6 +277,7 @@ perfometers["check_mk-smart.temp"] = perfometer_temperature perfometers["check_mk-f5_bigip_temp"] = perfometer_temperature perfometers["check_mk-hp_proliant_temp"] = perfometer_temperature perfometers["check_mk-akcp_sensor_temp"] = perfometer_temperature +perfometers["check_mk-akcp_daisy_temp"] = perfometer_temperature perfometers["check_mk-fsc_temp"] = perfometer_temperature perfometers["check_mk-viprinet_temp"] = perfometer_temperature perfometers["check_mk-hwg_temp"] = perfometer_temperature

10 years, 5 months

Check_MK Git: check_mk: enterasys_temp: New Check for temperature sensor in Enterasys Switches

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b5667445e15ee2faee64ce849a8a5a40fd26ae93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5667445e15ee2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Apr 25 12:29:31 2014 +0200 enterasys_temp: New Check for temperature sensor in Enterasys Switches --- .werks/899 | 8 ++++ ChangeLog | 1 + checkman/enterasys_temp | 27 ++++++++++++ checks/enterasys_temp | 65 +++++++++++++++++++++++++++++ pnp-templates/check_mk-enterasys_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 103 insertions(+) diff --git a/.werks/899 b/.werks/899 new file mode 100644 index 0000000..6848a3f --- /dev/null +++ b/.werks/899 @@ -0,0 +1,8 @@ +Title: enterasys_temp: New Check for temperature sensor in Enterasys Switches +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1398421742 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 497efe2..c88bed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 0897 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices * 0898 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... + * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/enterasys_temp b/checkman/enterasys_temp new file mode 100644 index 0000000..1dc26aa --- /dev/null +++ b/checkman/enterasys_temp @@ -0,0 +1,27 @@ +title: Enterasys Switch: Temperature +agents: snmp +catalog: hw/network/enterasys +license: GPL +distribution: check_mk +description: + Checks the temperature measured by the temperature sensor in Enterasys + Switches. + + Returns {WARN} or {CRIT} if reaching or exceeding given levels and {OK} + otherwise. + +inventory: + Creates one service on every Enterasys Switch in which a temperature + sensor is found to be active. + +perfdata: + One value: The temperature in degree celsius, together with it's warn and + crit levels. + +[parameters] +warning (int): The temperature in degree celsius that triggers a WARNING state. +critical (int): The temperature in degree celsius that triggers a CRITICAL state. + +[configuration] +enterasys_temp_default_levels(int, int): The default levels for WARNING and + CRITICAL state, preset to (30, 35) diff --git a/checks/enterasys_temp b/checks/enterasys_temp new file mode 100644 index 0000000..aa1c206 --- /dev/null +++ b/checks/enterasys_temp @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +enterasys_temp_default_levels = (30, 35) + +def inventory_enterasys_temp(info): + if info[0][0] == "0": + return [] + else: + return [ (None, "enterasys_temp_default_levels") ] + +def check_enterasys_temp(item, params, info): + warn, crit = params + + # info for MIB: The ambient temperature of the room in which the chassis + # is located. If this sensor is broken or not supported, then + # this object will be set to zero. The value of this object + # is the actual temperature in degrees Fahrenheit * 10. + temp_value_snmp = int(info[0][0]) + temp_c = (temp_value_snmp / 10 - 32) / 1.8 + temp_c = float("%0.1f" % temp_c) + + perfdata = [ ("temp", str(temp_c) + "C", warn, crit) ] + infotext = "Temperature is %0.1f C (warn/crit at %0.1f/%0.1f C)" % (temp_c, warn, crit) + status = 0 + if temp_c >= crit: + status = 2 + elif temp_c >= warn: + status = 1 + + return status, infotext, perfdata + +check_info["enterasys_temp"] = { + "check_function" : check_enterasys_temp, + "inventory_function" : inventory_enterasys_temp, + "service_description" : "Temperature", + "has_perfdata" : True, + "snmp_info" : ( ".1.3.6.1.4.1.52.4.1.1.8.1", [ 1 ]), # chEnvAmbientTemp + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "group" : "hw_single_temperature", +} + diff --git a/pnp-templates/check_mk-enterasys_temp.php b/pnp-templates/check_mk-enterasys_temp.php new file mode 120000 index 0000000..ee5de5e --- /dev/null +++ b/pnp-templates/check_mk-enterasys_temp.php @@ -0,0 +1 @@ +check_mk-brocade_mlx_temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 9e77b8c..186cf9c 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -289,6 +289,7 @@ perfometers["check_mk-innovaphone_temp"] = perfometer_temperature perfometers["check_mk-cmciii.temp"] = perfometer_temperature perfometers["check_mk-ibm_svc_enclosurestats.temp"] = perfometer_temperature perfometers["check_mk-wagner_titanus_topsense.temp"] = perfometer_temperature +perfometers["check_mk-enterasys_temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014