Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 8c7460103efdc722ce3ac21d054eef52df882e5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7460103efdc7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 18:17:04 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: oracle_tablespace: checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: 1e0e8a8a97d1b56ecbdca07616cc9a0421fe4a56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e0e8a8a97d1b5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 18:16:55 2013 +0100 oracle_tablespace: checkman update --- checkman/oracle_tablespaces | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 8be4f84..3623754 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -23,7 +23,7 @@ description: {Increment size}: If the configuration parameter {oracle_tablespaces_check_default_increment} is set to - {True} (which is the defaut), then the check will warn + {True} (which is the default), then the check will warn you, if the increment size is set to the ORACLE default value of {1} (which is generally considered as a non-optimal setting). @@ -52,8 +52,13 @@ item: examples: # Set levels for free space to 20% (WARN) and 10% (CRIT) - # of maximum tablespace size - oracle_tablespaces_default_levels = (20.0, 10.0) + # of maximum tablespace size and deactivate check of autoextend + + + oracle_tablespaces_default_levels = { + "levels" : (20.0, 10.0), + "autoextend" : None + } perfdata: Three values in bytes: the current size, the used size of the tablespace @@ -64,18 +69,29 @@ inventory: which is {ONLINE}. [parameters] -autoextend(bool): Either {True} or {False} - depending on - wether auto extension is expected to be on or off. -warn(int / float): Warning level for free space. 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. -crit(int / float): The critical level for free space. +parameters (dict): -[configuration] -oracle_tablespaces_default_levels(int/float, int/float): The default warning and critical levels - used for inventorized checks. This is preset to {(10.0, 5.0)}. + {"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. + 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)} + {"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 + for large tablespaces and lowers them for small ones. Please look at online documentation + for more details about magic factor. + + {"magic_normsize"}: Norm size of a tablespace for the magic computation + The default for this is {1000}. It is measured in {MB}. + + {"levels_low"}: Minimum levels if using magic factor. The warn / crit levels will never fall below + these numbers. The preset is set to (0.0, 0.0) (deactivated) + +[configuration] oracle_tablespaces_check_autoext(bool): This boolean setting determines, whether inventory should activate monitoring of the auto extension setting. Per default this is set to {True}, so the current state of the auto extension will be

11 years, 7 months

Check_MK Git: check_mk: Add: winperf_phydisk can now output IOPS

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ce61a4a7db11b854883fd247344203ec69b8f51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ce61a4a7db11b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 14:29:51 2013 +0100 Add: winperf_phydisk can now output IOPS --- ChangeLog | 1 + checkman/winperf_phydisk | 4 ++++ checks/diskstat.include | 19 +++++++++++++------ checks/winperf_phydisk | 16 ++++++++++------ 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0f9ecc..2aa33a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * if: Inventory settings can now be set host based * FIX: lnx_bonding/ovs_bonding: correct definition of bonding.include * Add: if check now able to handle interface groups (if_groups) + * Add: winperf_phydisk can now output IOPS Multisite: * Added comment painter to notification related views diff --git a/checkman/winperf_phydisk b/checkman/winperf_phydisk index f14bb0e..d89a342 100644 --- a/checkman/winperf_phydisk +++ b/checkman/winperf_phydisk @@ -28,6 +28,8 @@ description: it possible to ignore short "peaks" and only trigger and longer phases of high disk activity. + The check also gives info on the IOPS. + item: Either {"SUMMARY"} for a summarized check of alls disks or the name of the disk device, e.g. {"C:"}. @@ -62,6 +64,8 @@ perfdata: In the legacy mode only one variable: the throughput since the last check in in bytes(!) per second, either for read or for write. + The IOPS are returned if {"latency_perfdata"} is set to True. + inventory: The inventory is configured via {diskstat_inventory_mode}. If this is set to {"single"} (the default), then one check will be created for each diff --git a/checks/diskstat.include b/checks/diskstat.include index 553ab76..4c84054 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -130,17 +130,25 @@ def check_diskstat_line(this_time, item, params, line): if average_range != None: perfdata = [ perfdata[0], perfdata[2], perfdata[1], perfdata[3] ] - # Do Latency computation if this information is available: - if len(line) >= 6 and line[3] >= 0: - reads, writes, timems = map(int, line[3:6]) - ios = reads + writes + # Process IOs when available + if line[3] >= 0 and line[4] > 0: + reads, writes = map(int, line[3:5]) + ios = reads + writes timedif, ios_per_sec = get_counter(countername + ".ios", this_time, ios) + infos.append("IOs: %.2f/sec" % ios_per_sec) + + if params.get("latency_perfdata"): + perfdata.append(("ios", ios_per_sec)) + + # Do Latency computation if this information is available: + if len(line) >= 6 and line[5] >= 0: + timems = int(line[5]) timedif, timems_per_sec = get_counter(countername + ".time", this_time, timems) if not ios_per_sec: latency = 0.0 else: latency = timems_per_sec / ios_per_sec - infos.append("IOs: %.2f/sec, Latency: %.2fms" % (ios_per_sec, latency)) + infos.append("Latency: %.2fms" % latency) if "latency" in params: warn, crit = params["latency"] if latency >= crit: @@ -153,7 +161,6 @@ def check_diskstat_line(this_time, item, params, line): warn, crit = None, None if params.get("latency_perfdata"): - perfdata.append(("ios", ios_per_sec)) perfdata.append(("latency", latency, warn, crit)) # Queue Lengths (currently only Windows). Windows uses counters here. diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 052325a..f113775 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -45,8 +45,8 @@ # -24 1638326933 1638326933 average_timer # -24 18448 18448 average_base # -22 36283 36283 counter -# -20 17835 17835 counter -# -18 18448 18448 counter +# -20 17835 17835 counter ----> Disk Reads/sec +# -18 18448 18448 counter ----> Disk Writes/sec # -16 1315437056 1315437056 bulk_count # -14 672711680 672711680 bulk_count ----> Disk Read Bytes/sec # -12 642725376 642725376 bulk_count ----> Disk Write Bytes/sec @@ -66,11 +66,15 @@ def winperf_phydisk_convert(info): disks = [ d.split('_')[-1] for d in info[1][2:-1] ] for line in info[2:]: if line[0] == '-14': - disk_reads = [ int(x) / 512 for x in line[1:-2] ] + disk_read_bytes = [ int(x) / 512 for x in line[1:-2] ] elif line[0] == '-12': - disk_writes = [ int(x) / 512 for x in line[1:-2] ] + disk_write_bytes = [ int(x) / 512 for x in line[1:-2] ] + elif line[0] == '-20': + disk_reads = [ int(x) for x in line[1:-2] ] + elif line[0] == '-18': + disk_writes = [ int(x) for x in line[1:-2] ] elif line[0] == '1168': # Average Disk Read Queue Length - disk_readq_ctrs = [ int(x) for x in line[1:-2] ] + disk_readq_ctrs = [ int(x) for x in line[1:-2] ] elif line[0] == '1170': # Average Disk Read Queue Length disk_writeq_ctrs = [ int(x) for x in line[1:-2] ] @@ -78,7 +82,7 @@ def winperf_phydisk_convert(info): # information) empty = [ -1 for x in disks ] - return zip(disks, disk_reads, disk_writes, empty, empty, empty, disk_readq_ctrs, disk_writeq_ctrs) + return zip(disks, disk_read_bytes, disk_write_bytes, reads, writes, empty, disk_readq_ctrs, disk_writeq_ctrs) def inventory_winperf_phydisk(info): return inventory_diskstat_generic(winperf_phydisk_convert(info))

11 years, 7 months

Check_MK Git: check_mk: WATO: Added hook to make the mkeventd reload in distributed WATO setups during " activate changes" process

by Lars Michelsen

Module: check_mk Branch: master Commit: a2b9f6bce9c2ce857d7a68e1698bab0766bbea78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2b9f6bce9c2ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 08:44:34 2013 +0100 WATO: Added hook to make the mkeventd reload in distributed WATO setups during "activate changes" process --- ChangeLog | 2 ++ mkeventd/web/plugins/wato/mkeventd.py | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a242c02..a9548df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,8 @@ * Speed up rule matches in some special cases by factor of 100 and more * Init-Script: Improved handling of stale pidfiles * Init-Script: Detecting and reporting already running processes + * WATO: Added hook to make the mkeventd reload in distributed WATO setups + during "activate changes" process 1.2.1i5: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 3cfe729..8c13832 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1078,6 +1078,14 @@ def mode_mkeventd_edit_rule(phase): html.hidden_fields() html.end_form() +def mkeventd_reload(): + mkeventd.query("COMMAND RELOAD") + try: + os.remove(log_dir + "mkeventd.log") + except OSError: + pass # ignore not existing logfile + log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) + def mode_mkeventd_changes(phase): if phase == "title": return _("Event Console - Pending Changes") @@ -1088,14 +1096,12 @@ def mode_mkeventd_changes(phase): if config.may("mkeventd.activate") and parse_audit_log("mkeventd") and mkeventd.daemon_running(): html.context_button(_("Activate Changes!"), html.makeactionuri([("_activate", "now")]), "apply", hot=True) - + elif phase == "action": if html.check_transaction(): - mkeventd.query("COMMAND RELOAD") - os.remove(log_dir + "mkeventd.log") - log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) + mkeventd_reload() return "mkeventd_rules", _("Changes successfully activated.") - + else: if not mkeventd.daemon_running(): warning = _("The Event Console Daemon is currently not running. ") @@ -1864,3 +1870,7 @@ define command { api.register_hook("pre-activate-changes", mkeventd_update_notifiation_configuration) +# Only register the reload hook when mkeventd is enabled +if mkeventd_enabled: + api.register_hook("activate-changes", lambda hosts: mkeventd_reload()) +

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: 217ebad614b45de551660b1de9da30bb9b8a6ddf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217ebad614b45d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 17:43:27 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Added hook mkeventd-activate-changes to add custom actions to the mkeventd "activate changes" GUI function

by Lars Michelsen

Module: check_mk Branch: master Commit: a709ed59d006fbcb84e62051ae47080a1bd441be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a709ed59d006fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 13:32:32 2013 +0100 Added hook mkeventd-activate-changes to add custom actions to the mkeventd "activate changes" GUI function --- ChangeLog | 2 ++ mkeventd/web/plugins/wato/mkeventd.py | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9548df..b0f9ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,8 @@ * Init-Script: Detecting and reporting already running processes * WATO: Added hook to make the mkeventd reload in distributed WATO setups during "activate changes" process + * Added hook mkeventd-activate-changes to add custom actions to the mkeventd + "activate changes" GUI function 1.2.1i5: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 8c13832..6f59953 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1086,6 +1086,13 @@ def mkeventd_reload(): pass # ignore not existing logfile log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) +# This hook is executed when one applies the pending configuration changes +# related to the mkeventd via WATO on the local system. The hook is called +# without parameters. +def call_hook_mkeventd_activate_changes(): + if hooks.registered('mkeventd-activate-changes'): + hooks.call("mkeventd-activate-changes") + def mode_mkeventd_changes(phase): if phase == "title": return _("Event Console - Pending Changes") @@ -1100,6 +1107,7 @@ def mode_mkeventd_changes(phase): elif phase == "action": if html.check_transaction(): mkeventd_reload() + call_hook_mkeventd_activate_changes() return "mkeventd_rules", _("Changes successfully activated.") else:

11 years, 7 months

Check_MK Git: check_mk: fixed checkmans of pdu_gude*

by Andreas Boesl

Module: check_mk Branch: master Commit: f8893a2246d572a4901daf4dfba1628cc24ccfc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8893a2246d572… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 17:18:52 2013 +0100 fixed checkmans of pdu_gude* --- checkman/pdu_gude_8301 | 12 +++++++++++- checkman/pdu_gude_8310 | 9 ++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/checkman/pdu_gude_8301 b/checkman/pdu_gude_8301 index 81aa45d..c8bd7bf 100644 --- a/checkman/pdu_gude_8301 +++ b/checkman/pdu_gude_8301 @@ -15,8 +15,18 @@ perfdata: inventory: One service per Phase +examples: + pdu_gude_default_levels = { + "V" : ( 220, 210 ), + "A" : ( 15, 16 ), + "W" : ( 3500, 3600 ), + } + [parameters] -Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict +parameters(dict): Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict [configuration] pdu_gude_default_levels (dict): Default warning and critical level for each value + + + diff --git a/checkman/pdu_gude_8310 b/checkman/pdu_gude_8310 index 81aa45d..4885e99 100644 --- a/checkman/pdu_gude_8310 +++ b/checkman/pdu_gude_8310 @@ -15,8 +15,15 @@ perfdata: inventory: One service per Phase +examples: + pdu_gude_default_levels = { + "V" : ( 220, 210 ), + "A" : ( 15, 16 ), + "W" : ( 3500, 3600 ), + } + [parameters] -Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict +parameters(dict): Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict [configuration] pdu_gude_default_levels (dict): Default warning and critical level for each value

11 years, 7 months

Check_MK Git: check_mk: bugfix: ovs_bonding and disabled interfaces

by Andreas Boesl

Module: check_mk Branch: master Commit: ad25295e655b002f3129639d7fb6ebfd138c0a5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad25295e655b00… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 16:48:39 2013 +0100 bugfix: ovs_bonding and disabled interfaces --- checks/ovs_bonding | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/ovs_bonding b/checks/ovs_bonding index 1902f59..e54c4cc 100644 --- a/checks/ovs_bonding +++ b/checks/ovs_bonding @@ -43,7 +43,7 @@ def parse_ovs_bonding(info): for line in info: if line[0][0] == '[': bond = line[0][1:-1] - bonds[bond] = {} + bonds[bond] = {"active" : None} elif len(line) == 2: left = line[0] right = line[1].strip()

11 years, 7 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: ff13b3b95c4ee8dc233f735340a1a4e6b459e7f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff13b3b95c4ee8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 20:52:44 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Add: oracle_tablespaces with magic number and

by Andreas Boesl

Module: check_mk Branch: master Commit: 1f6ba3f43eb47b20be40886026c94f6c3fdeb186 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f6ba3f43eb47b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 20:52:21 2013 +0100 Add: oracle_tablespaces with magic number and WATO configuration --- ChangeLog | 2 + checks/oracle_tablespaces | 98 ++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 56 +++++++++++++++++++ 3 files changed, 141 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 977dc9b..468ae96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * if: Inventory settings can now be set host based * FIX: lnx_bonding/ovs_bonding: correct definition of bonding.include * Add: if check now able to handle interface groups (if_groups) + * Add: oracle_tablespace now with flexible warn/crit levels(magic number) Multisite: * Added comment painter to notification related views @@ -51,6 +52,7 @@ * FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation) * FIX: Fixed missing general.* permissions in auth.php on slave sites in case of distributed WATO setups + * Added oracle_tablespaces configuration to the application checkgroup Event Console: * Added UNIX socket for sending events to the EC diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 87f2a67..273fa0f 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -47,10 +47,20 @@ # 11. status of the table space # 12. free space in the datafile + +# This definition needs to be removed at a later stage +# A previous version of this check didn't write the parameter +# name into the autochecks file, but the parameter itself # default levels for *free* space. float: percent, # integer: MB. oracle_tablespaces_default_levels = (10.0, 5.0) +factory_settings["oracle_tablespaces_default_levels"] = { + "levels" : (10.0, 5.0), + "magic_normsize" : 1000, + "levels_low" : (0.0, 0.0) +} + # Whether to check auto extend settings oracle_tablespaces_check_autoext = True @@ -75,10 +85,62 @@ def inventory_oracle_tablespaces(info): ae = t in autoextensible else: ae = None # means: ignore, only display setting - inventory.append( ("%s.%s" % t, - "(%s, oracle_tablespaces_default_levels[0], oracle_tablespaces_default_levels[1])" % ae)) + + parameters = { "autoextend" : ae } + inventory.append(("%s.%s" % t, parameters)) return inventory + +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") + + if magic: + # convert warn/crit to percentage + if type(warn) != float: + warn = savefloat(warn * 1024 * 1024 / float(size_bytes)) * 100 + if type(crit) != float: + crit = savefloat(crit * 1024 * 1024 / float(size_bytes)) * 100 + + normsize = params["magic_normsize"] + hbytes_size = size_bytes / (float(normsize) * 1024 * 1024) + felt_size = hbytes_size ** magic + scale = felt_size / hbytes_size + warn_scaled = 100 - (( 100 - warn ) * scale) + crit_scaled = 100 - (( 100 - crit ) * scale) + + # Make sure, levels do never get too low due to magic factor + lowest_warning_level, lowest_critical_level = params["levels_low"] + if warn_scaled < lowest_warning_level: + warn_scaled = lowest_warning_level + if crit_scaled < lowest_critical_level: + crit_scaled = lowest_critical_level + warn_bytes = savefloat(size_bytes * warn_scaled / 100) + crit_bytes = savefloat(size_bytes * crit_scaled / 100) + else: + # warn/crit level are float => percentages of max size, otherwise MB + if type(warn) == float: + warn_bytes = warn / 100.0 * size_bytes + else: + warn_bytes = warn * 1024 * 1024 + + if type(crit) == float: + crit_bytes = crit / 100.0 * size_bytes + 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 + + def check_oracle_tablespaces(item, params, info): sid, tbsname = item.split('.') ts_status = None @@ -91,7 +153,12 @@ def check_oracle_tablespaces(item, params, info): num_increments = 0 increment_size = 0 free_space = 0 + + # Conversion of old autochecks params + if type(params) == tuple: + params = { "autoextend" : params[0], "levels" : params[1:] } + autoext = params.get("autoextend") uses_default_increment = False for line in info: @@ -132,6 +199,8 @@ def check_oracle_tablespaces(item, params, info): if ts_status == None: return (3, "UNKNOWN - Tablespace not found") + + infotext = " - %s, size %s, used %s" % \ (ts_status, @@ -144,7 +213,6 @@ def check_oracle_tablespaces(item, params, info): (num_increments, get_bytes_human_readable(increment_size)) status = 0 - autoext, warn, crit = params # Check increment size, should not be set to default (1) if oracle_tablespaces_check_default_increment: @@ -165,16 +233,9 @@ def check_oracle_tablespaces(item, params, info): else: infotext += ", no autoextend" - # warn/crit level are float => percentages of max size, otherwise MB - if type(warn) == float: - warn = warn / 100.0 * max_size - else: - warn *= 1024 * 1024 - if type(crit) == float: - crit = crit / 100.0 * max_size - else: - crit *= 1024 * 1024 + level_info = get_tablespace_levels_in_bytes(max_size, params) + warn, crit = level_info.get("levels_bytes") # Check free space, but only if status is not READONLY if ts_status != "READONLY": @@ -196,6 +257,13 @@ def check_oracle_tablespaces(item, params, info): return (status, nagios_state_names[status] + infotext, perfdata) -check_info['oracle_tablespaces'] = (check_oracle_tablespaces, "ORA %s Tablespace", 1, inventory_oracle_tablespaces ) +check_info['oracle_tablespaces'] = { + "service_description" : "ORA %s Tablespace", + "check_function" : check_oracle_tablespaces, + "inventory_function" : inventory_oracle_tablespaces, + "has_perfdata" : True, + "group" : "oracle_tablespaces", + "default_levels_variable" : "oracle_tablespaces_default_levels", + "includes" : [ "oracle.include" ] +} check_config_variables.append("oracle_tablespaces_check_default_increment") -check_includes['oracle_tablespaces'] = [ "oracle.include" ] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 380c156..9fc22f4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1413,6 +1413,62 @@ checkgroups.append(( checkgroups.append(( subgroup_applications, + "oracle_tablespaces", + _("Oracle Tablespaces"), + Dictionary( + elements = [ + ( "levels", + Alternative( + title = _("Total Memory Levels"), + 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", + Float( + title = _("Magic factor (automatic level adaptation for large tablespaces)"), + minvalue = 0.1, + maxvalue = 1.0)), + ( "magic_normsize", + Integer( + title = _("Reference size for magic factor"), + minvalue = 1, + default_value = 1000, + label = _("MB"))), + ( "levels_low", + Tuple( + title = _("Minimum levels if using magic factor"), + help = _("The tablespace levels will never fall below these values, when using " + "the magic factor and the tablespace is very small."), + elements = [ + Percentage(title = _("Warning at"), label = _("usage"), allow_int = True), + Percentage(title = _("Critical at"), label = _("usage"), allow_int = True)])), + ( "autoextend", + Checkbox( + title = _("Autoextend"), + label = _("Autoextension is expected"), + help = _(""))), + ]), + TextAscii( + title = _("Service descriptions"), + allow_empty = False), + None)) + + +checkgroups.append(( + subgroup_applications, "oracle_logswitches", _("Oracle Logswitches"), Tuple(

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013