Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: cdead9d9a14bc032e33529386bee202765ed9443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdead9d9a14bc0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 1 20:56:57 2019 +0200 Fix broken dokuwiki * Fix dokuwiki skel and other skel make targets * Fix dokuwiki cache directory creation with newer PHP versions Change-Id: I4b14e3863c7cd6b3ff2a08815c4d8f5306e108c6 --- omd/packages/check_mk/check_mk.make | 5 ++++- omd/packages/dokuwiki/dokuwiki.make | 5 ++++- omd/packages/dokuwiki/skel/etc/dokuwiki/local.php | 1 + omd/packages/omd/omd.make | 6 ++++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/omd/packages/check_mk/check_mk.make b/omd/packages/check_mk/check_mk.make index 3aa9298..2c78311 100644 --- a/omd/packages/check_mk/check_mk.make +++ b/omd/packages/check_mk/check_mk.make @@ -3,6 +3,7 @@ DISTNAME := $(CHECK_MK)-$(CMK_VERSION) CHECK_MK_BUILD := $(BUILD_HELPER_DIR)/$(DISTNAME)-build CHECK_MK_INSTALL := $(BUILD_HELPER_DIR)/$(DISTNAME)-install +CHECK_MK_SKEL := $(BUILD_HELPER_DIR)/$(DISTNAME)-skel CHECK_MK_PATCHING := $(BUILD_HELPER_DIR)/$(DISTNAME)-patching .PHONY: $(CHECK_MK) $(CHECK_MK)-install $(CHECK_MK)-skel $(CHECK_MK)-clean @@ -10,6 +11,7 @@ CHECK_MK_PATCHING := $(BUILD_HELPER_DIR)/$(DISTNAME)-patching $(CHECK_MK): $(CHECK_MK_BUILD) $(CHECK_MK)-install: $(CHECK_MK_INSTALL) +$(CHECK_MK)-skel: $(CHECK_MK_SKEL) # This step creates a tar archive containing the sources # which are need for the build step @@ -113,9 +115,10 @@ $(CHECK_MK_INSTALL): $(CHECK_MK_BUILD) #chmod +x $(DESTDIR)$(OMD_ROOT)/bin/* $(TOUCH) $@ -$(CHECK_MK)-skel: +$(CHECK_MK_SKEL): $(CHECK_MK_INSTALL) $(RM) $(SKEL)/etc/check_mk/main.mk-* $(RM) $(SKEL)/etc/check_mk/multisite.mk-* + $(TOUCH) $@ $(CHECK_MK)-clean: $(RM) -r check_mk-*.*.*[0-9] werks ChangeLog $(BUILD_HELPER_DIR)/$(CHECK_MK)* diff --git a/omd/packages/dokuwiki/dokuwiki.make b/omd/packages/dokuwiki/dokuwiki.make index 1789bdc..d33a33a 100644 --- a/omd/packages/dokuwiki/dokuwiki.make +++ b/omd/packages/dokuwiki/dokuwiki.make @@ -5,6 +5,7 @@ DOKUWIKI_DIR = $(DOKUWIKI)-$(DOKUWIKI_VERS) DOKUWIKI_BUILD := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-build DOKUWIKI_INSTALL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-install DOKUWIKI_UNPACK := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-unpack +DOKUWIKI_SKEL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-skel DOKUWIKI_UNPACK_ADDITIONAL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-unpack-additional DOKUWIKI_PATCHING := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-patching @@ -13,6 +14,7 @@ DOKUWIKI_PATCHING := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-patching $(DOKUWIKI): $(DOKUWIKI_BUILD) $(DOKUWIKI)-install: $(DOKUWIKI_INSTALL) +$(DOKUWIKI)-skel: $(DOKUWIKI_SKEL) $(DOKUWIKI_UNPACK_ADDITIONAL): $(DOKUWIKI_UNPACK) $(TAR_GZ) $(PACKAGE_DIR)/$(DOKUWIKI)/template-arctictut.tgz -C $(DOKUWIKI_DIR)/lib/tpl/ @@ -57,7 +59,7 @@ $(DOKUWIKI_INSTALL): $(DOKUWIKI_BUILD) # rm -rf $(DESTDIR)$(OMD_ROOT)/etc # rm -rf $(DESTDIR)$(OMD_ROOT)/var -$(DOKUWIKI)-skel: $(DOKUWIKI_INSTALL) +$(DOKUWIKI_SKEL): $(DOKUWIKI_INSTALL) $(MKDIR) $(SKEL)/etc/dokuwiki $(MKDIR) $(SKEL)/var/dokuwiki/lib/plugins cp $(DOKUWIKI_DIR)/conf/*.conf $(SKEL)/etc/dokuwiki/. @@ -74,6 +76,7 @@ $(DOKUWIKI)-skel: $(DOKUWIKI_INSTALL) for i in `ls -1 $(DESTDIR)$(OMD_ROOT)/share/dokuwiki/htdocs/lib/plugins/` ; do \ $(LN) -s ../../../../share/dokuwiki/htdocs/lib/plugins/$$i . ; \ done + $(TOUCH) $@ $(DOKUWIKI)-clean: # Remove files created by build/install diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php b/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php index 6c94217..d103e13 100644 --- a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php +++ b/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php @@ -12,5 +12,6 @@ $conf['multisite']['auth_secret'] = '/omd/sites/###SITE###/etc/auth.secret'; $conf['multisite']['auth_serials'] = '/omd/sites/###SITE###/etc/auth.serials'; $conf['multisite']['htpasswd'] = '/omd/sites/###SITE###/etc/htpasswd'; $conf['tpl']['vector']['vector_navigation_location'] = 'sidebar'; +$conf['dmode'] = 0770; ?> diff --git a/omd/packages/omd/omd.make b/omd/packages/omd/omd.make index a0de0d2..9a0bf5f 100644 --- a/omd/packages/omd/omd.make +++ b/omd/packages/omd/omd.make @@ -9,12 +9,14 @@ else endif OMD_INSTALL := $(BUILD_HELPER_DIR)/$(OMD_DIR)-install +OMD_SKEL := $(BUILD_HELPER_DIR)/$(OMD_DIR)-skel .PHONY: $(OMD) $(OMD)-install $(OMD)-skel $(OMD): $(OMD)-install: $(OMD_INSTALL) +$(OMD)-skel: $(OMD_SKEL) $(OMD_INSTALL): install -m 755 $(PACKAGE_DIR)/$(OMD)/omd.bin $(DESTDIR)$(OMD_ROOT)/bin/omd @@ -37,10 +39,10 @@ $(OMD_INSTALL): install -m 644 $(PACKAGE_DIR)/$(OMD)/bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/ $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create install -m 755 $(PACKAGE_DIR)/$(OMD)/hooks/* $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - $(TOUCH) $@ -$(OMD)-skel: +$(OMD_SKEL): $(OMD_INSTALL) $(MKDIR) $(SKEL)/etc/bash_completion.d + $(TOUCH) $@ $(OMD)-clean:

5 years, 1 month

Fix some german localizations

by Ronny Bruska

Module: check_mk Branch: master Commit: 43fc980a2c1d1f5abc2e9ccc6a7d76e2abd5b67c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43fc980a2c1d1f… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu May 2 11:08:16 2019 +0200 Fix some german localizations Change-Id: Iaf044f39d12943c6a663165bba3ea9f06babfd8b --- locale/de/LC_MESSAGES/multisite.po | 363 +++++++++++++++++++++++++++++++------ 1 file changed, 306 insertions(+), 57 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=43fc980a2c…

5 years, 1 month

agent_aws: preperations to factor out cache (2)

by Moritz Kiemer

Module: check_mk Branch: master Commit: dcd6b7cf41da8881a7036f96a4b22b82c914e590 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcd6b7cf41da88… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 26 09:39:49 2019 +0200 agent_aws: preperations to factor out cache (2) Change-Id: If1eb5037725a3880f9d89622391476fc36d20b89 --- cmk/special_agents/agent_aws.py | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 72c83b9..526bc0b 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -629,7 +629,7 @@ class AWSSection(object): self._cache_is_recent_enough()): raw_content = self._read_from_cache() else: - raw_content = self._fetch_raw_content(colleague_contents) + raw_content = self.get_live_data(colleague_contents) # TODO: Write cache only when _compute_section_content succeeded? if use_cache: self._write_to_cache(raw_content) @@ -709,7 +709,7 @@ class AWSSection(object): pass @abc.abstractmethod - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): """ Call API methods, eg. 'response = ec2_client.describe_instances()' and extract content from raw content. Raw contents basically consist of @@ -810,7 +810,7 @@ class AWSSectionGeneric(AWSSection): class AWSSectionCloudwatch(AWSSection): __metaclass__ = abc.ABCMeta - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): end_time = time.time() start_time = end_time - self.period metrics = self._get_metrics(colleague_contents) @@ -879,7 +879,7 @@ class CostsAndUsage(AWSSectionGeneric): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): fmt = "%Y-%m-%d" now = time.time() response = self._client.get_cost_and_usage( @@ -929,7 +929,7 @@ class EC2Limits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): response = self._client.describe_instances() reservations = self._get_response_content(response, 'Reservations') @@ -1149,7 +1149,7 @@ class EC2Summary(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents([], 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): if self._tags is None and self._names is not None: return self._fetch_instances_filtered_by_names(colleague_contents.content) if self._tags is not None: @@ -1218,7 +1218,7 @@ class EC2Labels(AWSSectionLabels): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): response = self._client.describe_tags(Filters=[{ 'Name': 'resource-id', 'Values': [inst['InstanceId'] for inst in colleague_contents.content.itervalues()], @@ -1262,7 +1262,7 @@ class EC2SecurityGroups(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): response = self._describe_security_groups() return { group['GroupId']: group @@ -1383,7 +1383,7 @@ class EBSLimits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): response = self._client.describe_volumes() volumes = self._get_response_content(response, 'Volumes') @@ -1474,7 +1474,7 @@ class EBSSummary(AWSSectionGeneric): return AWSColleagueContents((volumes, instances), max_cache_timestamp) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): col_volumes, _col_instances = colleague_contents.content if self._tags is None and self._names is not None: volumes = self._fetch_volumes_filtered_by_names(col_volumes) @@ -1631,7 +1631,7 @@ class S3Limits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): """ There's no API method for getting account limits thus we have to fetch all buckets. @@ -1664,7 +1664,7 @@ class S3Summary(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents([], 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): found_buckets = [] for bucket in self._list_buckets(colleague_contents): bucket_name = bucket['Name'] @@ -1876,7 +1876,7 @@ class ELBLimits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): """ The AWS/ELB API method 'describe_account_limits' provides limit values but no values about the usage per limit thus we have to gather the usage @@ -1933,7 +1933,7 @@ class ELBSummaryGeneric(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents([], 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): found_load_balancers = [] for load_balancer in self._describe_load_balancers(colleague_contents): load_balancer_name = load_balancer['LoadBalancerName'] @@ -2004,7 +2004,7 @@ class ELBLabelsGeneric(AWSSectionLabels): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): return colleague_contents.content def _compute_content(self, raw_content, colleague_contents): @@ -2030,7 +2030,7 @@ class ELBHealth(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): load_balancers = {} for load_balancer_dns_name, load_balancer in colleague_contents.content.iteritems(): load_balancer_name = load_balancer['LoadBalancerName'] @@ -2139,7 +2139,7 @@ class ELBv2Limits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): """ The AWS/ELBv2 API method 'describe_account_limits' provides limit values but no values about the usage per limit thus we have to gather the usage @@ -2259,7 +2259,7 @@ class ELBv2TargetGroups(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): load_balancers = {} for load_balancer_dns_name, load_balancer in colleague_contents.content.iteritems(): load_balancer_type = load_balancer.get('Type') @@ -2508,7 +2508,7 @@ class RDSLimits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): """ AWS/RDS API method 'describe_account_attributes' already sends limit and usage values. @@ -2544,7 +2544,7 @@ class RDSSummary(AWSSectionGeneric): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): response = self._describe_db_instances() return self._get_response_content(response, 'DBInstances') @@ -2665,7 +2665,7 @@ class CloudwatchAlarmsLimits(AWSSectionLimits): def _get_colleague_contents(self): return AWSColleagueContents(None, 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): response = self._client.describe_alarms() return self._get_response_content(response, 'MetricAlarms') @@ -2694,7 +2694,7 @@ class CloudwatchAlarms(AWSSectionGeneric): return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents([], 0.0) - def _fetch_raw_content(self, colleague_contents): + def get_live_data(self, colleague_contents): if self._names: if colleague_contents.content: return [

