Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Use object for configured sidebar snapins during processing

by Lars Michelsen

Module: check_mk Branch: master Commit: a2c0d6be06e654ff7303eb577f4090ebbbd65191 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2c0d6be06e654… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 23 12:22:36 2018 +0200 Use object for configured sidebar snapins during processing * During runtime the configured sidebar snapins are represented as UserSidebarSnapin() objects. The persisted snapin config is now represented as dictionariy instead of tuples. We could also persist it using the internal classes. This would be something we need to decide in general before starting with something like this here. * Snapin visibility is now represented using SnapinVisibility enum. * Cleaned up special case "off" for removing snapins instead of toggling the visibility. CMK-855 Change-Id: I39ca11073d58ce34f0eb2a8de3d09647c437f0c5 --- cmk/gui/sidebar.py | 165 ++++++++++++++++++++++++++++++----------- tests/unit/web/test_sidebar.py | 80 +++++++++++--------- 2 files changed, 165 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a2c0d6be06…

6 years

Introduce UserSidebarConfig() for managing the users sidebar state

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ad3ec71258cadab31600594959f46025da61687 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad3ec71258cad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 21 20:51:04 2018 +0200 Introduce UserSidebarConfig() for managing the users sidebar state * Moved save_user_config / load_user_config to this class * Wraps sidebar state now in internal dict that is exactly the same as the previous data structure. * Do not access htis new structure directly * Access snapins through user_config.snapins * Modifications to snapins have dedicated methods now: * add_snapin() * move_snapin_before() * set_snapin_visibility() * For folding control use * is_folded * fold() * unfold() * Use config.user.load_file() for sidebar config CMK-855 Change-Id: I269d547bdc33beadaadc22224c0601ac5a95c5cb --- cmk/gui/sidebar.py | 222 ++++++++++++++++++++++++++--------------- tests/unit/web/test_sidebar.py | 205 ++++++++++++++++++++++++++++--------- 2 files changed, 299 insertions(+), 128 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2ad3ec7125…

6 years

Moved ajax_snapin next to other snapin rendering code

by Lars Michelsen

Module: check_mk Branch: master Commit: acafc73e16fd12fc2cdd4ccc37d1a50447d6ba99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acafc73e16fd12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 23 13:22:18 2018 +0200 Moved ajax_snapin next to other snapin rendering code CMK-855 Change-Id: Ia3d5e53178269592fce854e45e99740098dd7609 --- cmk/gui/sidebar.py | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 584ffe8..c15b82a 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -613,31 +613,10 @@ def render_snapin(name, visibility): return refresh_url -(a)cmk.gui.pages.register("sidebar_fold") -def ajax_fold(): - user_config = UserSidebarConfig(config.user, config.sidebar) - user_config.folded = html.var("fold") == "yes" - user_config.save() - - -(a)cmk.gui.pages.register("sidebar_openclose") -def ajax_openclose(): - snapin_id = html.var("name") - state = html.var("state") - if state not in [ SnapinVisibility.OPEN.value, SnapinVisibility.CLOSED.value, "off" ]: - raise MKUserError("state", "Invalid state: %s" % state) - - user_config = UserSidebarConfig(config.user, config.sidebar) - if state == "off": - user_config.remove_snapin(snapin_id) - else: - user_config.set_snapin_visibility(snapin_id, SnapinVisibility(state)) - user_config.save() - - @cmk.gui.pages.register("sidebar_snapin") def ajax_snapin(): - """Update online state of the user (if enabled)""" + """Renders and returns the contents of the requested sidebar snapin(s) in JSON format""" + # Update online state of the user (if enabled) userdb.update_user_access_time(config.user.id) snapname = html.var("name") @@ -681,6 +660,28 @@ def ajax_snapin(): html.write(json.dumps(snapin_code)) +(a)cmk.gui.pages.register("sidebar_fold") +def ajax_fold(): + user_config = UserSidebarConfig(config.user, config.sidebar) + user_config.folded = html.var("fold") == "yes" + user_config.save() + + +(a)cmk.gui.pages.register("sidebar_openclose") +def ajax_openclose(): + snapin_id = html.var("name") + state = html.var("state") + if state not in [ SnapinVisibility.OPEN.value, SnapinVisibility.CLOSED.value, "off" ]: + raise MKUserError("state", "Invalid state: %s" % state) + + user_config = UserSidebarConfig(config.user, config.sidebar) + if state == "off": + user_config.remove_snapin(snapin_id) + else: + user_config.set_snapin_visibility(snapin_id, SnapinVisibility(state)) + user_config.save() + + @cmk.gui.pages.register("sidebar_move_snapin") def move_snapin(): if not config.user.may("general.configure_sidebar"):

