Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6283 New mode "omd cleanup" for removing unused Check_MK versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ff93a5c27a5071b64f03316bae5ccfeabd7a18f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ff93a5c27a507… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:35:46 2018 +0200 6283 New mode "omd cleanup" for removing unused Check_MK versions --- .werks/6283 | 10 +++ omd/packages/omd/bash_completion | 2 +- omd/packages/omd/omd | 161 +++++++++++++++++++++++++++++++++++++-- omd/packages/omd/omd.8 | 10 +++ 4 files changed, 177 insertions(+), 6 deletions(-) diff --git a/.werks/6283 b/.werks/6283 new file mode 100644 index 0000000..ef6a175 --- /dev/null +++ b/.werks/6283 @@ -0,0 +1,10 @@ +Title: New mode "omd cleanup" for removing unused Check_MK versions +Level: 2 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530520505 +Class: feature + + diff --git a/omd/packages/omd/bash_completion b/omd/packages/omd/bash_completion index e880413..71f2e89 100644 --- a/omd/packages/omd/bash_completion +++ b/omd/packages/omd/bash_completion @@ -18,7 +18,7 @@ _omd() { local GLOBALCMDS="sites|version|versions|help" local SITECMDS="start|stop|restart|reload|status|update|config|backup|restore|diff" - local ROOTCMDS="create|setversion" + local ROOTCMDS="create|setversion|cleanup" local ROOTSITECMDS="rm|mv|cp|disable|enable|init|su" COMPREPLY=() diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index bac0d7f..4862ea9 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -51,6 +51,7 @@ if len(sys.argv) > 1 and sys.argv[1] == "update" \ import sys, os, shutil, pwd, grp, re, time, pprint, tty, termios, traceback +import abc import fcntl import string import random @@ -404,11 +405,11 @@ def groupdel(groupname): stdin=open(os.devnull, "r"), stdout=open(os.devnull, "w"), stderr=subprocess.PIPE, close_fds=True) except OSError, e: - bail_out("\n" + tty_error + ": Failed to delete user '%s': %s" % (groupname, e)) + bail_out("\n" + tty_error + ": Failed to delete group '%s': %s" % (groupname, e)) stderr = p.communicate()[1] if p.returncode != 0: - bail_out("\n" + tty_error + ": Failed to delete user '%s': %s" % (groupname, stderr)) + bail_out("\n" + tty_error + ": Failed to delete group '%s': %s" % (groupname, stderr)) def groupadd(groupname, gid = None): cmd = "groupadd " @@ -2582,9 +2583,13 @@ def default_version(): return os.path.basename(os.path.realpath("/omd/versions/default")) def omd_versions(): - v = [ v for v in os.listdir("/omd/versions") if v != "default" ] - v.sort() - return v + try: + return sorted([ v for v in os.listdir("/omd/versions") if v != "default" ]) + except OSError, e: + if e.errno == 2: + return [] + else: + raise def version_exists(v): return v in omd_versions() @@ -3860,6 +3865,146 @@ def postprocess_restore_as_site_user(options, orig_apache_port): finalize_size_as_user("restore") + +def main_cleanup(args, options=None): + if options is None: + options = {} + + package_manager = PackageManager.factory() + if package_manager is None: + bail_out("Command is not supported on this platform") + + for version in omd_versions(): + site_ids = [ s for s in all_sites() if site_version(s) == version ] + if site_ids: + sys.stdout.write("%s%-20s%s In use (by %s). Keeping this version.\n" % + (tty_bold, version, tty_normal, ", ".join(site_ids))) + continue + + version_path = os.path.join("/omd/versions", version) + + packages = package_manager.find_packages_of_path(version_path) + if len(packages) != 1: + sys.stdout.write("%s%-20s%s Could not determine package. Keeping this version.\n" % + (tty_bold, version, tty_normal)) + continue + + sys.stdout.write("%s%-20s%s Uninstalling\n" % (tty_bold, version, tty_normal)) + package_manager.uninstall(packages[0]) + + # In case there were modifications made to the version the uninstall may leave + # some files behind. Remove the whole version directory + if os.path.exists(version_path): + shutil.rmtree(version_path) + + + # In case the last version has been removed ensure some things created globally + # are removed. + if not omd_versions(): + _cleanup_global_files() + + +def _cleanup_global_files(): + sys.stdout.write("No version left. Cleaning up global files.\n") + shutil.rmtree(g_info["OMD_PHYSICAL_BASE"], ignore_errors=True) + + for path in [ + "/omd", + g_info["APACHE_CONF_DIR"] + "/zzz_omd.conf", + "/etc/init.d/omd", + "/usr/bin/omd", + ]: + try: + os.unlink(path) + except OSError, e: + if e.errno == 2: + pass + else: + raise + + if group_exists("omd"): + groupdel("omd") + + + +class PackageManager: + __metaclass__ = abc.ABCMeta + + @classmethod + def factory(self): + if os.path.exists("/etc/cma"): + return + + distro_code = g_info["DISTRO_CODE"] + if distro_code.startswith("el") \ + or distro_code.startswith("sles"): + cls = PackageManagerRPM + else: + cls = PackageManagerDEB + + return cls() + + + @abc.abstractmethod + def uninstall(self, cmd): + p = self._execute(cmd) + output = p.communicate()[0] + if p.wait() != 0: + bail_out("Failed to uninstall package:\n%s" % output) + + + def _execute(self, cmd): + if opt_verbose: + sys.stdout.write("Executing: %s\n" % subprocess.list2cmdline(cmd)) + + return subprocess.Popen(cmd, shell=False, close_fds=True, + stdin=open(os.devnull), stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + + + +class PackageManagerDEB(PackageManager): + def uninstall(self, package_name): + return super(PackageManagerDEB, self).uninstall( + ["apt-get", "-y", "purge", package_name]) + + + def find_packages_of_path(self, path): + real_path = os.path.realpath(path) + + p = self._execute(["dpkg", "-S", real_path]) + output = p.communicate()[0] + if p.wait() != 0: + bail_out("Failed to find packages:\n%s" % output) + + for line in output.split("\n"): + if line.endswith(": %s" % real_path): + return line.split(": ", 1)[0].split(", ") + + return [] + + + +class PackageManagerRPM(PackageManager): + def uninstall(self, package_name): + return super(PackageManagerRPM, self).uninstall( + ["rpm", "-e", package_name]) + + + def find_packages_of_path(self, path): + real_path = os.path.realpath(path) + + p = self._execute(["rpm", "-qf", real_path]) + output = p.communicate()[0] + + if p.wait() == 1 and "not owned" in output: + return [] + + elif p.wait() != 0: + bail_out("Failed to find packages:\n%s" % stderr) + + return output.strip().split("\n") + + exclude_options = [ ( "no-rrds", None, False, "do not copy RRD files (performance data)"), ( "no-logs", None, False, "do not copy the monitoring history and log files"), @@ -4071,6 +4216,12 @@ commands = [ ], "Restores the backup of a site to an existing site or creates a new site", ""), + + ( "cleanup", True, False, 0, 0, False, "", main_cleanup, + [ ], + "Uninstall all Check_MK versions that are not used by any site.", + ""), + ] def handle_global_option(opt, orig): diff --git a/omd/packages/omd/omd.8 b/omd/packages/omd/omd.8 index 8aa60d4..b3b155a 100644 --- a/omd/packages/omd/omd.8 +++ b/omd/packages/omd/omd.8 @@ -452,6 +452,16 @@ section about \fBomd update\fP for details. the available RAM at max. When providing the \fB-t\fP option together with the SIZE given as absolute value of e.g. \fB500M\fP or percentage value like \fB10%\fP the maximum size of the tmpfs can be changed. +.TP +.B omd cleanup +This removes all Check_MK versions that are currently not used by any site. All +installed versions are checked for the number of sites that use this version. The +versions without sites will be removed by deinstalling the RPM/DEB package of this +version. + +Note: The whole version directory \fB/omd/version/[version]\fP will be removed. Even +when there are files left after deinstallation of the RPM/DEB package. OMD will cleanup +the whole directory tree. .SH SEE ALSO .BR http://www.omdistro.org

