Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

Cleaned up star import for visuals plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: b151525b08ce322cb784214884abce99c85ba87a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b151525b08ce32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 1 17:35:07 2018 +0200 Cleaned up star import for visuals plugins Change-Id: I944d3f6f54cd07a48ea021f1d034502355eb034f --- cmk/gui/plugins/visuals/__init__.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/visuals/__init__.py b/cmk/gui/plugins/visuals/__init__.py index 2ef2cb1..6fc5b95 100644 --- a/cmk/gui/plugins/visuals/__init__.py +++ b/cmk/gui/plugins/visuals/__init__.py @@ -40,10 +40,16 @@ __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py # | |___/ | # '----------------------------------------------------------------------' -# TODO: Would be better to replace this star import with an explicit list of -# names needed for the plugins. Then we would have something like an official -# plugin API. At least a list of names that are intended to be used by plugins. -from cmk.gui.plugins.visuals.utils import * +from cmk.gui.plugins.visuals.utils import ( + declare_filter, + declare_info, + Filter, + FilterSite, + FilterTime, + FilterTristate, + FilterUnicodeFilter, + visual_types, +) #. # .--Plugins-------------------------------------------------------------.

6 years, 4 months

Cleaned up star import for view plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a2137e8f4adfa81a3e493389cb0038537cfe747 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a2137e8f4adfa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 1 17:28:08 2018 +0200 Cleaned up star import for view plugins This helps pylint Change-Id: I18ed1c36ddd0db59b0d2b991e66d08e10992fbaa --- cmk/gui/plugins/views/__init__.py | 51 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/views/__init__.py b/cmk/gui/plugins/views/__init__.py index b7bc867..58e0b5b 100644 --- a/cmk/gui/plugins/views/__init__.py +++ b/cmk/gui/plugins/views/__init__.py @@ -40,10 +40,53 @@ __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py # | |___/ | # '----------------------------------------------------------------------' -# TODO: Would be better to replace this star import with an explicit list of -# names needed for the plugins. Then we would have something like an official -# plugin API. At least a list of names that are intended to be used by plugins. -from cmk.gui.plugins.views.utils import * +from cmk.gui.plugins.views.utils import ( + cmp_custom_variable, + cmp_ip_address, + cmp_num_split, + cmp_service_name_equiv, + cmp_simple_number, + cmp_simple_string, + cmp_string_list, + declare_1to1_sorter, + declare_simple_sorter, + display_options, + do_query_data, + EmptyCell, + format_plugin_output, + get_graph_timerange_from_painter_options, + get_host_tags, + get_perfdata_nth_value, + get_tag_group, + group_value, + inventory_displayhints, + is_stale, + join_row, + link_to_view, + multisite_builtin_views, + multisite_commands, + multisite_datasources, + multisite_layouts, + multisite_painter_options, + multisite_painters, + multisite_sorters, + output_csv_headers, + paint_age, + painter_options, + paint_host_list, + paint_nagiosflag, + paint_stalified, + pnp_url, + query_data, + register_command_group, + render_cache_info, + replace_action_url_macros, + row_id, + transform_action_url, + url_to_view, + view_is_enabled, + view_title, +) #. # .--Plugins-------------------------------------------------------------.

6 years, 4 months