6 years

6489 FIX mssql_backup: Fixed parsing of backup date, time and type

by Simon Betz

Module: check_mk Branch: master Commit: 9d2477505ed30cd287a5b0ebfb4be636b7d528fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d2477505ed30c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 6 16:13:03 2018 +0200 6489 FIX mssql_backup: Fixed parsing of backup date, time and type Change-Id: Iacc7958f40255d241fdcbdcab972e6f641a800a1 --- .werks/6489 | 10 ++++++++++ checks/mssql_backup | 47 ++++++++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.werks/6489 b/.werks/6489 new file mode 100644 index 0000000..a668698 --- /dev/null +++ b/.werks/6489 @@ -0,0 +1,10 @@ +Title: mssql_backup: Fixed parsing of backup date, time and type +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536243168 +Class: fix + + diff --git a/checks/mssql_backup b/checks/mssql_backup index 961dd66..abf6870 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -24,28 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Old agent # <<<mssql_backup>>> -# MSSQL_SQLEXPRESS test123 1331207325 +# MSSQL_SQLEXPRESS1 test123 1331207325 -# Newer agent # <<<mssql_backup>>> -# MSSQL_SQL0x master 2016-07-08 20:20:27 -# MSSQL_SQL0x model 2016-07-08 20:20:28 -# MSSQL_SQL0x model 2016-07-12 09:09:42 -# MSSQL_SQL0x model 2016-07-11 20:20:07 -# MSSQL_SQL0x msdb 2016-07-08 20:20:43 -# MSSQL_SQL0x msdb 2016-07-11 20:20:07 - -# New agent (added backup type) -# <<<mssql_backup>>> -# MSSQL_SQL0x master 2016-07-08 20:20:27 D -# MSSQL_SQL0x model 2016-07-08 20:20:28 D -# MSSQL_SQL0x model 2016-07-12 09:09:42 L -# MSSQL_SQL0x model 2016-07-11 20:20:07 I -# MSSQL_SQL0x msdb 2016-07-08 20:20:43 D -# MSSQL_SQL0x msdb 2016-07-11 20:20:07 I +# MSSQL_SQL0x2 master 2016-07-08 20:20:27 +# MSSQL_SQL0x2 model 2016-07-08 20:20:28 +# MSSQL_SQL0x2 model 2016-07-12 09:09:42 +# MSSQL_SQL0x2 model 2016-07-11 20:20:07 +# MSSQL_SQL0x2 msdb 2016-07-08 20:20:43 +# MSSQL_SQL0x2 msdb 2016-07-11 20:20:07 +# <<<mssql_backup>>> +# MSSQL_SQL0x3 master 2016-07-08 20:20:27 D +# MSSQL_SQL0x3 model 2016-07-08 20:20:28 D +# MSSQL_SQL0x3 model 2016-07-12 09:09:42 L +# MSSQL_SQL0x3 model 2016-07-11 20:20:07 I +# MSSQL_SQL0x3 msdb 2016-07-08 20:20:43 D +# MSSQL_SQL0x3 msdb 2016-07-11 20:20:07 I + +# <<<mssql_backup:sep(124)>>> +# MSSQL_SQL0x4|master|2016-07-08 20:20:27|D +# MSSQL_SQL0x4|model|2016-07-08 20:20:28|D +# MSSQL_SQL0x4|model|2016-07-12 09:09:42|L +# MSSQL_SQL0x4|model|2016-07-11 20:20:07|I +# MSSQL_SQL0x4|msdb|2016-07-08 20:20:43|D +# MSSQL_SQL0x4|msdb|2016-07-11 20:20:07|I factory_settings["mssql_backup_default_levels"] = { "database": (None, None), @@ -94,7 +98,12 @@ def parse_mssql_backup(info): timestamp = _parse_date_and_time(backup_date, backup_time) elif len(line) == 4: - inst, tablespace, backup_date, backup_time = line + inst, tablespace = line[:2] + try: + backup_date, backup_time = line[2].split(" ") + backup_type = line[3] + except ValueError: + backup_date, backup_time = line[2:4] timestamp = _parse_date_and_time(backup_date, backup_time) elif len(line) == 3:

6 years

Revert "6488 FIX storeonce_servicesets, storeonce_clusterinfo:

by Simon Betz

Consider new API keys of capacity and free space values" Message-ID: <5b9137ad.pEpe4J3pECuRlYyC%si(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: 71939c5d676ed92c245dc1edc62460a55af7de22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71939c5d676ed9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 6 16:11:41 2018 +0200 Revert "6488 FIX storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values" This reverts commit 6569e7f5881dbe882c4733f35cd4f5e9deeb9332. --- .werks/6488 | 10 ---------- checks/storeonce.include | 34 ---------------------------------- checks/storeonce_clusterinfo | 14 +++++++++++--- checks/storeonce_servicesets | 26 ++++++++------------------ 4 files changed, 19 insertions(+), 65 deletions(-) diff --git a/.werks/6488 b/.werks/6488 deleted file mode 100644 index 153f703..0000000 --- a/.werks/6488 +++ /dev/null @@ -1,10 +0,0 @@ -Title: storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values -Level: 1 -Component: checks -Compatible: compat -Edition: cre -Version: 1.6.0i1 -Date: 1536219593 -Class: fix - - diff --git a/checks/storeonce.include b/checks/storeonce.include index e0f5b14..08e37fc 100644 --- a/checks/storeonce.include +++ b/checks/storeonce.include @@ -31,7 +31,6 @@ def parse_storeonce_clusterinfo(info): parsed[line[0]] = line[1] return parsed - def parse_storeonce_servicesets(info): parsed = {} for line in info: @@ -42,7 +41,6 @@ def parse_storeonce_servicesets(info): parsed[item][line[0]] = line[1] return parsed - def translate_storeonce_status(status): translate_state = { '0' : 3, # Unknown @@ -53,35 +51,3 @@ def translate_storeonce_status(status): } return translate_state[status] - -def _get_storeonce_space_values(values, type_): - key = "%s Space in bytes" % type_ - if key in values: - return float(values[key]), 0, 0 - - # combined(total) = local + cloud - combined_key = "combined%sBytes" % type_ - cloud_key = "cloud%sBytes" % type_ - local_key = "local%sBytes" % type_ - return float(values.get(combined_key, 0)),\ - float(values.get(cloud_key, 0)),\ - float(values.get(local_key, 0)) - - -def check_storeonce_space(item, params, values): - total_bytes, cloud_bytes, local_bytes = _get_storeonce_space_values(values, "Capacity") - free_bytes, free_cloud_bytes, free_local_bytes = _get_storeonce_space_values(values, "Free") - factor = 1024*2 - yield df_check_filesystem_list(item, params, [(item, total_bytes/factor, free_bytes/factor, 0)]) - - if cloud_bytes and local_bytes: - yield 0, "Total cloud: %s, Total local: %s" % ( - get_bytes_human_readable(cloud_bytes), - get_bytes_human_readable(local_bytes)) - - if free_cloud_bytes and free_local_bytes: - yield 0, "Free cloud: %s, Free local: %s" % ( - get_bytes_human_readable(free_cloud_bytes), - get_bytes_human_readable(free_local_bytes)) - - yield 0, "Dedup ratio: %.2f" % float(values['Deduplication Ratio']) diff --git a/checks/storeonce_clusterinfo b/checks/storeonce_clusterinfo index f83ffc4..2393932 100644 --- a/checks/storeonce_clusterinfo +++ b/checks/storeonce_clusterinfo @@ -132,17 +132,25 @@ check_info['storeonce_clusterinfo.cluster'] = { # | | # '----------------------------------------------------------------------' - def inventory_storeonce_clusterinfo_space(parsed): return [ ('Total Capacity', {}) ] +def check_storeonce_clusterinfo_space(item, params, parsed): + total_mb = float(parsed['Total Capacity (bytes)'])/1024/1024 + free_mb = float(parsed['Free Space (bytes)'])/1024/1024 + + yield df_check_filesystem_list(item, params, [ (item, total_mb, free_mb, 0) ]) + + dedup = float(parsed['Dedupe Ratio']) + + yield 0, "Dedup: %.2f" % dedup check_info['storeonce_clusterinfo.space'] = { 'inventory_function' : inventory_storeonce_clusterinfo_space, - 'check_function' : check_storeonce_space, + 'check_function' : check_storeonce_clusterinfo_space, 'service_description' : "%s", 'has_perfdata' : True, - 'includes' : [ "size_trend.include", "df.include", "storeonce.include"], + 'includes' : [ "size_trend.include", "df.include"], 'group' : "filesystem", 'default_levels_variable' : "filesystem_Default_levels", } diff --git a/checks/storeonce_servicesets b/checks/storeonce_servicesets index 0d75f1f..d9e4d4f 100644 --- a/checks/storeonce_servicesets +++ b/checks/storeonce_servicesets @@ -55,22 +55,6 @@ # Primary Node hpcz25132ltd # Secondary Node None # Active Node hpcz25132ltd -# -# In newer agent outputs 'capacity' has changed: -# cloudCapacityBytes 0 -# cloudDiskBytes 0 -# cloudReadWriteLicensedDiskBytes 0 -# cloudFreeBytes 0 -# cloudUserBytes 0 -# localCapacityBytes 136721392009216 -# localDiskBytes 47759419043899 -# localFreeBytes 85220347674624 -# localUserBytes 265622218292968 -# combinedCapacityBytes 136721392009216 -# combinedDiskBytes 47759419043899 -# combinedFreeBytes 85220347674624 -# combinedUserBytes 265622218292968 - def inventory_storeonce_servicesets(parsed): @@ -118,7 +102,13 @@ def check_storeonce_servicesets_capacity(item, params, parsed): for key, values in parsed.iteritems(): if not item == values["ServiceSet ID"]: continue - yield check_storeonce_space(item, params, values) + total_mb = float(values['Capacity in bytes'])/1024/1024 + free_mb = float(values['Free Space in bytes'])/1024/1024 + yield df_check_filesystem_list(item, params, [ (item, total_mb, free_mb, 0) ]) + + dedup = float(values['Deduplication Ratio']) + + yield 0, "Dedup ratio: %.2f" % dedup check_info['storeonce_servicesets.capacity'] = { @@ -127,5 +117,5 @@ check_info['storeonce_servicesets.capacity'] = { 'service_description' : "ServiceSet %s Capacity", 'has_perfdata' : True, 'group' : "filesystem", - 'includes' : ["size_trend.include", "df.include", "storeonce.include"], + 'includes' : [ "size_trend.include", "df.include" ], }

