Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

agent_aws: Started AWS/Cloudwatch alarms

by Simon Betz

Module: check_mk Branch: master Commit: c33922b59dfac9584bf0b19c38156bea1c4e3e8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c33922b59dfac9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 8 08:13:02 2019 +0200 agent_aws: Started AWS/Cloudwatch alarms New checks are: - aws_cloudwatch_alarms_limits - aws_cloudwatch_alarms CMK-1969 Change-Id: I10f35c71dcc68c85fc7e44111ab958cfccbeab84 --- checkman/aws_cloudwatch_alarms | 16 ++ checkman/aws_cloudwatch_alarms_limits | 19 +++ checks/agent_aws | 7 + checks/aws_cloudwatch_alarms | 61 +++++++ checks/aws_cloudwatch_alarms_limits | 50 ++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 36 ++++ cmk/gui/plugins/wato/datasource_programs.py | 18 +- cmk/special_agents/agent_aws.py | 99 +++++++++++ .../test_agent_aws_cloudwatch_alarms.py | 183 +++++++++++++++++++++ 9 files changed, 488 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c33922b59d…

5 years, 5 months

agent_aws, aws checks: Minor cleanup and a few bug fixes

by Simon Betz

Module: check_mk Branch: master Commit: 0810f4741c401680c03c2bb83f7ed820af38a177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0810f4741c4016… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 10 12:00:44 2019 +0200 agent_aws, aws checks: Minor cleanup and a few bug fixes - Wrong data structure of limits - Wrong representation function of RDS limits - Added missing perf data - Adapted help text in agent_aws - Exclude limit perf data including kind of dynamic names - Sort long output of limits check Change-Id: I0d3e792a7c0ac1286004fe4221251ac9183d586d --- checks/aws.include | 28 +++++++++++++++--- checks/aws_ebs_limits | 2 +- checks/aws_ec2_limits | 14 ++++----- checks/aws_rds_limits | 5 +++- cmk/gui/plugins/metrics/check_mk.py | 44 ++++++++++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 2 +- cmk/special_agents/agent_aws.py | 4 +-- 7 files changed, 81 insertions(+), 18 deletions(-) diff --git a/checks/aws.include b/checks/aws.include index 653de18..1f8b84e 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -85,6 +85,23 @@ def inventory_aws_generic_single(parsed, required_metrics): return [(None, {})] +# Some limit values have dynamic names, eg. +# 'Rules of VPC security group %s' % SECURITY_GROUP +# At the moment we exclude them in the performance data. If it's +# a limit for a piggyback host, we do NOT exclude, eg. 'load_balancer_listeners' +# and 'load_balancer_registered_instances' per load balancer piggyback host +_exclude_aws_limits_perf_vars = [ + 'vpc_sec_group_rules', + 'vpc_sec_groups', +] + + +def _is_valid_aws_limits_perf_data(perfvar): + if perfvar in _exclude_aws_limits_perf_vars: + return False + return True + + def check_aws_limits(aws_service, params, parsed): """ Generic check for checking limits of AWS resource. @@ -99,7 +116,7 @@ def check_aws_limits(aws_service, params, parsed): if human_readable_func is None: human_readable_func = lambda x: "%s" % x - p_limit, (warn, crit) = params[resource_key] + p_limit, warn, crit = params[resource_key] if p_limit is None: limit_ref = limit else: @@ -107,8 +124,10 @@ def check_aws_limits(aws_service, params, parsed): 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 _is_valid_aws_limits_perf_data(resource_key): + perfvar = "aws_%s_%s" % (aws_service, resource_key) + perfdata.append((perfvar, amount)) if not limit_ref: continue @@ -129,5 +148,6 @@ def check_aws_limits(aws_service, params, parsed): 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) + yield 0, "\n%s" % "\n".join(sorted(long_output)) diff --git a/checks/aws_ebs_limits b/checks/aws_ebs_limits index 7e7afad..bd22299 100644 --- a/checks/aws_ebs_limits +++ b/checks/aws_ebs_limits @@ -52,7 +52,7 @@ def parse_aws_ebs_limits(info): elif resource_key == "block_store_iops_io1": human_readable_func = lambda x: "%s/s" % x else: - human_readable_func = None + human_readable_func = int parsed.append((resource_key, resource_title, limit, amount, human_readable_func)) return parsed diff --git a/checks/aws_ec2_limits b/checks/aws_ec2_limits index 7a65a8a..cd785d0 100644 --- a/checks/aws_ec2_limits +++ b/checks/aws_ec2_limits @@ -26,7 +26,7 @@ from cmk.special_agents.agent_aws import AWSEC2InstTypes -_aws_ec2_limits_default_levels = { +factory_settings['aws_ec2_limits_default_levels'] = { 'vpc_elastic_ip_addresses': (None, 80.0, 90.0), 'elastic_ip_addresses': (None, 80.0, 90.0), 'vpc_sec_group_rules': (None, 80.0, 90.0), @@ -36,12 +36,9 @@ _aws_ec2_limits_default_levels = { 'active_spot_fleet_requests': (None, 80.0, 90.0), 'spot_fleet_total_target_capacity': (None, 80.0, 90.0), 'running_ondemand_instances_total': (None, 80.0, 90.0), + 'running_ondemand_instances': + [(inst_type, (None, 80.0, 90.0)) for inst_type in AWSEC2InstTypes], } -_aws_ec2_limits_default_levels.update({ - 'running_ondemand_instances_%s' % inst_type: (None, 80.0, 90.0) for inst_type in AWSEC2InstTypes -}) - -factory_settings['aws_ec2_limits_default_levels'] = _aws_ec2_limits_default_levels def parse_aws_ec2_limits(info): @@ -55,9 +52,8 @@ def _transform_ec2_limits(params): if isinstance(v, tuple): transformed[k] = v elif isinstance(v, list): - # As we get from agent - for inst_type, levels in v: - transformed['running_ondemand_instances_%s' % inst_type] = levels + transformed.update( + {'running_ondemand_instances_%s' % inst_type: levels for inst_type, levels in v}) return transformed diff --git a/checks/aws_rds_limits b/checks/aws_rds_limits index c3fa675..f0a7a33 100644 --- a/checks/aws_rds_limits +++ b/checks/aws_rds_limits @@ -51,7 +51,10 @@ def parse_aws_rds_limits(info): factor = 1024**4 / 1000 limit = limit * factor amount = amount * factor - parsed.append(resource_key, resource_title, limit, amount, get_bytes_human_readable) + human_readable_f = get_bytes_human_readable + else: + human_readable_f = int + parsed.append((resource_key, resource_title, limit, amount, human_readable_f)) return parsed diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 2187ca5..6482bf8 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -5071,6 +5071,50 @@ metric_info['aws_request_latency'] = { 'color': '21/a', } +metric_info['aws_ec2_vpc_elastic_ip_addresses'] = { + 'title': _('VPC Elastic IP Addresses'), + 'unit': 'count', + 'color': '11/a', +} + +metric_info['aws_ec2_elastic_ip_addresses'] = { + 'title': _('Elastic IP Addresses'), + 'unit': 'count', + 'color': '13/a', +} + +metric_info['aws_ec2_spot_inst_requests'] = { + 'title': _('Spot Instance Requests'), + 'unit': 'count', + 'color': '15/a', +} + +metric_info['aws_ec2_active_spot_fleet_requests'] = { + 'title': _('Active Spot Fleet Requests'), + 'unit': 'count', + 'color': '21/a', +} + +metric_info['aws_ec2_spot_fleet_total_target_capacity'] = { + 'title': _('Spot Fleet Requests Total Target Capacity'), + 'unit': 'count', + 'color': '23/a', +} + +metric_info['aws_ec2_running_ondemand_instances_total'] = { + 'title': _('Total Running On-Demand Instances'), + 'unit': 'count', + 'color': '25/a', +} + +from cmk.special_agents.agent_aws import AWSEC2InstTypes +for inst_type in AWSEC2InstTypes: + metric_info['aws_ec2_running_ondemand_instances_%s' % inst_type] = { + 'title': _('Total Running On-Demand %s Instances') % inst_type, + 'unit': 'count', + 'color': '11/a', + } + metric_info['get_requests'] = { 'title': _('GET Requests'), 'unit': '1/s', diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 87061e3..863d401 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -167,7 +167,7 @@ def _vs_limits(resource, default_limit, vs_limit_cls=None): Tuple( title=_("Set levels"), elements=[ - vs_limit, + Alternative(elements=[FixedValue(None, totext="Limit from AWS API"), vs_limit]), Percentage(title=_("Warning at"), default_value=80.0), Percentage(title=_("Critical at"), default_value=90.0), ]), diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 259f2d6..5857e12 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -2435,9 +2435,9 @@ def parse_arguments(argv): ) parser.add_argument( - "--access-key-id", required=True, help="The access key for your AWS account.") + "--access-key-id", required=True, help="The access key ID for your AWS account.") parser.add_argument( - "--secret-access-key", required=True, help="The secret key for your AWS account.") + "--secret-access-key", required=True, help="The secret access key for your AWS account.") parser.add_argument( "--regions", nargs='+',

