diff --git a/config.py b/config.py index 8050cd0b54744386c9f0cee55c10645fda66c65c..f1c559b954ed936d86646aa3308516163bdd027f 100644 --- a/config.py +++ b/config.py @@ -784,7 +784,7 @@ class Config(BaseConfig): max_prefix_length = IntParameter(default=24) rpsl_inverse_pref_style = BooleanParameter(default=False) - class metrics(ConfigSection): + class perfomance(ConfigSection): default_hist = ListParameter( item=FloatParameter(), default=[0.001, 0.005, 0.01, 0.05, 0.5, 1.0, 5.0, 10.0] ) @@ -856,7 +856,7 @@ class Config(BaseConfig): url += [",".join(str(h) for h in hosts)] url += ["/%s" % self.mongo.db] self._mongo_connection_args["host"] = "".join(url) - if self.metrics.enable_mongo_hist: + if self.perfomance.enable_mongo_hist: from noc.core.mongo.monitor import MongoCommandSpan self._mongo_connection_args["event_listeners"] = [MongoCommandSpan()] @@ -911,14 +911,14 @@ class Config(BaseConfig): :return: List of hist config or None """ # Check hist is enabled - if not getattr(self.metrics, "enable_%s_hist" % name, False): + if not getattr(self.perfomance, f"enable_{name}_hist", False): return None # Get config - cfg = getattr(self.metrics, "%s_hist" % name) + cfg = getattr(self.perfomance, f"{name}_hist") if cfg: return cfg # Fallback to defaults - return self.metrics.default_hist or None + return self.perfomance.default_hist or None def get_quantiles_config(self, name): """ @@ -926,7 +926,7 @@ class Config(BaseConfig): :return: True if quantile is enabled """ # Check quantiles is enabled - return getattr(self.metrics, "enable_%s_quantiles" % name, False) + return getattr(self.perfomance, f"enable_{name}_quantiles", False) config = Config() diff --git a/core/quantile/monitor.py b/core/quantile/monitor.py index 4e22bb8e2de0806972e0c97f30d4e7470167d089..1069848eb49dbf40ecdac90a99021ea22880e32c 100644 --- a/core/quantile/monitor.py +++ b/core/quantile/monitor.py @@ -1,7 +1,7 @@ # ---------------------------------------------------------------------- # Internal monitoring metrics # ---------------------------------------------------------------------- -# Copyright (C) 2007-2020 The NOC Project +# Copyright (C) 2007-2021 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -10,7 +10,7 @@ from noc.config import config from .base import Summary, TargetedStream DEFAULT_TARGETS = [ - (q, config.metrics.default_quantiles_epsilon) for q in config.metrics.default_quantiles + (q, config.perfomance.default_quantiles_epsilon) for q in config.perfomance.default_quantiles ] DEFAULT_QUANTILE_SCALE = 1000000 Q_SUFFIX = "_@q" @@ -20,10 +20,10 @@ Q_SUFFIX_LEN = len(Q_SUFFIX) class Quantile(Summary): def __init__(self, scale=DEFAULT_QUANTILE_SCALE): super().__init__( - config.metrics.default_quantiles_window, + config.perfomance.default_quantiles_window, 1, TargetedStream, - config.metrics.default_quantiles_buffer, + config.perfomance.default_quantiles_buffer, DEFAULT_TARGETS, ) self.scale = scale @@ -34,11 +34,11 @@ class Quantile(Summary): name = name[:-Q_SUFFIX_LEN] # Prepare labels ext_labels = ['%s="%s"' % (i.lower(), labels[i]) for i in labels] - for quantile in config.metrics.default_quantiles: + for quantile in config.perfomance.default_quantiles: (value,) = self.query(quantile, 0) all_labels = ext_labels + [ 'quantile="%s"' % quantile, - 'window="%s"' % config.metrics.default_quantiles_window, + 'window="%s"' % config.perfomance.default_quantiles_window, ] yield "# TYPE %s untyped" % name yield "%s{%s} %s" % (name, ",".join(all_labels), float(value) / self.scale) diff --git a/docs/en/docs/admin/reference/config/metrics.md b/docs/en/docs/admin/reference/config/performance.md similarity index 99% rename from docs/en/docs/admin/reference/config/metrics.md rename to docs/en/docs/admin/reference/config/performance.md index 8ffb970d96048ea928d3487aaa87563d2876bd50..82a23a35638c493d2efb7cb0d0ab45e521b88266 100644 --- a/docs/en/docs/admin/reference/config/metrics.md +++ b/docs/en/docs/admin/reference/config/performance.md @@ -1,4 +1,4 @@ -# [metrics] section +# [performance] section Metrics service configuration diff --git a/docs/en/docs/admin/reference/services/metrics.md b/docs/en/docs/admin/reference/services/metrics.md index 0918a843af3157eb4c81c9a12527c52d623d563f..0633bdf43f386596c6ecbffed24056882ca2b549 100644 --- a/docs/en/docs/admin/reference/services/metrics.md +++ b/docs/en/docs/admin/reference/services/metrics.md @@ -37,5 +37,4 @@ graph LR ## Configuration -`metricscollector` service may be configured via [[metrics]](../config/metrics.md) -config section. +`metrics` service may be configured via [metrics]() config section. diff --git a/docs/en/mkdocs.yml b/docs/en/mkdocs.yml index f0acfff84d321743ab91fa79ff824c3de1759123..4bf510f402b462b81a4e1840da3dc57315e183a8 100644 --- a/docs/en/mkdocs.yml +++ b/docs/en/mkdocs.yml @@ -1365,7 +1365,6 @@ nav: - "[mailsender] section": admin/reference/config/mailsender.md - "[memcached] section": admin/reference/config/memcached.md - "[message] section": admin/reference/config/message.md - - "[metrics] section": admin/reference/config/metrics.md - "[mongo] section": admin/reference/config/mongo.md - "[mrt] section": admin/reference/config/mrt.md - "[nbi] section": admin/reference/config/nbi.md @@ -1373,6 +1372,7 @@ nav: - "[nsqlookupd] section": admin/reference/config/nsqlookupd.md - "[path] section": admin/reference/config/path.md - "[peer] section": admin/reference/config/peer.md + - "[performance] section": admin/reference/config/performance.md - "[pg] section": admin/reference/config/pg.md - "[ping] section": admin/reference/config/ping.md - "[proxy] section": admin/reference/config/proxy.md diff --git a/docs/ru/docs/admin/reference/config/metrics.md b/docs/ru/docs/admin/reference/config/performance.md similarity index 99% rename from docs/ru/docs/admin/reference/config/metrics.md rename to docs/ru/docs/admin/reference/config/performance.md index 8ffb970d96048ea928d3487aaa87563d2876bd50..82a23a35638c493d2efb7cb0d0ab45e521b88266 100644 --- a/docs/ru/docs/admin/reference/config/metrics.md +++ b/docs/ru/docs/admin/reference/config/performance.md @@ -1,4 +1,4 @@ -# [metrics] section +# [performance] section Metrics service configuration diff --git a/docs/ru/mkdocs.yml b/docs/ru/mkdocs.yml index 9693fce3f706fdcfa586e1c20c2ad2c7f83659a4..206cfd6261d5f5445dabf50e08977c0d476a46d2 100644 --- a/docs/ru/mkdocs.yml +++ b/docs/ru/mkdocs.yml @@ -1373,7 +1373,6 @@ nav: - "[mailsender] section": admin/reference/config/mailsender.md - "[memcached] section": admin/reference/config/memcached.md - "[message] section": admin/reference/config/message.md - - "[metrics] section": admin/reference/config/metrics.md - "[mongo] section": admin/reference/config/mongo.md - "[mrt] section": admin/reference/config/mrt.md - "[nbi] section": admin/reference/config/nbi.md @@ -1381,6 +1380,7 @@ nav: - "[nsqlookupd] section": admin/reference/config/nsqlookupd.md - "[path] section": admin/reference/config/path.md - "[peer] section": admin/reference/config/peer.md + - "[performance] section": admin/reference/config/performance.md - "[pg] section": admin/reference/config/pg.md - "[ping] section": admin/reference/config/ping.md - "[proxy] section": admin/reference/config/proxy.md