5 years, 1 month

agent_aws: preperations to factor out cache (1)

by Moritz Kiemer

Module: check_mk Branch: master Commit: b74a7e482626bfb2df13a45313bc31b186bfba6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b74a7e482626bf… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 26 09:37:33 2019 +0200 agent_aws: preperations to factor out cache (1) Change-Id: I1726330a41cb8ed8c098d7b22bf27ebe8b7e9886 --- cmk/special_agents/agent_aws.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 0661e25..72c83b9 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -579,7 +579,8 @@ class AWSSection(object): colleague_contents.cache_timestamp, float), "%s: Cache timestamp of colleague contents must be of type 'float'" % self.name - raw_content = self._get_raw_content(colleague_contents, use_cache=use_cache) + raw_data = self._get_raw_content(colleague_contents, use_cache=use_cache) + raw_content = AWSRawContent(raw_data, self.cache_timestamp if use_cache else time.time()) assert isinstance( raw_content, AWSRawContent), "%s: Raw content must be of type 'AWSRawContent'" % self.name @@ -626,14 +627,13 @@ class AWSSection(object): self._cache_file_dir.mkdir(parents=True, exist_ok=True) if (use_cache and self.get_validity_from_args(colleague_contents) and self._cache_is_recent_enough()): - raw_content, cache_timestamp = self._read_from_cache() + raw_content = self._read_from_cache() else: raw_content = self._fetch_raw_content(colleague_contents) # TODO: Write cache only when _compute_section_content succeeded? if use_cache: self._write_to_cache(raw_content) - cache_timestamp = time.time() - return AWSRawContent(raw_content, cache_timestamp) + return raw_content @property def cache_timestamp(self): @@ -680,7 +680,7 @@ class AWSSection(object): except IOError as e: if e.errno == errno.ENOENT: logging.info("No such file or directory %s (read from cache)", self._cache_file) - return None, 0.0 + return None else: logging.info("Cannot read from cache file: %s", e) raise @@ -689,7 +689,7 @@ class AWSSection(object): except ValueError as e: logging.info("Cannot load raw content: %s", e) content = None - return content, self._cache_file.stat().st_mtime + return content def _write_to_cache(self, raw_content): json_dump = json.dumps(raw_content, default=datetime_serializer)