5 years, 5 months

mysql: add tests

by Moritz Kiemer

Module: check_mk Branch: master Commit: f9e9001ad7231205926d643df4bd9f0e91a1072d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9e9001ad72312… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 10 12:48:39 2019 +0200 mysql: add tests Change-Id: I9182f83a2872b6d1160b94f556e54a52ebcbaeda --- checks/mysql_ping | 5 - .../generictests/datasets/mysql_1_regression.py | 229 +++++++++++++++++++++ .../datasets/mysql_capacity_1_regression.py | 25 +++ .../datasets/mysql_ping_1_regression.py | 27 +++ 4 files changed, 281 insertions(+), 5 deletions(-) diff --git a/checks/mysql_ping b/checks/mysql_ping index 8304440..3cb6a57 100644 --- a/checks/mysql_ping +++ b/checks/mysql_ping @@ -29,11 +29,6 @@ # mysqladmin: connect to server at 'localhost' failed # error: 'Access denied for user 'root'@'localhost' (using password: NO)' # -# parsed = { -# "instance1" : [ "mysqld is alive" ], -# "instance2" : [ "mysqladmin: connect to server at 'localhost' failed", -# "error: 'Access denied for user 'root'@'localhost' (using password: NO)'" ] -# } # FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions diff --git a/tests/unit/checks/generictests/datasets/mysql_1_regression.py b/tests/unit/checks/generictests/datasets/mysql_1_regression.py new file mode 100644 index 0000000..82b77de --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mysql_1_regression.py @@ -0,0 +1,229 @@ +# yapf: disable + + +checkname = 'mysql' + + +info = [['[[mysql]]'], + ['version', 'Cheesgrater Edition'], + ['Aborted_clients', '0'], + ['Aborted_connects', '15'], + ['Binlog_cache_disk_use', '0'], + ['Binlog_cache_use', '0'], + ['Binlog_stmt_cache_disk_use', '0'], + ['Binlog_stmt_cache_use', '0'], + ['Bytes_received', '7198841'], + ['Bytes_sent', '19266624'], + ['Com_admin_commands', '200'], + ['Com_assign_to_keycache', '0'], + ['Com_alter_db', '0'], + ['Com_alter_db_upgrade', '0'], + ['Threads_connected', '42'], + ['Connections', '2'], + ['Threads_running', '23'], + ['0', '0'], + ['1', '1'], + ['2', '2'], + ['3', '3'], + ['4', '4'], + ['5', '5'], + ['6', '6'], + ['7', '7'], + ['8', '8'], + ['9', '9'], + ['10', '10'], + ['11', '11'], + ['12', '12'], + ['13', '13'], + ['14', '14'], + ['15', '15'], + ['16', '16'], + ['17', '17'], + ['18', '18'], + ['19', '19'], + ['20', '20'], + ['21', '21'], + ['22', '22'], + ['23', '23'], + ['24', '24'], + ['25', '25'], + ['26', '26'], + ['27', '27'], + ['28', '28'], + ['29', '29'], + ['30', '30'], + ['31', '31'], + ['32', '32'], + ['33', '33'], + ['34', '34'], + ['35', '35'], + ['36', '36'], + ['37', '37'], + ['38', '38'], + ['39', '39'], + ['40', '40'], + ['41', '41'], + ['42', '42'], + ['43', '43'], + ['44', '44'], + ['45', '45'], + ['46', '46'], + ['47', '47'], + ['48', '48'], + ['49', '49'], + ['50', '50'], + ['51', '51'], + ['52', '52'], + ['53', '53'], + ['54', '54'], + ['55', '55'], + ['56', '56'], + ['57', '57'], + ['58', '58'], + ['59', '59'], + ['60', '60'], + ['61', '61'], + ['62', '62'], + ['63', '63'], + ['64', '64'], + ['65', '65'], + ['66', '66'], + ['67', '67'], + ['68', '68'], + ['69', '69'], + ['70', '70'], + ['71', '71'], + ['72', '72'], + ['73', '73'], + ['74', '74'], + ['75', '75'], + ['76', '76'], + ['77', '77'], + ['78', '78'], + ['79', '79'], + ['80', '80'], + ['81', '81'], + ['82', '82'], + ['83', '83'], + ['84', '84'], + ['85', '85'], + ['86', '86'], + ['87', '87'], + ['88', '88'], + ['89', '89'], + ['90', '90'], + ['91', '91'], + ['92', '92'], + ['93', '93'], + ['94', '94'], + ['95', '95'], + ['96', '96'], + ['97', '97'], + ['98', '98'], + ['99', '99'], + ['100', '100'], + ['101', '101'], + ['102', '102'], + ['103', '103'], + ['104', '104'], + ['105', '105'], + ['106', '106'], + ['107', '107'], + ['108', '108'], + ['109', '109'], + ['110', '110'], + ['111', '111'], + ['112', '112'], + ['113', '113'], + ['114', '114'], + ['115', '115'], + ['116', '116'], + ['117', '117'], + ['118', '118'], + ['119', '119'], + ['120', '120'], + ['121', '121'], + ['122', '122'], + ['123', '123'], + ['124', '124'], + ['125', '125'], + ['126', '126'], + ['127', '127'], + ['128', '128'], + ['129', '129'], + ['130', '130'], + ['131', '131'], + ['132', '132'], + ['133', '133'], + ['134', '134'], + ['135', '135'], + ['136', '136'], + ['137', '137'], + ['138', '138'], + ['139', '139'], + ['140', '140'], + ['141', '141'], + ['142', '142'], + ['143', '143'], + ['144', '144'], + ['145', '145'], + ['146', '146'], + ['147', '147'], + ['148', '148'], + ['149', '149'], + ['150', '150'], + ['151', '151'], + ['152', '152'], + ['153', '153'], + ['154', '154'], + ['155', '155'], + ['156', '156'], + ['157', '157'], + ['158', '158'], + ['159', '159'], + ['160', '160'], + ['161', '161'], + ['162', '162'], + ['163', '163'], + ['164', '164'], + ['165', '165'], + ['166', '166'], + ['167', '167'], + ['168', '168'], + ['169', '169'], + ['170', '170'], + ['171', '171'], + ['172', '172'], + ['173', '173'], + ['174', '174'], + ['175', '175'], + ['176', '176'], + ['177', '177'], + ['178', '178'], + ['179', '179'], + ['180', '180'], + ['181', '181'], + ['182', '182'], + ['183', '183'], + ['184', '184'], + ['185', '185'], + ['186', '186'], + ['187', '187'], + ['188', '188'], + ['189', '189']] + + +discovery = {'': [('mysql', {})], + 'connections': [], + 'innodb_io': [], + 'sessions': [('mysql', {})]} + + +checks = {'': [('mysql', {}, [(0, 'Version: Cheesgrater Edition', [])])], + 'sessions': [('mysql', + {}, + [(0, + '42 total, 23 running, 0.00 connections/s', + [('total_sessions', 42, None, None, None, None), + ('running_sessions', 23, None, None, None, None), + ('connect_rate', 0.0, None, None, None, None)])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/datasets/mysql_capacity_1_regression.py b/tests/unit/checks/generictests/datasets/mysql_capacity_1_regression.py new file mode 100644 index 0000000..343df8d --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mysql_capacity_1_regression.py @@ -0,0 +1,25 @@ +# yapf: disable + + +checkname = 'mysql_capacity' + + +info = [['[[]]'], + ['information_schema', '147456', '0'], + ['mysql', '665902', '292'], + ['performance_schema', '0', '0'], + ['test', '409255936', '54525952']] + + +discovery = { + '': [ + ('mysql:test', {}), + ], +} + + +checks = { + '': [ + ('mysql:test', {}, [(0, 'Size: 390.30 MB', [('database_size', 409255936, None, None, None, None)])]), + ], +} diff --git a/tests/unit/checks/generictests/datasets/mysql_ping_1_regression.py b/tests/unit/checks/generictests/datasets/mysql_ping_1_regression.py new file mode 100644 index 0000000..4fe7bce --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mysql_ping_1_regression.py @@ -0,0 +1,27 @@ +# yapf: disable + + +checkname = 'mysql_ping' + + +info = [['this', 'line', 'is', 'ignored'], + ['[[elephant]]'], + ['mysqladmin:', 'connect', 'to', 'server', 'at', "'localhost'", 'failed'], + ['[[moth]]'], + ['mysqld', 'is', 'alive']] + + +discovery = { + '': [ + ('elephant', {}), + ('moth', {}), + ], +} + + +checks = { + '': [ + ('elephant', {}, [(2, "mysqladmin: connect to server at 'localhost' failed", [])]), + ('moth', {}, [(0, 'MySQL Deamon is alive', [])]), + ], +}

