Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

agent_kubernetes: fix bug introduced yesterday

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3b448dcab10dc305c02bb17d396fc349de1393e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b448dcab10dc3… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 9 12:02:41 2019 +0100 agent_kubernetes: fix bug introduced yesterday Change-Id: I04222c2105ddfe0c562a1de0c9ce5b8072534b39 --- checks/agent_kubernetes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/agent_kubernetes b/checks/agent_kubernetes index a439ed4..ff039c0 100644 --- a/checks/agent_kubernetes +++ b/checks/agent_kubernetes @@ -31,7 +31,7 @@ def agent_kubernetes_arguments(params, _hostname, ipaddress): if "port" in params: args += ["--port", str(params["port"])] - if "no-cert-check" in params: + if params.get('no-cert-check', False): args += ["--no-cert-check"] if "url-prefix" in params:

5 years, 5 months

agent_aws: Started AWS/Glacier checks

by Simon Betz

Module: check_mk Branch: master Commit: 87f04884576af3024ec2ff8ecb0f8d5ccab13f0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87f04884576af3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 7 11:44:50 2019 +0100 agent_aws: Started AWS/Glacier checks Change-Id: Ie5b1dbff31c5724aaedd48f041e5e465b548b8a4 --- agents/special/agent_aws | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 7298f38..5d11eb3 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -798,13 +798,28 @@ class Glacier(AWSSection): return 300 def _get_raw_result(self): - pass + response = self._client.list_vaults() + try: + vaults = {r['VaultName']: r for r in response['VaultList']} + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + vaults = {} + + for vault_name, vault in vaults.iteritems(): + response = self._client.list_jobs(vaultName=vault_name) + try: + jobs = response['JobList'] + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + jobs = [] + vault['Jobs'] = jobs + return vaults def _extract_content_from(self, raw_result): - pass + return raw_result def _format_content(self, content): - pass + return [AWSSectionResult("", content)] #. @@ -872,6 +887,7 @@ class AWSSections(object): s3_client = self._init_client('s3') elb_client = self._init_client('elb') cloudtrail_client = self._init_client('cloudtrail') + glacier_client = self._init_client('glacier') cloudwatch_client = self._init_client('cloudwatch') #---distributors---------------------------------------------------- @@ -892,6 +908,7 @@ class AWSSections(object): ec2 = EC2(cloudwatch_client) elb = ELB(cloudwatch_client) ebs = EBS(cloudwatch_client) + glacier = Glacier(glacier_client) #---register sections to distributors------------------------------- ec2_summary_distributor.add(ec2) @@ -914,6 +931,7 @@ class AWSSections(object): self._sections.append(elb) self._sections.append(ebs) self._sections.append(cloudtrail) + self._sections.append(glacier) def _init_client(self, client_key): try:

5 years, 5 months

6951 vms_cpu: Levels for utilization

by Moritz Kiemer

