Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Now really fixed rewriting the contact in case of " expect regular messages" rule

by Lars Michelsen

Module: check_mk Branch: master Commit: ebc0f610db03801f509de068cce29f66b42f5683 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebc0f610db0380… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 11:50:38 2013 +0100 Now really fixed rewriting the contact in case of "expect regular messages" rule --- mkeventd/bin/mkeventd | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 7deaf5e..281d4b3 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1084,7 +1084,6 @@ class EventServer: "last" : now, "comment" : "", "host" : "", - "contact" : "", "application" : "", "pid" : 0, "priority" : 3,

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Lars Michelsen

Module: check_mk Branch: master Commit: ef99366309bad75b4dcf9b8875f8135a95a8d625 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef99366309bad7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 11:51:51 2013 +0100 Merge branch '1.2.2' ---

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Lars Michelsen

Module: check_mk Branch: master Commit: 1541b3bb902190ea17afb3edd3c96638c8b24d60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1541b3bb902190… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 10:18:44 2013 +0100 Merge branch '1.2.2' ---

11 years, 7 months

Check_MK Git: check_mk: Added dynamic thresholds to the oracle_tablespace check depending on the size of the tablespaces .

by Lars Michelsen

Module: check_mk Branch: master Commit: 310a81d62fb58f9bd1b31635c3fd0c7c621c0f5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=310a81d62fb58f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 10:17:46 2013 +0100 Added dynamic thresholds to the oracle_tablespace check depending on the size of the tablespaces. --- ChangeLog | 4 ++ checkman/oracle_tablespaces | 10 ++++- checks/oracle_tablespaces | 34 ++++++++++------ web/htdocs/valuespec.py | 10 ++-- web/plugins/wato/check_parameters.py | 70 ++++++++++++++++++++++++---------- 5 files changed, 88 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c34cd3..7de477d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.2b2: + Checks & Agents: + * Added dynamic thresholds to the oracle_tablespace check depending on the + size of the tablespaces. + BI: * FIX: fix exception in BI-Boxes views of host groups diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 6d2162c..b2acffd 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -74,11 +74,17 @@ parameters (dict): {"autoextend"}: Either {True} or {False} - depending on whether auto extension is expected to be on or off - {"levels"}: A tuple containing the warn and crit levels for free space. + {"levels"}: By default a tuple containing the warn and crit levels for free space. Supported types (int / float). If this is a float, it is considered as percentage of the maximum size of the tablespace. If it is an integer, it is considered to be MB of free space. If the space drops to this level or below, - the check will get into warning state. Default is {(10.0, 5.0)} + the check will get into warning state. Default is {(10.0, 5.0)}. + This check also supports some kind of dynamic level definition. Using this you can + apply thresholds to tablespace checks depending on their size, just like using the + magic factor, but more simple do configure. To configure thi, you have to set this + variable to a list of tuples, where the first element is an integer representing + the minimum tablespace size in bytes to apply these thresholds to and a tuple + containing the thresholds as described above. {"magic"}: The magic number, which scales the levels according to the tablespace size. Default is a factor of 1.0, which does no adaptation. A factor less than 1.0 raises the levels diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 04e943d..52e0007 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -94,8 +94,23 @@ def inventory_oracle_tablespaces(info): def get_tablespace_levels_in_bytes(size_bytes, params): # If the magic factor is used, take table size and magic factor # into account in order to move levels - magic = params.get("magic") - warn, crit = params.get("levels") + magic = params.get("magic") + + # Use tablespace size dependent dynamic levels or static levels + size_bytes = 1031 * 1024 * 1024 * 1024 + if type(params.get("levels")) == tuple: + warn, crit = params.get("levels") + 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: + print 'match', to_size, this_levels + warn, crit = this_levels + found = True + if not found: + return (None, None) if magic: # convert warn/crit to percentage @@ -131,14 +146,7 @@ def get_tablespace_levels_in_bytes(size_bytes, params): else: crit_bytes = crit * 1024 * 1024 - warn_scaled = savefloat(warn_bytes / size_bytes * 100) - crit_scaled = savefloat(crit_bytes / size_bytes * 100) - - - levels = {} - levels["levels_bytes"] = (warn_bytes, crit_bytes) - levels["levels_text"] = "(levels at %.1f/%.1f%%)" % (warn_scaled, crit_scaled) - return levels + return warn_bytes, crit_bytes def check_oracle_tablespaces(item, params, info): @@ -237,12 +245,12 @@ def check_oracle_tablespaces(item, params, info): infotext += ", no autoextend" - level_info = get_tablespace_levels_in_bytes(max_size, params) - warn, crit = level_info.get("levels_bytes") + warn, crit = get_tablespace_levels_in_bytes(max_size, params) # Check free space, but only if status is not READONLY if ts_status != "READONLY": - if free_space <= crit or free_space <= warn: + 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)) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 00b5d0c..4649f1e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -257,27 +257,27 @@ class Filesize(Integer): def get_exponent(self, value): - for exp, unit_name in list(enumerate(self._names))[::-1]: + for exp, unit_name in list(enumerate(self._names))[::-1]: if value == 0: return 0,0 if value % (1024 ** exp) == 0: return exp, value / (1024 ** exp) def render_input(self, varprefix, value): - exp, count = self.get_exponent(value) + exp, count = self.get_exponent(value) html.number_input(varprefix + '_size', count, size = self._size) html.write(" ") html.select(varprefix + '_unit', enumerate(self._names), exp) - def from_html_vars(self, varprefix): + def from_html_vars(self, varprefix): try: return int(html.var(varprefix + '_size')) * (1024 ** int(html.var(varprefix + '_unit'))) except: raise MKUserError(varprefix + '_size', _("Please enter a valid integer number")) def value_to_text(self, value): - exp, count = self.get_exponent(value) - return "%s %s" % (count, self._names[exp]) + exp, count = self.get_exponent(value) + return "%s %s" % (count, self._names[exp]) # Editor for a line of text diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f646e6c..980ee91 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1416,26 +1416,56 @@ checkgroups.append(( _("Oracle Tablespaces"), Dictionary( elements = [ - ( "levels", - Alternative( - title = _("Total tablespace size"), - elements = [ - Tuple( - title = _("Percentage levels of free maximum space"), - elements = [ - Percentage(title = _("Warning at"), label = _("free")), - Percentage(title = _("Critical at"), label = _("free")), - ] - ), - Tuple( - title = _("Absolute free space"), - elements = [ - Integer(title = _("Warning lower than"), unit = _("MB")), - Integer(title = _("Critical lower than"), unit = _("MB")), - ] - ) - ])), - ( "magic", + ("levels", + Alternative( + title = _("Levels for the Tablespace size"), + elements = [ + Tuple( + title = _("Percentage free space"), + elements = [ + Percentage(title = _("Warning below"), label = _("free")), + Percentage(title = _("Critical below"), label = _("free")), + ] + ), + Tuple( + title = _("Absolute free space"), + elements = [ + Integer(title = _("Warning lower than"), unit = _("MB")), + Integer(title = _("Critical lower than"), unit = _("MB")), + ] + ), + ListOf( + Tuple( + orientation = "horizontal", + elements = [ + Filesize(title = _("Tablespace larger than")), + Alternative( + title = _("Levels for the Tablespace size"), + elements = [ + Tuple( + title = _("Percentage free space"), + elements = [ + Percentage(title = _("Warning below"), label = _("free")), + Percentage(title = _("Critical below"), label = _("free")), + ] + ), + Tuple( + title = _("Absolute free space"), + elements = [ + Integer(title = _("Warning lower than"), unit = _("MB")), + Integer(title = _("Critical lower than"), unit = _("MB")), + ] + ), + ] + ), + ], + ), + title = _('Dynamic levels'), + ), + ] + ) + ), + ("magic", Float( title = _("Magic factor (automatic level adaptation for large tablespaces)"), minvalue = 0.1,

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 752bc6cdab6193ae50d060d111f5bd246e09357c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=752bc6cdab6193… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 10:18:49 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: b6da10949aaed01f7ee6226c50dc029cad175a60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6da10949aaed0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 10:18:33 2013 +0100 Removed debug output --- checks/oracle_tablespaces | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 52e0007..f37b3b4 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -106,7 +106,6 @@ def get_tablespace_levels_in_bytes(size_bytes, params): found = False for to_size, this_levels in params.get("levels"): if size_bytes > to_size: - print 'match', to_size, this_levels warn, crit = this_levels found = True if not found:

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0888

by Mathias Kettner

Module: check_mk Branch: master Commit: c65883990b8beedcdeddf44e73af60c55fd848df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c65883990b8bee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 10:14:09 2013 +0100 Updated bug entries #0888 --- .bugs/888 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/.bugs/888 b/.bugs/888 new file mode 100644 index 0000000..983b80a --- /dev/null +++ b/.bugs/888 @@ -0,0 +1,16 @@ +Title: EC Forwarding: Nagios fails if contactgroup is empty +Component: wato +State: open +Date: 2013-02-14 10:12:11 +Targetversion: 1.2.3 +Class: nastiness + +The problem is that Check_MK does not create a contact group +if no hosts and services are assigned to it. We could check +if empty contact groups are possible and change that. If we +are in OMD context we could add a patch in Nagios that changes +that and make Check_MK behave like that in OMD context. + +For WATO it is not easily possible to savely know wether a +contact group will be empty, since many aspects are involved +(only_hosts, D-WATO, manual confiugration out of WATO, etc.)

11 years, 7 months

Check_MK Git: check_mk: notify: Fixed encoding issue when processing context to environment

by Lars Michelsen

Module: check_mk Branch: master Commit: b7212eb007776e55ae6034f61eeaace9f6d2977a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7212eb007776e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 08:32:01 2013 +0100 notify: Fixed encoding issue when processing context to environment --- modules/notify.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 5567c9e..838bb2f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -499,7 +499,7 @@ def call_notification_script(plugin, parameters, context, write_into_spoolfile): # Export complete context to have all vars in environment. # Existing vars are replaced, some already existing might remain for key in context: - os.putenv('NOTIFY_' + key, context[key]) + os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) # Remove service macros for host notifications if context['WHAT'] == 'HOST':

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: e323dcf9d6814818364605936fcfe68158521db6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e323dcf9d68148… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 08:32:25 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: tolerate if no piggyback dir is present

by Mathias Kettner

Module: check_mk Branch: master Commit: abb69f8dc28ea212805dc1c5703fa5d2f497b1a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abb69f8dc28ea2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 07:26:01 2013 +0100 FIX: tolerate if no piggyback dir is present --- modules/check_mk_base.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5cf3b09..6fbc5a4 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -438,6 +438,9 @@ def store_piggyback_info(sourcehost, piggybacked): def remove_piggyback_info_from(sourcehost, keep=[]): removed = 0 piggyback_path = tmp_dir + "/piggyback/" + if not os.path.exists(piggyback_path): + return # Nothing to do + for backedhost in os.listdir(piggyback_path): if backedhost not in ['.', '..'] and backedhost not in keep: path = piggyback_path + backedhost + "/" + sourcehost

11 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013