Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1772 FIX lparstat_aix: Check handles already working agent output again

by Lars Michelsen

Module: check_mk Branch: master Commit: ad9a08c313ab838990106bdba9e0f613a3b3c639 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad9a08c313ab83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 18 09:59:47 2014 +0100 #1772 FIX lparstat_aix: Check handles already working agent output again --- .werks/1772 | 10 ++++++++++ ChangeLog | 1 + checks/lparstat_aix | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/1772 b/.werks/1772 new file mode 100644 index 0000000..d97313f --- /dev/null +++ b/.werks/1772 @@ -0,0 +1,10 @@ +Title: lparstat_aix: Check handles already working agent output again +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418893154 + + diff --git a/ChangeLog b/ChangeLog index 54855cb..712ba0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 1770 FIX: megaraid_pdisks: Now handling unconfigured good/bad states... * 1771 FIX: domino_mailqueues: Fixed exception during inventory when no data usable data available * 1208 FIX: netwroks_fs: Detects now not reachable cifs mounts + * 1772 FIX: lparstat_aix: Check handles already working agent output again Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 20ffa17..134f445 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -43,10 +43,14 @@ def inventory_lparstat(info): def check_lparstat(item, params, info): line = info[0] - if len(line) == 9: + if len(line) == 10: + cols = [ 'physc', 'entc', 'lbusy', 'app', 'vcsw', 'phint' ] + uom = [ '', '%', '', '', '', '' ] + values = line[-6:] + elif len(line) == 9: cols = [ 'physc', 'entc', 'lbusy', 'app' ] uom = [ '', '%', '', '' ] - values = line[-4] + values = line[-4:] elif len(line) == 6: cols = [ 'nsp', 'utcyc' ] uom = [ '%', '%' ]

9 years, 9 months

Check_MK Git: check_mk: #1208 FIX netwroks_fs: Detects now not reachable cifs mounts

by Bastian Kuhn

Module: check_mk Branch: master Commit: c6758c0c197b190d927761d54e7896086e62fea0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6758c0c197b19… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 18 09:36:03 2014 +0100 #1208 FIX netwroks_fs: Detects now not reachable cifs mounts --- .werks/1208 | 10 ++++++++++ ChangeLog | 1 + checks/network_fs.include | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1208 b/.werks/1208 new file mode 100644 index 0000000..19004db --- /dev/null +++ b/.werks/1208 @@ -0,0 +1,10 @@ +Title: netwroks_fs: Detects now not reachable cifs mounts +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418891703 + + diff --git a/ChangeLog b/ChangeLog index 5f5e4df..54855cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 1769 FIX: megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity" * 1770 FIX: megaraid_pdisks: Now handling unconfigured good/bad states... * 1771 FIX: domino_mailqueues: Fixed exception during inventory when no data usable data available + * 1208 FIX: netwroks_fs: Detects now not reachable cifs mounts Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/network_fs.include b/checks/network_fs.include index a5408c1..b2bb698 100644 --- a/checks/network_fs.include +++ b/checks/network_fs.include @@ -49,7 +49,7 @@ def check_network_fs_mounts(item, _no_params, info): free_blocks = int(line[-2]) # for non-root user blocksize = int(line[-1]) - if size_blocks < 0 or free_blocks < 0 or blocksize > 1024*1024: + if size_blocks <= 0 or free_blocks < 0 or blocksize > 1024*1024: return (2, "Stale fs handle") if line[-5] == 'ok':

9 years, 9 months