Module: check_mk Branch: master Commit: da8c7907833b58fca780e2e0708bd02a0f583756 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da8c7907833b58… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 9 11:57:22 2019 +0100 6951 vms_cpu: Levels for utilization Levels and averaging can now be configured for the utilization. Change-Id: I94443f5b6b63a83dabafaa99e42b6c178ae80396 --- .werks/6951 | 10 ++++ checkman/vms_cpu | 4 +- checks/vms_cpu | 64 ++++++++++++---------- .../generictests/datasets/vms_cpu_regression.py | 26 +++++---- 4 files changed, 63 insertions(+), 41 deletions(-) diff --git a/.werks/6951 b/.werks/6951 new file mode 100644 index 0000000..57d4e55 --- /dev/null +++ b/.werks/6951 @@ -0,0 +1,10 @@ +Title: vms_cpu: Levels for utilization +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547031355 +Class: feature + +Levels and averaging can now be configured for the utilization. diff --git a/checkman/vms_cpu b/checkman/vms_cpu index 9901faf..1cf28b3 100644 --- a/checkman/vms_cpu +++ b/checkman/vms_cpu @@ -6,9 +6,9 @@ distribution: check_mk description: Check CPU utilization (user, system, idle) and IO-Wait on an OpenVMS system. The number of CPUs is taken into account so that - maximum percentage is 100% is refers to the total CPUs available. + maximum percentage is 100% and refers to the total CPUs available. - A level can be set only on {wait} (disk wait). + Levels can be set only on {wait} (disk wait) and the utilization. inventory: One check per host is created for OpenVMS systems. diff --git a/checks/vms_cpu b/checks/vms_cpu index a7e2bfb..f32dfa4 100644 --- a/checks/vms_cpu +++ b/checks/vms_cpu @@ -24,51 +24,57 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -vms_cpu_default_levels = None - # Example output from agent: # <<<vms_cpu>>> # 1 99.17 0.54 0.18 0.00 +def parse_vms_cpu(info): + parsed = {} + try: + parsed['num_cpus'] = int(info[0][0]) + for i, key in enumerate(('idle', 'user', 'wait_interrupt', 'wait_npsync'), 1): + parsed[key] = float(info[0][i]) / parsed['num_cpus'] + except (IndexError, ValueError): + return {} + + return parsed + + def inventory_vms_cpu(info): - if len(info) > 0: - return [(None, "vms_cpu_default_levels")] + if info: + yield None, {} -def check_vms_cpu(item, params, info): - num_cpus = int(info[0][0]) - idle, user, wait_interrupt, wait_npsync = [float(x) / num_cpus for x in info[0][1:]] - wait = wait_interrupt + wait_npsync - system = 100.0 - idle - user - wait - infotext = "user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system, wait) - state = 0 - perfdata = [ - ("user", user), - ("system", system), - ("wait", wait, 0, 0), - ] +def check_vms_cpu(_no_item, params, parsed): + # ancient tuple rule + # and legacy default None prior to 1.6 params = transform_cpu_iowait(params) - if isinstance(params.get('iowait'), tuple): - warn, crit = params['iowait'] - perfdata = [ - ("user", user), - ("system", system), - ("wait", wait, warn, crit), - ] - if wait >= crit: - state = 2 - elif wait >= warn: - state = 1 - return (state, infotext, perfdata) + user = parsed["user"] + wait = parsed["wait_interrupt"] + parsed["wait_npsync"] + util = 100. - parsed["idle"] + system = util - user - wait + + yield check_levels(user, "user", None, '%') + yield check_levels(system, "system", None, '%') + yield check_levels(wait, "wait", params.get("iowait"), '%') + + for util_result in check_cpu_util(util, params): + yield util_result + + num_cpus = parsed['num_cpus'] + unit = "CPU" if num_cpus == 1 else "CPUs" + yield check_levels( + num_cpus, 'cpu_entitlement', None, unit=unit, infoname="100% corresponding to") check_info['vms_cpu'] = { + "parse_function": parse_vms_cpu, "check_function": check_vms_cpu, "inventory_function": inventory_vms_cpu, "service_description": "CPU utilization", "has_perfdata": True, "group": "cpu_iowait", - 'includes': ['transforms.include'], + "includes": ["transforms.include", "cpu_util.include"], } diff --git a/tests/unit/checks/generictests/datasets/vms_cpu_regression.py b/tests/unit/checks/generictests/datasets/vms_cpu_regression.py index e2a78fa..6c48503 100644 --- a/tests/unit/checks/generictests/datasets/vms_cpu_regression.py +++ b/tests/unit/checks/generictests/datasets/vms_cpu_regression.py @@ -2,17 +2,23 @@ checkname = 'vms_cpu' info = [['1', '99.17', '0.54', '0.18', '0.00']] -discovery = {'': [(None, 'vms_cpu_default_levels')]} +discovery = {'': [(None, {})]} checks = { '': [ - (None, None, [(0, 'user: 0.5%, system: 0.1%, wait: 0.2%', - [('user', 0.54, None, None, None, None), - ('system', 0.10999999999999827, None, None, None, None), - ('wait', 0.18, 0, 0, None, None)])]), - (None, (0.1, 0.5), [(1, 'user: 0.5%, system: 0.1%, wait: 0.2%', - [('user', 0.54, None, None, None, None), - ('system', 0.10999999999999827, None, None, None, None), - ('wait', 0.18, 0.1, 0.5, None, None)])]), - ] + (None, None, [ + (0, 'user: 0.54%', [('user', 0.54)]), + (0, 'system: 0.11%', [('system', 0.10999999999999827)]), + (0, 'wait: 0.18%', [('wait', 0.18)]), + (0, 'total cpu: 0.83%', [('util', 0.8299999999999983, None, None, 0, 100)]), + (0, "100% corresponding to: 1.00 CPU", [('cpu_entitlement', 1)]), + ]), + (None, (0.1, 0.5), [ + (0, 'user: 0.54%', [('user', 0.54)]), + (0, 'system: 0.11%', [('system', 0.10999999999999827)]), + (1, 'wait: 0.18% (warn/crit at 0.10%/0.50%)', [('wait', 0.18, 0.1, 0.5)]), + (0, 'total cpu: 0.83%', [('util', 0.8299999999999983, None, None, 0, 100)]), + (0, "100% corresponding to: 1.00 CPU", [('cpu_entitlement', 1)]), + ]), + ], }

5 years, 5 months

7003 FIX f5_bigip_pool: Fixed crash if no SNMP info

by Simon Betz

Module: check_mk Branch: master Commit: 1eb6de9981256e69ac882c22174e45574e507798 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb6de9981256e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 9 11:40:25 2019 +0100 7003 FIX f5_bigip_pool: Fixed crash if no SNMP info Change-Id: Ia318ee5d0c250c124744ff1f9fc99cbe40887223 --- .werks/7003 | 11 +++++++++++ checks/f5_bigip_pool | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/7003 b/.werks/7003 new file mode 100644 index 0000000..919f7b9 --- /dev/null +++ b/.werks/7003 @@ -0,0 +1,11 @@ +Title: f5_bigip_pool: Fixed crash if no SNMP info +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1547030399 + + diff --git a/checks/f5_bigip_pool b/checks/f5_bigip_pool index e81d222..519da8a 100644 --- a/checks/f5_bigip_pool +++ b/checks/f5_bigip_pool @@ -38,6 +38,9 @@ def parse_f5_bigip_pool(info): parsed = {} processed_member_info = False for block in info: + if not block: + continue + # Member information if len(block[0]) == 3 and processed_member_info: break

5 years, 5 months

7001 FIX dell_om_fans: Fixed crash if only one device level (crit) is given

by Simon Betz

Module: check_mk Branch: master Commit: 80ae0d52c6d6be89f2bf41d7a44fe1110c0d25a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80ae0d52c6d6be… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 9 09:39:43 2019 +0100 7001 FIX dell_om_fans: Fixed crash if only one device level (crit) is given Change-Id: I3520cc824743461dd09a21a68c30acd86e10be98 --- .werks/7001 | 10 ++++++++++ checks/dell_om_fans | 36 ++++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.werks/7001 b/.werks/7001 new file mode 100644 index 0000000..78a5a3c --- /dev/null +++ b/.werks/7001 @@ -0,0 +1,10 @@ +Title: dell_om_fans: Fixed crash if only one device level (crit) is given +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547023047 +Class: fix + + diff --git a/checks/dell_om_fans b/checks/dell_om_fans index 19c8d97..f0b36ee 100644 --- a/checks/dell_om_fans +++ b/checks/dell_om_fans @@ -30,6 +30,28 @@ def inventory_dell_om_fans(info): yield (line[0], {}) +def _construct_levels(warn_upper, crit_upper, warn_lower, crit_lower): + # We've seen several possibilities: + # - 1, 2, 3, 4 + # - "", "", 3, 4 + # - "", "", "", 4 + if warn_lower not in ["", None] and crit_lower not in ["", None]: + lower = (int(warn_lower), int(crit_lower)) + elif crit_lower not in ["", None]: + lower = (int(crit_lower), int(crit_lower)) + else: + lower = (None, None) + + if warn_upper not in ["", None] and crit_upper not in ["", None]: + upper = (int(warn_upper), int(crit_upper)) + elif crit_upper not in ["", None]: + upper = (int(crit_upper), int(crit_upper)) + else: + upper = (None, None) + + return lower, upper + + def check_dell_om_fans(item, params, info): translate_status = { "1": (3, "OTHER"), @@ -50,17 +72,11 @@ def check_dell_om_fans(item, params, info): state, state_readable = translate_status[status] yield state, "Status: %s, Name: %s" % \ (state_readable, name) - - value = int(value) if not params: - params = { - 'lower': (int(warn_lower), int(crit_lower)), - } - if not warn_upper == "" and \ - crit_upper == "": - params["upper"] = (int(warn_upper), int(crit_upper)) - - yield check_fan(value, params) + lower, upper = _construct_levels(warn_upper, crit_upper, warn_lower, crit_lower) + params['lower'] = lower + params['upper'] = upper + yield check_fan(int(value), params) check_info["dell_om_fans"] = {

5 years, 5 months

Exclude check man pages from GUI crawl for now.

by Sven Panne

Module: check_mk Branch: master Commit: 557ed47273849057788b7d10382d8f370fc6f3df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=557ed472738490… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 9 11:42:57 2019 +0100 Exclude check man pages from GUI crawl for now. Because of roughly 4000 automation calls, crawling the check man pages took about 80% (= about 15 minutes on our CI) of the whole crawling time. We will re-enable this later when the automation calls are gone. Change-Id: I68ab53bb6125d0f1ab491442e168f9a0c9bfc17c --- tests/integration/cmk/gui/test_crawl.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/integration/cmk/gui/test_crawl.py b/tests/integration/cmk/gui/test_crawl.py index d5f033a..ffdab28 100644 --- a/tests/integration/cmk/gui/test_crawl.py +++ b/tests/integration/cmk/gui/test_crawl.py @@ -246,6 +246,13 @@ class Worker(threading.Thread): if "selection=" in url: raise InvalidUrl("Skipping selection URL: %s" % url) + # TODO: Remove this exclude when ModeCheckManPage works without an + # automation call. Currently we have to use such a call to enrich the + # man page with some additional info from config.check_info, see + # AutomationGetCheckManPage. + if "mode=check_manpage" in url and "wato.py" in url: + raise InvalidUrl("Skipping man page URL: %s" % url) + # Don't follow filled in filter form views if "view.py" in url and "filled_in=filter" in url: raise InvalidUrl("Skipping filled in filter URL: %s" % url)

5 years, 5 months

agent_azure: improve handling of metrics

by Moritz Kiemer

Module: check_mk Branch: master Commit: 45d53c03e55142246ab84786119a9684c9ff64d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d53c03e55142… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Dec 21 11:50:07 2018 +0100 agent_azure: improve handling of metrics * only one aggregation per metric * output both expected and true interval, if we can determine it Change-Id: I4bf7880d7267d237e07e0d3b96e2d635e31431f5 --- agents/special/agent_azure | 132 +++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 58 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index f82183d..df915c4 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -365,45 +365,53 @@ class IssueCollecter(object): return len(self._list) -class AzureMetric(object): # pylint: disable=too-few-public-methods +class AzureMetricParseError(ValueError): + pass - HEADER = ("name", "aggregation", "value", "unit", "timestamp", "timegrain", "filters") - AGGREGATIONS = ("total", "average", "maximum", "minimum", "last", "count") - def __init__(self, metric, aggregations, time_grain, filter_, rid, err): +class AzureMetric(object): # pylint: disable=too-many-instance-attributes + + HEADER = ("name", "aggregation", "value", "unit", "timestamp", "filter", "interval_id", + "interval") + + def __init__(self, metric, aggregation, interval_id, filter_): super(AzureMetric, self).__init__() - self.rows = [] self.name = metric.name.value + self.aggregation = aggregation + self.value = None + self.unit = metric.unit.name + self.timestamp = None + self.filter = filter_ + self.interval_id = interval_id + self.interval = None - # Assuming this agent is executed to gather one value per metric count = len(metric.timeseries) - if count <> 1: - msg = "timeseries has %d elements for metric %s" % (count, self.name) - err.add("info", rid, msg) - LOG.warning(msg + " for resource %s" % rid) + if count == 0: + msg = "no timeseries found for metric %r" % self.name + raise AzureMetricParseError('info', msg) for measurement in reversed(metric.timeseries): if not measurement.data: continue - for aggr in aggregations.split(','): - for data in reversed(measurement.data): - if aggregations.startswith(aggr): - LOG.debug("data: %s", data) - if hasattr(data, aggr): - value = getattr(data, aggr) - # the field *may* be present, even if we did not ask for it. - if value is not None: - timestamp = calendar.timegm(data.time_stamp.utctimetuple()) - self.rows.append((self.name, aggr, value, metric.unit.name, timestamp, - time_grain, filter_)) - break - else: # no break ocurred, we did not find anything - logging.debug("not found: %s %s", self.name, aggr) - if not self.rows: - LOG.info("Found no aggregation for metric %r", self.name) - return + try: + self.interval = (measurement.data[-1].time_stamp - measurement.data[-2].time_stamp) + except (IndexError, TypeError): + pass + + for data in reversed(measurement.data): + LOG.debug("data: %s", data) + self.value = getattr(data, aggregation, None) + if self.value is not None: + self.timestamp = calendar.timegm(data.time_stamp.utctimetuple()) + return + + raise AzureMetricParseError('warning', "not found: %s %s", self.name, aggregation) + + @property + def tuple(self): + return tuple(getattr(self, field) for field in AzureMetric.HEADER) class AzureResource(object): @@ -424,9 +432,9 @@ class AzureResource(object): def dumpinfo(self): lines = [("Resource",), (json.dumps(self.info),)] - m_lines = sum((m.rows for m in self.metrics), []) - if m_lines: - lines += [("metrics following", len(m_lines)), self.metrics[0].HEADER] + m_lines + if self.metrics: + lines += [("metrics following", len(self.metrics)), AzureMetric.HEADER] + lines += [m.tuple for m in self.metrics] return lines @@ -508,44 +516,52 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self.resources_cache = map(AzureResource, raw_resources) return self.resources_cache - def _fetch_specific_metrics(self, resource, metricnames, time_grain, aggregations, filter_, - err): + def _metric_api_call(self, rid, timespan, interval, metric, aggregation, filter_): + LOG.debug( + "metrics.list(%r, timespan=%r, interval=%r, metric=%r, aggregation=%r," + " filter=%r, raw=True)", rid, timespan, interval, metric, aggregation, filter_) + raw = self._monitor_client.metrics.list( + rid, + timespan=timespan, + interval=interval, + metric=metric, + aggregation=aggregation, + filter=filter_, + raw=True, + ) + # raw.output is what we'd gotten had we set raw=False. + # It is a paged object, make sure to actually retrieve + # all pages (as this may raise exceptions) + raw_metrics = list(raw.output.value) + return raw.response, raw_metrics + + def _fetch_specific_metrics(self, resource, metricnames, time_grain, aggregation, filter_, err): if metricnames.count(',') >= 20: raise ValueError("Azure API won't have requests with more than 20 metrics!") - metrics = [] - rid = resource.info["id"] timespan = self.timespans[time_grain] - LOG.debug( - "metrics.list(%r, timespan=%r, interval=%r, metricnames=%r, aggregation=%r," - " filter=%r, raw=True)", rid, timespan, time_grain, metricnames, aggregations, filter_) try: - # azure-api-call - raw = self._monitor_client.metrics.list( - rid, - timespan=timespan, - interval=time_grain, - metric=metricnames, - aggregation=aggregations, - filter=filter_, - raw=True, - ) - LOG.debug("raw.response: %s", raw.response) - self.remaining_reads = raw.response.headers[ - 'x-ms-ratelimit-remaining-subscription-reads'] - # raw.output is what we'd gotten had we set raw=False - LOG.debug("raw.ouput: %s", raw.output) - metrics += [ - AzureMetric(metric, aggregations, time_grain, filter_, rid, err) - for metric in raw.output.value - ] + response, raw_metrics = self._metric_api_call(rid, timespan, time_grain, metricnames, + aggregation, filter_) except ErrorResponseException as exc: if self.args.debug: raise exc err.add("exception", rid, exc.message) LOG.exception(exc) + return [] + + LOG.debug("response: %s", response) + self.remaining_reads = response.headers['x-ms-ratelimit-remaining-subscription-reads'] + + metrics = [] + for raw_metric in raw_metrics: + try: + metrics.append(AzureMetric(raw_metric, aggregation, time_grain, filter_)) + except AzureMetricParseError as exc: + err.add(exc[0], rid, exc[1]) + LOG.warning(exc.args[1]) return metrics @@ -556,8 +572,8 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes metric_params = METRICS_SELECTED.get(resource.info["type"], []) metrics = [] - for metricnames, time_grain, aggregations, filter_ in metric_params: - metrics += self._fetch_specific_metrics(resource, metricnames, time_grain, aggregations, + for metricnames, time_grain, aggregation, filter_ in metric_params: + metrics += self._fetch_specific_metrics(resource, metricnames, time_grain, aggregation, filter_, err) return metrics

5 years, 5 months

7022 Backup can now be configured to exclude historical data

by Lars Michelsen

Module: check_mk Branch: master Commit: 77abfb161f02141abdd26717e75208c8453124ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77abfb161f0214… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 14:06:41 2019 +0100 7022 Backup can now be configured to exclude historical data The site backup in WATO can now be configured to create partial backups of a site. The backup excludes the metric data (RRD files), the monitoring history and log files in this mode. Such backups are much smaller in general and can be created much faster. CMK-539 Change-Id: I81641662045315fd962c8c464cabb611582cabe1 --- .werks/7022 | 12 ++++++++++++ bin/mkbackup | 7 +++++++ cmk/gui/wato/pages/backup.py | 14 ++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/.werks/7022 b/.werks/7022 new file mode 100644 index 0000000..d32d794 --- /dev/null +++ b/.werks/7022 @@ -0,0 +1,12 @@ +Title: Backup can now be configured to exclude historical data +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1546952557 +Class: feature + +The site backup in WATO can now be configured to create partial backups of a site. The backup +excludes the metric data (RRD files), the monitoring history and log files in this mode. Such +backups are much smaller in general and can be created much faster. diff --git a/bin/mkbackup b/bin/mkbackup index 2e2a1bc..46129f0 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -600,6 +600,9 @@ def do_site_backup(opts, site=None, try_stop=True): if not compress_archives(): cmd.append("--no-compression") + if backup_without_history(): + cmd.append("--no-past") + # When executed as site user, "omd backup" is executed without the site # name and always performing backup for the current site. When executed # as root, the site argument has to be given and must be handed over to @@ -1036,6 +1039,10 @@ def compress_archives(): return g_job_config["compress"] +def backup_without_history(): + return g_job_config.get("no_history", False) + + def encrypt_archives(): return g_job_config["encrypt"] is not None diff --git a/cmk/gui/wato/pages/backup.py b/cmk/gui/wato/pages/backup.py index 0f2ad3a..d43dec6 100644 --- a/cmk/gui/wato/pages/backup.py +++ b/cmk/gui/wato/pages/backup.py @@ -34,6 +34,7 @@ from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.plugins.wato.utils.context_buttons import home_button from cmk.gui.plugins.wato.utils.base_modes import WatoWebApiMode +from cmk.gui.valuespec import Checkbox from cmk.gui.plugins.wato import ( WatoMode, @@ -149,6 +150,19 @@ class ModeEditBackupJob(backup.PageEditBackupJob, WatoMode): def keys(self): return SiteBackupKeypairStore() + def custom_job_attributes(self): + return [ + ("no_history", + Checkbox( + title=_("Do not backup historical data"), + help=_( + "You may use this option to create a much smaller partial backup of the site." + ), + label=_( + "Do not backup metric data (RRD files), the monitoring history and log files"), + )), + ] + @mode_registry.register class ModeBackupJobState(backup.PageBackupJobState, WatoMode):

5 years, 5 months

cpu_util.include: missed two occurances of 'levels'

by Moritz Kiemer

Module: check_mk Branch: master Commit: 72f385e62af2ee8e95a555033be5fc9ee4a97f3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72f385e62af2ee… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 9 08:48:39 2019 +0100 cpu_util.include: missed two occurances of 'levels' Change-Id: I53ff28564bc14f6de9fbe79150a41f5e45977f5a --- checks/cpu_util.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 2a7bcc4..6b53583 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -31,7 +31,7 @@ # 2. Variant: dictionary: # # param = { -# "levels" : .... --> compatible with check_levels(), optional +# "util" : .... --> compatible with check_levels(), optional # "average" : 15 # -> compute average for 15 minutes, optional # } @@ -62,7 +62,7 @@ def check_cpu_util(util, params, this_time=None, cores=None, perf_max=100): if params is None: params = {} elif isinstance(params, tuple): - params = {"levels": params} + params = {"util": params} if this_time is None: this_time = time.time()

5 years, 5 months

Stash variables via a context manager only.

by Sven Panne