Azure Agent: Add required Packages

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7ba5efc85ce217fcf2f27f6b7f2586122a6a413b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba5efc85ce217… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Aug 2 08:52:46 2018 +0200 Azure Agent: Add required Packages Change-Id: Ibeb01eccd1f0d59eed54c352eb06137dfa11056b --- omd/packages/python-modules/Makefile | 22 ++++++++++++++++++++- omd/packages/python-modules/src/PyJWT-1.6.4.tar.gz | Bin 0 -> 41694 bytes .../python-modules/src/SecretStorage-2.3.1.tar.gz | Bin 0 -> 16073 bytes omd/packages/python-modules/src/adal-1.0.2.tar.gz | Bin 0 -> 32634 bytes .../python-modules/src/azure-common-1.1.14.zip | Bin 0 -> 15737 bytes .../src/azure-mgmt-monitor-0.5.2.zip | Bin 0 -> 258952 bytes .../src/azure-mgmt-resource-2.0.0.zip | Bin 0 -> 725032 bytes .../python-modules/src/certifi-2018.4.16.tar.gz | Bin 0 -> 149967 bytes .../python-modules/src/chardet-3.0.4.tar.gz | Bin 0 -> 1868453 bytes .../python-modules/src/configparser-3.5.0.tar.gz | Bin 0 -> 39573 bytes .../python-modules/src/entrypoints-0.2.3.tar.gz | Bin 0 -> 11158 bytes .../python-modules/src/isodate-0.6.0.tar.gz | Bin 0 -> 28480 bytes .../python-modules/src/keyring-13.2.1.tar.gz | Bin 0 -> 43140 bytes .../python-modules/src/msrest-0.5.4.tar.gz | Bin 0 -> 41215 bytes .../python-modules/src/msrestazure-0.4.34.tar.gz | Bin 0 -> 29668 bytes .../python-modules/src/oauthlib-2.1.0.tar.gz | Bin 0 -> 128807 bytes .../src/requests-oauthlib-1.0.0.tar.gz | Bin 0 -> 74092 bytes .../python-modules/src/urllib3-1.23.tar.gz | Bin 0 -> 228314 bytes 18 files changed, 21 insertions(+), 1 deletion(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 56e4350..56fe773 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -108,7 +108,7 @@ else endif # Added for NetApp special agent, but may be used in other components too in future -MODULES+=requests-2.13.0.tar.gz +MODULES +=requests-2.13.0.tar.gz # Has requests as dependency -> must be built after MODULES += pyOpenSSL-16.2.0.tar.gz # Added for check_bi_aggr with kerberos support @@ -128,6 +128,26 @@ MODULES += pathlib2-2.3.2.tar.gz # Added for scheduling (cmk/schedule.py) MODULES += python-dateutil-2.7.3.tar.gz MODULES += python-snap7-0.9.tar.gz +# Added for azure special agent +MODULES += PyJWT-1.6.4.tar.gz +MODULES += SecretStorage-2.3.1.tar.gz +MODULES += adal-1.0.2.tar.gz +MODULES += azure-common-1.1.14.zip +MODULES += azure-mgmt-monitor-0.5.2.zip +MODULES += azure-mgmt-resource-2.0.0.zip +MODULES += certifi-2018.4.16.tar.gz +MODULES += chardet-3.0.4.tar.gz +MODULES += configparser-3.5.0.tar.gz +MODULES += entrypoints-0.2.3.tar.gz +MODULES += isodate-0.6.0.tar.gz +MODULES += keyring-13.2.1.tar.gz +MODULES += msrest-0.5.4.tar.gz +MODULES += msrestazure-0.4.34.tar.gz +MODULES += oauthlib-2.1.0.tar.gz +MODULES += requests-oauthlib-1.0.0.tar.gz +MODULES += urllib3-1.23.tar.gz + + .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/PyJWT-1.6.4.tar.gz b/omd/packages/python-modules/src/PyJWT-1.6.4.tar.gz new file mode 100644 index 0000000..7a5a900 Binary files /dev/null and b/omd/packages/python-modules/src/PyJWT-1.6.4.tar.gz differ diff --git a/omd/packages/python-modules/src/SecretStorage-2.3.1.tar.gz b/omd/packages/python-modules/src/SecretStorage-2.3.1.tar.gz new file mode 100644 index 0000000..46fed98 Binary files /dev/null and b/omd/packages/python-modules/src/SecretStorage-2.3.1.tar.gz differ diff --git a/omd/packages/python-modules/src/adal-1.0.2.tar.gz b/omd/packages/python-modules/src/adal-1.0.2.tar.gz new file mode 100644 index 0000000..c4c1855 Binary files /dev/null and b/omd/packages/python-modules/src/adal-1.0.2.tar.gz differ diff --git a/omd/packages/python-modules/src/azure-common-1.1.14.zip b/omd/packages/python-modules/src/azure-common-1.1.14.zip new file mode 100644 index 0000000..d43158f Binary files /dev/null and b/omd/packages/python-modules/src/azure-common-1.1.14.zip differ diff --git a/omd/packages/python-modules/src/azure-mgmt-monitor-0.5.2.zip b/omd/packages/python-modules/src/azure-mgmt-monitor-0.5.2.zip new file mode 100644 index 0000000..99c3087 Binary files /dev/null and b/omd/packages/python-modules/src/azure-mgmt-monitor-0.5.2.zip differ diff --git a/omd/packages/python-modules/src/azure-mgmt-resource-2.0.0.zip b/omd/packages/python-modules/src/azure-mgmt-resource-2.0.0.zip new file mode 100644 index 0000000..dfb98a4 Binary files /dev/null and b/omd/packages/python-modules/src/azure-mgmt-resource-2.0.0.zip differ diff --git a/omd/packages/python-modules/src/certifi-2018.4.16.tar.gz b/omd/packages/python-modules/src/certifi-2018.4.16.tar.gz new file mode 100644 index 0000000..47b3702 Binary files /dev/null and b/omd/packages/python-modules/src/certifi-2018.4.16.tar.gz differ diff --git a/omd/packages/python-modules/src/chardet-3.0.4.tar.gz b/omd/packages/python-modules/src/chardet-3.0.4.tar.gz new file mode 100644 index 0000000..13028bf Binary files /dev/null and b/omd/packages/python-modules/src/chardet-3.0.4.tar.gz differ diff --git a/omd/packages/python-modules/src/configparser-3.5.0.tar.gz b/omd/packages/python-modules/src/configparser-3.5.0.tar.gz new file mode 100644 index 0000000..7c9dc40 Binary files /dev/null and b/omd/packages/python-modules/src/configparser-3.5.0.tar.gz differ diff --git a/omd/packages/python-modules/src/entrypoints-0.2.3.tar.gz b/omd/packages/python-modules/src/entrypoints-0.2.3.tar.gz new file mode 100644 index 0000000..d57b8a5 Binary files /dev/null and b/omd/packages/python-modules/src/entrypoints-0.2.3.tar.gz differ diff --git a/omd/packages/python-modules/src/isodate-0.6.0.tar.gz b/omd/packages/python-modules/src/isodate-0.6.0.tar.gz new file mode 100644 index 0000000..4d388b6 Binary files /dev/null and b/omd/packages/python-modules/src/isodate-0.6.0.tar.gz differ diff --git a/omd/packages/python-modules/src/keyring-13.2.1.tar.gz b/omd/packages/python-modules/src/keyring-13.2.1.tar.gz new file mode 100644 index 0000000..03184ed Binary files /dev/null and b/omd/packages/python-modules/src/keyring-13.2.1.tar.gz differ diff --git a/omd/packages/python-modules/src/msrest-0.5.4.tar.gz b/omd/packages/python-modules/src/msrest-0.5.4.tar.gz new file mode 100644 index 0000000..e9b65a5 Binary files /dev/null and b/omd/packages/python-modules/src/msrest-0.5.4.tar.gz differ diff --git a/omd/packages/python-modules/src/msrestazure-0.4.34.tar.gz b/omd/packages/python-modules/src/msrestazure-0.4.34.tar.gz new file mode 100644 index 0000000..f819e46 Binary files /dev/null and b/omd/packages/python-modules/src/msrestazure-0.4.34.tar.gz differ diff --git a/omd/packages/python-modules/src/oauthlib-2.1.0.tar.gz b/omd/packages/python-modules/src/oauthlib-2.1.0.tar.gz new file mode 100644 index 0000000..ca795af Binary files /dev/null and b/omd/packages/python-modules/src/oauthlib-2.1.0.tar.gz differ diff --git a/omd/packages/python-modules/src/requests-oauthlib-1.0.0.tar.gz b/omd/packages/python-modules/src/requests-oauthlib-1.0.0.tar.gz new file mode 100644 index 0000000..67a964f Binary files /dev/null and b/omd/packages/python-modules/src/requests-oauthlib-1.0.0.tar.gz differ diff --git a/omd/packages/python-modules/src/urllib3-1.23.tar.gz b/omd/packages/python-modules/src/urllib3-1.23.tar.gz new file mode 100644 index 0000000..401dc25 Binary files /dev/null and b/omd/packages/python-modules/src/urllib3-1.23.tar.gz differ

6 years, 4 months

6419 FIX agent_3par: Prevent InsecureRequestWarning error when ignoring SSL cert issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 520c24f983561699761413103e1a303c0e725577 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=520c24f9835616… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 2 09:44:33 2018 +0200 6419 FIX agent_3par: Prevent InsecureRequestWarning error when ignoring SSL cert issues In previous 1.5 releases the 3par special agent could report errors like this: CRIT - [special_3par] Agent exited with code 1: /omd/sites/debsg/lib/python/requests/packages/urllib3/connectionpool.py:852: InsecureRequestWarning: Unverified HTTPS request is being made. Adding certificate verification is strongly advised. See When a special agent is told to ignore SSL issues (like it's done always for this agent) such warnings should be suppressed. Change-Id: I0cc1ea0d434fbad725807aece484664dbe838aa1 --- .werks/6419 | 20 ++++++++++++++++++++ agents/special/agent_3par | 15 ++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.werks/6419 b/.werks/6419 new file mode 100644 index 0000000..a41e3d5 --- /dev/null +++ b/.werks/6419 @@ -0,0 +1,20 @@ +Title: agent_3par: Prevent InsecureRequestWarning error when ignoring SSL cert issues +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533195825 + +In previous 1.5 releases the 3par special agent could report errors like +this: + +CRIT - [special_3par] Agent exited with code 1: +/omd/sites/debsg/lib/python/requests/packages/urllib3/connectionpool.py:852: +InsecureRequestWarning: Unverified HTTPS request is being made. Adding +certificate verification is strongly advised. See + +When a special agent is told to ignore SSL issues (like it's done always for +this agent) such warnings should be suppressed. diff --git a/agents/special/agent_3par b/agents/special/agent_3par index d949983..90c2d60 100755 --- a/agents/special/agent_3par +++ b/agents/special/agent_3par @@ -24,11 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import sys, getopt, requests -try: - import simplejson as json -except: - import json +import getopt +import json +import sys + +import requests +from requests.packages.urllib3.exceptions import \ + InsecureRequestWarning # pylint: disable=import-error + # .--Arguments-----------------------------------------------------------. # | _ _ | @@ -104,7 +107,9 @@ headers = { "Content-Type": "application/json", "Accept": "application/json", } + verify = False +requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # pylint: disable=no-member # Initiate connection and get session Key. The api expects the login data # in json format. The standard port for all requests is 8080 as it is hard

6 years, 4 months

Improved indentation of code

by Lars Michelsen

Module: check_mk Branch: master Commit: e858efc7fb432dc8f55ac7ca24741b10c39d9fc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e858efc7fb432d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 2 10:31:58 2018 +0200 Improved indentation of code Change-Id: I8a552d7cceae9e97fd31e78bd7aa64e8c0049c0f --- cmk/gui/plugins/wato/datasource_programs.py | 69 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index ace85b0..46fcfa2 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1125,42 +1125,39 @@ def _transform_3par_add_verify_cert(v): register_rule("datasource_programs", - "special_agents:3par", - Transform( - Dictionary(elements = [("user", - TextAscii(title = _("Username"), - allow_empty = False, - )), - ("password", - Password(title = _("Password"), - allow_empty = False, - )), - ("verify_cert", DropdownChoice( - title = _("SSL certificate verification"), - choices = [ - (True, _("Activate")), - (False, _("Deactivate")), - ], - )), - ("values", - ListOfStrings(title = _("Values to fetch"), - orientation = "horizontal", - help = _("Possible values are the following: " - "cpgs, volumes, hosts, capacity, " - "system, ports, remotecopy, hostsets, volumesets, " - "vluns, flashcache, users, roles, qos.\n" - "If you do not specify any value the " - "first seven are used as default.") - )), - ], - optional_keys = [ "values" ], - ), - # verify_cert was added with 1.5.0p1 - forth = _transform_3par_add_verify_cert, - ), - title = _("Agent 3PAR Configuration"), - match = 'first' - + "special_agents:3par", + Transform( + Dictionary( + elements = [ + ("user", TextAscii(title = _("Username"), + allow_empty = False, + )), + ("password", Password(title = _("Password"), + allow_empty = False, + )), + ("verify_cert", DropdownChoice( + title = _("SSL certificate verification"), + choices = [ + (True, _("Activate")), + (False, _("Deactivate")), + ], + )), + ("values", ListOfStrings( + title = _("Values to fetch"), + orientation = "horizontal", + help = _("Possible values are the following: cpgs, volumes, hosts, capacity, " + "system, ports, remotecopy, hostsets, volumesets, vluns, flashcache, " + "users, roles, qos.\n" + "If you do not specify any value the first seven are used as default."), + )), + ], + optional_keys = [ "values" ], + ), + # verify_cert was added with 1.5.0p1 + forth = _transform_3par_add_verify_cert, + ), + title = _("Agent 3PAR Configuration"), + match = 'first', ) register_rule(

6 years, 4 months

6420 agent_3par: Certificate verification can now be enabled/disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: dca66e631cdf101009dfd9b21c34ce355078f9aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dca66e631cdf10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 2 10:29:36 2018 +0200 6420 agent_3par: Certificate verification can now be enabled/disabled The special agent is now verifying certificates by default. In case you have to disable the verification for some reason, you can do this in the special agent parameters. However, it is recommended to upload the CA certificate to Check_MK to enable the special agent to verify the certificate. Change-Id: I87ef8ff62dc4141500064fc5f3484cbe660c2845 --- .werks/6420 | 16 +++++++++ agents/special/agent_3par | 17 +++++---- checks/agent_3par | 1 + cmk/gui/plugins/wato/datasource_programs.py | 56 ++++++++++++++++++----------- 4 files changed, 64 insertions(+), 26 deletions(-) diff --git a/.werks/6420 b/.werks/6420 new file mode 100644 index 0000000..d2fa336 --- /dev/null +++ b/.werks/6420 @@ -0,0 +1,16 @@ +Title: agent_3par: Certificate verification can now be enabled/disabled +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533198458 + +The special agent is now verifying certificates by default. In case you +have to disable the verification for some reason, you can do this in +the special agent parameters. + +However, it is recommended to upload the CA certificate to Check_MK to +enable the special agent to verify the certificate. diff --git a/agents/special/agent_3par b/agents/special/agent_3par index 90c2d60..19fb4f2 100755 --- a/agents/special/agent_3par +++ b/agents/special/agent_3par @@ -55,6 +55,8 @@ OPTIONS: -h, --help Show this help message and exit -u USER, --user USER Username for 3par login -p PASSWORD, --password PASSWORD Password for 3par login + --verify-certs yes/no Enable/disable verification of the servers + ssl certificate. Disabled by default. -v VALUE,VALUE, --values VALUE,VALUE Values to fetch from 3par system. Possible values: system hosts @@ -68,9 +70,10 @@ opt_host = None opt_user = None opt_pass = None opt_values = ["system", "cpgs", "volumes", "hosts", "capacity", "ports", "remotecopy"] +opt_verify = False short_options = "hh:u:p:v:" -long_options = [ "help", "user=", "password=", "values=" ] +long_options = [ "help", "user=", "password=", "values=", "verify-certs=" ] try: opts, args = getopt.getopt( sys.argv[1:], short_options, long_options ) @@ -88,6 +91,8 @@ for opt, arg in opts: opt_password = arg elif opt in ["-v", "--values"]: opt_values = arg.split(",") + elif opt in [ '--verify-certs' ]: + opt_verify = arg == "yes" elif not opt: usage() sys.exit(0) @@ -108,8 +113,8 @@ headers = { "Accept": "application/json", } -verify = False -requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # pylint: disable=no-member +if not opt_verify: + requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # pylint: disable=no-member # Initiate connection and get session Key. The api expects the login data # in json format. The standard port for all requests is 8080 as it is hard @@ -119,7 +124,7 @@ try: json={'user':opt_user,'password':opt_password}, headers=headers, timeout=10, - verify=verify) + verify=opt_verify) except requests.exceptions.RequestException as e: sys.stderr.write("Error: {}".format(e)) @@ -147,7 +152,7 @@ for value in opt_values: req = requests.get("%s/%s" % (url, value), headers=headers, timeout=10, - verify=verify) + verify=opt_verify) value_data = req.text.replace("\r\n", "").replace("\n", "").replace(" ","") print value_data @@ -156,7 +161,7 @@ for value in opt_values: req = requests.delete("%s/credentials/%s" % (url, headers["X-HP3PAR-WSAPI-SessionKey"]), headers=headers, timeout=10, - verify=verify) + verify=opt_verify) if not req.status_code == requests.codes.OK: # pylint: disable=no-member sys.stderr.write("Wrong status code: %s. Expected: %s \n" % (req.status_code, diff --git a/checks/agent_3par b/checks/agent_3par index 6a472fc..57edac2 100644 --- a/checks/agent_3par +++ b/checks/agent_3par @@ -29,6 +29,7 @@ def agent_3par_arguments(params, hostname, ipaddress): args += " -u " + quote_shell_string(params["user"]) args += " -p " + quote_shell_string(params["password"]) + args += quote_shell_string(" --verify-certs=%s" % ("yes" if params.get("verify_cert", False) else "no")) if "values" in params: args += " -v " + quote_shell_string(",".join(params["values"])) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index e5148a7..ace85b0 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1119,28 +1119,44 @@ register_rule(group, ) +def _transform_3par_add_verify_cert(v): + v.setdefault("verify_cert", False) + return v + + register_rule("datasource_programs", "special_agents:3par", - Dictionary(elements = [("user", - TextAscii(title = _("Username"), - allow_empty = False, - )), - ("password", - Password(title = _("Password"), - allow_empty = False, - )), - ("values", - ListOfStrings(title = _("Values to fetch"), - orientation = "horizontal", - help = _("Possible values are the following: " - "cpgs, volumes, hosts, capacity, " - "system, ports, remotecopy, hostsets, volumesets, " - "vluns, flashcache, users, roles, qos.\n" - "If you do not specify any value the " - "first seven are used as default.") - )), - ], - optional_keys = [ "values" ], + Transform( + Dictionary(elements = [("user", + TextAscii(title = _("Username"), + allow_empty = False, + )), + ("password", + Password(title = _("Password"), + allow_empty = False, + )), + ("verify_cert", DropdownChoice( + title = _("SSL certificate verification"), + choices = [ + (True, _("Activate")), + (False, _("Deactivate")), + ], + )), + ("values", + ListOfStrings(title = _("Values to fetch"), + orientation = "horizontal", + help = _("Possible values are the following: " + "cpgs, volumes, hosts, capacity, " + "system, ports, remotecopy, hostsets, volumesets, " + "vluns, flashcache, users, roles, qos.\n" + "If you do not specify any value the " + "first seven are used as default.") + )), + ], + optional_keys = [ "values" ], + ), + # verify_cert was added with 1.5.0p1 + forth = _transform_3par_add_verify_cert, ), title = _("Agent 3PAR Configuration"), match = 'first'

6 years, 4 months

6393 FIX check_bi_aggr: Fixed link in 'Open this aggregation'

by Simon Betz

in the dropdown menu of the aggregation service Message-ID: <5b62d8b9.71gpqln0IIzNIkj1%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8d44e47c4f7c3b9d9df115ea8cbf40a3e19ffd53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d44e47c4f7c3b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 2 11:20:41 2018 +0200 6393 FIX check_bi_aggr: Fixed link in 'Open this aggregation' in the dropdown menu of the aggregation service Change-Id: I89276494d52b0678fca8782e6d508cdb101d83d6 --- .werks/6393 | 11 +++++++++++ checks/check_bi_aggr | 22 ++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.werks/6393 b/.werks/6393 new file mode 100644 index 0000000..24b655d --- /dev/null +++ b/.werks/6393 @@ -0,0 +1,11 @@ +Title: check_bi_aggr: Fixed link in 'Open this aggregation' in the dropdown menu of the aggregation service +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533201535 + + diff --git a/checks/check_bi_aggr b/checks/check_bi_aggr index 94664c8..1146f46 100644 --- a/checks/check_bi_aggr +++ b/checks/check_bi_aggr @@ -26,28 +26,26 @@ def check_bi_aggr_arguments(params): base_url, aggr_name, username, secret, opt_params = params - args = [] - - args += [ '-b%s' % base_url ] - args += [ '-a%s' % aggr_name ] - args += [ '-u%s' % username ] - args += [ passwordstore_get_cmdline("-s%s", secret) ] + args = ' -b %s -a %s -u %s %s' % ( + quote_shell_string(base_url), + quote_shell_string(aggr_name), + quote_shell_string(username), + passwordstore_get_cmdline(" -s %s", secret)) if "auth_mode" in opt_params: - args += [ '-m%s' % opt_params['auth_mode'] ] + args += ' -m %s' % quote_shell_string(opt_params['auth_mode']) if "timeout" in opt_params: - args += [ '-t%d' % opt_params['timeout'] ] + args += ' -t %d' % opt_params['timeout'] if opt_params.get("in_downtime"): - args += [ '--in-downtime=%s' % opt_params['in_downtime'] ] + args += ' --in-downtime %s' % opt_params['in_downtime'] if opt_params.get("acknowledged"): - args += [ '--acknowledged=%s' % opt_params['acknowledged'] ] + args += ' --acknowledged %s' % opt_params['acknowledged'] if opt_params.get("track_downtimes"): - args += [ '-r' ] - args += [ '-n $HOSTNAME$' ] + args += ' -r -n $HOSTNAME$' return args

6 years, 4 months

6391 FIX multipath: Fixed unrecognized paths which include a dot

by Simon Betz

Module: check_mk Branch: master Commit: c482af4991ea46819ef5df9a17da04af611b2305 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c482af4991ea46… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 1 13:49:12 2018 +0200 6391 FIX multipath: Fixed unrecognized paths which include a dot Change-Id: Ib9dfe6afab251c331509ae68f0187038fad4dcbd --- .werks/6391 | 10 ++++++++++ checks/multipath | 17 +++++++++++++++-- tests/unit/checks/test_multipath.py | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/.werks/6391 b/.werks/6391 new file mode 100644 index 0000000..8d0044e --- /dev/null +++ b/.werks/6391 @@ -0,0 +1,10 @@ +Title: multipath: Fixed unrecognized paths which include a dot +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1533124059 +Class: fix + + diff --git a/checks/multipath b/checks/multipath index de0a34b..fafab8d 100644 --- a/checks/multipath +++ b/checks/multipath @@ -151,6 +151,20 @@ inventory_multipath_rules = [] # Nov 05 17:17:03 | You can run /sbin/mpathconf to create or modify /etc/multipath.conf # Nov 05 17:17:03 | DM multipath kernel driver not loaded +# UUID which includes dots (seen on Oracle Exadata VM) +# <<<multipath>>> +# iqn.2015-05.com.oracle:QD_DG_VOTE101_EXAO2ADM1VM101 dm-7 IET,VIRTUAL-DISK +# size=128M features='0' hwhandler='0' wp=rw +# |-+- policy='round-robin 0' prio=0 status=active +# | `- 8:0:0:1 sdg 8:96 active undef unknown +# |-+- policy='round-robin 0' prio=0 status=enabled +# | `- 9:0:0:1 sdh 8:112 active undef unknown +# |-+- policy='round-robin 0' prio=0 status=enabled +# | `- 10:0:0:1 sdi 8:128 active undef unknown +# `-+- policy='round-robin 0' prio=0 status=enabled +# `- 11:0:0:1 sdj 8:144 active undef unknown + + def parse_multipath(info): # New reported header lines need to be placed here # the matches need to be put in a list of tupples @@ -166,7 +180,7 @@ def parse_multipath(info): (regex(r"^[a-zA-Z0-9_]+$"), 0, None, None), # 3. (regex(r"^([0-9a-z]{33}|[0-9a-z]{49})\s?(dm.[0-9]+).*$"), 1, None, 2), # 4. (regex(r"^[a-zA-Z0-9_]+(dm-[0-9]+).*$"), 0, None, 1), # 5. Remove this line in 1.2.0 - (regex(r"^([-a-zA-Z0-9_ :]+)\s?(dm-[0-9]+).*$"), 1, None, 2), # 6. and 7. + (regex(r"^([-.a-zA-Z0-9_ :]+)\s?(dm-[0-9]+).*$"), 1, None, 2), # 6. and 7. ] reg_prio = regex("[[ ]prio=") @@ -205,7 +219,6 @@ def parse_multipath(info): matchobject = None for header_regex, uuid_pos, alias_pos, dm_pos in reg_headers: matchobject = header_regex.search(l) - if matchobject: uuid = matchobject.group(uuid_pos).strip() diff --git a/tests/unit/checks/test_multipath.py b/tests/unit/checks/test_multipath.py new file mode 100644 index 0000000..f90b6fa --- /dev/null +++ b/tests/unit/checks/test_multipath.py @@ -0,0 +1,37 @@ +import pytest + +# Mark all tests in this file as check related tests +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("group,result", [ + (['iqn.2015-05.com.oracle:QD_DG_VOTE101_EXAO2ADM1VM101', 'dm-7', 'IET,VIRTUAL-DISK'], + 'iqn.2015-05.com.oracle:QD_DG_VOTE101_EXAO2ADM1VM101'), + (['1IET', u'00010001', u'dm-4', u'IET,VIRTUAL-DISK'], + '1IET 00010001'), + (['SDataCoreSANsymphony_DAT05-fscl', u'dm-6', u'DataCore,SANsymphony'], + 'SDataCoreSANsymphony_DAT05-fscl'), + (['SDDN_S2A_9900_1308xxxxxxxx', u'dm-13', u'DDN,S2A', u'9900'], + 'SDDN_S2A_9900_1308xxxxxxxx'), + (['3600508b40006d7da0001a00004740000', u'dm-0', u'HP,HSV210'], + '3600508b40006d7da0001a00004740000'), + (['360080e500017bd72000002eb4c1b1ae8', u'dm-1', u'IBM,1814', u'FAStT'], + '360080e500017bd72000002eb4c1b1ae8'), + (['mpath1', u'(SIBM_____SwapA__________DA02BF71)'], + 'SIBM_____SwapA__________DA02BF71'), + (['anzvol1', '(36005076306ffc6480000000000005005)', 'dm-16', 'IBM,2107900'], + '36005076306ffc6480000000000005005'), + (['1494554000000000052303250303700000000000000000000', 'dm-0', 'IET,VIRTUAL-DISK'], + '1494554000000000052303250303700000000000000000000'), + (['360a980004334644d654a316e65306e51dm-4', u'NETAPP,LUN'], + '360a980004334644d654a316e65306e51'), + (['SFUJITSU_MAW3073NC_DBL2P62003VT'], + 'SFUJITSU_MAW3073NC_DBL2P62003VT'), + (['360a980004334644d654a364469555a76'], + '360a980004334644d654a364469555a76'), + (['orabase.lun50', '(360a9800043346937686f456f59386741)', 'dm-15', 'NETAPP,LUN'], + '360a9800043346937686f456f59386741') +]) +def test_multipath_parse_groups(check_manager, group, result): + check = check_manager.get_check("multipath") + assert result in check.run_parse([group])

6 years, 4 months

agent_azure: Special Agent for Azure monitoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 18ed796835c82837c2807b8928c72ee15ecc99bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18ed796835c828… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 31 15:44:04 2018 +0200 agent_azure: Special Agent for Azure monitoring CMK-513 Change-Id: I1c30e9b4b175ba5c4ba20a8cd02e8ce5048186df --- agents/special/agent_azure | 775 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 775 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18ed796835…

6 years, 4 months

check_sql: Insist on cmk.password_store

by Moritz Kiemer

Module: check_mk Branch: master Commit: 75c3b645f337c294d76b47386205952deae72a07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75c3b645f337c2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Aug 1 13:20:41 2018 +0200 check_sql: Insist on cmk.password_store This is hopefully the last commit relating to CMK-719 Change-Id: I2dec168e5231966cfdec315c157818e2ff248489 --- active_checks/check_sql | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/active_checks/check_sql b/active_checks/check_sql index 5e969e7..ca32cef 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -35,11 +35,8 @@ import os import logging import argparse -try: - import cmk.password_store - cmk.password_store.replace_passwords() -except ImportError: - pass +import cmk.password_store +cmk.password_store.replace_passwords() log = logging.getLogger(__name__)

6 years, 4 months

← Newer
1
...
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018