5 years, 5 months

GUI CSS: Moved commented out wato styles from classic to facelift theme ( CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: a2a5bad4b19fdd618c4ce533dc4c754c2b178fe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2a5bad4b19fdd… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Wed Apr 10 11:41:01 2019 +0200 GUI CSS: Moved commented out wato styles from classic to facelift theme (CMK-1171) Change-Id: Ia5f9a1ddc49905fcc78e7e5844e3c035769688ab --- web/htdocs/themes/facelift/scss/_wato.scss | 1482 ++++++++++++++++++++++++++++ web/htdocs/themes/facelift/theme.scss | 1 + 2 files changed, 1483 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a2a5bad4b1…

5 years, 5 months

GUI CSS: Removed wrong background color for screenshot mode (CMK-1453)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 8a152ea44079bf4f62ccf1cb1e1083690bd77a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a152ea44079bf… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Wed Apr 10 11:26:44 2019 +0200 GUI CSS: Removed wrong background color for screenshot mode (CMK-1453) Change-Id: I29a091ca922f3c90b4eb6a023c9440e0d7f9666a --- web/htdocs/themes/facelift/scss/_views.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/htdocs/themes/facelift/scss/_views.scss b/web/htdocs/themes/facelift/scss/_views.scss index cee4721..e60f6b5 100644 --- a/web/htdocs/themes/facelift/scss/_views.scss +++ b/web/htdocs/themes/facelift/scss/_views.scss @@ -144,10 +144,6 @@ div.floatfilter { } } -body.main.screenshotmode div.floatfilter { - background-color: #5893af; -} - .filterform > tbody > tr > td div.floatfilter { position: relative; width: 372px;

5 years, 5 months

GUI CSS: Refactored logwatch styles to nested structure meeting sasslint requirements (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 2ed07527610e303669acf9b8d8b2fa09496ad2ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed07527610e30… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Wed Apr 10 11:13:21 2019 +0200 GUI CSS: Refactored logwatch styles to nested structure meeting sasslint requirements (CMK-1171) Change-Id: Icc31210fee6c3f65e3cbb800e27621df5bf5df30 --- web/htdocs/themes/facelift/scss/_logwatch.scss | 211 ++++++++++++------------- 1 file changed, 104 insertions(+), 107 deletions(-) diff --git a/web/htdocs/themes/facelift/scss/_logwatch.scss b/web/htdocs/themes/facelift/scss/_logwatch.scss index ca1cf28..9377fc5 100644 --- a/web/htdocs/themes/facelift/scss/_logwatch.scss +++ b/web/htdocs/themes/facelift/scss/_logwatch.scss @@ -27,159 +27,156 @@ Boston, MA 02110-1301 USA. /* Styles used in the logwatch pages */ #logwatch { - margin-top: 1ex; - color: #000; -} + margin-top: 6px; + color: #000; -#logwatch div.chunk { - border-width: 1px; - border-style: solid; - margin-bottom: 1em; - padding: 0.5ex; - border-color: #bbb #555 #222 #bbb; + div.chunk { + padding: 3px; + margin-bottom: 11px; background-color: #fff; -} + border-color: #bbb #555 #222 #bbb; + border-style: solid; + border-width: 1px; + } -#logwatch a { + a { + width: 26px; font-family: sans-serif; font-weight: bold; - width: 4em; color: #008; -} - -/* TODO: Reproduce this html element */ -#logwatch a b { - color: #08f; -} - -/* TODO: Reproduce this html element */ -#logwatch a.ack { - background-color: #33c; - color: #fff; - text-decoration: none; - border-width: 2px; - border-style: solid; - border-color: #ccc #888 #333 #777; - padding: 0.3ex 1ex; - border-radius: 6px; -} -#logwatch p { - font-family: courier, monospace; + /* TODO: Reproduce this html element */ + b { + color: #08f; + } + + /* TODO: Reproduce this html element */ + &.ack { + padding: 2.1px 7px; + color: #fff; + text-decoration: none; + background-color: #33c; + border-color: #ccc #888 #333 #777; + border-style: solid; + border-width: 2px; + border-radius: 6px; + } + } + + p { + padding: 1.6px 0 4px 12px; margin: 0; - padding: 0.2ex 0 0.5ex 0.2ex; - border-left: 1px solid #888; - border-right: 1px solid #888; - font-size: 10pt; - background-color: #ddd; - text-indent: -1.0ex; - padding-left: 1.5ex; + font-family: courier, monospace; + font-size: 13px; + text-indent: -8px; + word-wrap: break-word; /* IE */ white-space: pre-wrap; /* CSS3 */ white-space: -moz-pre-wrap; /* Firefox */ white-space: -pre-wrap; /* Opera <7 */ white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* IE */ -} + background-color: #ddd; + border-right: 1px solid #888; + border-left: 1px solid #888; -#logwatch p img { - margin-right: 2px; -} + img { + margin-right: 2px; + } + } -#logwatch .WARN { + .WARN { background-color: #ff8; border-bottom: 1px solid #cc0; -} + } -#logwatch .CRIT { + .CRIT { background-color: #f88; border-bottom: 1px solid #c00; -} + } -#logwatch .OK { + .OK { background-color: #0b3; border-bottom: 1px solid #0c0; -} + } -#logwatch td.WARN, td.CRIT, td.OK { - width: 5em; - text-align: center; - padding: 0em 0.5ex; + td.WARN, td.CRIT, td.OK { + width: 60px; + padding: 0 3px; margin: 0; font-weight: bold; -} - -#logwatch td.WARN { + text-align: center; border: 1px solid #000; + } + + td.WARN { background-color: #ff0; -} + } -#logwatch td.CRIT { - border: 1px solid #000; - background-color: #f00; + td.CRIT { color: #fff; -} + background-color: #f00; + } -#logwatch td.OK { - background-color: #0b3; - border: 1px solid #000; + td.OK { color: #fff; -} + background-color: #0b3; + } -#logwatch table.section { - margin: 0ex 0ex 0.8ex 0ex; - width: 100% -} + table.section { + width: 100%; + margin: 0 0 4.8px; + } -#logwatch .date { + .date { + padding-left: 6px; font-weight: normal; - padding-left: 1ex; color: #666; -} + } -/* TODO: Reproduce these three td.button elements */ -#logwatch td.button { + /* TODO: Reproduce these three td.button elements */ + td.button { text-align: right; -} - -#logwatch td.button a { - background-color: #cca; - color: #000; - text-decoration: none; - font-weight: normal; - border-width: 1px; - border-style: solid; - border-color: #ddd #888 #333 #ddd; - padding: 0.1ex 1ex; - border-radius: 4px; -} - -#logwatch td.button a:active { - background-color: #aa8; -} - -/* --- navigation tabs in logwatch ------------------ */ -/* TODO: Reproduce these .tab and .tabactive elements */ -#logwatch a.tab, #logwatch a.tabactive { - border-radius: 12px 12px 0px 0px; + a { + padding: .7px 7px; + font-weight: normal; + color: #000; + text-decoration: none; + background-color: #cca; + border-color: #ddd #888 #333 #ddd; + border-style: solid; + border-width: 1px; + border-radius: 4px; + + &:active { + background-color: #aa8; + } + } + } + + /* --- navigation tabs in logwatch ------------------ */ + /* TODO: Reproduce these .tab and .tabactive elements */ + + a.tab, a.tabactive { display: block; - margin-bottom: 0px; + width: 140px; + padding: 2.8px 12px; + margin-right: 2.1px; + margin-bottom: 0; color: #000; - padding: 0.4ex 1em; - border-style: none; + text-decoration: none; vertical-align: top; - margin-right: 0.3ex; background-color: #fc0; border-bottom: 1px solid #000; - text-decoration: none; - width: 140px; -} + border-style: none; + border-radius: 12px 12px 0 0; + } -#logwatch a.tab:hover { + a.tab:hover { padding-bottom: 10px; -} + } -#logwatch a.tabactive { + a.tabactive { padding-bottom: 6px; border-bottom-style: none; + } }

5 years, 5 months

openhardwaremonitor: Handles WMI timeouts

by Simon Betz

Module: check_mk Branch: master Commit: 305f3bd05867ec0984ce0d27055a86b3a2f471f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=305f3bd05867ec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 10 09:13:44 2019 +0200 openhardwaremonitor: Handles WMI timeouts Change-Id: I1437c7a1df7aa52d9a4669a7770294eb1d711ae8 --- .werks/7366 | 13 +++++++++++++ checks/openhardwaremonitor | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/.werks/7366 b/.werks/7366 new file mode 100644 index 0000000..72b3169 --- /dev/null +++ b/.werks/7366 @@ -0,0 +1,13 @@ +Title: openhardwaremonitor: Handles WMI timeouts correctly +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554899463 +Class: fix + +Newer Windows agents provide an additional column WMIStatus +with the possible value OK or Timeout. +In case of a WMI timeout the {{openhardwaremonitor}} services +go stale. diff --git a/checks/openhardwaremonitor b/checks/openhardwaremonitor index ce20800..ef6b267 100644 --- a/checks/openhardwaremonitor +++ b/checks/openhardwaremonitor @@ -170,6 +170,7 @@ def inventory_openhardwaremonitor(sensor_type, parsed): def check_openhardwaremonitor(sensor_type, item, params, parsed): if item in parsed.get(sensor_type, {}): data = parsed[sensor_type][item] + _check_openhardwaremonitor_wmistatus(data) if 'lower' in params: status_lower = _openhardwaremonitor_expect_order(params['lower'][1], params['lower'][0], data.reading) @@ -189,6 +190,11 @@ def check_openhardwaremonitor(sensor_type, item, params, parsed): '%.1f%s' % (data.reading, data.unit), perfdata) +def _check_openhardwaremonitor_wmistatus(data): + if data.WMIstatus.lower() == 'timeout': + raise MKCounterWrapped('WMI query timed out') + + # .--clock---------------------------------------------------------------. # | _ _ | # | ___| | ___ ___| | __ | @@ -231,6 +237,7 @@ def check_openhardwaremonitor_temperature(item, params, parsed): if item in parsed.get('Temperature', {}): data = parsed['Temperature'][item] + _check_openhardwaremonitor_wmistatus(data) return check_temperature(data.reading, params, "openhardwaremonitor_%s" % item) @@ -281,6 +288,7 @@ factory_settings['openhardwaremonitor_fan_default_levels'] = { def check_openhardwaremonitor_fan(item, params, parsed): if item in parsed.get("Fan", {}): data = parsed["Fan"][item] + _check_openhardwaremonitor_wmistatus(data) return check_fan(data.reading, params) @@ -338,6 +346,7 @@ def check_openhardwaremonitor_smart(item, params, parsed): warn, crit = params[reading['key']] data = parsed[sensor_type][reading_name] + _check_openhardwaremonitor_wmistatus(data) if reading.get('lower_bounds', False): status = _openhardwaremonitor_expect_order(crit, warn, data.reading)

5 years, 5 months

agent_vsphere: refactor to make pylint happier

by Moritz Kiemer

Module: check_mk Branch: master Commit: e4605401052bba7bd375d43f9ce6ca3680208607 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4605401052bba… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 10 09:29:02 2019 +0200 agent_vsphere: refactor to make pylint happier Change-Id: Ia6a478a8d5b5c43c7badee3b6c115612ee8bc857 --- agents/special/agent_vsphere | 189 ++++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e460540105…

5 years, 5 months

agent_vsphere: do nothing upon import

by Moritz Kiemer

Module: check_mk Branch: master Commit: a3ca76b50dfa71b68670fbc8a001917558e63dd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3ca76b50dfa71… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 10 11:09:26 2019 +0200 agent_vsphere: do nothing upon import clearly a main function would be better, but there are still to many globals. Now we can at least import and test. Change-Id: Ieb3f579ae5346681e21ee4678ec24f055937ee5d --- agents/special/agent_vsphere | 269 ++++++++++++++++++++++--------------------- 1 file changed, 135 insertions(+), 134 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index a3820d0..a0dd419 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1745,141 +1745,142 @@ def call_legacy_pysphere(): # | | # +----------------------------------------------------------------------+ -short_options = "hi:u:s:Dat:H:Pp:S:" -long_options = [ - "help", "user=", "secret=", "direct", "agent", "debug", "modules=", "timeout=", "no-cert-check", - "hostname=", "tracefile=", "pysphere", "port=", "spaces=", "host_pwr_display=", - "vm_pwr_display=", "snapshot_display=", "vm_piggyname=" -] - -opt_debug = False -opt_direct = False -opt_agent = False -opt_timeout = 60 -opt_port = 443 -opt_hostname = None -opt_skip_placeholder_vm = False -opt_pysphere = False -opt_tracefile = None -opt_host_pwr_display = None -opt_vm_pwr_display = None -opt_snapshot_display = None -opt_vm_piggyname = "alias" -opt_spaces = "underscore" -opt_no_cert = False - -host_address = None -g_user = None -g_secret = None -tracefile = None -query_objects = ['hostsystem', 'virtualmachine', 'datastore', 'counters', 'licenses'] - -try: - opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) -except getopt.GetoptError, get_opt_exc: - sys.stderr.write("%s\n" % get_opt_exc) - sys.exit(1) - -for o, a in opts: - if o in ['--debug']: - opt_debug = True - elif o in ['--tracefile']: - opt_tracefile = a - elif o in ['-D', '--direct']: - opt_direct = True - elif o in ['-a', '--agent']: - opt_agent = True - elif o == '-P': - opt_skip_placeholder_vm = True - elif o in ['-p', '--port']: - opt_port = a - elif o in ['--no-cert-check']: - opt_no_cert = True - elif o == '--pysphere': - opt_pysphere = True - elif o in ['-u', '--user']: - g_user = a - elif o in ['-s', '--secret']: - g_secret = a - elif o in ['-i', '--modules']: - query_objects = a.split(',') - elif o in ['-t', '--timeout']: - opt_timeout = int(a) - elif o in ['-H', '--hostname']: - opt_hostname = a - elif o in ['--vm_piggyname']: - opt_vm_piggyname = a - elif o in ['--vm_pwr_display']: - opt_vm_pwr_display = a - elif o in ['--host_pwr_display']: - opt_host_pwr_display = a - elif o in ['--snapshot_display']: - opt_snapshot_display = a - elif o in ['-S', '--spaces']: - if a not in ["cut", "underscore"]: +if __name__ == "__main__": + short_options = "hi:u:s:Dat:H:Pp:S:" + long_options = [ + "help", "user=", "secret=", "direct", "agent", "debug", "modules=", "timeout=", + "no-cert-check", "hostname=", "tracefile=", "pysphere", "port=", "spaces=", + "host_pwr_display=", "vm_pwr_display=", "snapshot_display=", "vm_piggyname=" + ] + + opt_debug = False + opt_direct = False + opt_agent = False + opt_timeout = 60 + opt_port = 443 + opt_hostname = None + opt_skip_placeholder_vm = False + opt_pysphere = False + opt_tracefile = None + opt_host_pwr_display = None + opt_vm_pwr_display = None + opt_snapshot_display = None + opt_vm_piggyname = "alias" + opt_spaces = "underscore" + opt_no_cert = False + + host_address = None + g_user = None + g_secret = None + tracefile = None + query_objects = ['hostsystem', 'virtualmachine', 'datastore', 'counters', 'licenses'] + + try: + opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) + except getopt.GetoptError, get_opt_exc: + sys.stderr.write("%s\n" % get_opt_exc) + sys.exit(1) + + for o, a in opts: + if o in ['--debug']: + opt_debug = True + elif o in ['--tracefile']: + opt_tracefile = a + elif o in ['-D', '--direct']: + opt_direct = True + elif o in ['-a', '--agent']: + opt_agent = True + elif o == '-P': + opt_skip_placeholder_vm = True + elif o in ['-p', '--port']: + opt_port = a + elif o in ['--no-cert-check']: + opt_no_cert = True + elif o == '--pysphere': + opt_pysphere = True + elif o in ['-u', '--user']: + g_user = a + elif o in ['-s', '--secret']: + g_secret = a + elif o in ['-i', '--modules']: + query_objects = a.split(',') + elif o in ['-t', '--timeout']: + opt_timeout = int(a) + elif o in ['-H', '--hostname']: + opt_hostname = a + elif o in ['--vm_piggyname']: + opt_vm_piggyname = a + elif o in ['--vm_pwr_display']: + opt_vm_pwr_display = a + elif o in ['--host_pwr_display']: + opt_host_pwr_display = a + elif o in ['--snapshot_display']: + opt_snapshot_display = a + elif o in ['-S', '--spaces']: + if a not in ["cut", "underscore"]: + usage() + sys.exit(1) + opt_spaces = a + elif o in ['-h', '--help']: usage() - sys.exit(1) - opt_spaces = a - elif o in ['-h', '--help']: - usage() - sys.exit(0) - -# If the --pysphere option is set we use the legacy pysphere agent, though 50 times slower... -if opt_pysphere: - sys.exit(call_legacy_pysphere()) - -if len(args) == 1: - host_address = args[0] -elif not args: - sys.stderr.write("ERROR: No host given.\n") - sys.exit(1) -else: - sys.stderr.write("ERROR: Please specify exactly one host.\n") - sys.exit(1) - -vsphere_output = [] - -socket.setdefaulttimeout(opt_timeout) - -if opt_tracefile: - tracefile_dir = os.path.dirname(opt_tracefile) or "." - if os.path.exists(tracefile_dir): - tracefile = file(opt_tracefile, "w") - elif opt_debug: - sys.stderr.write("Path for tracefile %s does not exist" % opt_tracefile) - sys.stderr.flush() - -if tracefile: - tracefile.write("Tracefile %s Host address: %s\n" % - (datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), host_address)) - -try: - esx_connection = ESXConnection((host_address, opt_port), g_user, g_secret, opt_no_cert, - opt_debug) - - # If the data aquisition fails, e.g. invalid cookie we try another run - for _run_count in [0, 1]: - # Note: If the cookie fails inbetween these calls, we also start a second run - try: - fetch_data(esx_connection) - break - except MKQueryServerException: - # There was a problem during the query. - # It is possible that the server cookie got invalid. - # We are delete the cookie and start a second run - vsphere_output = [] # Reset current output - esx_connection.delete_server_cookie() - esx_connection.login() - continue # do a second run - except Exception: - if opt_debug: - raise - raise MKGeneralException("Error while processing received data") + sys.exit(0) + + # If the --pysphere option is set we use the legacy pysphere agent, though 50 times slower... + if opt_pysphere: + sys.exit(call_legacy_pysphere()) -except MKGeneralException as exc: - sys.stderr.write("%s\n" % exc) - sys.exit(0 if opt_agent else 1) + if len(args) == 1: + host_address = args[0] + elif not args: + sys.stderr.write("ERROR: No host given.\n") + sys.exit(1) + else: + sys.stderr.write("ERROR: Please specify exactly one host.\n") + sys.exit(1) -write_output(vsphere_output, opt_agent, host_address) + vsphere_output = [] -sys.exit(0) + socket.setdefaulttimeout(opt_timeout) + + if opt_tracefile: + tracefile_dir = os.path.dirname(opt_tracefile) or "." + if os.path.exists(tracefile_dir): + tracefile = file(opt_tracefile, "w") + elif opt_debug: + sys.stderr.write("Path for tracefile %s does not exist" % opt_tracefile) + sys.stderr.flush() + + if tracefile: + tracefile.write("Tracefile %s Host address: %s\n" % + (datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), host_address)) + + try: + esx_connection = ESXConnection((host_address, opt_port), g_user, g_secret, opt_no_cert, + opt_debug) + + # If the data aquisition fails, e.g. invalid cookie we try another run + for _run_count in [0, 1]: + # Note: If the cookie fails inbetween these calls, we also start a second run + try: + fetch_data(esx_connection) + break + except MKQueryServerException: + # There was a problem during the query. + # It is possible that the server cookie got invalid. + # We are delete the cookie and start a second run + vsphere_output = [] # Reset current output + esx_connection.delete_server_cookie() + esx_connection.login() + continue # do a second run + except Exception: + if opt_debug: + raise + raise MKGeneralException("Error while processing received data") + + except MKGeneralException as exc: + sys.stderr.write("%s\n" % exc) + sys.exit(0 if opt_agent else 1) + + write_output(vsphere_output, opt_agent, host_address) + + sys.exit(0)

5 years, 5 months

Copy arguments, simplifying things later.

by Sven Panne

Module: check_mk Branch: master Commit: eab5164e76dc5ea67a94485fc51141470b27216e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eab5164e76dc5e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 10 15:01:50 2019 +0200 Copy arguments, simplifying things later. Change-Id: I99598934700c1317bd1e3a1a01c1a8a81617beb2 --- livestatus/src/Logfile.cc | 1 - livestatus/src/NagiosCore.cc | 6 +++--- livestatus/src/NagiosCore.h | 11 +++++------ livestatus/src/Query.cc | 1 - 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 7251a1c..a26e2f4 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -196,4 +196,3 @@ const logfile_entries_t *Logfile::getEntriesFor(size_t max_lines_per_logfile, uint64_t Logfile::makeKey(time_t t, size_t lineno) { return (static_cast<uint64_t>(t) << 32) | static_cast<uint64_t>(lineno); } - diff --git a/livestatus/src/NagiosCore.cc b/livestatus/src/NagiosCore.cc index 52404a8..5507a76 100644 --- a/livestatus/src/NagiosCore.cc +++ b/livestatus/src/NagiosCore.cc @@ -44,11 +44,11 @@ void NagiosPaths::dump(Logger *logger) { Notice(logger) << "mkeventd socket path = '" << _mkeventd_socket << "'"; } -NagiosCore::NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits, - const NagiosAuthorization &authorization, +NagiosCore::NagiosCore(NagiosPaths paths, NagiosLimits limits, + NagiosAuthorization authorization, Encoding data_encoding) : _logger_livestatus(Logger::getLogger("cmk.livestatus")) - , _paths(paths) + , _paths(std::move(paths)) , _limits(limits) , _authorization(authorization) , _data_encoding(data_encoding) diff --git a/livestatus/src/NagiosCore.h b/livestatus/src/NagiosCore.h index ea11d70..bc7daf9 100644 --- a/livestatus/src/NagiosCore.h +++ b/livestatus/src/NagiosCore.h @@ -67,9 +67,8 @@ struct NagiosAuthorization { class NagiosCore : public MonitoringCore { public: - NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits, - const NagiosAuthorization &authorization, - Encoding data_encoding); + NagiosCore(NagiosPaths paths, NagiosLimits limits, + NagiosAuthorization authorization, Encoding data_encoding); Host *find_host(const std::string &name) override; Host *getHostByDesignation(const std::string &designation) override; @@ -133,9 +132,9 @@ public: private: Logger *_logger_livestatus; - const NagiosPaths &_paths; - const NagiosLimits &_limits; - const NagiosAuthorization &_authorization; + const NagiosPaths _paths; + const NagiosLimits _limits; + const NagiosAuthorization _authorization; Encoding _data_encoding; Store _store; std::unordered_map<std::string, host *> _hosts_by_designation; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index f32f53e..cd45bcf 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -807,4 +807,3 @@ void Query::doWait() { timezoneOffset()); }); } -

5 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019