Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: FIX dell_om_disks: Handle hotspares more correctly

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2380fc15d808433155b2fbc55a5ddf25736178a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2380fc15d80843… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Apr 30 10:58:52 2014 +0200 FIX dell_om_disks: Handle hotspares more correctly --- .werks/158 | 8 ++++++++ ChangeLog | 3 ++- checks/dell_om_disks | 9 +++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/158 b/.werks/158 new file mode 100644 index 0000000..e4bacde --- /dev/null +++ b/.werks/158 @@ -0,0 +1,8 @@ +Title: dell_om_disks: Handle hotspares more correctly +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398848314 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1273e28..3da90c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,10 +56,11 @@ * 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 - * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 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 + * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 0910 FIX: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure... + * 0158 FIX: dell_om_disks: Handle hotspares more correctly Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/dell_om_disks b/checks/dell_om_disks index c7b5727..7bf2349 100644 --- a/checks/dell_om_disks +++ b/checks/dell_om_disks @@ -93,14 +93,15 @@ def check_dell_om_disks(item, _no_params, info): elif dstate not in [ 3 ]: state = 2 label = "(!!)" - msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), label )) - msg.append("Bus Type: %s" % bus_type.get(btype,'unk (%s)' % btype) ) - # handle global hot spares as OK - if sstate == 3 and dstate == 1: + # handle hot spares as OK + if sstate in [ 3, 4 ] and dstate == 1: state = 0 label = "" + msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), + msg.append("Bus Type: %s" % bus_type.get(btype,'unk (%s)' % btype) ) + if sstate != 5: msg.append("Spare State: %s" % spare_state.get(sstate, 'ukn (%s)' %sstate )) if mt != 0:

10 years, 5 months

Check_MK Git: check_mk: notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b586c2bcd947b7eada35adf1a75879f4171f13d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b586c2bcd947b7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 08:22:42 2014 +0200 notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway donated by Stadt Regensburg --- .werks/900 | 8 +++++ ChangeLog | 3 +- doc/treasures/notify_multitech.py | 61 +++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/.werks/900 b/.werks/900 new file mode 100644 index 0000000..ce87c05 --- /dev/null +++ b/.werks/900 @@ -0,0 +1,8 @@ +Title: notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway +Level: 2 +Component: notifications +Version: 1.2.5i3 +Date: 1398838893 +Class: feature + +donated by Stadt Regensburg diff --git a/ChangeLog b/ChangeLog index 1273e28..c93bcb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,9 +56,9 @@ * 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 - * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 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 + * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 0910 FIX: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure... Multisite: @@ -81,6 +81,7 @@ * 0754 Allow users to disable their notifications completely... * 0755 Added variables LASTHOSTUP_REL and LASTSERVICEOK_REL to notification context... * 0883 Added Date / Time to HTML notification email + * 0900 notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway... * 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 diff --git a/doc/treasures/notify_multitech.py b/doc/treasures/notify_multitech.py new file mode 100755 index 0000000..8c9c2c0 --- /dev/null +++ b/doc/treasures/notify_multitech.py @@ -0,0 +1,61 @@ +#!/usr/bin/python +# Send SMS via MultiTech SMS-Gateway # encoding: utf-8 +# +# This notification script can be put below share/check_mk/notifications. It sends +# SMS via a MultiTech SMS-Gateway. Please add your personal configuration directly in this +# script. The target phone number is take from the contact's pager address. +# You can override this by specifying it as a parameter +import sys, os, urllib + +# This does not need to be changed +to = os.environ.get("NOTIFY_CONTACTPAGER") +fromname = "Check_MK" +user = "nagios" +passwd = "test123" +url = "http://isms.example.com/sendmsg?" + + +if len(sys.argv) > 1: + to = sys.argv[1] + +if not to: + sys.stderr.write("NOTIFY_CONTACTPAGER is not set.\n") + sys.exit(1) + + +max_len = 160 +message = os.environ['NOTIFY_HOSTNAME'] + " " + +if os.environ['NOTIFY_WHAT'] == 'SERVICE': + message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEOUTPUT'][:avail_len] + +else: + message += "is " + os.environ['NOTIFY_HOSTSTATE'] + +# constructing a url like +# http://isms.example.com/sendmsg?user=nagios&passwd=test123&cat=1&to=0170123…' +url += urllib.urlencode([ + ( "user", user ), + ( "passwd", passwd ), + ( "cat", "1" ), + ( "to", to ), + ( "text", message ) +]) + + +try: + handle = urllib.urlopen(url) + response = handle.read().strip() + print response + if response.startswith("ID:"): + sys.stdout.write("Successfully sent SMS to %s\n" % to) + else: + sys.stderr.write("Error sending SMS to %s: %s\n" % (to, response)) + sys.stderr.write("URL was %s\n" % url) +except Exception, e: + sys.stderr.write("Error sending SMS to %s. Exception: %s%s\n" % e) +

10 years, 5 months

Check_MK Git: check_mk: Added vimrc and screenrc to doc/treasures

by Bastian Kuhn

