Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6caac7f1fdea68cafc83245337600acc67ae9d8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6caac7f1fdea68… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 11:43:47 2019 +0100 mssql_backup: display error messages CMK-1570 Change-Id: I884fcb24e80862b02b0f7d2780d53d38eec058e4 --- checks/mssql_backup | 5 ++++- tests/unit/checks/generictests/datasets/mssql_backup_regression.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/mssql_backup b/checks/mssql_backup index cf09005..516487e 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -101,7 +101,7 @@ def parse_mssql_backup(info): timestamp = _parse_date_and_time(b_date, b_time) item = "%s %s" % (inst, tablespace) - backup = Backup(timestamp, map_backup_types.get(b_type), b_state) + backup = Backup(timestamp, map_backup_types.get(b_type), b_state or "") parsed.setdefault(item, []).append(backup) return parsed @@ -137,6 +137,9 @@ def check_mssql_backup(item, params, parsed): if backup.state == "no backup found": yield params.get("not_found", 1), "No backup found" continue + if backup.state.startswith("ERROR: "): + yield 2, backup.state[7:] + continue if backup.type is None: backup_type_var = "database" perfkey = "seconds" diff --git a/tests/unit/checks/generictests/datasets/mssql_backup_regression.py b/tests/unit/checks/generictests/datasets/mssql_backup_regression.py index c4edb74..8feb8fc 100644 --- a/tests/unit/checks/generictests/datasets/mssql_backup_regression.py +++ b/tests/unit/checks/generictests/datasets/mssql_backup_regression.py @@ -12,6 +12,7 @@ info = [ ['MSSQL_SQL0x4', 'msdb', '-', '-', '-', 'no backup found'], ['MSSQL_SQL0x4', 'foo'], ['MSSQL_SQL0x4', 'bar', '12345678'], + ['MSSQL_Parrot', 'Polly', '-', '-', '-', 'ERROR: Polly has no crackers'] ] @@ -21,6 +22,7 @@ discovery = { ("MSSQL_SQL0x4 model", {}), ("MSSQL_SQL0x4 msdb", {}), ("MSSQL_SQL0x4 bar", {}), + ("MSSQL_Parrot Polly", {}), ], 'per_type': [], }

5 years, 3 months

mssql_databases: add regression test

by Moritz Kiemer

Module: check_mk Branch: master Commit: ddf42f73e0ae180a9b3af8904b09fc4d0d306149 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf42f73e0ae18… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 12:11:04 2019 +0100 mssql_databases: add regression test Change-Id: I9df56965e2498bdb2bf3f61fece7f1d1f12de6e2 --- .../datasets/mssql_databases_regression.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/mssql_databases_regression.py b/tests/unit/checks/generictests/datasets/mssql_databases_regression.py new file mode 100644 index 0000000..91ed286 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mssql_databases_regression.py @@ -0,0 +1,50 @@ +# yapf: disable + +checkname = 'mssql_databases' + + +info = [['MSSQL_MSSQL46', 'CorreLog_Report_T', 'ONLINE', 'FULL', '0', '0'], + ['MSSQL_MSSQL46', 'master', 'ONLINE', 'SIMPLE', '0', '0'], + ['MSSQL_MSSQL46', 'msdb', 'ONLINE', 'SIMPLE', '0', '0'], + ['MSSQL_MSSQL46', 'NOC_ALARM_T', 'ONLINE', 'FULL', '0', '1'], + ['MSSQL_MSSQL46', 'test_autoclose', 'ONLINE', 'FULL', '1', '0'], + ['MSSQL_MSSQL46', 'test_autoclose', 'RECOVERY', 'PENDING', 'FULL', '1', '0']] + + +discovery = {'': [('MSSQL_MSSQL46 CorreLog_Report_T', {}), + ('MSSQL_MSSQL46 NOC_ALARM_T', {}), + ('MSSQL_MSSQL46 master', {}), + ('MSSQL_MSSQL46 msdb', {}), + ('MSSQL_MSSQL46 test_autoclose', {})]} + + +checks = {'': [('MSSQL_MSSQL46 CorreLog_Report_T', + {}, + [(0, 'Status: ONLINE', []), + (0, 'Recovery: FULL', []), + (0, 'Auto close: off', []), + (0, 'Auto shrink: off', [])]), + ('MSSQL_MSSQL46 NOC_ALARM_T', + {}, + [(0, 'Status: ONLINE', []), + (0, 'Recovery: FULL', []), + (0, 'Auto close: off', []), + (1, 'Auto shrink: on', [])]), + ('MSSQL_MSSQL46 master', + {}, + [(0, 'Status: ONLINE', []), + (0, 'Recovery: SIMPLE', []), + (0, 'Auto close: off', []), + (0, 'Auto shrink: off', [])]), + ('MSSQL_MSSQL46 msdb', + {}, + [(0, 'Status: ONLINE', []), + (0, 'Recovery: SIMPLE', []), + (0, 'Auto close: off', []), + (0, 'Auto shrink: off', [])]), + ('MSSQL_MSSQL46 test_autoclose', + {}, + [(0, 'Status: ONLINE', []), + (0, 'Recovery: FULL', []), + (1, 'Auto close: on', []), + (0, 'Auto shrink: off', [])])]}

