1 files changed, 37 insertions, 28 deletions
diff --git a/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py b/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
index fc719a96..bc8326ff 100644
--- a/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
+++ b/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
@@ -54,13 +54,13 @@ class ZTEMetrics:
            cls._instance.password = environ.get('ZTE_PASSWORD')
            cls._instance.attrs = None
        return cls._instance
-    
    def __init__(self):
        raise RuntimeError('Call instance() instead')
-    _error_pattern = re.compile('^IF_ERROR(PARAM|TYPE|STR|ID)$')
+    _error_pattern = re.compile(r'^IF_ERROR(PARAM|TYPE|STR|ID)$')
-    _obj_pattern = re.compile('^(?:OBJ_(.+)_ID)|(?:ID_(WAN_COMFIG))$')
+    _obj_pattern = re.compile(r'^(?:OBJ_(.+)_ID)|(?:ID_(WAN_COMFIG))$')
    def update(self):
        attrs = dict()
@@ -106,6 +106,8 @@ class ZTEMetrics:
                                    value = child.text
                                case _:
                                    pass
+                            if value == '0,0':
+                                value = '0'
                            if not name is None and not value is None:
                                instance_dict[name] = value
                                name = None
@@ -120,8 +122,8 @@ class ZTEMetrics:
    def json_text(self):
        return json.dumps(self.attrs)
-    _link_pattern = re.compile('^IGD\.WD1\.LINE([0-9]+)$')
+    _link_pattern = re.compile(r'^IGD\.WD1\.LINE([0-9]+)$')
-    _eth_pattern = re.compile('^IGD\.LD1\.ETH([0-9]+)$')
+    _eth_pattern = re.compile(r'^IGD\.LD1\.ETH([0-9]+)$')
    def prometheus(self):
        metrics = ''
@@ -133,34 +135,41 @@ class ZTEMetrics:
            link_match = self._link_pattern.match(link)
            link_number = link_match.group(1)
-            if 'crc_errors_count' not in link_metrics:
+            link_is_up = self.attrs['DSLINTERFACE'][link]['Status'] == 'Up'
-                link_metrics['crc_errors_count'] = {'type': 'counter', 'metrics': []}
-            link_metrics['crc_errors_count']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['UpCrc_errors']))]
+            if link_is_up:
-            link_metrics['crc_errors_count']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['DownCrc_errors']))]
+                if 'crc_errors_count' not in link_metrics:
+                    link_metrics['crc_errors_count'] = {'type': 'counter', 'metrics': []}
+                link_metrics['crc_errors_count']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['UpCrc_errors']))]
+                link_metrics['crc_errors_count']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['DownCrc_errors']))]
-            if 'noise_margin_db' not in link_metrics:
+                if 'noise_margin_db' not in link_metrics:
-                link_metrics['noise_margin_db'] = {'type': 'gauge', 'metrics': []}
+                    link_metrics['noise_margin_db'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['noise_margin_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_noise_margin']))]
+                link_metrics['noise_margin_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_noise_margin']) / 10)]
-            link_metrics['noise_margin_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_noise_margin']))]
+                link_metrics['noise_margin_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_noise_margin']) / 10)]
-            if 'attenuation_db' not in link_metrics:
+                if 'attenuation_db' not in link_metrics:
-                link_metrics['attenuation_db'] = {'type': 'gauge', 'metrics': []}
+                    link_metrics['attenuation_db'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['attenuation_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_attenuation']))]
+                link_metrics['attenuation_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_attenuation']) / 10)]
-            link_metrics['attenuation_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_attenuation']))]
+                link_metrics['attenuation_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_attenuation']) / 10)]
-            if 'max_rate_kbps' not in link_metrics:
+                if 'max_rate_kbps' not in link_metrics:
-                link_metrics['max_rate_kbps'] = {'type': 'gauge', 'metrics': []}
+                    link_metrics['max_rate_kbps'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['max_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_max_rate']))]
+                link_metrics['max_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_max_rate']))]
-            link_metrics['max_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_max_rate']))]
+                link_metrics['max_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_max_rate']))]
-            if 'current_rate_kbps' not in link_metrics:
+                if 'current_rate_kbps' not in link_metrics:
-                link_metrics['current_rate_kbps'] = {'type': 'gauge', 'metrics': []}
+                    link_metrics['current_rate_kbps'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['current_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_current_rate']))]
+                link_metrics['current_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_current_rate']))]
-            link_metrics['current_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_current_rate']))]
+                link_metrics['current_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_current_rate']))]
            if 'dsl_uptime_seconds' not in link_metrics:
-                link_metrics['dsl_uptime_seconds'] = {'type': 'gauge', 'metrics': []}
+                link_metrics['uptime_seconds'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['dsl_uptime_seconds']['metrics'] += [({"link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Showtime_start']))]
+            link_metrics['uptime_seconds']['metrics'] += [({"link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Showtime_start']) if link_is_up else 0)]
+            if 'status' not in link_metrics:
+                link_metrics['status'] = {'type': 'gauge', 'metrics': []}
+            link_metrics['status']['metrics'] += [({"link": link_number, "status": self.attrs['DSLINTERFACE'][link]['Status']}, 1)]
        if link_metrics:
            for metric_name in link_metrics:
                metrics += _format_prom_metrics(f'dsl_{metric_name}', link_metrics[metric_name]['type'], link_metrics[metric_name]['metrics'])
@@ -203,7 +212,7 @@ class ZTEMetricsServer(BaseHTTPRequestHandler):
                self.send_response(200)
                self.send_header("Content-type", "text/plain")
                self.end_headers()
-                
                self.wfile.write(zte_metrics.prometheus())
            case _:
                self.send_response(404)

diff --git a/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py b/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py index fc719a96..bc8326ff 100644 --- a/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py +++ b/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
@@ -54,13 +54,13 @@ class ZTEMetrics:
54	cls._instance.password = environ.get('ZTE_PASSWORD')	54	cls._instance.password = environ.get('ZTE_PASSWORD')
55	cls._instance.attrs = None	55	cls._instance.attrs = None
56	return cls._instance	56	return cls._instance
57		57
58		58
59	def __init__(self):	59	def __init__(self):
60	raise RuntimeError('Call instance() instead')	60	raise RuntimeError('Call instance() instead')
61		61
62	_error_pattern = re.compile('^IF_ERROR(PARAM\|TYPE\|STR\|ID)$')	62	_error_pattern = re.compile(r'^IF_ERROR(PARAM\|TYPE\|STR\|ID)$')
63	_obj_pattern = re.compile('^(?:OBJ_(.+)_ID)\|(?:ID_(WAN_COMFIG))$')	63	_obj_pattern = re.compile(r'^(?:OBJ_(.+)_ID)\|(?:ID_(WAN_COMFIG))$')
64	def update(self):	64	def update(self):
65	attrs = dict()	65	attrs = dict()
66		66
@@ -106,6 +106,8 @@ class ZTEMetrics:
106	value = child.text	106	value = child.text
107	case _:	107	case _:
108	pass	108	pass
		109	if value == '0,0':
		110	value = '0'
109	if not name is None and not value is None:	111	if not name is None and not value is None:
110	instance_dict[name] = value	112	instance_dict[name] = value
111	name = None	113	name = None
@@ -120,8 +122,8 @@ class ZTEMetrics:
120	def json_text(self):	122	def json_text(self):
121	return json.dumps(self.attrs)	123	return json.dumps(self.attrs)
122		124
123	_link_pattern = re.compile('^IGD\.WD1\.LINE([0-9]+)$')	125	_link_pattern = re.compile(r'^IGD\.WD1\.LINE([0-9]+)$')
124	_eth_pattern = re.compile('^IGD\.LD1\.ETH([0-9]+)$')	126	_eth_pattern = re.compile(r'^IGD\.LD1\.ETH([0-9]+)$')
125	def prometheus(self):	127	def prometheus(self):
126	metrics = ''	128	metrics = ''
127		129
@@ -133,34 +135,41 @@ class ZTEMetrics:
133	link_match = self._link_pattern.match(link)	135	link_match = self._link_pattern.match(link)
134	link_number = link_match.group(1)	136	link_number = link_match.group(1)
135		137
136	if 'crc_errors_count' not in link_metrics:	138	link_is_up = self.attrs['DSLINTERFACE'][link]['Status'] == 'Up'
137	link_metrics['crc_errors_count'] = {'type': 'counter', 'metrics': []}	139
138	link_metrics['crc_errors_count']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['UpCrc_errors']))]	140	if link_is_up:
139	link_metrics['crc_errors_count']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['DownCrc_errors']))]	141	if 'crc_errors_count' not in link_metrics:
		142	link_metrics['crc_errors_count'] = {'type': 'counter', 'metrics': []}
		143	link_metrics['crc_errors_count']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['UpCrc_errors']))]
		144	link_metrics['crc_errors_count']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['DownCrc_errors']))]