6 years, 3 months

Revert "check_http: separate the argument parsing for urls and certificates"

by Sven Panne

Module: check_mk Branch: master Commit: f88904f337d69ef52d1fd52169a84f9af273c7b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f88904f337d69e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 2 10:17:50 2018 +0200 Revert "check_http: separate the argument parsing for urls and certificates" This reverts commit 249f1949e90f8baadda64b02653e1d02b793084a. For some highly obscure reason, this commit (or a related one?) increased the pylint running time from about 35 min to 5 h 18 min. Change-Id: I85409c165c5fd94785f08b44fb927f306d08eeab --- checks/check_http | 137 ++++++++++++++++++------------------------------------ 1 file changed, 46 insertions(+), 91 deletions(-) diff --git a/checks/check_http b/checks/check_http index 7e90591..85d3232 100644 --- a/checks/check_http +++ b/checks/check_http @@ -24,42 +24,52 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def check_http_arguments(params): + description, settings = params + args = [] + + if "verbose" in settings: + args += [ "-v" ] + + if "vhost" in settings: + args += [ "-H", settings["vhost"] ] + + if "virthost" in settings: + vhost, omit_ip = settings["virthost"] + args += [ "-H", vhost ] + else: + omit_ip = False -def _is_certificate_check(settings): - return "cert_days" in settings + if "uri" in settings: + args += [ '-u', settings["uri"] ] + if "port" in settings: + args += [ '-p', settings["port"] ] -def _get_family_and_address(settings): # Use the address family of the monitored host by default - family = settings.get("address_family") - if family == None: - family = is_ipv6_primary(host_name()) and "ipv6" or "ipv4" + address_family = settings.get("address_family") + if address_family == None: + address_family = is_ipv6_primary(host_name()) and "ipv6" or "ipv4" - if family == "ipv6": + if address_family == "ipv6": + args.append("-6") address = "$_HOSTADDRESS_6$" else: address = "$_HOSTADDRESS_4$" - return family, address - - -def _certificate_args(address_family, address, settings): - args = [] + ssl = settings.get("ssl") + if ssl in [ True, "auto" ]: + args.append('--ssl') + elif ssl: + args.append('--ssl=%s' % ssl) if "cert_host" in settings: + omit_ip = True if settings.get("sni"): args += [ '-H', settings['cert_host'] ] else: - args += [ '-I', settings['cert_host'] ] args += [ '-H', address ] - else: - args += [ "-I", address ] - - if address_family == 'ipv6': - args.append('-6') - - if "port" in settings: - args += [ '-p', settings["port"] ] + args += [ '-I', settings['cert_host'] ] if "cert_days" in settings: # legacy behavior @@ -69,48 +79,7 @@ def _certificate_args(address_family, address, settings): warn, crit = settings["cert_days"] args += [ '-C', '%d,%d' % (warn, crit) ] - if "sni" in settings: - args.append('--sni') - - return args - - -def _url_args(address_family, address, settings): - def _omit_ip(settings): - if "virthost" in settings: - return settings["virthost"][1] - return False - - args = [] - - if (not _omit_ip(settings)) and ("proxy" not in settings): - args += [ "-I", address ] - elif "proxy" in settings: - args += [ "-I", settings["proxy"] ] - - if "vhost" in settings: - args += [ "-H", settings["vhost"] ] - - if "virthost" in settings: - vhost = settings["virthost"][0] - args += [ "-H", vhost ] - - if address_family == 'ipv6': - args.append('-6') - - if "port" in settings: - args += [ '-p', settings["port"] ] - - if "uri" in settings: - args += [ '-u', settings["uri"] ] - - ssl = settings.get("ssl") - if ssl in [ True, "auto" ]: - args.append('--ssl') - elif ssl: - args.append('--ssl=%s' % ssl) - - if "sni" in settings: + if settings.get("sni"): args.append('--sni') if "response_time" in settings: @@ -148,17 +117,17 @@ def _url_args(address_family, address, settings): if "expect_regex" in settings: if len(settings['expect_regex']) >= 4 and settings['expect_regex'][3]: - args.append('-l') + args += [ '-l' ] if settings['expect_regex'][1]: - args.append('-R') + args += [ '-R' ] else: - args.append('-r') - args.append(settings['expect_regex'][0]) + args += [ '-r' ] + args += [ settings['expect_regex'][0] ] if settings['expect_regex'][2]: - args.append('--invert-regex') + args += [ '--invert-regex' ] if settings.get("extended_perfdata"): - args.append('--extended-perfdata') + args += [ '--extended-perfdata' ] if "post_data" in settings: data, content_type = settings["post_data"] @@ -168,7 +137,7 @@ def _url_args(address_family, address, settings): args += [ '-j', settings["method"] ] if settings.get("no_body"): - args.append('--no-body') + args += [ '--no-body' ] if "page_size" in settings: args += [ '-m', '%d:%d' % settings["page_size"] ] @@ -176,32 +145,18 @@ def _url_args(address_family, address, settings): if "max_age" in settings: args += [ '-M', settings["max_age"] ] - # FIXME: This option is deprecated. According to the monitoring-plugins - # the "urlize" plugin should be used. if settings.get("urlize"): - args.append('-L') - - if "verbose" in settings: - args.append("-v") - - return args - + args += [ '-L' ] -def check_http_arguments(params): - description, settings = params - args = [] - - address_family, address = _get_family_and_address(settings) - - if _is_certificate_check(settings): - args += _certificate_args(address_family, address, settings) - else: - args += _url_args(address_family, address, settings) + if (not omit_ip) and ("proxy" not in settings): + args = [ "-I", address ] + args + elif "proxy" in settings: + args = [ "-I", settings["proxy"] ] + args return args -def check_http_description(params): +def check_http_desc(params): description, settings = params if description.startswith("^"): @@ -219,7 +174,7 @@ def check_http_description(params): active_check_info['http'] = { "command_line" : '$USER1$/check_http $ARG1$', "argument_function" : check_http_arguments, - "service_description" : check_http_description, + "service_description" : check_http_desc, "has_perfdata" : True, }