5 years, 3 months

Manpage: Changed agent and catalog for esx_vsphere_licenses

by Kenneth Okoh

Module: check_mk Branch: master Commit: a36c2d5d4485c10273bcc5e5a91b0cbbf66d2d23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a36c2d5d4485c1… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Feb 28 10:18:48 2019 +0100 Manpage: Changed agent and catalog for esx_vsphere_licenses Change-Id: I707032f01d0c2f08943518049bcd32aa48a5458f --- checkman/esx_vsphere_licenses | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/esx_vsphere_licenses b/checkman/esx_vsphere_licenses index cec97d8..e7cb216 100644 --- a/checkman/esx_vsphere_licenses +++ b/checkman/esx_vsphere_licenses @@ -1,6 +1,6 @@ title: ESX VSphere Licenses -agents: windows -catalog: app/vmware +agents: vsphere +catalog: os/misc license: GPL distribution: check_mk description:

5 years, 3 months

aws_limits: Add performance data and put detailed information to long output

by Simon Betz

Module: check_mk Branch: master Commit: f8c9579b27b88e834cc032f76b08949ad87ca91f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8c9579b27b88e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 27 11:56:34 2019 +0100 aws_limits: Add performance data and put detailed information to long output Change-Id: I14f45d0ffa44e49918dfcaa8d6635d9cf3bcec02 --- checks/aws.include | 51 +++++++++++++++++++++++----- checks/aws_elb_limits | 14 +++++--- checks/aws_s3_limits | 10 ++++-- cmk/gui/plugins/metrics/check_mk.py | 24 +++++++++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 9 +++-- 5 files changed, 88 insertions(+), 20 deletions(-) diff --git a/checks/aws.include b/checks/aws.include index 0828800..8106c56 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -104,15 +104,48 @@ def inventory_aws_generic_single(parsed, required_metrics): def check_aws_limits(aws_service, params, parsed): - for resource, resource_title, limit, amount in parsed: - p_limit, (warn, crit) = params['%s_limit_levels' % resource] - if p_limit is not None: - limit_ref = p_limit - else: + """ + Generic check for checking limits of AWS resource. + - levels: use plain resource_key + - performance data: aws_%s_%s % AWS resource, resource_key + """ + long_output = [] + levels_reached = [] + max_state = 0 + perfdata = [] + for resource_key, resource_title, limit, amount, human_readable_func in parsed: + if human_readable_func is None: + human_readable_func = lambda x: "%s" % x + + p_limit, (warn, crit) = params[resource_key] + if p_limit is None: limit_ref = limit - yield 0, '%s: %s (of max. %s)' % (resource_title, amount, limit_ref) - yield check_levels( - 100.0 * amount / limit, - "aws_%s_%s_limits" % (aws_service, resource), (warn, crit), + else: + limit_ref = p_limit + + infotext = '%s: %s (of max. %s)' % (resource_title, human_readable_func(amount), + human_readable_func(limit_ref)) + perfvar = "aws_%s_%s" % (aws_service, resource_key) + perfdata.append((perfvar, amount)) + + if not limit_ref: + continue + + state, extrainfo, _perfdata = check_levels( + 100.0 * amount / limit_ref, + "%s_usage" % perfvar, (warn, crit), human_readable_func=get_percent_human_readable, infoname="Usage") + + max_state = max(state, max_state) + if state: + levels_reached.append(resource_title) + infotext += ", %s%s" % (extrainfo, state_markers[state]) + long_output.append(infotext) + + if levels_reached: + yield max_state, 'Levels reached: %s' % ", ".join(levels_reached), perfdata + else: + yield 0, 'No levels reached', perfdata + if long_output: + yield 0, "\n%s" % "\n".join(long_output) diff --git a/checks/aws_elb_limits b/checks/aws_elb_limits index 9b055e4..3416555 100644 --- a/checks/aws_elb_limits +++ b/checks/aws_elb_limits @@ -25,22 +25,28 @@ # Boston, MA 02110-1301 USA. factory_settings['aws_elb_limits_default_levels'] = { - 'load_balancers_limit_levels': (None, (80.0, 90.0)), - 'load_balancer_listeners_limit_levels': (None, (80.0, 90.0)), - 'load_balancer_registered_instances_limit_levels': (None, (80.0, 90.0)), + 'load_balancers': (None, (80.0, 90.0)), + 'load_balancer_listeners': (None, (80.0, 90.0)), + 'load_balancer_registered_instances': (None, (80.0, 90.0)), } +def parse_aws_elb_limits(info): + return [(resource_key, resource_title, limit, amount, None) + for resource_key, resource_title, limit, amount in parse_aws(info)] + + def check_aws_elb_limits(item, params, parsed): return check_aws_limits("elb", params, parsed) check_info['aws_elb_limits'] = { - 'parse_function': parse_aws, + 'parse_function': parse_aws_elb_limits, 'inventory_function': discover_single, 'check_function': check_aws_elb_limits, 'service_description': 'AWS/ELB Limits', 'includes': ['aws.include'], 'group': 'aws_elb_limits', 'default_levels_variable': 'aws_elb_limits_default_levels', + 'has_perfdata': True, } diff --git a/checks/aws_s3_limits b/checks/aws_s3_limits index ebedf52..4de9b46 100644 --- a/checks/aws_s3_limits +++ b/checks/aws_s3_limits @@ -25,20 +25,26 @@ # Boston, MA 02110-1301 USA. factory_settings['aws_s3_limits_default_levels'] = { - 'buckets_limit_levels': (None, (80.0, 90.0)), + 'buckets': (None, (80.0, 90.0)), } +def parse_aws_s3_limits(info): + return [(resource_key, resource_title, limit, amount, None) + for resource_key, resource_title, limit, amount in parse_aws(info)] + + def check_aws_s3_limits(item, params, parsed): return check_aws_limits("s3", params, parsed) check_info['aws_s3_limits'] = { - 'parse_function': parse_aws, + 'parse_function': parse_aws_s3_limits, 'inventory_function': discover_single, 'check_function': check_aws_s3_limits, 'service_description': 'AWS/S3 Limits', 'includes': ['aws.include'], 'group': 'aws_s3_limits', 'default_levels_variable': 'aws_s3_limits_default_levels', + 'has_perfdata': True, } diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index be5a388..372380c 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4992,6 +4992,30 @@ metric_info['aws_s3_select_object_returned'] = { 'color': '41/a', } +metric_info['aws_s3_buckets'] = { + 'title': _('Buckets'), + 'unit': 'count', + 'color': '11/a', +} + +metric_info['aws_elb_load_balancers'] = { + 'title': _('Load balancers'), + 'unit': 'count', + 'color': '11/a', +} + +metric_info['aws_elb_load_balancer_listeners'] = { + 'title': _('Load balancer listeners'), + 'unit': 'count', + 'color': '12/a', +} + +metric_info['aws_elb_load_balancer_registered_instances'] = { + 'title': _('Load balancer registered instances'), + 'unit': 'count', + 'color': '13/a', +} + metric_info["elapsed_time"] = { "title": _("Elapsed time"), "unit": "s", diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 630fc2a..0506009 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -440,7 +440,7 @@ class RulespecCheckgroupParametersAwsS3Limits(CheckParameterRulespecWithoutItem) @property def parameter_valuespec(self): - return Dictionary(elements=[('buckets_limit_levels', _vs_limits("Buckets", 100))]) + return Dictionary(elements=[('buckets', _vs_limits("Buckets", 100))]) #. @@ -710,10 +710,9 @@ class RulespecCheckgroupParametersAwsElbLimits(CheckParameterRulespecWithoutItem @property def parameter_valuespec(self): return Dictionary(elements=[ - ('load_balancers_limit_levels', _vs_limits("Load balancers", 20)), - ('load_balancer_listeners_limit_levels', - _vs_limits("Listeners per load balancer", 100)), - ('load_balancer_registered_instances_limit_levels', + ('load_balancers', _vs_limits("Load balancers", 20)), + ('load_balancer_listeners', _vs_limits("Listeners per load balancer", 100)), + ('load_balancer_registered_instances', _vs_limits("Registered instances per load balancer", 1000)), ])

5 years, 3 months

Fixed broken PNP graph context menu icon

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fe6868f0a60828a6f1696ededec9f980fdbf4e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fe6868f0a6082… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 09:56:47 2019 +0100 Fixed broken PNP graph context menu icon Change-Id: I0736676f6c7d6596a244be0d9a53ee1037681f96 --- web/htdocs/js/modules/graph_integration.js | 1 - web/htdocs/themes/classic/scss/_pages.scss | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/modules/graph_integration.js b/web/htdocs/js/modules/graph_integration.js index 095fc86..d2f6bb9 100644 --- a/web/htdocs/js/modules/graph_integration.js +++ b/web/htdocs/js/modules/graph_integration.js @@ -116,7 +116,6 @@ function create_pnp_graph(data, params) { var visualadd = document.createElement("a"); visualadd.title = data["add_txt"]; visualadd.className = "popup_trigger"; - visualadd.innerHTML = "<img src=\"images/icon_menu.png\" class=\"icon\">"; visualadd.onclick = function(host, service, view, source) { return function(event) { popup_menu.toggle_popup(event, this, "add_visual", "add_visual", diff --git a/web/htdocs/themes/classic/scss/_pages.scss b/web/htdocs/themes/classic/scss/_pages.scss index 1d5a9aa..745ccfc 100644 --- a/web/htdocs/themes/classic/scss/_pages.scss +++ b/web/htdocs/themes/classic/scss/_pages.scss @@ -1458,6 +1458,8 @@ div.pnp_graph a.popup_trigger { display: block; width: 20px; height: 20px; + background-image: url(images/icon_menu.png); + background-size: contain; } div.pnp_graph a.popup_trigger:hover {

5 years, 3 months

Changed "archive event" icon

by Lars Michelsen

Module: check_mk Branch: master Commit: 7514e7107cb55c2614ba9b3dffe65e57c9dac2f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7514e7107cb55c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 10:03:16 2019 +0100 Changed "archive event" icon The previous garbage can was misleading. CMK-1371 Change-Id: I6f1bf50240708c8b3cd665779b4f03f973f2ba79 --- cmk/gui/plugins/views/mkeventd.py | 2 +- web/htdocs/themes/classic/images/icon_archive_event.png | Bin 0 -> 3487 bytes web/htdocs/themes/facelift/images/icon_archive_event.png | Bin 0 -> 723 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/mkeventd.py b/cmk/gui/plugins/views/mkeventd.py index 9edc26f..a1641e7 100644 --- a/cmk/gui/plugins/views/mkeventd.py +++ b/cmk/gui/plugins/views/mkeventd.py @@ -824,7 +824,7 @@ def render_delete_event_icons(row): ] url = html.makeactionuri( urlvars, filename=filename, delvars=["selection", "show_checkboxes"]) - return html.render_icon_button(url, _("Archive this event"), "delete") + return html.render_icon_button(url, _("Archive this event"), "archive_event") else: return '' diff --git a/web/htdocs/themes/classic/images/icon_archive_event.png b/web/htdocs/themes/classic/images/icon_archive_event.png new file mode 100644 index 0000000..ce3dc78 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_archive_event.png differ diff --git a/web/htdocs/themes/facelift/images/icon_archive_event.png b/web/htdocs/themes/facelift/images/icon_archive_event.png new file mode 100644 index 0000000..378c441 Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_archive_event.png differ

5 years, 3 months

Fixed broken icon and styling of profile replication

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a6296489b64cf2d81d20e29914314f9a620dff7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a6296489b64cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 09:17:56 2019 +0100 Fixed broken icon and styling of profile replication Change-Id: I8f851ea265783dfb63159c07775d5bd08bde56cc --- cmk/gui/wato/user_profile.py | 3 +-- web/htdocs/js/modules/profile_replication.js | 6 ++--- web/htdocs/themes/classic/scss/_check_mk.scss | 4 ++-- web/htdocs/themes/classic/scss/_wato.scss | 34 ++++++++++++++++++++++++++- web/htdocs/themes/facelift/scss/_main.scss | 6 +++++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/cmk/gui/wato/user_profile.py b/cmk/gui/wato/user_profile.py index e23c708..ce37acf 100644 --- a/cmk/gui/wato/user_profile.py +++ b/cmk/gui/wato/user_profile.py @@ -82,8 +82,7 @@ def user_profile_async_replication_dialog(sites): icon = 'repl_pending' html.open_div(class_="site", id_="site-%s" % site_id) - - html.icon(status_txt, icon) + html.div("", title=status_txt, class_=["icon", "repl_status", icon]) if start_sync: changes_manager = watolib.ActivateChanges() changes_manager.load() diff --git a/web/htdocs/js/modules/profile_replication.js b/web/htdocs/js/modules/profile_replication.js index ba72e0f..43377b0 100644 --- a/web/htdocs/js/modules/profile_replication.js +++ b/web/htdocs/js/modules/profile_replication.js @@ -60,9 +60,9 @@ export function start(siteid, est, progress_text) { } function set_status(siteid, image, text) { - var oImg = document.getElementById("site-" + siteid).childNodes[0]; - oImg.title = text; - oImg.src = "images/icon_"+image+".png"; + var icon = document.getElementById("site-" + siteid).getElementsByClassName("repl_status")[0]; + icon.title = text; + icon.className = "icon repl_status " + image; } export function step(siteid, est, progress_text) { diff --git a/web/htdocs/themes/classic/scss/_check_mk.scss b/web/htdocs/themes/classic/scss/_check_mk.scss index 456ae47..773ca47 100644 --- a/web/htdocs/themes/classic/scss/_check_mk.scss +++ b/web/htdocs/themes/classic/scss/_check_mk.scss @@ -326,13 +326,13 @@ input:hover, select:hover, textarea:hover { browser. That way if you select a zoom level in the browser, the quality of the images are better */ -img.icon { +img.icon, div.icon { width: 20px; height: 20px; } a.inline img.icon, -img.icon.inline { +img.icon.inline, div.icon { vertical-align: middle; width: 16px; height: 16px; diff --git a/web/htdocs/themes/classic/scss/_wato.scss b/web/htdocs/themes/classic/scss/_wato.scss index c72d7f7..7990b44 100644 --- a/web/htdocs/themes/classic/scss/_wato.scss +++ b/web/htdocs/themes/classic/scss/_wato.scss @@ -1395,10 +1395,42 @@ table.nform.rulesettings td.legend div.title { text-overflow: ellipsis; } -#profile_repl .site img, #profile_repl .site span { +#profile_repl div.site div, #profile_repl div.site span { vertical-align: middle; + display: inline-block; +} + +#profile_repl div.repl_status { + background-size: contain; +} + +#profile_repl div.repl_locked { + background-image: url(images/icon_repl_locked.png); +} + +#profile_repl div.repl_pending { + background-image: url(images/icon_repl_pending.png); +} + +#profile_repl div.repl_failed { + background-image: url(images/icon_repl_failed.png); +} + +#profile_repl div.repl_25 { + background-image: url(images/icon_repl_25.png); +} + +#profile_repl div.repl_50 { + background-image: url(images/icon_repl_50.png); +} + +#profile_repl div.repl_75 { + background-image: url(images/icon_repl_75.png); } +#profile_repl div.repl_success { + background-image: url(images/icon_success.png); +} .wato table.data.check_catalog td.title { width: 500px; diff --git a/web/htdocs/themes/facelift/scss/_main.scss b/web/htdocs/themes/facelift/scss/_main.scss index 6974e83..f3c6f30 100644 --- a/web/htdocs/themes/facelift/scss/_main.scss +++ b/web/htdocs/themes/facelift/scss/_main.scss @@ -1767,3 +1767,9 @@ img.glass { display: block; } #hover_menu .graph_container div.time { letter-spacing: 0px; } + +#profile_repl .site { + box-shadow: none; + background: $theme-color-white; + border: 1px solid $theme-color-table-border; +}

5 years, 3 months

Unbreak two 'log' table columns.

by Sven Panne

Module: check_mk Branch: master Commit: 3576cc719e43dde4145290c0097bf58f2c48ed75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3576cc719e43dd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 28 11:50:26 2019 +0100 Unbreak two 'log' table columns. Things looks like an Emacs keyboard macro gone horribly wrong... :-} Change-Id: I17fa23c83aaf32ac99d59dc34a61019896e2c401 --- livestatus/src/TableLog.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index f05e317..2ce18d1 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -97,14 +97,14 @@ TableLog::TableLog(MonitoringCore *mc, LogCache *log_cache) -1, -1, DANGEROUS_OFFSETOF(LogEntry, _state))); addColumn(std::make_unique<OffsetSStringColumn>( "state_type", "The type of the state (varies on different log classes)", - entry_offset - 1, -1, -1, DANGEROUS_OFFSETOF(LogEntry, _state_type))); + entry_offset, -1, -1, DANGEROUS_OFFSETOF(LogEntry, _state_type))); addColumn(std::make_unique<OffsetIntColumn>( "attempt", "The number of the check attempt", entry_offset, -1, -1, DANGEROUS_OFFSETOF(LogEntry, _attempt))); addColumn(std::make_unique<OffsetSStringColumn>( "service_description", "The description of the service log entry is about (might be empty)", - entry_offset - 1, -1, -1, + entry_offset, -1, -1, DANGEROUS_OFFSETOF(LogEntry, _service_description))); addColumn(std::make_unique<OffsetSStringColumn>( "host_name",

5 years, 4 months

sap_hana_*: Fixed catalog entry and added hint about deprecated check plugins to related man pages

by Simon Betz

Module: check_mk Branch: master Commit: cab86343e2d06e9d35b87f321fbe7044816e75e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cab86343e2d06e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 28 10:43:14 2019 +0100 sap_hana_*: Fixed catalog entry and added hint about deprecated check plugins to related man pages Change-Id: Ica6910826b67ee63346b2a72148426f2b10c28f2 --- checkman/sap_hana_filesystem | 5 ++++- checkman/sap_hana_full_backup | 5 ++++- checkman/sap_hana_mem | 5 ++++- checkman/sap_hana_mem.database | 5 ++++- checkman/sap_hana_process_list | 5 ++++- checkman/sap_hana_version | 5 ++++- cmk/utils/man_pages.py | 1 + 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/checkman/sap_hana_filesystem b/checkman/sap_hana_filesystem index a235f3a..3d6e468 100644 --- a/checkman/sap_hana_filesystem +++ b/checkman/sap_hana_filesystem @@ -1,12 +1,15 @@ title: SAP HANA: Filesystem agents: linux -catalog: app/sap-hana +catalog: app/sap_hana license: GPL distribution: check_mk description: This check monitors filesystem usage of SAP HANA instances. No default levels are set. + Note: This check is deprecated and replaced by newer checks. + See werk 7100 for detailed information. + item: Instance and filesystem name. diff --git a/checkman/sap_hana_full_backup b/checkman/sap_hana_full_backup index 439bcb9..4204f79 100644 --- a/checkman/sap_hana_full_backup +++ b/checkman/sap_hana_full_backup @@ -1,6 +1,6 @@ title: SAP HANA: Full database backup agents: linux -catalog: app/sap-hana +catalog: app/sap_hana license: GPL distribution: check_mk description: @@ -10,6 +10,9 @@ description: Moveover the check reports the duration of the backup and the how many days the last backup was executed. + Note: This check is deprecated and replaced by newer checks. + See werk 7100 for detailed information. + item: The instance name. diff --git a/checkman/sap_hana_mem b/checkman/sap_hana_mem index 6857fa5..ac12727 100644 --- a/checkman/sap_hana_mem +++ b/checkman/sap_hana_mem @@ -1,11 +1,14 @@ title: SAP HANA: Resident Memory agents: linux -catalog: app/sap-hana +catalog: app/sap_hana license: GPL distribution: check_mk description: This check monitors the resident memory of SAP HANA instances. + Note: This check is deprecated and replaced by newer checks. + See werk 7100 for detailed information. + item: The instance name. diff --git a/checkman/sap_hana_mem.database b/checkman/sap_hana_mem.database index 3faee0f..fe2f1e0 100644 --- a/checkman/sap_hana_mem.database +++ b/checkman/sap_hana_mem.database @@ -1,11 +1,14 @@ title: SAP HANA: Database Memory agents: linux -catalog: app/sap-hana +catalog: app/sap_hana license: GPL distribution: check_mk description: This check monitors the database memory of SAP HANA instances. + Note: This check is deprecated and replaced by newer checks. + See werk 7100 for detailed information. + item: The instance name. diff --git a/checkman/sap_hana_process_list b/checkman/sap_hana_process_list index cd10922..ad8a403 100644 --- a/checkman/sap_hana_process_list +++ b/checkman/sap_hana_process_list @@ -1,6 +1,6 @@ title: SAP HANA: Processes agents: linux -catalog: app/sap-hana +catalog: app/sap_hana license: GPL distribution: check_mk description: @@ -8,6 +8,9 @@ description: The check is OK is the status is GREEN; otherwise CRIT. + Note: This check is deprecated and replaced by newer checks. + See werk 7100 for detailed information. + item: The process name diff --git a/checkman/sap_hana_version b/checkman/sap_hana_version index bfa3ce6..5b6df2e 100644 --- a/checkman/sap_hana_version +++ b/checkman/sap_hana_version @@ -1,10 +1,13 @@ title: SAP HANA: Version agents: linux -catalog: app/sap-hana +catalog: app/sap_hana license: GPL distribution: check_mk description: This check shows the version of SAP HANA. + Note: This check is deprecated and replaced by newer checks. + See werk 7100 for detailed information. + inventory: One service is created. diff --git a/cmk/utils/man_pages.py b/cmk/utils/man_pages.py index b6d8e61..c816d26 100644 --- a/cmk/utils/man_pages.py +++ b/cmk/utils/man_pages.py @@ -175,6 +175,7 @@ catalog_titles = { "qmail" : "qmail", "ruckus" : "Ruckus Spot", "sap" : "SAP R/3", + "sap_hana" : "SAP HANA", "tsm" : "IBM Tivoli Storage Manager (TSM)", "unitrends" : "Unitrends", "sansymphony" : "Datacore SANsymphony",

5 years, 4 months

7042 mk_logwatch: Support configuration of subnetworks in CIDR notation

by Florian Kromer

Module: check_mk Branch: master Commit: 9a5f7a44de24375d838b537d6140a8d3d023a790 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a5f7a44de2437… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Feb 27 17:37:27 2019 +0100 7042 mk_logwatch: Support configuration of subnetworks in CIDR notation This werk adds support for the lookup of the remote ip against IPv4 and IPv6 subnetworks (CIDR notation) in the logwatch cluster configurations. Until now the cluster mapping allowed lookup of the remote ip against IPv4 and IPv6 addressess only. CMK-1690 Change-Id: I6e997780497613bd2f7a534e05a616b51a18b03e --- .werks/7042 | 14 ++++ agents/cfg_examples/logwatch.cfg | 9 ++- agents/plugins/mk_logwatch | 97 ++++++++++++++++++++++----- tests/unit/agents/plugins/test_mk_logwatch.py | 29 +++++++- 4 files changed, 129 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9a5f7a44de…

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019