Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Martin Hirschvogel

Module: check_mk Branch: master Commit: b546f3dd59e2f67f9b5313820b6769cd7bc9de05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b546f3dd59e2f6… Author: Martin Hirschvogel <mh(a)mathias-kettner.de> Date: Tue Mar 26 14:27:48 2019 +0100 checkman: fixed BI catalog entries Change-Id: I69ce862643215714cf08a2fd6e31835df82cc7cb --- checkman/bi_aggregation | 7 +++---- checkman/bi_aggregation_connection | 4 ++-- checkman/check_bi_aggr | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/checkman/bi_aggregation b/checkman/bi_aggregation index baccda2..47cf9d7 100644 --- a/checkman/bi_aggregation +++ b/checkman/bi_aggregation @@ -1,13 +1,12 @@ title: State of BI aggregation -agents: bi -catalog: os/misc +agents: BI +catalog: app/omd license: GPL distribution: check_mk description: This check outputs the state of a BI aggregation. - The plugin output also shows if the aggregation is currently + The plugin output also shows, if the aggregation is currently in downtime or has been acknowledged. inventory: Creates one check per BI aggregation - diff --git a/checkman/bi_aggregation_connection b/checkman/bi_aggregation_connection index aa74bc7..5e03061 100644 --- a/checkman/bi_aggregation_connection +++ b/checkman/bi_aggregation_connection @@ -1,6 +1,6 @@ title: Status information for BI aggregation connection -agents: bi -catalog: os/misc +agents: BI +catalog: app/omd license: GPL distribution: check_mk description: diff --git a/checkman/check_bi_aggr b/checkman/check_bi_aggr index efa69ba..24a9079 100644 --- a/checkman/check_bi_aggr +++ b/checkman/check_bi_aggr @@ -1,6 +1,6 @@ title: BI Aggregations agents: active -catalog: agentless +catalog: app/omd license: GPL distribution: check_mk description:

5 years, 6 months

fixed integration test

by Andreas Boesl

Module: check_mk Branch: master Commit: e31403a205d5ffdf1a5885b03233b88d0e4e8d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e31403a205d5ff… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 27 09:47:28 2019 +0100 fixed integration test Change-Id: I7482f3846597a8dce41351ad7687cdd55988348d --- cmk_base/automations/check_mk.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 9c4d799..ae5a316 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -116,8 +116,10 @@ class AutomationDiscovery(DiscoveryAutomation): for hostname in hostnames: result, error = discovery.discover_on_host(how, hostname, do_snmp_scan, use_caches, on_error) - counts[hostname] = result["self_new"], result["self_removed"], result[ - "self_kept"], result["self_total"] + counts[hostname] = [ + result["self_new"], result["self_removed"], result["self_kept"], + result["self_total"] + ] if error is not None: failed_hosts[hostname] = error

5 years, 6 months