6 years, 3 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 5cb0b77d70708a5072efc5feac641b283fbf0d1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cb0b77d70708a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:27:32 2018 +0200 Reserved 20 Werk IDS Change-Id: I7b9cd547141b9665d84d0218c3e93f59474ab50a --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9a1a3f3..b0eb089 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6279 +6299

6 years, 3 months

Refreshed Pipfile.lock.

by Sven Panne

Module: check_mk Branch: master Commit: 9a607d26ce8bc6ae0925a6f264715419ba61fae2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a607d26ce8bc6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 2 09:26:16 2018 +0200 Refreshed Pipfile.lock. Change-Id: Ic77a740afc8bb4ae89d8a86925e307bbdf75d7e6 --- Pipfile.lock | 220 +++++++++++++++++++++++------------------------------------ 1 file changed, 86 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9a607d26ce…

6 years, 3 months

Some little improvements

by Simon Betz

Module: check_mk Branch: master Commit: b80b67d2255309f83358f83bb9f1371358d825d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b80b67d2255309… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 29 11:32:25 2018 +0200 Some little improvements Change-Id: Ida3698a5b5c724d6933dfac5c82eaa5ccc1225ab --- agents/plugins/mk_oracle | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 9836879..19f2f17 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1016,9 +1016,11 @@ sql_asm_diskgroup () { # '----------------------------------------------------------------------' do_dummy_sections () { - for section in $SYNC_SECTIONS $ASYNC_SECTIONS $SYNC_ASM_SECTIONS $ASYNC_ASM_SECTIONS; do - echo "<<<oracle_${section}>>>" - done + if [ "$MK_ORA_DEBUG_CONNECT" != "1" ]; then + for section in $SYNC_SECTIONS $ASYNC_SECTIONS $SYNC_ASM_SECTIONS $ASYNC_ASM_SECTIONS; do + echo "<<<oracle_${section}>>>" + done + fi } @@ -1087,7 +1089,7 @@ remove_excluded_sections () { fi done if [ "$skip" != yes ]; then - result="$result $section" + result=${result:+"$result "}"${section}" fi done echo "$result" @@ -1379,24 +1381,28 @@ do_testmode () { local piggyback_host="$3" local sections="$4" local asections="$5" - echo "-----------------------------------------------" - echo "Operating System: ${OS_TYPE}" - echo "Logincheck to Instance: ${sid}, Version: ${ORACLE_VERSION}" - echo "select 'Login ok User: ' || user || ' on ' || host_name ||' Instance ' || instance_name + echo + echo "---login----------------------------------------------------------------" + echo " Operating System: ${OS_TYPE}" + echo " Logincheck to Instance: ${sid}" + echo " Version: ${ORACLE_VERSION}" + echo "select ' Login ok User: ' || user || ' on ' || host_name ||' Instance ' || instance_name from v\$instance;" | mk_ora_sqlplus "${sid}" "$db_connect" "$piggyback_host" "no" - echo "SYNC_SECTIONS=$sections" - echo "ASYNC_SECTIONS=$asections" + echo " SYNC_SECTIONS: $sections" + echo " ASYNC_SECTIONS: $asections" if [ "$IGNORE_DB_NAME" ]; then - echo "IGNORE_DB_NAME found. Ignoring DB_NAME in all SQLs!" + echo " IGNORE_DB_NAME found. Ignoring DB_NAME in all SQLs!" fi if [ "$DISABLE_ORA_SESSION_SETTINGS" ]; then - echo "Paramter DISABLE_ORA_SESSION_SETTINGS found!" + echo " Paramter DISABLE_ORA_SESSION_SETTINGS found!" fi if [ "$HINT_RMAN" ]; then - echo "Using HINT_RMAN for this Instance!" + echo " Using HINT_RMAN for this Instance!" fi + echo "------------------------------------------------------------------------" + echo } @@ -1427,8 +1433,13 @@ do_checks () { ASYNC_SQL=$(for section in $asections ; do eval "sql_$section" ; done) export ASYNC_SQL + if [ "$MK_ORA_LOGGING" = "1" ]; then + logging "[$LINENO] [${sid}] [do_checks]" "Testmode: $(echo \ + "select user || ' on ' || host_name || ' instance ' || instance_name from v\$instance;"|\ + mk_ora_sqlplus "${sid}" "$db_connect" "$piggyback_host" "no")" + fi - if [ "$MK_ORA_DEBUG_CONNECT" ]; then + if [ "$MK_ORA_DEBUG_CONNECT" = "1" ]; then do_testmode "$sid" "$db_connect" "$piggyback_host" "$sections" "$asections" >&2 else do_sync_checks "$sid" "$db_connect" "$piggyback_host" "$sections"

6 years, 3 months

check_http: separate the argument parsing for urls and certificates

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 249f1949e90f8baadda64b02653e1d02b793084a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=249f1949e90f8b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jun 28 16:50:43 2018 +0200 check_http: separate the argument parsing for urls and certificates Change-Id: I6441ac34ce312a19d45aafa2c71c93319ddd7dd6 --- checks/check_http | 137 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 46 deletions(-) diff --git a/checks/check_http b/checks/check_http index 85d3232..7e90591 100644 --- a/checks/check_http +++ b/checks/check_http @@ -24,52 +24,42 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_http_arguments(params): - description, settings = params - args = [] - - if "verbose" in settings: - args += [ "-v" ] - - if "vhost" in settings: - args += [ "-H", settings["vhost"] ] - - if "virthost" in settings: - vhost, omit_ip = settings["virthost"] - args += [ "-H", vhost ] - else: - omit_ip = False - if "uri" in settings: - args += [ '-u', settings["uri"] ] +def _is_certificate_check(settings): + return "cert_days" in settings - if "port" in settings: - args += [ '-p', settings["port"] ] +def _get_family_and_address(settings): # Use the address family of the monitored host by default - address_family = settings.get("address_family") - if address_family == None: - address_family = is_ipv6_primary(host_name()) and "ipv6" or "ipv4" + family = settings.get("address_family") + if family == None: + family = is_ipv6_primary(host_name()) and "ipv6" or "ipv4" - if address_family == "ipv6": - args.append("-6") + if family == "ipv6": address = "$_HOSTADDRESS_6$" else: address = "$_HOSTADDRESS_4$" - ssl = settings.get("ssl") - if ssl in [ True, "auto" ]: - args.append('--ssl') - elif ssl: - args.append('--ssl=%s' % ssl) + return family, address + + +def _certificate_args(address_family, address, settings): + args = [] if "cert_host" in settings: - omit_ip = True if settings.get("sni"): args += [ '-H', settings['cert_host'] ] else: - args += [ '-H', address ] args += [ '-I', settings['cert_host'] ] + args += [ '-H', address ] + else: + args += [ "-I", address ] + + if address_family == 'ipv6': + args.append('-6') + + if "port" in settings: + args += [ '-p', settings["port"] ] if "cert_days" in settings: # legacy behavior @@ -79,7 +69,48 @@ def check_http_arguments(params): warn, crit = settings["cert_days"] args += [ '-C', '%d,%d' % (warn, crit) ] - if settings.get("sni"): + if "sni" in settings: + args.append('--sni') + + return args + + +def _url_args(address_family, address, settings): + def _omit_ip(settings): + if "virthost" in settings: + return settings["virthost"][1] + return False + + args = [] + + if (not _omit_ip(settings)) and ("proxy" not in settings): + args += [ "-I", address ] + elif "proxy" in settings: + args += [ "-I", settings["proxy"] ] + + if "vhost" in settings: + args += [ "-H", settings["vhost"] ] + + if "virthost" in settings: + vhost = settings["virthost"][0] + args += [ "-H", vhost ] + + if address_family == 'ipv6': + args.append('-6') + + if "port" in settings: + args += [ '-p', settings["port"] ] + + if "uri" in settings: + args += [ '-u', settings["uri"] ] + + ssl = settings.get("ssl") + if ssl in [ True, "auto" ]: + args.append('--ssl') + elif ssl: + args.append('--ssl=%s' % ssl) + + if "sni" in settings: args.append('--sni') if "response_time" in settings: @@ -117,17 +148,17 @@ def check_http_arguments(params): if "expect_regex" in settings: if len(settings['expect_regex']) >= 4 and settings['expect_regex'][3]: - args += [ '-l' ] + args.append('-l') if settings['expect_regex'][1]: - args += [ '-R' ] + args.append('-R') else: - args += [ '-r' ] - args += [ settings['expect_regex'][0] ] + args.append('-r') + args.append(settings['expect_regex'][0]) if settings['expect_regex'][2]: - args += [ '--invert-regex' ] + args.append('--invert-regex') if settings.get("extended_perfdata"): - args += [ '--extended-perfdata' ] + args.append('--extended-perfdata') if "post_data" in settings: data, content_type = settings["post_data"] @@ -137,7 +168,7 @@ def check_http_arguments(params): args += [ '-j', settings["method"] ] if settings.get("no_body"): - args += [ '--no-body' ] + args.append('--no-body') if "page_size" in settings: args += [ '-m', '%d:%d' % settings["page_size"] ] @@ -145,18 +176,32 @@ def check_http_arguments(params): if "max_age" in settings: args += [ '-M', settings["max_age"] ] + # FIXME: This option is deprecated. According to the monitoring-plugins + # the "urlize" plugin should be used. if settings.get("urlize"): - args += [ '-L' ] + args.append('-L') - if (not omit_ip) and ("proxy" not in settings): - args = [ "-I", address ] + args - elif "proxy" in settings: - args = [ "-I", settings["proxy"] ] + args + if "verbose" in settings: + args.append("-v") + + return args + + +def check_http_arguments(params): + description, settings = params + args = [] + + address_family, address = _get_family_and_address(settings) + + if _is_certificate_check(settings): + args += _certificate_args(address_family, address, settings) + else: + args += _url_args(address_family, address, settings) return args -def check_http_desc(params): +def check_http_description(params): description, settings = params if description.startswith("^"): @@ -174,7 +219,7 @@ def check_http_desc(params): active_check_info['http'] = { "command_line" : '$USER1$/check_http $ARG1$', "argument_function" : check_http_arguments, - "service_description" : check_http_desc, + "service_description" : check_http_description, "has_perfdata" : True, }

6 years, 3 months

check_http: add tests for service description and argument parsing

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4fbc47264cbc57dc357e75f563348fe534f93ce8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fbc47264cbc57… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jun 29 10:19:43 2018 +0200 check_http: add tests for service description and argument parsing Change-Id: Ie3649429e8e96dca50a5fec5ba5c7334c4a26877 --- tests/testlib/__init__.py | 26 ++++++++++++---- tests/unit/checks/test_check_http.py | 60 ++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3a68960..d3a6457 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1779,11 +1779,15 @@ class CheckManager(object): config.load_checks(check_api.get_check_api_context, map(lambda f: os.path.join(cmk.paths.checks_dir, f), file_names)) - def get_check(self, name): - self.load([name.split(".", 1)[0]]) + main_check = name.split(".", 1)[0] + self.load([main_check]) return Check(name) + def get_active_check(self, name): + self.load([name]) + return ActiveCheck(name) + class Check(object): def __init__(self, name): @@ -1792,13 +1796,11 @@ class Check(object): self.info = config.check_info[name] self.context = config._check_contexts[name] - def default_parameters(self): import cmk_base.config as config params = {} return config._update_with_default_check_parameters(self.name, params) - def run_parse(self, info): parse_func = self.info.get("parse_function") if not parse_func: @@ -1806,12 +1808,10 @@ class Check(object): return parse_func(info) - def run_discovery(self, info): # TODO: use standard sanitizing code return self.info["inventory_function"](info) - def run_check(self, item, params, info): # TODO: use standard sanitizing code return self.info["check_function"](item, params, info) @@ -1837,3 +1837,17 @@ class Check(object): # # TODO: use standard sanitizing code # return self.info["check_function"](item, params, info) + + +class ActiveCheck(object): + def __init__(self, name): + import cmk_base.config as config + self.name = name + assert name.startswith('check_'), 'Specify the full name of the active check, e.g. check_http' + self.info = config.active_check_info[name[len('check_'):]] + + def run_argument_function(self, params): + return self.info['argument_function'](params) + + def run_service_description(self, params): + return self.info['service_description'](params) diff --git a/tests/unit/checks/test_check_http.py b/tests/unit/checks/test_check_http.py new file mode 100644 index 0000000..8cf89b0 --- /dev/null +++ b/tests/unit/checks/test_check_http.py @@ -0,0 +1,60 @@ +import pytest + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize('params,expected_args', [( + (None, { + 'onredirect': 'follow', + 'port': 80, + 'uri': '/images', + 'urlize': True, + 'virthost': ('www.test123.de', True) + }), + ['-H', 'www.test123.de', '-p', 80, '-u', '/images', '--onredirect=follow', '-L'], +), ( + (None, { + 'extended_perfdata': True, + 'method': 'CONNECT', + 'port': 3128, + 'proxy': '163.172.86.64', + 'ssl': 'auto', + 'uri': '/images', + 'virthost': ('www.test123.de', True) + }), + [ + '-I', '163.172.86.64', '-H', 'www.test123.de', '-p', 3128, '-u', '/images', '--ssl', + '--extended-perfdata', '-j', 'CONNECT' + ], +), ( + (None, { + 'cert_days': (10, 20), + 'cert_host': 'www.test123.com' + }), + ['-I', 'www.test123.com', '-H', '$_HOSTADDRESS_4$', '-C', '10,20'], +)]) +def test_check_http_argument_parsing(check_manager, params, expected_args): + """Tests if all required arguments are present. The tests do not check the order of arguments.""" + active_check = check_manager.get_active_check('check_http') + assert sorted(active_check.run_argument_function(params)) == sorted(expected_args) + + +(a)pytest.mark.parametrize('params,expected_description', [ + ( + (u'No SSL Test', {}), + u'HTTP No SSL Test', + ), + ( + (u'Test with SSL', { + 'ssl': "auto" + }), + u'HTTPS Test with SSL', + ), + ( + (u'^No Prefix Test', {}), + u'No Prefix Test', + ), +]) +def test_check_http_service_description(check_manager, params, expected_description): + active_check = check_manager.get_active_check('check_http') + assert active_check.run_service_description(params) == expected_description

6 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018