5 years, 1 month

agent_hp_msa: Return command line as list

by Florian Kromer

Module: check_mk Branch: master Commit: c5a32ba3c3d6549711997f07532762383947d44c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5a32ba3c3d654… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu May 2 11:03:28 2019 +0200 agent_hp_msa: Return command line as list Change-Id: I9d154be91b7840a56cf77efeb162068ca559ccdc --- checks/agent_hp_msa | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/checks/agent_hp_msa b/checks/agent_hp_msa index 543dc20..946d254 100644 --- a/checks/agent_hp_msa +++ b/checks/agent_hp_msa @@ -26,13 +26,7 @@ def agent_hp_msa_arguments(params, hostname, ipaddress): - args = '' - - args += " -u " + quote_shell_string(params["username"]) - args += " -p " + quote_shell_string(params["password"]) - - args += " " + quote_shell_string(ipaddress) - return args + return ['-u', params["username"], '-p', params["password"], ipaddress] special_agent_info['hp_msa'] = agent_hp_msa_arguments

5 years, 1 month

7295: postgres_stats: Optional ignore of db table

by Florian Kromer

Module: check_mk Branch: master Commit: 6e37a7b43115bc1ac2cc9b07f7b4ae11d571dd14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e37a7b43115bc… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Apr 24 08:42:43 2019 +0200 7295: postgres_stats: Optional ignore of db table This check plugin notifies about db tables which have never been analyzed or vacuumed with status according to the configuration in the WATO rule "PostgresSQL VACUUM and ANALYZE: Age of never analyzed/vacuumed tables". Users can now disable this rule, such that never analyzed or vacuumed tables are always {OK}. CMK-1385 Change-Id: I858fb6784321a45ad0ffb617d9be4d818a6b9570 --- .werks/7295 | 14 ++++++++++++++ checkman/postgres_stats | 11 ++++++++++- checks/postgres_stats | 2 +- .../wato/check_parameters/postgres_maintenance.py | 22 ++++++++++++++++++---- .../checks/generictests/datasets/postgres_stats.py | 4 ++-- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/.werks/7295 b/.werks/7295 new file mode 100644 index 0000000..842d74b --- /dev/null +++ b/.werks/7295 @@ -0,0 +1,14 @@ +Title: postgres_stats: Optional ignore of db table +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1556035464 +Class: feature + +This check plugin notifies about db tables which have never been analyzed or +vacuumed with status according to the configuration in the WATO rule +"PostgresSQL VACUUM and ANALYZE: Age of never analyzed/vacuumed tables". +Users can now disable this rule, such that never analyzed or vacuumed tables +are always {OK}. diff --git a/checkman/postgres_stats b/checkman/postgres_stats index 91360da..2488ba0 100644 --- a/checkman/postgres_stats +++ b/checkman/postgres_stats @@ -8,7 +8,16 @@ description: a PostgreSQL database. You can configure limits specifiying the maximum age of the last operation. Without additional limits configuration this check is always OK. - This check relies on data reported by the agent-side plugin {mk_postgres} + This check relies on data reported by the agent-side plugin {mk_postgres}. + + Check status: + + For every table the time since it has last been analyzed or vacuumed is checked + according to the WATO rule "PostgresSQL VACUUM and ANALYZE: Time since the last + VACUUM" and "Time since the last ANALYZE" respectively. For tables that were + never analyzed or vacuumed the time period for which they exist is checked + according to the WATO rule "PostgresSQL VACUUM and ANALYZE: Age of never + analyzed/vacuumed tables". inventory: Two services for each database. One for VACUUM and one for ANALYZE. diff --git a/checks/postgres_stats b/checks/postgres_stats index b4903b2..da2958b 100644 --- a/checks/postgres_stats +++ b/checks/postgres_stats @@ -37,7 +37,7 @@ # postgres;pg_catalog;pg_attribute;-1;-1 factory_settings["postgres_stats_default_levels"] = { - "never_analyze_vacuum": (0, float('inf')), + "never_analyze_vacuum": (0, 1000 * 365 * 24 * 3600), } diff --git a/cmk/gui/plugins/wato/check_parameters/postgres_maintenance.py b/cmk/gui/plugins/wato/check_parameters/postgres_maintenance.py index e6d9cac..92107d2 100644 --- a/cmk/gui/plugins/wato/check_parameters/postgres_maintenance.py +++ b/cmk/gui/plugins/wato/check_parameters/postgres_maintenance.py @@ -27,7 +27,9 @@ from cmk.gui.i18n import _ from cmk.gui.valuespec import ( Age, + Alternative, Dictionary, + FixedValue, TextAscii, Tuple, ) @@ -82,11 +84,23 @@ class RulespecCheckgroupParametersPostgresMaintenance(CheckParameterRulespecWith ], )), ("never_analyze_vacuum", - Tuple( - title=_("Age of never analyzed/vacuumed tables"), + Alternative( + title=_("Never analyzed/vacuumed tables"), + style="dropdown", elements=[ - Age(title=_("Warning if older than"), default_value=86400 * 7), - Age(title=_("Critical if older than"), default_value=86400 * 14) + Tuple( + title=_("Age of never analyzed/vacuumed tables"), + elements=[ + Age(title=_("Warning if older than"), default_value=0), + Age(title=_("Critical if older than"), + default_value=1000 * 365 * 24 * 3600) + ], + ), + FixedValue( + None, + title=_("Do not check age of never analyzed/vacuumed tables"), + totext="", + ), ], )), ], diff --git a/tests/unit/checks/generictests/datasets/postgres_stats.py b/tests/unit/checks/generictests/datasets/postgres_stats.py index 0367d79..98fc68b 100644 --- a/tests/unit/checks/generictests/datasets/postgres_stats.py +++ b/tests/unit/checks/generictests/datasets/postgres_stats.py @@ -39,11 +39,11 @@ checks = { (0, u'2 tables were never analyzed: anrede/auftrag_mediadaten', []), (2, u'Unhandled tables for: 20 m (warn/crit at 16 m/18 m)', []), ]), - (u'ANALYZE adwebconnect', {"never_analyze_vacuum": (0, float('inf'))}, [ + (u'ANALYZE adwebconnect', {'never_analyze_vacuum': (0, 1000 * 365 * 24 * 3600)}, [ (0, u'Table: auftrag', []), (0, u'Time since last vacuum: 674 d', []), (0, u'2 tables were never analyzed: anrede/auftrag_mediadaten', []), - (1, u'Unhandled tables for: 20 m (warn/crit at 0.00 s/inf y)', []), + (1, u'Unhandled tables for: 20 m (warn/crit at 0.00 s/1000 y)', []), ]), (u'ANALYZE adwebconnect', {'never_analyze_vacuum': None}, [ (0, u'Table: auftrag', []),

