Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6637 nfsiostat: New plugin to monitor NFS performance stats

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4bf5b0f2af3a19f5d498e18fe04a0803e0b6f312 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bf5b0f2af3a19… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 14 15:37:08 2018 +0100 6637 nfsiostat: New plugin to monitor NFS performance stats Change-Id: Ibd27ea38f22c6ec3de5d5410b74d9f576dd2e8de --- .werks/6637 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6637 b/.werks/6637 new file mode 100644 index 0000000..a56fa61 --- /dev/null +++ b/.werks/6637 @@ -0,0 +1,10 @@ +Title: nfsiostat: New plugin to monitor NFS performance stats +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542206199 +Class: feature + +

5 years, 10 months

mk_jolokia: clean up configuration, make default global

by Moritz Kiemer

Module: check_mk Branch: master Commit: b669ddbe0e3f7b631889cc65fee7cfc0d9dc2d8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b669ddbe0e3f7b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Nov 14 07:10:22 2018 +0100 mk_jolokia: clean up configuration, make default global Change-Id: I4cd3a32b20264443058aade4c0a7356547fcdc99 --- agents/plugins/mk_jolokia | 72 +++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index bd603e9..b45ac17 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -30,6 +30,7 @@ import socket import ssl import sys import urllib2 +import copy from httplib import HTTPConnection, HTTPSConnection try: @@ -45,6 +46,29 @@ except ImportError: VERBOSE = '--verbose' in sys.argv DEBUG = '--debug' in sys.argv +DEFAULT_CONFIG = { + # Default global configuration values + "protocol": "http", + "server": "localhost", + "port": 8080, + "user": "monitoring", + "password": None, + "mode": "digest", + "suburi": "jolokia", + "instance": None, + "cert_path": None, + "client_cert": None, + "client_key": None, + "service_url": None, + "service_user": None, + "service_password": None, + "product": None, + "custom_vars": [], + # List of instances to monitor. Each instance is a dict where + # the global configuration values can be overridden. + "instances": [{}], +} + class SkipInstance(RuntimeError): pass @@ -410,56 +434,18 @@ def generate_values(inst, var_list): def yield_configured_instances(): - # Default configuration for all instances - protocol = "http" - server = "localhost" - port = 8080 - user = "monitoring" - password = None - mode = "digest" - suburi = "jolokia" - instance = None - cert_path = None - client_cert = None - client_key = None - service_url = None - service_user = None - service_password = None - product = None - custom_vars = [] + custom_config = copy.deepcopy(DEFAULT_CONFIG) - # List of instances to monitor. Each instance is a dict where - # the global configuration values can be overridden. - instances = [{}] - - conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" + conffile = os.path.join(os.getenv("MK_CONFDIR", "/etc/check_mk"), "jolokia.cfg") if os.path.exists(conffile): - execfile(conffile) - - default_config = { - "protocol": protocol, - "server": server, - "port": port, - "user": user, - "password": password, - "mode": mode, - "suburi": suburi, - "instance": instance, - "cert_path": cert_path, - "client_cert": client_cert, - "client_key": client_key, - "service_url": service_url, - "service_user": service_user, - "service_password": service_password, - "product": product, - "custom_vars": custom_vars, - } + execfile(conffile, {}, custom_config) # Compute list of instances to monitor. If the user has defined # instances in his configuration, we will use this (a list # of dicts). + instances = custom_config.pop("instances", [{}]) for inst in instances: - config = {k: inst.get(k, default_config[k]) for k in default_config} + config = {k: inst.get(k, custom_config[k]) for k in custom_config} if not config["instance"]: config["instance"] = str(config["port"])

5 years, 10 months

6903 FIX mk_jolokia: CA default for https connection

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8cf0d9907456bee9b6221e246ef7b1d4c2f6c0ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cf0d9907456be… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Nov 14 14:46:20 2018 +0100 6903 FIX mk_jolokia: CA default for https connection The previous default value for "cert_path" in the mk_jolokia plugin configuration led to a crash. The new default is 'None' which means the server certificate is ignored altogether. Change-Id: I2446dd5a025cbff550d654a3264d66a8d4d52fd9 --- .werks/6903 | 16 ++++++++++++++++ agents/plugins/mk_jolokia | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6903 b/.werks/6903 new file mode 100644 index 0000000..61b34a1 --- /dev/null +++ b/.werks/6903 @@ -0,0 +1,16 @@ +Title: mk_jolokia: CA default for https connection +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542121791 + +The previous default value for "cert_path" in the mk_jolokia +plugin configuration led to a crash. + +The new default is 'None' which means the server certificate is +ignored altogether. + diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 8b95504..bd603e9 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -419,7 +419,7 @@ def yield_configured_instances(): mode = "digest" suburi = "jolokia" instance = None - cert_path = "_default" + cert_path = None client_cert = None client_key = None service_url = None

5 years, 10 months

Introduced special agent for monitoring Amazon Web Services

by Simon Betz

Module: check_mk Branch: master Commit: 8590981f343752948870a708b3f7041d36602767 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8590981f343752… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 14 13:23:15 2018 +0100 Introduced special agent for monitoring Amazon Web Services Change-Id: I4736dca691ae76988fcef52a4ab10c273a471350 --- agents/special/agent_aws | 72 +++++++++++++++++++++++++++++ checks/agent_aws | 39 ++++++++++++++++ cmk/gui/plugins/wato/datasource_programs.py | 46 ++++++++++++++++++ tests/unit/checks/test_agent_aws.py | 14 ++++++ 4 files changed, 171 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws new file mode 100755 index 0000000..60a1e84 --- /dev/null +++ b/agents/special/agent_aws @@ -0,0 +1,72 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. +""" +Special agent for monitoring Amazon web services (AWS) with Check_MK. +""" + +import sys +import argparse +import boto3 + + +def parse_arguments(argv): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--debug", action="store_true", help='''Raise Python exceptions.''') + parser.add_argument("--aws-access-key-id", help='''The access key for your AWS account.''') + parser.add_argument("--aws-secret-access-key", help='''The secret key for your AWS account.''') + parser.add_argument("--region", help='''The region to use.''') + return parser.parse_args(argv) + + +def main(): + args = parse_arguments(sys.argv[1:]) + + if not args.aws_access_key_id or not args.aws_secret_access_key or not args.region: + sys.stderr.write("Access key ID, secret access key and region must be set.\n") + return 1 + + s = boto3.session.Session( + aws_access_key_id=args.aws_access_key_id, + aws_secret_access_key=args.aws_secret_access_key, + region_name=args.region) + + try: + _cloudwatch = s.client('cloudwatch') + except ValueError, err: + # If region name is not valid we get a ValueError + # but not in all cases, eg.: + # 1. 'eu-central-' raises a ValueError + # 2. 'foobar' does not raise a ValueError + # In the second case we get an exception raised by botocore + # during we execute an operation, eg. cloudwatch.get_metrics(**kwargs): + # - botocore.exceptions.EndpointConnectionError + sys.stderr.write("ERROR: %s\n" % err) + return 3 + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/checks/agent_aws b/checks/agent_aws new file mode 100644 index 0000000..f08a435 --- /dev/null +++ b/checks/agent_aws @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def agent_aws_arguments(params, hostname, ipaddress): + return [ + "--aws-access-key-id", + params["--aws-access-key-id"], + "--aws-secret-access-key", + passwordstore_get_cmdline("%s", params["--aws-secret-access-key"]), + "--region", + params["--region"], + ] + + +special_agent_info['aws'] = agent_aws_arguments diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 15ab062..e778235 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1445,3 +1445,49 @@ register_rule( help=_("This rule allows you to check multiple BI aggregations from multiple sites at once. " "You can also assign aggregations to specific hosts through the piggyback mechanism."), match='first') + +register_rule( + 'datasource_programs', + 'special_agents:aws', + Dictionary( + elements=[ + ("--aws-access-key-id", + TextAscii( + title=_("The access key for your AWS account"), + allow_empty=False, + )), + ("--aws-secret-access-key", + IndividualOrStoredPassword( + title=_("The secret key for your AWS account"), + allow_empty=False, + )), + ("--region", + DropdownChoice( + title=_("The region to use"), + choices=sorted([ + ("ap-south-1", _("Asia Pacific (Mumbai)")), + ("ap-northeast-3", _("Asia Pacific (Osaka-Local)")), + ("ap-northeast-2", _("Asia Pacific (Seoul)")), + ("ap-southeast-1", _("Asia Pacific (Singapore)")), + ("ap-southeast-2", _("Asia Pacific (Sydney)")), + ("ap-northeast-1", _("Asia Pacific (Tokyo)")), + ("ca-central-1", _("Canada (Central)")), + ("cn-north-1", _("China (Beijing)")), + ("cn-northwest-1", _("China (Ningxia)")), + ("eu-central-1", _("EU (Frankfurt)")), + ("eu-west-1", _("EU (Ireland)")), + ("eu-west-2", _("EU (London)")), + ("eu-west-3", _("EU (Paris)")), + ("sa-east-1", _("South America (Sao Paulo)")), + ("us-east-2", _("US East (Ohio)")), + ("us-east-1", _("US East (N. Virginia)")), + ("us-west-1", _("US West (N. California)")), + ("us-west-2", _("US West (Oregon)")), + ], + key=lambda x: x[1]), + )), + ], + optional_keys=[], + ), + title=_('Amazon Web Services (AWS)'), + match='first') diff --git a/tests/unit/checks/test_agent_aws.py b/tests/unit/checks/test_agent_aws.py new file mode 100644 index 0000000..bba4178 --- /dev/null +++ b/tests/unit/checks/test_agent_aws.py @@ -0,0 +1,14 @@ +import pytest + + +(a)pytest.mark.parametrize("params,result", [ + ({ + "--aws-access-key-id": "user", + "--aws-secret-access-key": "d1ng", + "--region": 'region-eu', + }, ['--aws-access-key-id', 'user', '--aws-secret-access-key', 'd1ng', '--region', 'region-eu']), +]) +def test_aws(check_manager, params, result): + agent = check_manager.get_special_agent("agent_aws") + arguments = agent.argument_func(params, "host", "address") + assert arguments == result

5 years, 10 months

reverted: update for WK6678

by Marcel Arentz

Module: check_mk Branch: master Commit: 03fc96b830657ab5cc06f631159bb13c971b1c46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03fc96b830657a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Nov 14 14:40:48 2018 +0100 reverted: update for WK6678 This commit is unnecessary if the classes are in correct order Change-Id: I3b30a863d322f6c5215d2e8bdac1271796b7895d --- web/htdocs/status.css | 2 +- web/htdocs/themes/facelift/theme.css | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 36dd1de..555b2f2 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -109,7 +109,7 @@ table.data tr.data td.stale.hstate1 { } /* in DOWNTIME */ -.stated, .hstated, .stated a, .hstated a, .even0 .hstated, .odd0 .hstated, .even0 .hstated a, .odd0 .hstated a{ +.stated, .hstated, .stated a, .hstated a { background-color: #0af; color: #fff; } diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index cdf36e1..26ac941 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -1363,8 +1363,7 @@ div.color { color: #fff !important; border-color: #7b7b7b !important; } -.stated, .hstated, .stated a, .stated body.main .popup_menu span, body.main .popup_menu .stated span, .hstated a, .hstated body.main .popup_menu span, body.main .popup_menu .hstated span, -.even0 .hstated, .odd0 .hstated, .even0 .hstated a, .odd0 .hstated a { +.stated, .hstated, .stated a, .stated body.main .popup_menu span, body.main .popup_menu .stated span, .hstated a, .hstated body.main .popup_menu span, body.main .popup_menu .hstated span { background-color: #0099FF !important; color: #fff !important; border-color: #7b7b7b !important; }

5 years, 10 months

yapf diskstat check

by Florian Kromer

Module: check_mk Branch: master Commit: 10c8e5fe2f2b6859d7e66a9d676abb0b2879c640 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10c8e5fe2f2b68… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Nov 14 14:35:01 2018 +0100 yapf diskstat check Change-Id: I92d594fa8e9e2802b7a390b8758ada2dae211b2a --- checks/diskstat | 95 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index a3971e8..41b3fd0 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -121,9 +121,10 @@ def parse_diskstat(info): # Sort of partitions with disks - typical in XEN virtual setups. # Eg. there are xvda1, xvda2, but no xvda... device_names = [line[3] for line in proc_diskstat] - real_partitions = {device_name for device_name in device_names - if diskstat_diskless_pattern.match(device_name) - and re.sub('[0-9]+$', '', device_name)} + real_partitions = { + device_name for device_name in device_names + if diskstat_diskless_pattern.match(device_name) and re.sub('[0-9]+$', '', device_name) + } disks = {} for line in proc_diskstat: if line[3] in real_partitions: @@ -146,27 +147,32 @@ def parse_diskstat(info): # Note: we use onwrap=0.0 here because the parse function is being used also during # service discovery. If we raise a counter wrap exception here, then nothing will # be inventorized. - read_ticks_rate = get_rate(counter_base + "read_ticks", timestamp, int(read_ticks), onwrap=0.0) - write_ticks_rate = get_rate(counter_base + "write_ticks", timestamp, int(write_ticks), onwrap=0.0) - total_ticks_rate = get_rate(counter_base + "total_ticks", timestamp, int(total_ticks), onwrap=0.0) - read_ios_rate = get_rate(counter_base + "read_ios", timestamp, int(read_ios), onwrap=0.0) - write_ios_rate = get_rate(counter_base + "write_ios", timestamp, int(write_ios), onwrap=0.0) - total_ios_rate = read_ios_rate + write_ios_rate - utilization = total_ticks_rate / 1000 # not percent, but 0...1 - read_bytes_rate = get_rate(counter_base + "read_sectors", timestamp, int(read_sectors), onwrap=0.0) * 512 - write_bytes_rate = get_rate(counter_base + "write_sectors", timestamp, int(write_sectors), onwrap=0.0) * 512 + read_ticks_rate = get_rate( + counter_base + "read_ticks", timestamp, int(read_ticks), onwrap=0.0) + write_ticks_rate = get_rate( + counter_base + "write_ticks", timestamp, int(write_ticks), onwrap=0.0) + total_ticks_rate = get_rate( + counter_base + "total_ticks", timestamp, int(total_ticks), onwrap=0.0) + read_ios_rate = get_rate(counter_base + "read_ios", timestamp, int(read_ios), onwrap=0.0) + write_ios_rate = get_rate(counter_base + "write_ios", timestamp, int(write_ios), onwrap=0.0) + total_ios_rate = read_ios_rate + write_ios_rate + utilization = total_ticks_rate / 1000 # not percent, but 0...1 + read_bytes_rate = get_rate( + counter_base + "read_sectors", timestamp, int(read_sectors), onwrap=0.0) * 512 + write_bytes_rate = get_rate( + counter_base + "write_sectors", timestamp, int(write_sectors), onwrap=0.0) * 512 total_bytes_rate = read_bytes_rate + write_bytes_rate # The service time is computed from the utilization. If we work # e.g. 0.34 (34%) of the time and we can do 17 operations in that # time then the average latency is time * 0.34 / 17 if total_ios_rate: - latency = utilization / total_ios_rate - average_wait = (read_ticks_rate + write_ticks_rate) / total_ios_rate / 1000.0 + latency = utilization / total_ios_rate + average_wait = (read_ticks_rate + write_ticks_rate) / total_ios_rate / 1000.0 average_request_size = total_bytes_rate / total_ios_rate else: - latency = 0.0 - average_wait = 0.0 + latency = 0.0 + average_wait = 0.0 average_request_size = 0.0 # Average read and write rate, from end to end, including queuing, etc. @@ -186,20 +192,20 @@ def parse_diskstat(info): average_write_size = 0.0 disks[device] = { - "node" : node_name, - "read_ios" : read_ios_rate, - "write_ios" : write_ios_rate, - "read_throughput" : read_bytes_rate, - "write_throughput" : write_bytes_rate, - "utilization" : utilization, - "latency" : latency, - "average_request_size" : average_request_size, - "average_wait" : average_wait, - "average_read_wait" : average_read_wait, - "average_read_request_size" : average_read_size, - "average_write_wait" : average_write_wait, - "average_write_request_size" : average_write_size, - "queue_length" : int(ios_in_prog), + "node": node_name, + "read_ios": read_ios_rate, + "write_ios": write_ios_rate, + "read_throughput": read_bytes_rate, + "write_throughput": write_bytes_rate, + "utilization": utilization, + "latency": latency, + "average_request_size": average_request_size, + "average_wait": average_wait, + "average_read_wait": average_read_wait, + "average_read_request_size": average_read_size, + "average_write_wait": average_write_wait, + "average_write_request_size": average_write_size, + "queue_length": int(ios_in_prog), } return disks @@ -272,7 +278,7 @@ def parse_diskstat(info): # (None, 253, 6): 'LVM vgappl-applvol', # } def diskstat_extract_name_info(info): - name_info = {} # dict from (node, major, minor) to itemname + name_info = {} # dict from (node, major, minor) to itemname timestamp = None info_plain = [] @@ -305,7 +311,7 @@ def diskstat_extract_name_info(info): name = "DM %s" % line[1] name_info[node, major, minor] = name except: - pass # ignore such crap as "No Devices Found" + pass # ignore such crap as "No Devices Found" elif phase == 'vx_dsk': major = int(line[1], 16) minor = int(line[2], 16) @@ -315,9 +321,10 @@ def diskstat_extract_name_info(info): return timestamp, info_plain, name_info + def diskstat_convert_info(parsed): disks, multipath_info = parsed - converted_disks = dict(disks.items()) # we must not modify info! + converted_disks = dict(disks.items()) # we must not modify info! # If we have information about multipathing, then remove the # physical path devices from the disks array. But only do this, @@ -359,8 +366,8 @@ def inventory_diskstat(parsed): # Use generic diskstat inventory function that is used also for other # Disk IO checks. That expects a table of (node, device, ...) - return inventory_diskstat_generic([ - (disk["node"], device) for device, disk in converted_disks.items()]) + return inventory_diskstat_generic( + [(disk["node"], device) for device, disk in converted_disks.items()]) def check_diskstat(item, params, parsed): @@ -368,13 +375,13 @@ def check_diskstat(item, params, parsed): check_info["diskstat"] = { - 'parse_function' : parse_diskstat, - 'inventory_function' : inventory_diskstat, - 'check_function' : check_diskstat, - 'service_description' : 'Disk IO %s', - 'has_perfdata' : True, - 'group' : 'diskstat', - "node_info" : True, # add first column with actual host name - 'includes' : [ "diskstat.include" ], - 'extra_sections' : [ "multipath" ], + 'parse_function': parse_diskstat, + 'inventory_function': inventory_diskstat, + 'check_function': check_diskstat, + 'service_description': 'Disk IO %s', + 'has_perfdata': True, + 'group': 'diskstat', + "node_info": True, # add first column with actual host name + 'includes': ["diskstat.include"], + 'extra_sections': ["multipath"], }

5 years, 10 months

CMK-1261: Fixed colorizing of downtime fields

by Marcel Arentz

Module: check_mk Branch: master Commit: 1a814abd04b0054a526306137bf6a9a8a2477c56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a814abd04b005… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Nov 14 11:24:31 2018 +0100 CMK-1261: Fixed colorizing of downtime fields Change-Id: I66bc8ca697103e5301adf18106342ae365e65fec --- web/htdocs/themes/facelift/theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 939c296..cdf36e1 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -1365,7 +1365,7 @@ div.color { .stated, .hstated, .stated a, .stated body.main .popup_menu span, body.main .popup_menu .stated span, .hstated a, .hstated body.main .popup_menu span, body.main .popup_menu .hstated span, .even0 .hstated, .odd0 .hstated, .even0 .hstated a, .odd0 .hstated a { - background-color: #888 !important; + background-color: #0099FF !important; color: #fff !important; border-color: #7b7b7b !important; }

5 years, 10 months

Lenny is dead, Jim... :-)

by Sven Panne

Module: check_mk Branch: master Commit: f2080f258ef2cb4adef09f5d05a728102b64c311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2080f258ef2cb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 14 14:17:34 2018 +0100 Lenny is dead, Jim... :-) Change-Id: Ia8514a5e569de19fac2efb5430e098a34c37d193 --- omd/packages/python-modules/Makefile | 4 ---- .../python-modules/src/cryptography-1.9.tar.gz | Bin 409664 -> 0 bytes 2 files changed, 4 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index d2a7725..0f76823 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -110,10 +110,6 @@ else ifneq ($(filter $(DISTRO_CODE),el6),) MODULES += cryptography-1.5.3.tar.gz PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch -else ifneq ($(filter $(DISTRO_CODE),lenny),) -# NOTE: This branch is probably dead... - MODULES += asn1crypto-0.24.0.tar.gz - MODULES += cryptography-1.9.tar.gz else MODULES += asn1crypto-0.24.0.tar.gz MODULES += cryptography-2.3.1.tar.gz diff --git a/omd/packages/python-modules/src/cryptography-1.9.tar.gz b/omd/packages/python-modules/src/cryptography-1.9.tar.gz deleted file mode 100644 index 970f71a..0000000 Binary files a/omd/packages/python-modules/src/cryptography-1.9.tar.gz and /dev/null differ

5 years, 10 months

6636 FIX hr_fs: Fix discovery for VCenter appliances

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5201eed184041179146d9a741abeee78aadca9fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5201eed1840411… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 14 13:22:17 2018 +0100 6636 FIX hr_fs: Fix discovery for VCenter appliances Previously, due to a bogus type value provided by these appliances via SNMP, the filesystem checks would not be discovered. This has been fixed. Change-Id: Id52210cde800571ee70f0b55bff66b46767123e5 --- .werks/6636 | 13 +++++++++++++ checks/hr_fs.include | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/6636 b/.werks/6636 new file mode 100644 index 0000000..83d5c1a --- /dev/null +++ b/.werks/6636 @@ -0,0 +1,13 @@ +Title: hr_fs: Fix discovery for VCenter appliances +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542198055 + +Previously, due to a bogus type value provided by +these appliances via SNMP, the filesystem checks +would not be discovered. This has been fixed. diff --git a/checks/hr_fs.include b/checks/hr_fs.include index bb56877..f1d0b22 100644 --- a/checks/hr_fs.include +++ b/checks/hr_fs.include @@ -53,7 +53,12 @@ def inventory_hr_fs(info): mplist = [] for hrtype, hrdescr, _hrunits, hrsize, _hrused in info: hrdescr = fix_hr_fs_mountpoint(hrdescr) - if hrtype in [ ".1.3.6.1.2.1.25.2.1.4" ] and \ + # NOTE: These types are defined in the HR-TYPES-MIB. + # .1.3.6.1.2.1.25.2.1 + + # +-> .4 "hrStorageFixedDisk" + if hrtype in [ ".1.3.6.1.2.1.25.2.1.4", + # This strange value below is needed for VCenter Appliances + ".1.3.6.1.2.1.25.2.3.1.2.4"] and \ hrdescr not in inventory_df_exclude_mountpoints and \ saveint(hrsize) != 0: mplist.append(hrdescr)

5 years, 10 months

yapf complete cmk/gui

by Óscar Nájera

Module: check_mk Branch: master Commit: d8e8afeae7bcb26a13d9fb1fff1164252ad2e744 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8e8afeae7bcb2… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Nov 14 10:47:53 2018 +0100 yapf complete cmk/gui CMK-1180 Change-Id: Ic6452e23db5870339b02d5a6f1945a76385385de --- cmk/gui/plugins/views/painters.py | 56 +- cmk/gui/plugins/wato/datasource_programs.py | 216 +- cmk/gui/plugins/webapi/webapi.py | 11 +- cmk/gui/wato/mkeventd.py | 3280 ++++++++++++++------------- cmk/gui/wato/user_profile.py | 78 +- 5 files changed, 1860 insertions(+), 1781 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d8e8afeae7…

5 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018