Module: check_mk Branch: master Commit: 8b17175c0d355b881e35656e8ed81ca0d5b2818d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b17175c0d355b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 9 08:51:30 2019 +0100 Stash variables via a context manager only. This is conceptually much simpler, uses less code and even fixes a few border cases when exceptions were thrown. Change-Id: I09378bfcd13103f41362a9142ade259e2b320d2a --- cmk/gui/dashboard.py | 26 ++++++++++++-------------- cmk/gui/htmllib.py | 19 +++++++++---------- cmk/gui/visuals.py | 35 +++++++++++++++++------------------ 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 85d0395..100f35c 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -640,26 +640,24 @@ def render_dashlet_title_html(dashlet_instance): def render_dashlet_content(dashlet_instance, is_update, stash_html_vars=True): - if stash_html_vars: - html.stash_vars() - html.del_all_vars() - html.set_var("name", dashlet_instance.dashboard_name) - - try: + def update_or_show(): visuals.add_context_to_uri_vars(dashlet_instance.dashlet_spec) if dashlet_instance.wato_folder is not None: html.set_var("wato_folder", dashlet_instance.wato_folder) - with html.plugged(): - if not is_update: - dashlet_instance.show() - else: + if is_update: dashlet_instance.update() - + else: + dashlet_instance.show() return html.drain() - finally: - if stash_html_vars: - html.unstash_vars() + + if stash_html_vars: + with html.stashed_vars(): + html.del_all_vars() + html.set_var("name", dashlet_instance.dashboard_name) + return update_or_show() + else: + return update_or_show() def render_dashlet_exception_content(dashlet_instance, nr, e): diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 524a8a0..1a6b6ff 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -992,9 +992,6 @@ class html(HTMLGenerator): self.start_time = time.time() self.last_measurement = self.start_time - # Variable management - self._var_stash = [] - # Register helpers self.encoder = Encoder() self.timeout_manager = TimeoutManager() @@ -1146,13 +1143,15 @@ class html(HTMLGenerator): def del_all_vars(self, prefix=None): self.request.del_all_vars(prefix) - def stash_vars(self): - self._var_stash.append(dict(self.request.all_vars())) - - def unstash_vars(self): - self.request.del_all_vars() - for varname, value in self._var_stash.pop().iteritems(): - self.request.set_var(varname, value) + @contextmanager + def stashed_vars(self): + saved_vars = dict(self.request.all_vars()) + try: + yield + finally: + self.request.del_all_vars() + for varname, value in saved_vars.iteritems(): + self.request.set_var(varname, value) def get_ascii_input(self, varname, deflt=None): """Helper to retrieve a byte string and ensure it only contains ASCII characters diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index a051121..723b4b6 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -1154,25 +1154,24 @@ def get_filter_headers(datasource, context): # Prepare Filter headers for Livestatus filter_headers = "" only_sites = None - html.stash_vars() - for filter_name, filter_vars in context.items(): - # first set the HTML variables. Sorry - the filters need this - if isinstance(filter_vars, dict): # this is a multi-context filter - for uri_varname, value in filter_vars.items(): - html.set_var(uri_varname, value) - else: - html.set_var(filter_name, filter_vars) - - # Now compute filter headers for all infos of the used datasource - our_infos = datasource["infos"] - for filter_name, filter_object in multisite_filters.items(): - if filter_object.info in our_infos: - header = filter_object.filter(datasource["table"]) - if header.startswith("Sites:"): - only_sites = header.strip().split(" ")[1:] + with html.stashed_vars(): + for filter_name, filter_vars in context.items(): + # first set the HTML variables. Sorry - the filters need this + if isinstance(filter_vars, dict): # this is a multi-context filter + for uri_varname, value in filter_vars.items(): + html.set_var(uri_varname, value) else: - filter_headers += header - html.unstash_vars() + html.set_var(filter_name, filter_vars) + + # Now compute filter headers for all infos of the used datasource + our_infos = datasource["infos"] + for filter_name, filter_object in multisite_filters.items(): + if filter_object.info in our_infos: + header = filter_object.filter(datasource["table"]) + if header.startswith("Sites:"): + only_sites = header.strip().split(" ")[1:] + else: + filter_headers += header return filter_headers, only_sites

5 years, 5 months

← Newer
1
...
37
38
39
40
41
42
43
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019