Module: check_mk Branch: master Commit: ab49a921307291e07793419b582c56a8c5bb7b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab49a921307291… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 23:08:31 2014 +0200 Added vimrc and screenrc to doc/treasures --- doc/treasures/workplace/screenrc | 14 ++++++++ doc/treasures/workplace/vimrc | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/doc/treasures/workplace/screenrc b/doc/treasures/workplace/screenrc new file mode 100644 index 0000000..47a1b33 --- /dev/null +++ b/doc/treasures/workplace/screenrc @@ -0,0 +1,14 @@ +startup_message off # Keine Willkommensnachricht +vbell off # Kein visuelles Blinken +msgwait 1 # Nachrichten für 1 Sekunden anzeigen +defutf8 on # utf8 bei neuen fenstern +shelltitle 'bash' # Fenstertitel +hardcopydir $HOME # Screenshots ins Homeverzeichnis +defscrollback 10000 # Buffer +defmonitor off # Aktivitäten nicht in Fenstertitel schreiben + +screen -t bash +screen -t bash + +caption always "%{= wk} %-w%{= KW} [%n %t] %{-}%+w %= | @%H | %l | %Y-%m-%d %c " + diff --git a/doc/treasures/workplace/vimrc b/doc/treasures/workplace/vimrc new file mode 100644 index 0000000..2247f82 --- /dev/null +++ b/doc/treasures/workplace/vimrc @@ -0,0 +1,74 @@ +set ignorecase + +" Die just-one-space Funktion von Emacs, direkt auf der Leertaste :-) +nmap <space> :s/[[:space:]]\+\%#[[:space:]]\+/ /e<CR> + + +syntax on + + +" Einruecken von Python +" set cindent +set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class +inoremap # X<BS># + +set cino=g0 +map \ :wa<CR>:make -j 8 -z 2>/dev/null ; f12<CR> +map <F12> :wa<CR>:make -j 8 -z 2>/dev/null ; f12<CR> +imap <F12> <ESC>:wa<CR>:make -j 8 -z 2>/dev/null ; f12<CR> + +set fileencodings=ucs-bom,utf-8,latin1 +set ls=2 +set ruler +set showmode +set nocompatible +set sidescroll=1 +set sidescrolloff=10 +set nolinebreak +set nobackup + +set incsearch +set hlsearch +set tabstop=8 +set softtabstop=4 +set shiftwidth=4 +set expandtab +set autoindent +set ignorecase + +" Absatz auf ___ Spalten umbrechen +nmap <C-j> }!{fmt -80 -u<CR> + +map! <C-k> <C-o>d$ +map! <C-e> <C-o>dw + +" Check_MK-Dateien erkennen +autocmd BufRead *.mk set syntax=python filetype=python +autocmd BufRead *.wsgi set syntax=python filetype=python +autocmd BufRead *.lektion set syntax=tex filetype=tex + +" Statusbar +set laststatus=2 +set statusline= +set statusline+=%-3.3n\ " buffer number +set statusline+=%f\ " file name +set statusline+=%h%m%r%w " flags +set statusline+=\[%{strlen(&ft)?&ft:'none'}, " filetype +set statusline+=%{&encoding}, " encoding +set statusline+=%{&fileformat}] " file format +set statusline+=%= " right align +set statusline+=0x%-8B\ " current char +set statusline+=%-10.(%l,%c%V%)\ %<%P " offset + +" Faltung von wato.py +set foldenable +map <F7> :set foldlevel=0<CR> +map <F8> :set foldlevel=1<CR> +set foldmethod=marker +set foldmarker=#\ \ \ .,#. + +" Zeile vom letzten mal merken +autocmd BufReadPost * + \ if line("'\"") > 0 && line("'\"") <= line("$") | + \ exe "normal g`\"" | + \ endif

10 years, 5 months

Check_MK Git: check_mk: FIX apc_symmetra_test: Fixed case of unkown last test date

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2c7a57c36cebbec813b0fae29b050054246f3254 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7a57c36cebbe… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 16:29:18 2014 +0200 FIX apc_symmetra_test: Fixed case of unkown last test date --- .werks/157 | 8 ++++++++ ChangeLog | 1 + checks/apc_symmetra_test | 3 +++ 3 files changed, 12 insertions(+) diff --git a/.werks/157 b/.werks/157 new file mode 100644 index 0000000..33d7c1d --- /dev/null +++ b/.werks/157 @@ -0,0 +1,8 @@ +Title: apc_symmetra_test: Fixed case of unkown last test date +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398781737 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c88bed1..f56258c 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 + * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index 3b18dca..7392ed6 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -64,6 +64,9 @@ def check_apc_test(item, params, info): DiagnosticsResults = saveint(line[0]) LastDiagnosticsDate = line[1] + if LastDiagnosticsDate == 'Unkown': + return 3, "Date of last self test is unkown" + month, day, year = map(saveint, LastDiagnosticsDate.split('/')) last_diag_date = datetime.date( year, month, day) today = datetime.date.today()

10 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0844

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1e92570b55126498d3cae8ae737e751cd5429340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e92570b551264… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 14:12:32 2014 +0200 Updated bug entries #0844 --- .bugs/844 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/844 b/.bugs/844 new file mode 100644 index 0000000..8e93610 --- /dev/null +++ b/.bugs/844 @@ -0,0 +1,8 @@ +Title: apc_rackpdu_power does not work with inline snmp +Component: checks +State: open +Date: 2014-04-29 14:11:04 +Targetversion: 1.2.5i1 +Class: bug + +The check apc_rackpdu_power does not work with inline snmp, the first value in the snmp_info list (1.1.0) is missing, only the other 3 are queried.

10 years, 5 months

Check_MK Git: check_mk: merge conflict

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits