Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: oracle_tablespaces: improved formatting of levels text in check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 7c84300b6756cb44c21cad8dcbe8502330ba6030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c84300b6756cb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 11:56:56 2014 +0200 oracle_tablespaces: improved formatting of levels text in check output If you configure percentage levels within WATO the check will display them as percentage in the check output, as well. Previously these values were always displayed as bytes --- .werks/829 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 16 +++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/829 b/.werks/829 new file mode 100644 index 0000000..d711ace --- /dev/null +++ b/.werks/829 @@ -0,0 +1,10 @@ +Title: oracle_tablespaces: improved formatting of levels text in check output +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396950872 +Class: feature + +If you configure percentage levels within WATO the check will display them +as percentage in the check output, as well. Previously these values were always +displayed as bytes diff --git a/ChangeLog b/ChangeLog index 05ade8e..7deac55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ NOTE: Please refer to the migration notes! * 0802 ibm_svc_nodestats.iops, ibm_svc_systemstats.iops: new checks for IO operations/sec on IBM SVC / V7000 devices * 0602 cmciii.humidity: new check for Rittals CMC III humidity sensors + * 0829 oracle_tablespaces: improved formatting of levels text in check output... * 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/checks/oracle_tablespaces b/checks/oracle_tablespaces index ca850cf..05cb437 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -107,8 +107,9 @@ def get_tablespace_levels_in_bytes(size_bytes, params): warn, crit = this_levels break else: - return (None, None) + return None, None, "" + levels_text = "levels at " if magic: # convert warn/crit to percentage if type(warn) != float: @@ -131,19 +132,25 @@ def get_tablespace_levels_in_bytes(size_bytes, params): crit_scaled = lowest_critical_level warn_bytes = savefloat(size_bytes * warn_scaled / 100) crit_bytes = savefloat(size_bytes * crit_scaled / 100) + levels_text += get_bytes_human_readable(warn_bytes) + levels_text += "/%s" % get_bytes_human_readable(crit_bytes) else: # warn/crit level are float => percentages of max size, otherwise MB if type(warn) == float: warn_bytes = warn / 100.0 * size_bytes + levels_text += "%.1f%%" % warn else: warn_bytes = warn * 1024 * 1024 + levels_text += get_bytes_human_readable(warn_bytes) if type(crit) == float: crit_bytes = crit / 100.0 * size_bytes + levels_text += "/%.1f%%" % crit else: crit_bytes = crit * 1024 * 1024 + levels_text += "/%s" % get_bytes_human_readable(crit_bytes) - return warn_bytes, crit_bytes + return warn_bytes, crit_bytes, levels_text def check_oracle_tablespaces(item, params, info): @@ -242,15 +249,14 @@ def check_oracle_tablespaces(item, params, info): infotext += ", no autoextend" - warn, crit = get_tablespace_levels_in_bytes(max_size, params) + warn, crit, levels_text = get_tablespace_levels_in_bytes(max_size, params) # Check free space, but only if status is not READONLY if ts_status != "READONLY": if (crit is not None and free_space <= crit) \ or (warn is not None and free_space <= warn): infotext += ", only %s left" % get_bytes_human_readable(free_space) - infotext += " (levels at %s/%s)" % ( - get_bytes_human_readable(warn), get_bytes_human_readable(crit)) + infotext += " (%s)" % levels_text if free_space <= crit: status = 2 else:

10 years, 5 months

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: a8628306cf560382a97d3efaaac78cd1dc6ea3b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8628306cf5603… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 11:54:24 2014 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5755750..180bd24 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -829 +879

10 years, 5 months

Check_MK Git: check_mk: FIX oracle_tablespaces: fixed bug when using dynamic filesystem levels

by Andreas Boesl

Module: check_mk Branch: master Commit: 126e1422af3f6615ab251e638e7245567a0a83f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=126e1422af3f66… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 11:02:02 2014 +0200 FIX oracle_tablespaces: fixed bug when using dynamic filesystem levels The check did not process the dynamic levels correctly. If there was a rule with dynamic filesystem levels, e.g. <ul> <li>1 TB - 5%/2% free</li> <li>500 GB - 6%/3% free</li> <li>200 GB - 10%/4% free</li> <li>500 MB - 20%/15% free</li> </ul> and the filesystems size was 700GB, the levels of the 500 MB rule were actually used. --- .werks/789 | 18 ++++++++++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 5 ++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/789 b/.werks/789 new file mode 100644 index 0000000..fda3da3 --- /dev/null +++ b/.werks/789 @@ -0,0 +1,18 @@ +Title: oracle_tablespaces: fixed bug when using dynamic filesystem levels +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1396947332 + +The check did not process the dynamic levels correctly. +If there was a rule with dynamic filesystem levels, e.g. +<ul> +<li>1 TB - 5%/2% free</li> +<li>500 GB - 6%/3% free</li> +<li>200 GB - 10%/4% free</li> +<li>500 MB - 20%/15% free</li> +</ul> +and the filesystems size was 700GB, the levels of the 500 MB rule were actually used. + diff --git a/ChangeLog b/ChangeLog index c2abeee..05ade8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... + * 0789 FIX: oracle_tablespaces: fixed bug when using dynamic filesystem levels... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 7ed2eec..ca850cf 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -102,12 +102,11 @@ def get_tablespace_levels_in_bytes(size_bytes, params): else: # A list of levels. Choose the correct one depending on the # size of the current tablespace - found = False for to_size, this_levels in params.get("levels"): if size_bytes > to_size: warn, crit = this_levels - found = True - if not found: + break + else: return (None, None) if magic:

10 years, 5 months

Check_MK Git: check_mk: FIX Availability: fixed memory leak in table statehist

by Andreas Boesl

Module: check_mk Branch: master Commit: e820d79af2bc40cb806b3a479d67089524646346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e820d79af2bc40… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 4 15:09:54 2014 +0200 FIX Availability: fixed memory leak in table statehist The cleanup procedure of the livestatus table statehist missed some items.. This has been fixed. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 73459b4..c2abeee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,8 +19,8 @@ * 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 - * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... Multisite:

10 years, 5 months

Check_MK Git: check_mk: FIX oracle_tablespaces: now able to bear None values as warn/crit levels

by Andreas Boesl

Module: check_mk Branch: master Commit: e8a79db20d1fce7a3abea3ee07922fb43c5c5527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8a79db20d1fce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 10:46:52 2014 +0200 FIX oracle_tablespaces: now able to bear None values as warn/crit levels The levels in the oracle_tablespaces parameters could be set to None if dynamic levels were used, but the filesystem was not within the limits of the dynamic levels. This caused an invalid check output. --- .werks/788 | 11 +++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/788 b/.werks/788 new file mode 100644 index 0000000..f692950 --- /dev/null +++ b/.werks/788 @@ -0,0 +1,11 @@ +Title: oracle_tablespaces: now able to bear None values as warn/crit levels +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396946661 +Class: fix + +The levels in the oracle_tablespaces parameters could be set to None +if dynamic levels were used, but the filesystem was not within the limits +of the dynamic levels. +This caused an invalid check output. diff --git a/ChangeLog b/ChangeLog index 6f647db..ac71639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index a8c01c6..7ed2eec 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -257,7 +257,7 @@ def check_oracle_tablespaces(item, params, info): else: status = max(1, status) - perfdata = [ ("size", current_size, max_size - warn, max_size - crit), + perfdata = [ ("size", current_size, max_size - (warn or 0), max_size - (crit or 0)), ("used", used), ("max_size", max_size) ]

10 years, 5 months

Check_MK Git: check_mk: Allow availability of multisite BI aggregates at once

by Mathias Kettner

Module: check_mk Branch: master Commit: b74d6fb6df0a81e73c6403b2b736f85f52de7a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b74d6fb6df0a81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 8 10:09:15 2014 +0200 Allow availability of multisite BI aggregates at once Views containing multisite BI aggregates now also have the button <i>Availability</i> at the top of the view. Multisite BI aggregates can thus be displayed in one availability table - just as for hosts and services. --- .werks/756 | 10 ++ ChangeLog | 3 + web/htdocs/bi.py | 9 +- web/htdocs/check_mk.css | 38 ------- web/htdocs/pages.css | 35 ++++++ web/htdocs/views.py | 20 +++- web/plugins/pages/shipped.py | 1 - web/plugins/views/availability.py | 215 +++++++++++++++++++++++++------------ web/plugins/views/bi.py | 4 +- 9 files changed, 220 insertions(+), 115 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b74d6fb6df…

10 years, 5 months

Check_MK Git: check_mk: Display HTML variables in debug mode in a nicer way

by Mathias Kettner

Module: check_mk Branch: master Commit: 1555e6797b752f105b5b2755d3f20125551c698a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1555e6797b752f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 8 10:07:40 2014 +0200 Display HTML variables in debug mode in a nicer way --- web/htdocs/htmllib.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ae524a8..6862841 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -752,7 +752,12 @@ class html: _("<a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a>")) self.write("<hr class=header>\n") if self.enable_debug: - self.write("<div class=urldebug>%s</div>" % self.makeuri([])) + self.dump_get_vars() + + def dump_get_vars(self): + self.begin_foldable_container("html", "debug_vars", True, _("GET/POST variables of this page")) + self.debug_vars(hide_with_mouse = False) + self.end_foldable_container() def body_start(self, title='', **args): self.html_head(title, **args) @@ -1081,13 +1086,17 @@ class html: self.lowlevel_write("<pre>%s</pre>\n" % pprint.pformat(element)) - def debug_vars(self, prefix = None): - self.lowlevel_write('<table onmouseover="this.style.display=\'none\';" class=debug_vars>') + def debug_vars(self, prefix=None, hide_with_mouse=True): + if hide_with_mouse: + hover = ' onmouseover="this.style.display=\'none\';"' + else: + hover = "" + self.lowlevel_write('<table %s class=debug_vars>' % hover) 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("</ul>") + self.write("</table>") def var(self, varname, deflt = None): return self.vars.get(varname, deflt)

10 years, 5 months

Check_MK Git: check_mk: agent_ibmsvc: a version additionally calling lsdrive

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 05b03b7b4effb4ad4f0ff4516a451ae833976752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05b03b7b4effb4… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Apr 7 15:56:53 2014 +0200 agent_ibmsvc: a version additionally calling lsdrive --- agents/special/agent_ibmsvc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 4a61a04..6a3e64f 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -163,6 +163,14 @@ for module in command_options.keys(): else: cmd += "%s -nohdr -delim :;" % module + # in these 2 sections we need to run the lsdrive command additionaly + # to find out if there are drives. Only if there are some, the drives + # checks need to be created by inventory + if module in [ "lsnodestats", "lssystemstats" ]: + cmd += "echo \[lsdrive start\];" + cmd += "lsdrive -delim : -nohdr;" + cmd += "echo \[lsdrive end\];" + cmd += "'" if opt_debug:

10 years, 5 months

Check_MK Git: check_mk: agent_ibmsvc: removing call of lsdrive again, because it is only useful at inventory, but always called at every check

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e88c5e85db7196131c37cef26fa21acfb38c1310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88c5e85db7196… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Apr 7 15:58:45 2014 +0200 agent_ibmsvc: removing call of lsdrive again, because it is only useful at inventory, but always called at every check --- agents/special/agent_ibmsvc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 6a3e64f..d409a97 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -162,15 +162,6 @@ for module in command_options.keys(): cmd += "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr;" else: cmd += "%s -nohdr -delim :;" % module - - # in these 2 sections we need to run the lsdrive command additionaly - # to find out if there are drives. Only if there are some, the drives - # checks need to be created by inventory - if module in [ "lsnodestats", "lssystemstats" ]: - cmd += "echo \[lsdrive start\];" - cmd += "lsdrive -delim : -nohdr;" - cmd += "echo \[lsdrive end\];" - cmd += "'" if opt_debug:

10 years, 5 months

Check_MK Git: check_mk: FIX agent_ibmsvc: raw data for System Info Check and License Check now in correct format

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f8f7a2c1e138b2b78cb4d62714891a7d75f873ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f7a2c1e138b2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Apr 7 16:20:59 2014 +0200 FIX agent_ibmsvc: raw data for System Info Check and License Check now in correct format The System Info Check did return noting and the License Check did not work when using special agent ibmsvc because the system commands were called with the wrong parameters. This is fixed now. --- .werks/803 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 32 +++++++++++++++++++------------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.werks/803 b/.werks/803 new file mode 100644 index 0000000..75c9088 --- /dev/null +++ b/.werks/803 @@ -0,0 +1,10 @@ +Title: agent_ibmsvc: raw data for System Info Check and License Check now in correct format +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396880282 +Class: fix + +The System Info Check did return noting and the License Check did not work when using +special agent ibmsvc because the system commands were called with the wrong parameters. +This is fixed now. diff --git a/ChangeLog b/ChangeLog index e6f3b02..70ee9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 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 + * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index d409a97..91b4e07 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -92,15 +92,24 @@ user = None mortypes = [ 'all' ] command_options = { - "lshost" : {"section_header" : "ibm_svc_host", "active" : False}, - "lslicense" : {"section_header" : "ibm_svc_license", "active" : False}, - "lsmdisk" : {"section_header" : "ibm_svc_mdisk", "active" : False}, - "lsmdiskgrp" : {"section_header" : "ibm_svc_mdiskgrp", "active" : False}, - "lsnode" : {"section_header" : "ibm_svc_node", "active" : False}, - "lsnodestats" : {"section_header" : "ibm_svc_nodestats", "active" : False}, - "lssystem" : {"section_header" : "ibm_svc_system", "active" : False}, - "lssystemstats" : {"section_header" : "ibm_svc_systemstats", "active" : False}, - "lseventlog" : {"section_header" : "ibm_svc_eventlog", "active" : False}, + "lshost" : {"section_header" : "ibm_svc_host", "active" : False, + "command" : "lshost -nohdr -delim :"}, + "lslicense" : {"section_header" : "ibm_svc_license", "active" : False, + "command" : "lslicense -delim :"}, + "lsmdisk" : {"section_header" : "ibm_svc_mdisk", "active" : False, + "command" : "lsmdisk -nohdr -delim :"}, + "lsmdiskgrp" : {"section_header" : "ibm_svc_mdiskgrp", "active" : False, + "command" : "lsmdiskgrp -nohdr -delim :"}, + "lsnode" : {"section_header" : "ibm_svc_node", "active" : False, + "command" : "lsnode -nohdr -delim :"}, + "lsnodestats" : {"section_header" : "ibm_svc_nodestats", "active" : False, + "command" : "lsnodestats -nohdr -delim :"}, + "lssystem" : {"section_header" : "ibm_svc_system", "active" : False, + "command" : "lssystem -delim :"}, + "lssystemstats" : {"section_header" : "ibm_svc_systemstats", "active" : False, + "command" : "lssystemstats -nohdr -delim :"}, + "lseventlog" : {"section_header" : "ibm_svc_eventlog", "active" : False, + "command" : "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr"}, } for o,a in opts: @@ -158,10 +167,7 @@ cmd = "ssh -o ConnectTimeout=%s %s %s@%s '" % (opt_timeout, opt_any_hostkey, use for module in command_options.keys(): if command_options[module]["active"] == True: cmd += "echo \<\<\<%s:sep\(58\)\>\>\>;" % command_options[module]["section_header"] - if module == "lseventlog": - cmd += "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr;" - else: - cmd += "%s -nohdr -delim :;" % module + cmd += "%s;" % command_options[module]["command"] cmd += "'" if opt_debug:

10 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014