Check_MK Git: check_mk: #1771 FIX domino_mailqueues: Fixed exception during inventory when no data usable data available

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d9ec7b339928fb0ca8bff7e7f2edae4ba0e3cd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d9ec7b339928f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 18 09:23:32 2014 +0100 #1771 FIX domino_mailqueues: Fixed exception during inventory when no data usable data available --- .werks/1771 | 10 ++++++++++ ChangeLog | 1 + checks/domino_mailqueues | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/1771 b/.werks/1771 new file mode 100644 index 0000000..239e5c9 --- /dev/null +++ b/.werks/1771 @@ -0,0 +1,10 @@ +Title: domino_mailqueues: Fixed exception during inventory when no data usable data available +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418890967 + + diff --git a/ChangeLog b/ChangeLog index e8375f2..5f5e4df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 1768 FIX: brocade_fcport/brocade_info: Only try to discover these services when device provides correct info... * 1769 FIX: megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity" * 1770 FIX: megaraid_pdisks: Now handling unconfigured good/bad states... + * 1771 FIX: domino_mailqueues: Fixed exception during inventory when no data usable data available Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/domino_mailqueues b/checks/domino_mailqueues index b098acb..0d41caa 100644 --- a/checks/domino_mailqueues +++ b/checks/domino_mailqueues @@ -38,9 +38,10 @@ domino_mailqueues = { def inventory_domino_mailqueues(info): for line in info: - val = int(line[0][0].split(".")[12]) - if val in domino_mailqueues.keys(): - yield domino_mailqueues[val][0], {} + if line: + val = int(line[0][0].split(".")[12]) + if val in domino_mailqueues.keys(): + yield domino_mailqueues[val][0], {} def check_domino_mailqueues(item, params, info): for line in info:

9 years, 9 months

Check_MK Git: check_mk: #1770 FIX megaraid_pdisks: Now handling unconfigured good/bad states

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e7520005eb5e61961aa75724f4c0b91c74bc942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e7520005eb5e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 18 08:58:08 2014 +0100 #1770 FIX megaraid_pdisks: Now handling unconfigured good/bad states The check now also handles the states Unconfigured(good) (as OK state) and Unconfigured(bad) (as WARNING state). --- .werks/1770 | 11 +++++++++++ ChangeLog | 1 + checks/megaraid_pdisks | 8 +++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/1770 b/.werks/1770 new file mode 100644 index 0000000..b7d5219 --- /dev/null +++ b/.werks/1770 @@ -0,0 +1,11 @@ +Title: megaraid_pdisks: Now handling unconfigured good/bad states +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418889442 + +The check now also handles the states Unconfigured(good) (as OK state) +and Unconfigured(bad) (as WARNING state). diff --git a/ChangeLog b/ChangeLog index d63eb95..e8375f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 1767 FIX: fc_port: Re-enabled check discovery of this check * 1768 FIX: brocade_fcport/brocade_info: Only try to discover these services when device provides correct info... * 1769 FIX: megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity" + * 1770 FIX: megaraid_pdisks: Now handling unconfigured good/bad states... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index e04789e..84cf345 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -104,9 +104,11 @@ def inventory_megaraid_pdisks(info): return inventory megaraid_pdisks_states = { - 'Online' : 0, - 'Hotspare' : 0, - 'Failed' : 2, + 'Online' : 0, + 'Hotspare' : 0, + 'Unconfigured(good)' : 0, + 'Failed' : 2, + 'Unconfigured(bad)' : 1, } def check_megaraid_pdisks(item, _no_params, info):

9 years, 9 months

Check_MK Git: check_mk: #1769 FIX megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity"

by Lars Michelsen

Module: check_mk Branch: master Commit: 28f8ef0e18039a73731452eb289350b6a77898cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28f8ef0e18039a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 18 08:50:15 2014 +0100 #1769 FIX megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity" --- .werks/1769 | 10 ++++++++++ ChangeLog | 1 + checks/megaraid_bbu | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1769 b/.werks/1769 new file mode 100644 index 0000000..7a0119c --- /dev/null +++ b/.werks/1769 @@ -0,0 +1,10 @@ +Title: megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418888985 + + diff --git a/ChangeLog b/ChangeLog index a3e35f2..d63eb95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 1666 FIX: inventory check esx_vsphere_hostsystem: no longer crashes if information is missing... * 1767 FIX: fc_port: Re-enabled check discovery of this check * 1768 FIX: brocade_fcport/brocade_info: Only try to discover these services when device provides correct info... + * 1769 FIX: megaraid_bbu: Fixed exception for some controllers reporting "full charge capacity" Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu index ca7d8ac..021cae6 100644 --- a/checks/megaraid_bbu +++ b/checks/megaraid_bbu @@ -88,7 +88,7 @@ def check_megaraid_bbu(item, _no_params, info): else: charge = ", Charge is %s" % controller['Relative State of Charge'] if 'Full Charge Capacity' in controller: - charge += ", Charge is %s, Capacity is %s" % controller['Full Charge Capacity'] + charge += ", Capacity is %s" % controller['Full Charge Capacity'] # verify defined important parameters to current level for varname, (refvalue, refstate) in megaraid_bbu_refvalues.items():

9 years, 9 months

Check_MK Git: check_mk: netapp_api_aggr: removed debug values,

by Andreas Boesl

which caused the check to report wrong data Message-ID: <5491dd02.U+jnrMrIbAa1t2aQ%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5a612fb97edba5cc37b29ed73d8bea614d631836 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a612fb97edba5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 17 20:43:50 2014 +0100 netapp_api_aggr: removed debug values, which caused the check to report wrong data --- checks/netapp_api_aggr | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/netapp_api_aggr b/checks/netapp_api_aggr index 98de02c..c0e07d3 100644 --- a/checks/netapp_api_aggr +++ b/checks/netapp_api_aggr @@ -45,8 +45,6 @@ def check_netapp_api_aggr(item, params, parsed): mega = 1024.0 * 1024.0 size_total = saveint(aggr.get("size-total")) / mega size_avail = saveint(aggr.get("size-available")) / mega - size_total = 20000 - size_avail = 20000 return df_check_filesystem_list(item, params, [(item, size_total, size_avail)]) check_info["netapp_api_aggr"] = {

9 years, 9 months

Check_MK Git: check_mk: msexch_dag: minor code review

by Goetz Golla

Module: check_mk Branch: master Commit: 64daab6b544f1848c61a6a42bfda4b28940c9e58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64daab6b544f18… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Dec 17 18:14:33 2014 +0100 msexch_dag: minor code review --- checks/msexch_dag | 56 ++++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/checks/msexch_dag b/checks/msexch_dag index 77f02cc..522b34d 100644 --- a/checks/msexch_dag +++ b/checks/msexch_dag @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example Output +# Example Output: # <<<msexch_dag:sep(58)>>> # RunspaceId : d58353f4-f868-43b2-8404-25875841a47b # Identity : Mailbox Database 1\S0141KL @@ -72,7 +72,7 @@ # IncomingLogCopyingNetwork : # SeedingNetwork : # ActiveCopy : True -# +# # RunspaceId : d58353f4-f868-43b2-8404-25875841a47b # Identity : Mailbox Database 2\S0141KL # Name : Mailbox Database 2\S0141KL @@ -120,8 +120,6 @@ # SeedingNetwork : # ActiveCopy : False - - # .--dbcopy--------------------------------------------------------------. # | _ _ | # | __| | |__ ___ ___ _ __ _ _ | @@ -130,21 +128,18 @@ # | \__,_|_.__/ \___\___/| .__/ \__, | | # | |_| |___/ | # +----------------------------------------------------------------------+ -# | | -# '----------------------------------------------------------------------' def inventory_msexch_dag_dbcopy(info): - return inventory_msexch_dag_dbcopy_withkey( info, "Status" ) - -def inventory_msexch_dag_dbcopy_withkey(info, key): getit = False + key = "Status" for line in info: if len(line) == 2: if line[0].strip() == "DatabaseName": dbname = line[1].strip() getit = True elif getit and line[0].strip() == key: - yield dbname, ( key, line[1].strip() ) + yield dbname, (key, line[1].strip()) + getit = False def check_msexch_dag_dbcopy(item, params, info): getit = False @@ -157,10 +152,10 @@ def check_msexch_dag_dbcopy(item, params, info): elif getit and key == inv_key: if val == inv_val: state = 0 - infotxt = "%s is %s" % ( inv_key, val ) + infotxt = "%s is %s" % (inv_key, val) else: state = 1 - infotxt = "%s changed from %s to %s" % ( inv_key, inv_val, val ) + infotxt = "%s changed from %s to %s" % (inv_key, inv_val, val) return state, infotxt check_info['msexch_dag.dbcopy'] = { @@ -169,17 +164,16 @@ check_info['msexch_dag.dbcopy'] = { "service_description" : "Exchange DAG DBCopy for %s", } + #. -# .--ContentIndex--------------------------------------------------------. -# | ____ _ _ ___ _ | -# | / ___|___ _ __ | |_ ___ _ __ | |_|_ _|_ __ __| | _____ __ | -# | | | / _ \| '_ \| __/ _ \ '_ \| __|| || '_ \ / _` |/ _ \ \/ / | -# | | |__| (_) | | | | || __/ | | | |_ | || | | | (_| | __/> < | -# | \____\___/|_| |_|\__\___|_| |_|\__|___|_| |_|\__,_|\___/_/\_\ | +# .--contentindex--------------------------------------------------------. +# | _ _ _ _ | +# | ___ ___ _ __ | |_ ___ _ __ | |_(_)_ __ __| | _____ __ | +# | / __/ _ \| '_ \| __/ _ \ '_ \| __| | '_ \ / _` |/ _ \ \/ / | +# | | (_| (_) | | | | || __/ | | | |_| | | | | (_| | __/> < | +# | \___\___/|_| |_|\__\___|_| |_|\__|_|_| |_|\__,_|\___/_/\_\ | # | | # +----------------------------------------------------------------------+ -# | | -# '----------------------------------------------------------------------' def inventory_msexch_dag_contentindex(info): for line in info: @@ -209,16 +203,14 @@ check_info['msexch_dag.contentindex'] = { #. -# .--CopyQueue-----------------------------------------------------------. -# | ____ ___ | -# | / ___|___ _ __ _ _ / _ \ _ _ ___ _ _ ___ | -# | | | / _ \| '_ \| | | | | | | | | |/ _ \ | | |/ _ \ | -# | | |__| (_) | |_) | |_| | |_| | |_| | __/ |_| | __/ | -# | \____\___/| .__/ \__, |\__\_\\__,_|\___|\__,_|\___| | -# | |_| |___/ | -# +----------------------------------------------------------------------+ +# .--copyqueue-----------------------------------------------------------. # | | -# '----------------------------------------------------------------------' +# | ___ ___ _ __ _ _ __ _ _ _ ___ _ _ ___ | +# | / __/ _ \| '_ \| | | |/ _` | | | |/ _ \ | | |/ _ \ | +# | | (_| (_) | |_) | |_| | (_| | |_| | __/ |_| | __/ | +# | \___\___/| .__/ \__, |\__, |\__,_|\___|\__,_|\___| | +# | |_| |___/ |_| | +# +----------------------------------------------------------------------+ msexch_dag_copyqueue_default_levels = (100, 200) @@ -236,14 +228,16 @@ def check_msexch_dag_copyqueue(item, params, info): if key == "DatabaseName" and val == item: getit = True elif getit and key == "CopyQueueLength": + infotxt = "Queue length is %d" % int(val) if int(val) >= crit: state = 2 + infotxt += ", levels at %d/%d" % (warn, crit) elif int(val) >= warn: state = 1 + infotxt += ", levels at %d/%d" % (warn, crit) else: state = 0 - infotxt = "Queue length is %d" % int(val) - perfdata = [ ( "length", int(val), warn, crit, 0 ) ] + perfdata = [ ("length", int(val), warn, crit, 0) ] return state, infotxt, perfdata check_info['msexch_dag.copyqueue'] = {

9 years, 9 months

Check_MK Git: check_mk: #1790 FIX Fix WATO parameters page for passive checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 943a1d9dc0f40c1b0f19df5c5ff190b470fa390b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=943a1d9dc0f40c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 17 16:59:45 2014 +0100 #1790 FIX Fix WATO parameters page for passive checks Showing the parameters page for passive checks (i.e. classical checks without a command line) resulted in an exception. This has been fixed. --- .werks/1790 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 6 ++++-- web/htdocs/wato.py | 11 +++++++---- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.werks/1790 b/.werks/1790 new file mode 100644 index 0000000..f0d1fc6 --- /dev/null +++ b/.werks/1790 @@ -0,0 +1,11 @@ +Title: Fix WATO parameters page for passive checks +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418831944 + +Showing the parameters page for passive checks (i.e. classical checks without +a command line) resulted in an exception. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 9a3dfb4..a3e35f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services + * 1790 FIX: Fix WATO parameters page for passive checks... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/modules/automation.py b/modules/automation.py index 3eb7774..3e8da31 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -599,11 +599,13 @@ def automation_analyse_service(args): for nr, entry in enumerate(custchecks): desc = entry["service_description"] if desc == servicedesc: - return { + result = { "origin" : "classic", "rule_nr" : nr, - "command_line" : entry["command_line"], } + if "command_line" in entry: # Only active checks have a command line + result["command_line"] = entry["command_line"] + return result # 4. Active checks for acttype, rules in active_checks.items(): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4ab56f1..cea3a10 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2651,9 +2651,12 @@ def mode_object_parameters(phase): html.write('<table class=setting><tr><td class=reason><a href="%s">%s %d %s %s</a></td>' % ( url, _("Rule"), rel_nr + 1, _("in"), rule[0]["title"])) - html.write("<td class=settingvalue used><tt>%s</tt></td></tr></table>" % - serviceinfo["command_line"]) - + html.write("<td class=settingvalue used>") + if "command_line" in serviceinfo: + html.write("<tt>%s</tt>" % serviceinfo["command_line"]) + else: + html.write(_("(no command line, passive check)")) + html.write("</td></tr></table>") last_maingroup = None for groupname in groupnames: @@ -5403,7 +5406,7 @@ def check_mk_local_automation(command, args=[], indata=""): raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) else: - raise MKGeneralException("<h1>%s</h1>%s" % (_("Error"), hilite_errors(outdata))) + raise MKGeneralException(hilite_errors(outdata)) # On successful "restart" command execute the activate changes hook

9 years, 9 months

Check_MK Git: check_mk: #1789 FIX Fix preview of passive checks in WATO list of services

by Mathias Kettner

Module: check_mk Branch: master Commit: 32a3a4fbc968de9a603a99284e29adc35c77e31b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32a3a4fbc968de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 17 16:51:46 2014 +0100 #1789 FIX Fix preview of passive checks in WATO list of services --- .werks/1789 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 2 ++ web/htdocs/js/wato.js | 2 ++ web/htdocs/status.css | 4 ++-- web/htdocs/wato.py | 6 +++++- 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/1789 b/.werks/1789 new file mode 100644 index 0000000..c939e04 --- /dev/null +++ b/.werks/1789 @@ -0,0 +1,10 @@ +Title: Fix preview of passive checks in WATO list of services +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418831491 + + diff --git a/ChangeLog b/ChangeLog index 1f8831a..9a3dfb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 1785 Upload SNMP MIBs via WATO... * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... + * 1789 FIX: Fix preview of passive checks in WATO list of services Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/modules/automation.py b/modules/automation.py index 0940990..3eb7774 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1270,6 +1270,8 @@ def automation_active_check(args): if command_line: command_line = autodetect_plugin(command_line) return execute_check_plugin(command_line) + else: + return -1, "Passive check - cannot be executed" else: rules = active_checks.get(plugin) if rules: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 23000dc..6580387 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -872,6 +872,8 @@ function handle_execute_active_check(oDiv, response_text) // Response is STATUS\nOUTPUT var parts = response_text.split("\n", 3); var state = parts[0]; + if (state == "-1") + state = "p"; // Pending var statename = parts[1]; var output = parts[2]; oDiv.innerHTML = output; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 4836d29..d374f35 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -238,8 +238,8 @@ td.statex { /* zero count */ } /* Row coloring in case of the different states */ -tr.odd0 { background-color: #eee; } -tr.even0 { background-color: #ddd; } +tr.odd0, tr.oddp { background-color: #eee; } +tr.even0, tr.evenp { background-color: #ddd; } td.odd0 { background-color: #eee; } td.even0 { background-color: #ddd; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0e9afb3..4ab56f1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3329,7 +3329,11 @@ def ajax_execute_check(): hostname = html.var("host") checktype = html.var("checktype") item = html.var("item") - status, output = check_mk_automation(site, "active-check", [ hostname, checktype, item ]) + try: + status, output = check_mk_automation(site, "active-check", [ hostname, checktype, item ]) + except Exception, e: + status = 1 + output = str(e) statename = nagios_short_state_names.get(status, "UNKN") html.write("%d\n%s\n%s" % (status, statename, output))

9 years, 9 months

Check_MK Git: check_mk: #1788 New personal setting for start page, right after login

by Mathias Kettner

Module: check_mk Branch: master Commit: 0914b07a2a7e38e7ffa31329c1dad2647a77ccda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0914b07a2a7e38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 17 16:23:16 2014 +0100 #1788 New personal setting for start page, right after login A user can now configure an alternative start URL in his personal settings. Default is <tt>dashboard.py</tt> (which can changed in the global setting). Only relative URLs are allowed. --- .werks/1788 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/main.py | 5 +++-- web/htdocs/sidebar.py | 2 +- web/plugins/userdb/user_attributes.py | 10 ++++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.werks/1788 b/.werks/1788 new file mode 100644 index 0000000..5d6fd21 --- /dev/null +++ b/.werks/1788 @@ -0,0 +1,12 @@ +Title: New personal setting for start page, right after login +Level: 2 +Component: multisite +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418829739 + +A user can now configure an alternative start URL in his personal +settings. Default is <tt>dashboard.py</tt> (which can changed in the +global setting). Only relative URLs are allowed. diff --git a/ChangeLog b/ChangeLog index 3a4744a..1f8831a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... + * 1788 New personal setting for start page, right after login... * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 85fc2e4..89091f9 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -27,11 +27,12 @@ import defaults, config def page_index(): - start_url = html.var("start_url", config.start_url) + default_start_url = config.user.get("start_url") or config.start_url + start_url = html.var("start_url", default_start_url) # Prevent redirecting to absolute URL which could be used to redirect # users to compromised pages if '://' in start_url: - start_url = config.start_url + start_url = default_start_url # Do not cache the index page -> caching problems when page is accessed # while not logged in diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 132e0f0..793dac0 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -158,7 +158,7 @@ def sidebar_head(): html.write('<a title="%s" target="main" href="%s">' '<div id="side_version">%s</div>' '</a>' - '</div>\n' % (_("Go to main overview"), html.attrencode(config.start_url), defaults.check_mk_version)) + '</div>\n' % (_("Go to main overview"), html.attrencode(config.user.get("start_url") or config.start_url), defaults.check_mk_version)) def render_messages(): for msg in notify.get_gui_messages(): diff --git a/web/plugins/userdb/user_attributes.py b/web/plugins/userdb/user_attributes.py index bc67d7d..ec5224d 100644 --- a/web/plugins/userdb/user_attributes.py +++ b/web/plugins/userdb/user_attributes.py @@ -64,4 +64,14 @@ declare_user_attribute( domain = "check_mk", ) +declare_user_attribute( + "start_url", + TextAscii(title = _("Start-URL to display in main frame"), + help = _("When you point your browser to the Multisite GUI, usually the dashboard " + "is shown in the main (right) frame. You can replace this with any other " + "URL you like here."), + size = 80, + default_value = "dashboard.py", + attrencode = True), + domain = "multisite")

9 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014