GUI CSS: Moved remaining styles for sidebar from classic to facelift theme ( CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 9862ecb0b9effdaabaa32b9d5f3966fd463017a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9862ecb0b9effd… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Mar 25 15:19:20 2019 +0100 GUI CSS: Moved remaining styles for sidebar from classic to facelift theme (CMK-1171) Change-Id: Ib30bf0a14449c405b1508faf82f8de02e127d3ab --- web/htdocs/themes/facelift/scss/_main.scss | 95 +--- web/htdocs/themes/facelift/scss/_sidebar.scss | 705 +++++++++++++++++++------- web/htdocs/themes/facelift/theme.scss | 2 - 3 files changed, 527 insertions(+), 275 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9862ecb0b9…

5 years, 6 months

WK7250: Check_MK Discovery: Clusters were unable to automatically discover new services

by Andreas Boesl

Module: check_mk Branch: master Commit: a76dacd3167f3388c5f177e6949ee9883b14b0e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a76dacd3167f33… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 26 14:50:45 2019 +0100 WK7250: Check_MK Discovery: Clusters were unable to automatically discover new services Change-Id: Ie975f6998666c67ee598bface62457720fa34476 --- .werks/7250 | 22 ++++++++++++++ cmk_base/automations/check_mk.py | 4 ++- cmk_base/discovery.py | 64 ++++++++++++++++++++++++---------------- 3 files changed, 64 insertions(+), 26 deletions(-) diff --git a/.werks/7250 b/.werks/7250 new file mode 100644 index 0000000..fb19dbf --- /dev/null +++ b/.werks/7250 @@ -0,0 +1,22 @@ +Title: Check_MK Discovery: Clusters were unable to automatically discover new services +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553243799 + +The <tt>Check_MK Discovery</tt> check for a cluster was able to identify new/vanished services. +However, the automatic discovery mechanism in the background failed to integrate them into the configuration. + + +This has been fixed. There is still some constraint which makes this werk incompatible. +The <tt>Periodic service discovery</tt> rule allows you to configure <tt>Automatcally activate changes</tt> for the specified host. +If you want automatic activation of new services for cluster hosts, you have to configured a rule on the nodes instead of the cluster hosts. +So any <tt>Periodic service discovery</tt> rules of clusters should be duplicated onto the nodes. + + +This requirement is currently necessary because of the internal configuration. +Clusters never have an explicit configuration file, the actual clusters configuration is compute on demand. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index b883ba6..9c4d799 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -116,7 +116,9 @@ class AutomationDiscovery(DiscoveryAutomation): for hostname in hostnames: result, error = discovery.discover_on_host(how, hostname, do_snmp_scan, use_caches, on_error) - counts[hostname] = result + counts[hostname] = result["self_new"], result["self_removed"], result[ + "self_kept"], result["self_total"] + if error is not None: failed_hosts[hostname] = error else: diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index f3a4abd..ae38c19 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -213,10 +213,17 @@ def discover_on_host(mode, use_caches, on_error="ignore", service_filter=None): - counts = {"added": 0, "removed": 0, "kept": 0} + counts = { + "self_new": 0, + "self_removed": 0, + "self_kept": 0, + "self_total": 0, + "clustered_new": 0, + "clustered_vanished": 0, + } if hostname not in config.all_active_realhosts(): - return [0, 0, 0, 0], "" + return counts, "" if service_filter is None: service_filter = lambda hostname, check_plugin_name, item: True @@ -228,7 +235,7 @@ def discover_on_host(mode, # checks of the host, so that _get_host_services() does show us the # new discovered check parameters. if mode == "refresh": - counts["removed"] += remove_autochecks_of(hostname) # this is cluster-aware! + counts["self_removed"] += remove_autochecks_of(hostname) # this is cluster-aware! if config.is_cluster(hostname): ipaddress = None @@ -259,13 +266,13 @@ def discover_on_host(mode, if check_source == "new": if mode in ("new", "fixall", "refresh") and service_filter( hostname, check_plugin_name, item): - counts["added"] += 1 + counts["self_new"] += 1 new_items[(check_plugin_name, item)] = paramstring elif check_source in ("old", "ignored"): # keep currently existing valid services in any case new_items[(check_plugin_name, item)] = paramstring - counts["kept"] += 1 + counts["self_kept"] += 1 elif check_source == "vanished": # keep item, if we are currently only looking for new services @@ -273,12 +280,13 @@ def discover_on_host(mode, if mode not in ("fixall", "remove") or not service_filter(hostname, check_plugin_name, item): new_items[(check_plugin_name, item)] = paramstring - counts["kept"] += 1 + counts["self_kept"] += 1 else: - counts["removed"] += 1 + counts["self_removed"] += 1 elif check_source.startswith("clustered_"): # Silently keep clustered services + counts[check_source] += 1 new_items[(check_plugin_name, item)] = paramstring else: @@ -292,8 +300,9 @@ def discover_on_host(mode, if cmk.utils.debug.enabled(): raise err = str(e) - return [counts["added"], counts["removed"], counts["kept"], - counts["added"] + counts["kept"]], err + + counts["self_total"] = counts["self_new"] + counts["self_kept"] + return counts, err #. @@ -397,8 +406,12 @@ def check_discovery(hostname, ipaddress): "ignored: %s: %s" % (check_plugin_name, config.service_description(hostname, check_plugin_name, item))) - _set_rediscovery_flag(hostname, need_rediscovery) if need_rediscovery: + if config.is_cluster(hostname): + for nodename in config.nodes_of(hostname): + _set_rediscovery_flag(nodename) + else: + _set_rediscovery_flag(hostname) infotexts.append("rediscovery scheduled") # Add data source information to check results @@ -436,7 +449,7 @@ def default_discovery_check_parameters(): } -def _set_rediscovery_flag(hostname, need_rediscovery): +def _set_rediscovery_flag(hostname): def touch(filename): if not os.path.exists(filename): f = open(filename, "w") @@ -444,16 +457,10 @@ def _set_rediscovery_flag(hostname, need_rediscovery): autodiscovery_dir = cmk.utils.paths.var_dir + '/autodiscovery' discovery_filename = os.path.join(autodiscovery_dir, hostname) - if need_rediscovery: - if not os.path.exists(autodiscovery_dir): - os.makedirs(autodiscovery_dir) - touch(discovery_filename) - else: - if os.path.exists(discovery_filename): - try: - os.remove(discovery_filename) - except OSError: - pass + + if not os.path.exists(autodiscovery_dir): + os.makedirs(autodiscovery_dir) + touch(discovery_filename) class DiscoveryTimeout(Exception): @@ -595,12 +602,19 @@ def _discover_marked_host(hostname, all_hosts, now_ts, oldest_queued): # compatible with the automation code console.verbose(" failed: host is offline\n") else: - new_services, removed_services, kept_services, total_services = result - if new_services == 0 and removed_services == 0 and kept_services == total_services: + if result["self_new"] == 0 and\ + result["self_removed"] == 0 and\ + result["self_kept"] == result["self_total"] and\ + result["clustered_new"] == 0 and\ + result["clustered_vanished"] == 0: console.verbose(" nothing changed.\n") else: - console.verbose( - " %d new, %d removed, %d kept, %d total services.\n" % (tuple(result))) + console.verbose(" %(self_new)s new, %(self_removed)s removed, "\ + "%(self_kept)s kept, %(self_total)s total services. "\ + "clustered new %(clustered_new)s, clustered vanished %(clustered_vanished)s" % result) + + # Note: Even if the actual mark-for-discovery flag may have been created by a cluster host, + # the activation decision is based on the discovery configuration of the node if redisc_params["activation"]: services_changed = True

5 years, 6 months

Made tag value selection more flexible

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b92d653c44212a277f96ee0d2ba7d7c7da4a598 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b92d653c44212… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 24 22:08:44 2019 +0100 Made tag value selection more flexible * Since the tags are now identified by a combination of the tag group ID and the tag ID, like e.g. <tt>criticality:prod</tt>, the tag IDs don't need to be be unique anymore compared to other tag groups or the auxiliary tags. The tag IDs only need to be unique within a single tag group. * Cleaned up tag config validation handling. The validation is now done after the config modifications have been made to the TagConfig structure. Don't call the validation during config loading anymore, because this prevented repairing actions using the GUI. * Cleaned up tag config insertion tests a bit CMK-1815 Cleanup tag config validation Change-Id: Iee6bc8bfcd925a649d358a188b25b0e7b785d082 --- cmk/gui/plugins/webapi/webapi.py | 1 + cmk/gui/tags.py | 44 ++++++++++-------------------- cmk/gui/wato/pages/tags.py | 14 +++++----- tests/unit/cmk/gui/test_gui_tags.py | 53 ++++++++++++++++++++++++++++--------- 4 files changed, 61 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b92d653c4…

5 years, 6 months

Changed aux tag actions to use tag id as identifier

by Lars Michelsen

Module: check_mk Branch: master Commit: bb03a34e4509941984d946f1750fb6fb6166d63c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb03a34e450994… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 24 20:51:09 2019 +0100 Changed aux tag actions to use tag id as identifier Change-Id: I79fdc5295b5b57b99fae78761362bf55722b8b0c --- cmk/gui/tags.py | 10 +-- cmk/gui/wato/pages/tags.py | 160 ++++++++++++++++++++++++--------------------- 2 files changed, 89 insertions(+), 81 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bb03a34e45…

5 years, 6 months

Reduce duplicate logic of tag edit modes

by Lars Michelsen

Module: check_mk Branch: master Commit: a1574b7ef9f6a59b239a897e7fb295d7e9c3a75a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1574b7ef9f6a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 24 21:30:31 2019 +0100 Reduce duplicate logic of tag edit modes Move more common code to the base class of tag group and aux tag edit modes. Change-Id: I89521b2c715f63d370190f002449d8f7fd694940 --- cmk/gui/wato/__init__.py | 1 - cmk/gui/wato/pages/tags.py | 145 ++++++++++++++++++--------------------------- 2 files changed, 57 insertions(+), 89 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a9e8312..9a5bda0 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -205,7 +205,6 @@ from cmk.gui.wato.pages.host_diagnose import ModeDiagHost from cmk.gui.wato.pages.host_rename import ModeBulkRenameHost, ModeRenameHost from cmk.gui.wato.pages.tags import ( ModeTags, - ModeEditHosttagConfiguration, ModeEditAuxtag, ModeEditTagGroup, ) diff --git a/cmk/gui/wato/pages/tags.py b/cmk/gui/wato/pages/tags.py index a4a168e..179248a 100644 --- a/cmk/gui/wato/pages/tags.py +++ b/cmk/gui/wato/pages/tags.py @@ -26,6 +26,8 @@ """Manage the variable config.wato_host_tags -> The set of tags to be assigned to hosts and that is the basis of the rules.""" +import abc + import cmk.gui.config as config import cmk.gui.watolib as watolib from cmk.gui.table import table_element @@ -274,9 +276,15 @@ class ModeTags(WatoMode): return sorted(used_tags) -class ModeEditHosttagConfiguration(WatoMode): +class ABCEditTagMode(WatoMode): + __metaclass__ = abc.ABCMeta + + @classmethod + def permissions(cls): + return ["hosttags"] + def __init__(self): - super(ModeEditHosttagConfiguration, self).__init__() + super(ABCEditTagMode, self).__init__() self._tag_config_file = TagConfigFile() self._untainted_hosttags_config = cmk.gui.tags.TagConfig() self._untainted_hosttags_config.parse_config(self._tag_config_file.load_for_reading()) @@ -285,6 +293,41 @@ class ModeEditHosttagConfiguration(WatoMode): self._effective_config.parse_config(self._untainted_hosttags_config.get_dict_format()) self._effective_config += cmk.gui.config.BuiltinTagConfig() + self._id = self._get_id() + self._new = self._is_new_tag() + + @abc.abstractmethod + def _get_id(self): + raise NotImplementedError() + + def _is_new_tag(self): + return html.request.var("edit") is None + + def _basic_elements(self): + if self._new: + vs_id = ID( + title=_("Tag ID"), + size=60, + allow_empty=False, + help=_("The internal ID of the tag is used as it's unique identifier " + "It cannot be changed later."), + ) + else: + vs_id = FixedValue( + self._id, + title=_("Tag ID"), + ) + + return [ + ("id", vs_id), + ("title", TextUnicode( + title=_("Title"), + size=60, + allow_empty=False, + )), + ("topic", self._get_topic_valuespec()), + ] + def _get_topic_valuespec(self): return OptionalDropdownChoice( title=_("Topic") + "<sup>*</sup>", @@ -292,38 +335,29 @@ class ModeEditHosttagConfiguration(WatoMode): explicit=TextUnicode(), otherlabel=_("Create new topic"), default_value=None, - help=_("Different tag groups can be grouped in topics to make the visualization and " + help=_("Different tags can be grouped in topics to make the visualization and " "selections in the GUI more comfortable."), ) @mode_registry.register -class ModeEditAuxtag(ModeEditHosttagConfiguration): +class ModeEditAuxtag(ABCEditTagMode): @classmethod def name(cls): return "edit_auxtag" - @classmethod - def permissions(cls): - return ["hosttags"] - def __init__(self): super(ModeEditAuxtag, self).__init__() - self._new = self._is_new_aux_tag() - if self._new: - self._aux_tag_id = None self._aux_tag = cmk.gui.tags.AuxTag() else: - self._aux_tag_id = self._get_tag_id() - self._aux_tag = self._untainted_hosttags_config.aux_tag_list.get_aux_tag( - self._aux_tag_id) + self._aux_tag = self._untainted_hosttags_config.aux_tag_list.get_aux_tag(self._id) - def _is_new_aux_tag(self): - return html.request.var("edit") is None + def _get_id(self): + if not html.request.has_var("edit"): + return None - def _get_tag_id(self): return html.get_item_input( "edit", dict(self._untainted_hosttags_config.aux_tag_list.get_choices()))[1] @@ -361,7 +395,7 @@ class ModeEditAuxtag(ModeEditHosttagConfiguration): if self._new: changed_hosttags_config.aux_tag_list.append(self._aux_tag) else: - changed_hosttags_config.aux_tag_list.update(self._aux_tag_id, self._aux_tag) + changed_hosttags_config.aux_tag_list.update(self._id, self._aux_tag) self._tag_config_file.save(changed_hosttags_config.get_dict_format()) @@ -387,63 +421,26 @@ class ModeEditAuxtag(ModeEditHosttagConfiguration): optional_keys=[], ) - def _basic_elements(self): - if self._new: - vs_id = ID( - title=_("Tag ID"), - size=60, - allow_empty=False, - help=_("The internal ID of the tag is used to store the tag's " - "value in the host properties. It cannot be changed later."), - ) - else: - vs_id = FixedValue( - self._aux_tag.id, - title=_("Tag ID"), - ) - - return [ - ("id", vs_id), - ("title", - TextUnicode( - title=_("Title"), - size=60, - help=_("An alias or description of this auxiliary tag"), - allow_empty=False, - )), - ("topic", self._get_topic_valuespec()), - ] - @mode_registry.register -class ModeEditTagGroup(ModeEditHosttagConfiguration): +class ModeEditTagGroup(ABCEditTagMode): @classmethod def name(cls): return "edit_tag" - @classmethod - def permissions(cls): - return ["hosttags"] - def __init__(self): super(ModeEditTagGroup, self).__init__() - self._tag_group_id = self._get_taggroup_id() - self._new = self._is_new_hosttag_group() - self._untainted_tag_group = self._untainted_hosttags_config.get_tag_group( - self._tag_group_id) + self._untainted_tag_group = self._untainted_hosttags_config.get_tag_group(self._id) if not self._untainted_tag_group: self._untainted_tag_group = cmk.gui.tags.TagGroup() self._tag_group = self._untainted_hosttags_config.get_tag_group( - self._tag_group_id) or cmk.gui.tags.TagGroup() + self._id) or cmk.gui.tags.TagGroup() - def _get_taggroup_id(self): + def _get_id(self): return html.request.var("edit", html.request.var("tag_id")) - def _is_new_hosttag_group(self): - return html.request.var("edit") is None - def title(self): if self._new: return _("Create new tag group") @@ -514,8 +511,7 @@ class ModeEditTagGroup(ModeEditHosttagConfiguration): if message: self._tag_config_file.save(changed_hosttags_config.get_dict_format()) config.load_config() - add_change("edit-hosttags", - _("Edited host tag group %s (%s)") % (message, self._tag_group_id)) + add_change("edit-hosttags", _("Edited host tag group %s (%s)") % (message, self._id)) return "tags", message != True and message or None return "tags" @@ -547,33 +543,6 @@ class ModeEditTagGroup(ModeEditHosttagConfiguration): optional_keys=[], ) - def _basic_elements(self): - if self._new: - vs_id = ID( - title=_("Tag group ID"), - size=60, - allow_empty=False, - help=_("The internal ID of the tag group is used to store the tag's " - "value in the host properties. It cannot be changed later."), - ) - else: - vs_id = FixedValue( - self._tag_group_id, - title=_("Tag group ID"), - ) - - return [ - ("id", vs_id), - ("title", - TextUnicode( - title=_("Title"), - size=60, - help=_("An alias or description of this tag group."), - allow_empty=False, - )), - ("topic", self._get_topic_valuespec()), - ] - def _tag_choices_elements(self): return [ ("tags", self._tag_choices_valuespec()),

5 years, 6 months

check_http: change valuespec to dict

by Moritz Kiemer

Module: check_mk Branch: master Commit: 25130abf96887bdad67d7b7a1c5be30f9f7b7af1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25130abf96887b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Mar 26 09:43:20 2019 +0100 check_http: change valuespec to dict Change-Id: I7a83d702b76384abc96e55856845b0821e8dc8f2 --- checks/check_http | 35 +- cmk/gui/plugins/wato/active_checks.py | 735 ++++++++++++++++++---------------- 2 files changed, 397 insertions(+), 373 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=25130abf96…

5 years, 6 months

WATO actice_checks: refactor portspec

by Moritz Kiemer

Module: check_mk Branch: master Commit: d7ac3578549992c1e56ab9ee212d476cfde11e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7ac3578549992… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Mar 26 15:11:14 2019 +0100 WATO actice_checks: refactor portspec Change-Id: Iefe45bc07bddd44eeda059fbcc8b19743b1c6641 --- cmk/gui/plugins/wato/active_checks.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index bb8cb7b..48d5c22 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -963,6 +963,9 @@ class RulespecActiveChecksHttp(HostRulespec): def match_type(self): return "all" + def _portspec(self, default): + return Integer(title=_("TCP Port"), minvalue=1, maxvalue=65535, default_value=default) + @property def valuespec(self): return Transform( @@ -1021,12 +1024,7 @@ class RulespecActiveChecksHttp(HostRulespec): title=_("URI to fetch (default is <tt>/</tt>)"), allow_empty=False, default_value="/")), - ("port", - Integer( - title=_("TCP Port"), - minvalue=1, - maxvalue=65535, - default_value=80)), + ("port", self._portspec(80)), _ip_address_family_element(), ("ssl", Transform( @@ -1286,15 +1284,7 @@ class RulespecActiveChecksHttp(HostRulespec): "address from the host primary address."), ), ), - ( - "port", - Integer( - title=_("TCP Port"), - minvalue=1, - maxvalue=65535, - default_value=443, - ), - ), + ("port", self._portspec(443)), _ip_address_family_element(), ( "sni",

5 years, 6 months

check_http: minor refactorings

by Moritz Kiemer

Module: check_mk Branch: master Commit: 055e0e640b6291ca60474d43e85d070c6b03ed03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=055e0e640b6291… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Mar 26 15:18:43 2019 +0100 check_http: minor refactorings Change-Id: I443c17cbe0017dc90abb68e89e69f47d399a7a20 --- checks/check_http | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/checks/check_http b/checks/check_http index 13b5762..933deb3 100644 --- a/checks/check_http +++ b/checks/check_http @@ -47,9 +47,9 @@ def _get_family_and_address(settings): return family, address -def _get_proxy_setting(settings): +def _get_proxy(params): """return proxys (address, port, auth) or None""" - proxy = settings.get("proxy") + proxy = params.get("proxy") if not proxy: return None @@ -59,7 +59,7 @@ def _get_proxy_setting(settings): else: address, port = proxy, None - auth = settings.get("proxy_auth") + auth = params.get("proxy_auth") if auth: auth = passwordstore_get_cmdline("%s:%%s" % auth[0], auth[1]) @@ -67,7 +67,7 @@ def _get_proxy_setting(settings): return proset(address, port, auth) -def _certificate_args(address_family, address, settings): +def _certificate_args(address_family, address, proxy, settings): args = [] server = settings.get('cert_host', address) @@ -86,7 +86,6 @@ def _certificate_args(address_family, address, settings): if "sni" in settings: args += ['--sni'] - proxy = _get_proxy_setting(settings) server_port = settings.get("port") specify_port = proxy.port if proxy else server_port @@ -108,12 +107,11 @@ def _certificate_args(address_family, address, settings): return args -def _url_args(address_family, address, settings): +def _url_args(address_family, address, proxy, settings): # get virthost settings: # TODO: when did 'vhost' dissapear from WATO? vhost, omit_ip = settings.get("virthost", (settings.get("vhost"), False)) - proxy = _get_proxy_setting(settings) args = [] @@ -224,10 +222,11 @@ def check_http_arguments(params): mode_name, settings = params["mode"] address_family, address = _get_family_and_address(settings) + proxy = _get_proxy(settings) if mode_name == 'cert': - return _certificate_args(address_family, address, settings) - return _url_args(address_family, address, settings) + return _certificate_args(address_family, address, proxy, settings) + return _url_args(address_family, address, proxy, settings) def check_http_description(params):

5 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019