140		145
141	if 'noise_margin_db' not in link_metrics:	146	if 'noise_margin_db' not in link_metrics:
142	link_metrics['noise_margin_db'] = {'type': 'gauge', 'metrics': []}	147	link_metrics['noise_margin_db'] = {'type': 'gauge', 'metrics': []}
143	link_metrics['noise_margin_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_noise_margin']))]	148	link_metrics['noise_margin_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_noise_margin']) / 10)]
144	link_metrics['noise_margin_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_noise_margin']))]	149	link_metrics['noise_margin_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_noise_margin']) / 10)]
145		150
146	if 'attenuation_db' not in link_metrics:	151	if 'attenuation_db' not in link_metrics:
147	link_metrics['attenuation_db'] = {'type': 'gauge', 'metrics': []}	152	link_metrics['attenuation_db'] = {'type': 'gauge', 'metrics': []}
148	link_metrics['attenuation_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_attenuation']))]	153	link_metrics['attenuation_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_attenuation']) / 10)]
149	link_metrics['attenuation_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_attenuation']))]	154	link_metrics['attenuation_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_attenuation']) / 10)]
150		155
151	if 'max_rate_kbps' not in link_metrics:	156	if 'max_rate_kbps' not in link_metrics:
152	link_metrics['max_rate_kbps'] = {'type': 'gauge', 'metrics': []}	157	link_metrics['max_rate_kbps'] = {'type': 'gauge', 'metrics': []}
153	link_metrics['max_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_max_rate']))]	158	link_metrics['max_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_max_rate']))]
154	link_metrics['max_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_max_rate']))]	159	link_metrics['max_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_max_rate']))]
155		160
156	if 'current_rate_kbps' not in link_metrics:	161	if 'current_rate_kbps' not in link_metrics:
157	link_metrics['current_rate_kbps'] = {'type': 'gauge', 'metrics': []}	162	link_metrics['current_rate_kbps'] = {'type': 'gauge', 'metrics': []}
158	link_metrics['current_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_current_rate']))]	163	link_metrics['current_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_current_rate']))]
159	link_metrics['current_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_current_rate']))]	164	link_metrics['current_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_current_rate']))]
160		165
161	if 'dsl_uptime_seconds' not in link_metrics:	166	if 'dsl_uptime_seconds' not in link_metrics:
162	link_metrics['dsl_uptime_seconds'] = {'type': 'gauge', 'metrics': []}	167	link_metrics['uptime_seconds'] = {'type': 'gauge', 'metrics': []}
163	link_metrics['dsl_uptime_seconds']['metrics'] += [({"link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Showtime_start']))]	168	link_metrics['uptime_seconds']['metrics'] += [({"link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Showtime_start']) if link_is_up else 0)]
		169
		170	if 'status' not in link_metrics:
		171	link_metrics['status'] = {'type': 'gauge', 'metrics': []}
		172	link_metrics['status']['metrics'] += [({"link": link_number, "status": self.attrs['DSLINTERFACE'][link]['Status']}, 1)]
164	if link_metrics:	173	if link_metrics:
165	for metric_name in link_metrics:	174	for metric_name in link_metrics:
166	metrics += _format_prom_metrics(f'dsl_{metric_name}', link_metrics[metric_name]['type'], link_metrics[metric_name]['metrics'])	175	metrics += _format_prom_metrics(f'dsl_{metric_name}', link_metrics[metric_name]['type'], link_metrics[metric_name]['metrics'])
@@ -203,7 +212,7 @@ class ZTEMetricsServer(BaseHTTPRequestHandler):
203	self.send_response(200)	212	self.send_response(200)
204	self.send_header("Content-type", "text/plain")	213	self.send_header("Content-type", "text/plain")
205	self.end_headers()	214	self.end_headers()
206		215
207	self.wfile.write(zte_metrics.prometheus())	216	self.wfile.write(zte_metrics.prometheus())
208	case _:	217	case _:
209	self.send_response(404)	218	self.send_response(404)