6 years

Revert "Revert "6488 FIX storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values""

by Simon Betz

Module: check_mk Branch: master Commit: 61c8112dd2f754277c522af1c3725aa650dc9ead URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c8112dd2f754… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 6 16:14:04 2018 +0200 Revert "Revert "6488 FIX storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values"" This reverts commit 71939c5d676ed92c245dc1edc62460a55af7de22. --- .werks/6488 | 10 ++++++++++ checks/storeonce.include | 34 ++++++++++++++++++++++++++++++++++ checks/storeonce_clusterinfo | 14 +++----------- checks/storeonce_servicesets | 26 ++++++++++++++++++-------- 4 files changed, 65 insertions(+), 19 deletions(-) diff --git a/.werks/6488 b/.werks/6488 new file mode 100644 index 0000000..153f703 --- /dev/null +++ b/.werks/6488 @@ -0,0 +1,10 @@ +Title: storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536219593 +Class: fix + + diff --git a/checks/storeonce.include b/checks/storeonce.include index 08e37fc..e0f5b14 100644 --- a/checks/storeonce.include +++ b/checks/storeonce.include @@ -31,6 +31,7 @@ def parse_storeonce_clusterinfo(info): parsed[line[0]] = line[1] return parsed + def parse_storeonce_servicesets(info): parsed = {} for line in info: @@ -41,6 +42,7 @@ def parse_storeonce_servicesets(info): parsed[item][line[0]] = line[1] return parsed + def translate_storeonce_status(status): translate_state = { '0' : 3, # Unknown @@ -51,3 +53,35 @@ def translate_storeonce_status(status): } return translate_state[status] + +def _get_storeonce_space_values(values, type_): + key = "%s Space in bytes" % type_ + if key in values: + return float(values[key]), 0, 0 + + # combined(total) = local + cloud + combined_key = "combined%sBytes" % type_ + cloud_key = "cloud%sBytes" % type_ + local_key = "local%sBytes" % type_ + return float(values.get(combined_key, 0)),\ + float(values.get(cloud_key, 0)),\ + float(values.get(local_key, 0)) + + +def check_storeonce_space(item, params, values): + total_bytes, cloud_bytes, local_bytes = _get_storeonce_space_values(values, "Capacity") + free_bytes, free_cloud_bytes, free_local_bytes = _get_storeonce_space_values(values, "Free") + factor = 1024*2 + yield df_check_filesystem_list(item, params, [(item, total_bytes/factor, free_bytes/factor, 0)]) + + if cloud_bytes and local_bytes: + yield 0, "Total cloud: %s, Total local: %s" % ( + get_bytes_human_readable(cloud_bytes), + get_bytes_human_readable(local_bytes)) + + if free_cloud_bytes and free_local_bytes: + yield 0, "Free cloud: %s, Free local: %s" % ( + get_bytes_human_readable(free_cloud_bytes), + get_bytes_human_readable(free_local_bytes)) + + yield 0, "Dedup ratio: %.2f" % float(values['Deduplication Ratio']) diff --git a/checks/storeonce_clusterinfo b/checks/storeonce_clusterinfo index 2393932..f83ffc4 100644 --- a/checks/storeonce_clusterinfo +++ b/checks/storeonce_clusterinfo @@ -132,25 +132,17 @@ check_info['storeonce_clusterinfo.cluster'] = { # | | # '----------------------------------------------------------------------' + def inventory_storeonce_clusterinfo_space(parsed): return [ ('Total Capacity', {}) ] -def check_storeonce_clusterinfo_space(item, params, parsed): - total_mb = float(parsed['Total Capacity (bytes)'])/1024/1024 - free_mb = float(parsed['Free Space (bytes)'])/1024/1024 - - yield df_check_filesystem_list(item, params, [ (item, total_mb, free_mb, 0) ]) - - dedup = float(parsed['Dedupe Ratio']) - - yield 0, "Dedup: %.2f" % dedup check_info['storeonce_clusterinfo.space'] = { 'inventory_function' : inventory_storeonce_clusterinfo_space, - 'check_function' : check_storeonce_clusterinfo_space, + 'check_function' : check_storeonce_space, 'service_description' : "%s", 'has_perfdata' : True, - 'includes' : [ "size_trend.include", "df.include"], + 'includes' : [ "size_trend.include", "df.include", "storeonce.include"], 'group' : "filesystem", 'default_levels_variable' : "filesystem_Default_levels", } diff --git a/checks/storeonce_servicesets b/checks/storeonce_servicesets index d9e4d4f..0d75f1f 100644 --- a/checks/storeonce_servicesets +++ b/checks/storeonce_servicesets @@ -55,6 +55,22 @@ # Primary Node hpcz25132ltd # Secondary Node None # Active Node hpcz25132ltd +# +# In newer agent outputs 'capacity' has changed: +# cloudCapacityBytes 0 +# cloudDiskBytes 0 +# cloudReadWriteLicensedDiskBytes 0 +# cloudFreeBytes 0 +# cloudUserBytes 0 +# localCapacityBytes 136721392009216 +# localDiskBytes 47759419043899 +# localFreeBytes 85220347674624 +# localUserBytes 265622218292968 +# combinedCapacityBytes 136721392009216 +# combinedDiskBytes 47759419043899 +# combinedFreeBytes 85220347674624 +# combinedUserBytes 265622218292968 + def inventory_storeonce_servicesets(parsed): @@ -102,13 +118,7 @@ def check_storeonce_servicesets_capacity(item, params, parsed): for key, values in parsed.iteritems(): if not item == values["ServiceSet ID"]: continue - total_mb = float(values['Capacity in bytes'])/1024/1024 - free_mb = float(values['Free Space in bytes'])/1024/1024 - yield df_check_filesystem_list(item, params, [ (item, total_mb, free_mb, 0) ]) - - dedup = float(values['Deduplication Ratio']) - - yield 0, "Dedup ratio: %.2f" % dedup + yield check_storeonce_space(item, params, values) check_info['storeonce_servicesets.capacity'] = { @@ -117,5 +127,5 @@ check_info['storeonce_servicesets.capacity'] = { 'service_description' : "ServiceSet %s Capacity", 'has_perfdata' : True, 'group' : "filesystem", - 'includes' : [ "size_trend.include", "df.include" ], + 'includes' : ["size_trend.include", "df.include", "storeonce.include"], }

6 years

Revert "6487 FIX mssql_backup: Fixed parsing of backup date, time and type "

by Simon Betz

Module: check_mk Branch: master Commit: dc3198d04f2a5e2f3bd46a0d99631a2d4185c795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc3198d04f2a5e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 6 16:13:43 2018 +0200 Revert "6487 FIX mssql_backup: Fixed parsing of backup date, time and type" This reverts commit e9c95a99dc72b2a6120f79863c8a5270acb3ffdd. --- .werks/6487 | 10 ---------- checks/mssql_backup | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.werks/6487 b/.werks/6487 deleted file mode 100644 index b880d84..0000000 --- a/.werks/6487 +++ /dev/null @@ -1,10 +0,0 @@ -Title: mssql_backup: Fixed parsing of backup date, time and type -Level: 1 -Component: checks -Compatible: compat -Edition: cre -Version: 1.6.0i1 -Date: 1536145690 -Class: fix - - diff --git a/checks/mssql_backup b/checks/mssql_backup index cb4c7e8..961dd66 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -94,8 +94,8 @@ def parse_mssql_backup(info): timestamp = _parse_date_and_time(backup_date, backup_time) elif len(line) == 4: - inst, tablespace, backup_date_time, backup_type = line - timestamp = _parse_date_and_time(*backup_date_time.split(" ")) + inst, tablespace, backup_date, backup_time = line + timestamp = _parse_date_and_time(backup_date, backup_time) elif len(line) == 3: inst, tablespace, backup_timestamp = line

6 years

6487 FIX mssql_backup: Fixed parsing of backup date, time and type

by Simon Betz

Module: check_mk Branch: master Commit: e9c95a99dc72b2a6120f79863c8a5270acb3ffdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9c95a99dc72b2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 5 13:08:36 2018 +0200 6487 FIX mssql_backup: Fixed parsing of backup date, time and type Change-Id: I3fa4d61f17cc93cce3017139e9c062af838af72a --- .werks/6487 | 10 ++++++++++ checks/mssql_backup | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/6487 b/.werks/6487 new file mode 100644 index 0000000..b880d84 --- /dev/null +++ b/.werks/6487 @@ -0,0 +1,10 @@ +Title: mssql_backup: Fixed parsing of backup date, time and type +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536145690 +Class: fix + + diff --git a/checks/mssql_backup b/checks/mssql_backup index 961dd66..cb4c7e8 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -94,8 +94,8 @@ def parse_mssql_backup(info): timestamp = _parse_date_and_time(backup_date, backup_time) elif len(line) == 4: - inst, tablespace, backup_date, backup_time = line - timestamp = _parse_date_and_time(backup_date, backup_time) + inst, tablespace, backup_date_time, backup_type = line + timestamp = _parse_date_and_time(*backup_date_time.split(" ")) elif len(line) == 3: inst, tablespace, backup_timestamp = line

6 years

6488 FIX storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values

by Simon Betz

Module: check_mk Branch: master Commit: 6569e7f5881dbe882c4733f35cd4f5e9deeb9332 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6569e7f5881dbe… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 6 09:41:37 2018 +0200 6488 FIX storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values Change-Id: I23b8886e6df9c2236348c0f3b5b9a998ffa8ad0a --- .werks/6488 | 10 ++++++++++ checks/storeonce.include | 34 ++++++++++++++++++++++++++++++++++ checks/storeonce_clusterinfo | 14 +++----------- checks/storeonce_servicesets | 26 ++++++++++++++++++-------- 4 files changed, 65 insertions(+), 19 deletions(-) diff --git a/.werks/6488 b/.werks/6488 new file mode 100644 index 0000000..153f703 --- /dev/null +++ b/.werks/6488 @@ -0,0 +1,10 @@ +Title: storeonce_servicesets, storeonce_clusterinfo: Consider new API keys of capacity and free space values +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536219593 +Class: fix + + diff --git a/checks/storeonce.include b/checks/storeonce.include index 08e37fc..e0f5b14 100644 --- a/checks/storeonce.include +++ b/checks/storeonce.include @@ -31,6 +31,7 @@ def parse_storeonce_clusterinfo(info): parsed[line[0]] = line[1] return parsed + def parse_storeonce_servicesets(info): parsed = {} for line in info: @@ -41,6 +42,7 @@ def parse_storeonce_servicesets(info): parsed[item][line[0]] = line[1] return parsed + def translate_storeonce_status(status): translate_state = { '0' : 3, # Unknown @@ -51,3 +53,35 @@ def translate_storeonce_status(status): } return translate_state[status] + +def _get_storeonce_space_values(values, type_): + key = "%s Space in bytes" % type_ + if key in values: + return float(values[key]), 0, 0 + + # combined(total) = local + cloud + combined_key = "combined%sBytes" % type_ + cloud_key = "cloud%sBytes" % type_ + local_key = "local%sBytes" % type_ + return float(values.get(combined_key, 0)),\ + float(values.get(cloud_key, 0)),\ + float(values.get(local_key, 0)) + + +def check_storeonce_space(item, params, values): + total_bytes, cloud_bytes, local_bytes = _get_storeonce_space_values(values, "Capacity") + free_bytes, free_cloud_bytes, free_local_bytes = _get_storeonce_space_values(values, "Free") + factor = 1024*2 + yield df_check_filesystem_list(item, params, [(item, total_bytes/factor, free_bytes/factor, 0)]) + + if cloud_bytes and local_bytes: + yield 0, "Total cloud: %s, Total local: %s" % ( + get_bytes_human_readable(cloud_bytes), + get_bytes_human_readable(local_bytes)) + + if free_cloud_bytes and free_local_bytes: + yield 0, "Free cloud: %s, Free local: %s" % ( + get_bytes_human_readable(free_cloud_bytes), + get_bytes_human_readable(free_local_bytes)) + + yield 0, "Dedup ratio: %.2f" % float(values['Deduplication Ratio']) diff --git a/checks/storeonce_clusterinfo b/checks/storeonce_clusterinfo index 2393932..f83ffc4 100644 --- a/checks/storeonce_clusterinfo +++ b/checks/storeonce_clusterinfo @@ -132,25 +132,17 @@ check_info['storeonce_clusterinfo.cluster'] = { # | | # '----------------------------------------------------------------------' + def inventory_storeonce_clusterinfo_space(parsed): return [ ('Total Capacity', {}) ] -def check_storeonce_clusterinfo_space(item, params, parsed): - total_mb = float(parsed['Total Capacity (bytes)'])/1024/1024 - free_mb = float(parsed['Free Space (bytes)'])/1024/1024 - - yield df_check_filesystem_list(item, params, [ (item, total_mb, free_mb, 0) ]) - - dedup = float(parsed['Dedupe Ratio']) - - yield 0, "Dedup: %.2f" % dedup check_info['storeonce_clusterinfo.space'] = { 'inventory_function' : inventory_storeonce_clusterinfo_space, - 'check_function' : check_storeonce_clusterinfo_space, + 'check_function' : check_storeonce_space, 'service_description' : "%s", 'has_perfdata' : True, - 'includes' : [ "size_trend.include", "df.include"], + 'includes' : [ "size_trend.include", "df.include", "storeonce.include"], 'group' : "filesystem", 'default_levels_variable' : "filesystem_Default_levels", } diff --git a/checks/storeonce_servicesets b/checks/storeonce_servicesets index d9e4d4f..0d75f1f 100644 --- a/checks/storeonce_servicesets +++ b/checks/storeonce_servicesets @@ -55,6 +55,22 @@ # Primary Node hpcz25132ltd # Secondary Node None # Active Node hpcz25132ltd +# +# In newer agent outputs 'capacity' has changed: +# cloudCapacityBytes 0 +# cloudDiskBytes 0 +# cloudReadWriteLicensedDiskBytes 0 +# cloudFreeBytes 0 +# cloudUserBytes 0 +# localCapacityBytes 136721392009216 +# localDiskBytes 47759419043899 +# localFreeBytes 85220347674624 +# localUserBytes 265622218292968 +# combinedCapacityBytes 136721392009216 +# combinedDiskBytes 47759419043899 +# combinedFreeBytes 85220347674624 +# combinedUserBytes 265622218292968 + def inventory_storeonce_servicesets(parsed): @@ -102,13 +118,7 @@ def check_storeonce_servicesets_capacity(item, params, parsed): for key, values in parsed.iteritems(): if not item == values["ServiceSet ID"]: continue - total_mb = float(values['Capacity in bytes'])/1024/1024 - free_mb = float(values['Free Space in bytes'])/1024/1024 - yield df_check_filesystem_list(item, params, [ (item, total_mb, free_mb, 0) ]) - - dedup = float(values['Deduplication Ratio']) - - yield 0, "Dedup ratio: %.2f" % dedup + yield check_storeonce_space(item, params, values) check_info['storeonce_servicesets.capacity'] = { @@ -117,5 +127,5 @@ check_info['storeonce_servicesets.capacity'] = { 'service_description' : "ServiceSet %s Capacity", 'has_perfdata' : True, 'group' : "filesystem", - 'includes' : [ "size_trend.include", "df.include" ], + 'includes' : ["size_trend.include", "df.include", "storeonce.include"], }

6 years

Make enum module available in the check_api and update module docstring

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 6a26d401bfcf689b75b638121928d3064192cbb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a26d401bfcf68… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Sep 5 10:46:09 2018 +0200 Make enum module available in the check_api and update module docstring Change-Id: I2eaf7e105020c41a942525cd3a52e7459fd413d0 --- cmk_base/check_api.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 28d3512..1bba202 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -29,13 +29,16 @@ The things in this module specify the official Check_MK check API. Meaning all variables, functions etc. and default modules that are available to checks. Modules available by default (pre imported by Check_MK): + collections + enum fnmatch math re socket sys + os time - + pprint Global variables: from cmk.regex import regex @@ -122,6 +125,7 @@ def get_check_api_context(): # TODO: Move imports directly to checks? import collections +import enum import fnmatch import math import re

6 years

← Newer
1
...
28
29
30
31
32
33
34
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018