5 years, 1 month

7474 check_mk_agent: Cache information for local checks

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7d06b53666f1b6a1fceef21a2260639a45ca9da0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d06b53666f1b6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 23 09:47:21 2019 +0200 7474 check_mk_agent: Cache information for local checks For local checks running asynchronously the cache age information is now included in the section header. Services corresponding to outdated check data will become stale. CMK-1313 Change-Id: I5dfb7326fc360fa915466f07fc19f7b49f333987 --- .werks/7474 | 13 +++++++++++++ agents/check_mk_agent.aix | 12 ++++++++---- agents/check_mk_agent.freebsd | 12 ++++++++---- agents/check_mk_agent.linux | 12 ++++++++---- agents/check_mk_agent.solaris | 12 ++++++++---- checks/local | 22 ++++++++++++++++++++-- .../checks/generictests/datasets/local_cached.py | 17 +++++++++++++++++ tests/unit/checks/test_local_expired.py | 22 ++++++++++++++++++++++ 8 files changed, 104 insertions(+), 18 deletions(-) diff --git a/.werks/7474 b/.werks/7474 new file mode 100644 index 0000000..9187e40 --- /dev/null +++ b/.werks/7474 @@ -0,0 +1,13 @@ +Title: check_mk_agent: Cache information for local checks +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1556030292 +Class: feature + +For local checks running asynchronously the cache age information +is now included in the agent output. Services corresponding to +outdated check data will become stale. +Previously the user was not able to recognize outdated data in this case. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 9ca0aa5..ba84653 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -124,10 +124,14 @@ function run_cached { if (( $MTIME < $MAXAGE )) ; then USE_CACHEFILE=1 fi - CACHE_INFO=":cached($MTIME,$MAXAGE)" - # insert the cache info in the section header (^= after '!'), - # if none is present (^= before '!') - sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" + CACHE_INFO="cached($MTIME,$MAXAGE)" + if [[ $NAME == local_* ]]; then + sed -e "s/^/$CACHE_INFO /" "$CACHEFILE" + else + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1:'$CACHE_INFO'>>>/' "$CACHEFILE" + fi fi if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] then diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index f187bbd..849cd19 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -97,10 +97,14 @@ function run_cached() { if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - CACHE_INFO=":cached($MTIME,$MAXAGE)" - # insert the cache info in the section header (^= after '!'), - # if none is present (^= before '!') - sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" + CACHE_INFO="cached($MTIME,$MAXAGE)" + if [[ $NAME == local_* ]]; then + sed -e "s/^/$CACHE_INFO /" "$CACHEFILE" + else + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1:'$CACHE_INFO'>>>/' "$CACHEFILE" + fi fi # Cache file outdated and new job not yet running? Start it diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 90c8c34..5a3e01d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -290,10 +290,14 @@ function run_cached () { # all further lines are long output) sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" < "$CACHEFILE" else - CACHE_INFO=":cached($MTIME,$MAXAGE)" - # insert the cache info in the section header (^= after '!'), - # if none is present (^= before '!') - sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" + CACHE_INFO="cached($MTIME,$MAXAGE)" + if [[ $NAME == local_* ]]; then + sed -e "s/^/$CACHE_INFO /" "$CACHEFILE" + else + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1:'$CACHE_INFO'>>>/' "$CACHEFILE" + fi fi fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 74ebf51..b0c9228 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -127,10 +127,14 @@ function run_cached () { # all further lines are long output) cat "$CACHEFILE" | sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" else - CACHE_INFO=":cached($MTIME,$MAXAGE)" - # insert the cache info in the section header (^= after '!'), - # if none is present (^= before '!') - sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" + CACHE_INFO="cached($MTIME,$MAXAGE)" + if [[ $NAME == local_* ]]; then + sed -e "s/^/$CACHE_INFO /" "$CACHEFILE" + else + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1:'$CACHE_INFO'>>>/' "$CACHEFILE" + fi fi fi diff --git a/checks/local b/checks/local index f6f6ba1..a5c0e7c 100644 --- a/checks/local +++ b/checks/local @@ -45,6 +45,16 @@ def float_ignore_uom(value): return 0.0 +def _parse_cache(line, now): + if not line or not line[0].startswith("cached("): + return 0, line + + cache_raw, stripped_line = line[0], line[1:] + time, maxage = (float(v) for v in cache_raw[7:-1].split(',', 1)) + + return max(now - time - maxage, 0), stripped_line + + def _is_valid_line(line): return len(line) >= 4 or (len(line) == 3 and line[0] == 'P') @@ -118,11 +128,13 @@ def _parse_perftxt(string): def parse_local(info): LocalResult = collections.namedtuple("LocalResult", - ("node", "item", "state", "text", "perfdata")) + ("node", "expired", "item", "state", "text", "perfdata")) + now = time.time() parsed = {} for line in info: node, stripped_line = line[0], line[1:] + expired, stripped_line = _parse_cache(stripped_line, now) if not _is_valid_line(stripped_line): parsed.setdefault(None, []).append(LocalResult(node, None, None, stripped_line)) continue @@ -136,7 +148,7 @@ def parse_local(info): if state_msg or perf_msg: state = 3 text = "%s%sOutput is: %s" % (state_msg, perf_msg, text) - parsed.setdefault(item, []).append(LocalResult(node, item, state, text, perfdata)) + parsed.setdefault(item, []).append(LocalResult(node, expired, item, state, text, perfdata)) return parsed @@ -200,8 +212,14 @@ def _calculate_local_worst_state(collected_stats): def check_local(_no_item, params, data): collected_stats = {} for result in data: + if result.expired > 0: + continue node_dict = collected_stats.setdefault(result.node, {}) node_dict.setdefault(result.item, _parse_local_line(result)) + if not collected_stats: + most_recent_expirery = min(r.expired for r in data) + raise MKCounterWrapped( + "Cached data expired %s ago." % get_age_human_readable(most_recent_expirery)) if params is not None and params.get("outcome_on_cluster", "worst") == "best": yield _calculate_local_best_state(collected_stats) diff --git a/tests/unit/checks/generictests/datasets/local_cached.py b/tests/unit/checks/generictests/datasets/local_cached.py new file mode 100644 index 0000000..f7cb085 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/local_cached.py @@ -0,0 +1,17 @@ +# yapf: disable + + +checkname = 'local' + +freeze_time = "2019-04-23 07:45:00" + +info = [ + ['node_1', 'cached(1556005301,300)', '0', 'Service_FOO', 'V=1', 'This', 'Check', 'is', 'OK'], +] + + +discovery = { + '': [ + ('Service_FOO', {}), + ], +} diff --git a/tests/unit/checks/test_local_expired.py b/tests/unit/checks/test_local_expired.py new file mode 100644 index 0000000..f967ae7 --- /dev/null +++ b/tests/unit/checks/test_local_expired.py @@ -0,0 +1,22 @@ +import pytest # type: ignore +from cmk_base.check_api import MKCounterWrapped +from checktestlib import CheckResult + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize('item,info', [ + ('Service_FOO', [[ + 'node_1', 'cached(1556005301,300)', '0', 'Service_FOO', 'V=1', 'This', 'Check', 'is', + 'outdated' + ]]), +]) +def test_local_check(check_manager, monkeypatch, item, info): + monkeypatch.setattr('time.time', lambda: 1556005721) + check = check_manager.get_check('local') + + parsed = check.run_parse(info) + assert parsed[item][0].expired == 120. + + with pytest.raises(MKCounterWrapped): + CheckResult(check.run_check(item, {}, parsed))

5 years, 1 month

Disable site fixture for packaging tests, just like for unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cfe1bb78f352e85c735390edb536000783d3c2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cfe1bb78f352e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 10:46:36 2019 +0200 Disable site fixture for packaging tests, just like for unit tests Change-Id: I4ef6bd53488fce82a3645f1f067b22bc04196bbf --- tests/packaging/conftest.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/packaging/conftest.py b/tests/packaging/conftest.py index 6e3faac..89f9eee 100644 --- a/tests/packaging/conftest.py +++ b/tests/packaging/conftest.py @@ -2,6 +2,13 @@ import os import pytest +# Packaging tests should not be executed in site. +# -> Disabled site fixture for them +(a)pytest.fixture(scope="session") +def site(request): + pass + + @pytest.fixture(scope="module") def version_path(): path = os.environ.get("VERSION_PATH")

5 years, 1 month

Scripts and descriptions for future new Agent testing

by Sergey Kipnis

Module: check_mk Branch: master Commit: 7e7e258f66c12a26644599b763835fd1dbf87ec1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e7e258f66c12a… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu May 2 09:41:23 2019 +0200 Scripts and descriptions for future new Agent testing Change-Id: I87c507bb38ba4f3f4ac36e8da9e7bc1a9ee84d3d --- agents/wnx/test_files/lwa_enable.cmd | 18 ++++++++++++++++++ agents/wnx/test_files/readme.txt | 3 +++ agents/wnx/test_files/tests/integration/readme.txt | 4 ++++ agents/wnx/test_files/wnx_enable.cmd | 18 ++++++++++++++++++ 4 files changed, 43 insertions(+) diff --git a/agents/wnx/test_files/lwa_enable.cmd b/agents/wnx/test_files/lwa_enable.cmd new file mode 100644 index 0000000..93f745c --- /dev/null +++ b/agents/wnx/test_files/lwa_enable.cmd @@ -0,0 +1,18 @@ +@echo off +set lwa=check_mk_agent +set wnx=checkmkservice +powershell Write-Host "'New' Agent Service stopping..." -Foreground Cyan +net stop %wnx% 2> nul > nul +if "%errorlevel%" == "2" powershell Write-Host "'New' Agent Service already stopped" -Foreground Green && goto next +if not "%errorlevel%" == "0" powershell Write-Host "Failed Stop 'NEW' Agent Service" -Foreground Yellow +:next +sc config "%wnx%" start= disabled > nul +if not "%errorlevel%" == "0" powershell Write-Host "Failed Disable 'NEW' Agent Service, Error=[%errorlevel%]" -Foreground Yellow +sc config "%lwa%" start= auto > nul +if not "%errorlevel%" == "0" powershell Write-Host "Failed Enable 'LEGACY' Agent Service, Error=[%errorlevel%]" -Foreground Yellow +powershell Write-Host "'Legacy' Agent Service starting..." -Foreground Cyan +net start %lwa% 2> nul > nul +if "%errorlevel%" == "2" powershell Write-Host "'Legacy' Agent Service already started" -Foreground Green && set errorlevel=0 && goto end +if not "%errorlevel%" == "0" powershell Write-Host "Failed Start 'Legacy' Agent Service, Error=[%errorlevel%]" -Foreground Red && exit 1 +powershell Write-Host "'Legacy' Agent Service started successfully" -Foreground Green +:end \ No newline at end of file diff --git a/agents/wnx/test_files/readme.txt b/agents/wnx/test_files/readme.txt new file mode 100644 index 0000000..2c8aba7 --- /dev/null +++ b/agents/wnx/test_files/readme.txt @@ -0,0 +1,3 @@ +Limited description of the content: +lwa_enable.cmd - stop&disable new agent + enable& start old one +wnx_enable.cmd - stop&disable old agent + enable& start new one \ No newline at end of file diff --git a/agents/wnx/test_files/tests/integration/readme.txt b/agents/wnx/test_files/tests/integration/readme.txt new file mode 100644 index 0000000..d11629c --- /dev/null +++ b/agents/wnx/test_files/tests/integration/readme.txt @@ -0,0 +1,4 @@ + +Windows Local Test +py -2 -m pip install pypiwin32 +py -2 -m pip install pytest \ No newline at end of file diff --git a/agents/wnx/test_files/wnx_enable.cmd b/agents/wnx/test_files/wnx_enable.cmd new file mode 100644 index 0000000..8dcb63d --- /dev/null +++ b/agents/wnx/test_files/wnx_enable.cmd @@ -0,0 +1,18 @@ +@echo off +set lwa=check_mk_agent +set wnx=checkmkservice +powershell Write-Host "'Legacy' Agent Service stopping..." -Foreground Cyan +net stop %lwa% 2> nul > nul +if "%errorlevel%" == "2" powershell Write-Host "'Legacy' Agent Service already stopped" -Foreground Green && goto next +if not "%errorlevel%" == "0" powershell Write-Host "Failed Stop 'Legacy' Agent Service [%errorlevel%]" -Foreground Yellow +:next +sc config "%lwa%" start= disabled > nul +if not "%errorlevel%" == "0" powershell Write-Host "Failed Disable 'Legacy' Agent Service, Error=[%errorlevel%]" -Foreground Yellow +sc config "%wnx%" start= auto > nul +if not "%errorlevel%" == "0" powershell Write-Host "Failed Enable 'New' Agent Service, Error=[%errorlevel%]" -Foreground Yellow +powershell Write-Host "'New' Agent Service starting..." -Foreground Cyan +net start %wnx% 2> nul > nul +if "%errorlevel%" == "2" powershell Write-Host "'New' Agent Service already started" -Foreground Green && set errorlevel=0 && goto end +if not "%errorlevel%" == "0" powershell Write-Host "Failed Start 'New' Agent Service, Error=[%errorlevel%]" -Foreground Red && exit 1 +powershell Write-Host "'New' Agent Service started successfully" -Foreground Green +:end \ No newline at end of file

5 years, 1 month

7343 FIX Fixed broken Dokuwiki CSS with newer PHP versions

by Lars Michelsen

Module: check_mk Branch: master Commit: bab2d5d0582ce932b5a1f190ec7c0458bad65c93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab2d5d0582ce9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 1 13:57:53 2019 +0200 7343 FIX Fixed broken Dokuwiki CSS with newer PHP versions Change-Id: I3dbfb55342bac1c84d8356116b4c596881ffc289 --- .werks/7343 | 11 +++++++++++ omd/packages/dokuwiki/patches/0011-fix-broken-css.patch | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.werks/7343 b/.werks/7343 new file mode 100644 index 0000000..6cb8da6 --- /dev/null +++ b/.werks/7343 @@ -0,0 +1,11 @@ +Title: Fixed broken Dokuwiki CSS with newer PHP versions +Level: 1 +Component: packages +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1556711830 + + diff --git a/omd/packages/dokuwiki/patches/0011-fix-broken-css.patch b/omd/packages/dokuwiki/patches/0011-fix-broken-css.patch new file mode 100644 index 0000000..0800867 --- /dev/null +++ b/omd/packages/dokuwiki/patches/0011-fix-broken-css.patch @@ -0,0 +1,17 @@ +diff -Nur dokuwiki.orig/lib/exe/css.php dokuwiki/lib/exe/css.php +--- dokuwiki.orig/lib/exe/css.php 2016-07-03 18:08:51.000000000 +0200 ++++ dokuwiki/lib/exe/css.php 2019-05-01 13:55:57.876291377 +0200 +@@ -166,11 +166,11 @@ + global $conf; + + $less = new lessc(); +- $less->importDir[] = DOKU_INC; ++ $less->importDir = array(DOKU_INC); + $less->setPreserveComments(!$conf['compress']); + + if (defined('DOKU_UNITTEST')){ +- $less->importDir[] = TMP_DIR; ++ $less->importDir = array(TMP_DIR); + } + + try {

5 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019