From 36330ef30187145cf1eb0e1334cfc7ee06686696 Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 3 Aug 2020 12:05:43 +0500 Subject: [PATCH] Generic.get_metrics. Skip SNMP rule if metric ID already processed. --- sa/profiles/Generic/get_metrics.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sa/profiles/Generic/get_metrics.py b/sa/profiles/Generic/get_metrics.py index b91d9ddc44..0ffd388769 100644 --- a/sa/profiles/Generic/get_metrics.py +++ b/sa/profiles/Generic/get_metrics.py @@ -396,6 +396,12 @@ class Script(BaseScript, metaclass=MetricScriptBase): """ for m in self.metric_configs[metric]: for oid, vtype, scale, path in rule.iter_oids(self, m): + if m.id in self.seen_ids: + # If override Generic metrics by profile skipping duplicate + self.logger.debug( + "SNMP Rule %s for metric %s already set. Skipping", m.id, rule + ) + continue self.snmp_batch[oid] += [ BatchConfig(id=m.id, metric=m.metric, path=path, type=vtype, scale=scale) ] -- GitLab