From a933aaac636187d7521f94646ea7f8291f46ad88 Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 14 Oct 2019 23:15:13 +0500 Subject: [PATCH 1/3] Eltex.WOP.get_metrics. Fix Radio | Tx Power metric. --- sa/profiles/Eltex/WOP/get_metrics.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sa/profiles/Eltex/WOP/get_metrics.py b/sa/profiles/Eltex/WOP/get_metrics.py index 1c0d6f18ad..b4bc8b7963 100644 --- a/sa/profiles/Eltex/WOP/get_metrics.py +++ b/sa/profiles/Eltex/WOP/get_metrics.py @@ -10,6 +10,9 @@ from __future__ import division from collections import defaultdict +# Third-party modules +import six + # NOC modules from noc.sa.profiles.Generic.get_metrics import Script as GetMetricsScript, metrics from noc.core.validators import is_ipv4 @@ -87,7 +90,6 @@ class Script(GetMetricsScript): s["status"] = data["status"] s["radio"] = data["radio"] - """ @metrics( [ "Interface | Load | In", @@ -134,21 +136,20 @@ class Script(GetMetricsScript): iface = "%s.%s" % (data["name"], ssid) else: iface = data["name"] - for field, metric in six.iteritems(iface_metric_map): - if data.get(field) is not None: - self.set_metric( - id=(metric, ["", "", "", iface]), - value=data[field], - type="counter", - scale=8 if metric in self.scale_x8 else 1, - ) + # for field, metric in six.iteritems(iface_metric_map): + # if data.get(field) is not None: + # self.set_metric( + # id=(metric, ["", "", "", iface]), + # value=data[field], + # type="counter", + # scale=8 if metric in self.scale_x8 else 1, + # ) # LifeHack. Set Radio interface metrics to SSID if "radio" in data and data["radio"] in radio_metrics: self.set_metric( id=("Radio | TxPower", ["", "", "", iface]), value=radio_metrics[data["radio"]]["tx-power"], ) - """ @metrics( ["Radio | TxPower", "Radio | Quality"], -- GitLab From 1f93404e754109392c1cd64a374666e88ab3769b Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 14 Oct 2019 23:17:53 +0500 Subject: [PATCH 2/3] Fix flake. --- sa/profiles/Eltex/WOP/get_metrics.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sa/profiles/Eltex/WOP/get_metrics.py b/sa/profiles/Eltex/WOP/get_metrics.py index b4bc8b7963..67e2cdf164 100644 --- a/sa/profiles/Eltex/WOP/get_metrics.py +++ b/sa/profiles/Eltex/WOP/get_metrics.py @@ -106,14 +106,14 @@ class Script(GetMetricsScript): def get_interface_metrics(self, metrics): ifaces = [] radio_metrics = self.get_radio_metrics(metrics) - iface_metric_map = { - "rx-bytes": "Interface | Load | In", - "tx-bytes": "Interface | Load | Out", - "rx-packets": "Interface | Packets | In", - "tx-packets": "Interface | Packets | Out", - "rx-errors": "Interface | Errors | In", - "tx-errors": "Interface | Errors | Out", - } + # iface_metric_map = { + # "rx-bytes": "Interface | Load | In", + # "tx-bytes": "Interface | Load | Out", + # "rx-packets": "Interface | Packets | In", + # "tx-packets": "Interface | Packets | Out", + # "rx-errors": "Interface | Errors | In", + # "tx-errors": "Interface | Errors | Out", + # } c = self.cli("get interface all detail") for block in c.split("\n\n"): ifaces += [ -- GitLab From eacce676069ed8429dd2cc624369cfb177456ec2 Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 14 Oct 2019 23:20:22 +0500 Subject: [PATCH 3/3] Fix flake. --- sa/profiles/Eltex/WOP/get_metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa/profiles/Eltex/WOP/get_metrics.py b/sa/profiles/Eltex/WOP/get_metrics.py index 67e2cdf164..f4cd0fb025 100644 --- a/sa/profiles/Eltex/WOP/get_metrics.py +++ b/sa/profiles/Eltex/WOP/get_metrics.py @@ -11,7 +11,7 @@ from __future__ import division from collections import defaultdict # Third-party modules -import six +# import six # NOC modules from noc.sa.profiles.Generic.get_metrics import Script as GetMetricsScript, metrics -- GitLab