...

1 files changed, 6 insertions, 9 deletions

diff --git a/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py b/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py
index b450f5a1..7d5d8a98 100644
--- a/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py
+++ b/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py
@@ -63,14 +63,12 @@ class CAKEMetrics:
             for tin_name, tin_data in zip(tin_names, qdisc['tins']):
                 tins[tin_name] = {
                     'bytes': tin_data['sent_bytes'],
-                    'packets': tin_data['sent_packets']
+                    'packets': tin_data['sent_packets'],
+                    'ecn_mark': tin_data['ecn_mark'],
+                    'drops': tin_data['drops'],
                 }
 
             attrs[qdisc['dev']] = {
-                'bytes': qdisc['bytes'],
-                'packets': qdisc['packets'],
-                'drops': qdisc['drops'],
-                'ecn_mark': sum(map(lambda tin: tin['ecn_mark'], qdisc['tins'])),
                 'overlimits': qdisc['overlimits'],
                 'requeues': qdisc['requeues'],
                 'tins': tins
@@ -84,12 +82,11 @@ class CAKEMetrics:
     def prometheus(self):
         metrics = ''
 
-        metrics += _format_prom_metrics('cake_bytes', 'counter', [({'dev': dev}, self.attrs[dev]['bytes']) for dev in self.attrs])
-        for packet_counter in ['packets', 'overlimits', 'requeues', 'drops', 'ecn_mark']:
+        for packet_counter in ['overlimits', 'requeues']:
             metrics += _format_prom_metrics(f'cake_{packet_counter}', 'counter', [({'dev': dev}, self.attrs[dev][packet_counter]) for dev in self.attrs])
 
-        metrics += _format_prom_metrics('cake_tin_bytes', 'counter', [({'dev': dev, 'tin': tin}, self.attrs[dev]['tins'][tin]['bytes']) for dev in self.attrs for tin in self.attrs[dev]['tins']])
-        metrics += _format_prom_metrics('cake_tin_packets', 'counter', [({'dev': dev, 'tin': tin}, self.attrs[dev]['tins'][tin]['packets']) for dev in self.attrs for tin in self.attrs[dev]['tins']])
+        for packet_counter in ['bytes', 'packets', 'drops', 'ecn_mark']:
+            metrics += _format_prom_metrics(f'cake_{packet_counter}', 'counter', [({'dev': dev, 'tin': tin}, self.attrs[dev]['tins'][tin][packet_counter]) for dev in self.attrs for tin in self.attrs[dev]['tins']])
 
         return metrics.encode('utf-8')