2 files changed, 3 insertions, 4 deletions

diff --git a/hosts/vidhar/network/pppoe/default.nix b/hosts/vidhar/network/pppoe/default.nix
index 85ea992d..309e1734 100644
--- a/hosts/vidhar/network/pppoe/default.nix
+++ b/hosts/vidhar/network/pppoe/default.nix
@@ -123,8 +123,8 @@ in {
 
         tc qdisc add dev "$1" handle ffff: ingress
         tc filter add dev "$1" parent ffff: basic action ctinfo dscp 0x0000003f 0x00000040 action mirred egress redirect dev "ifb4$1"
-        tc qdisc replace dev "ifb4$1" root cake memlimit 128Mb pppoe-ptm nat diffserv4 ingress rtt 15ms unlimited
-        tc qdisc replace dev "$1" root cake memlimit 128Mb pppoe-ptm nat diffserv4 wash rtt 15ms unlimited
+        tc qdisc replace dev "ifb4$1" root cake memlimit 128Mb pppoe-ptm nat diffserv4 ingress rtt 15ms bandwidth 140mbit
+        tc qdisc replace dev "$1" root cake memlimit 128Mb pppoe-ptm nat diffserv4 wash rtt 15ms bandwidth 32.5mbit
       '';
       "ppp/ip-up".source = pkgs.resholve.writeScript "ip-up" {
         interpreter = pkgs.runtimeShell;
diff --git a/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py b/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py
index 4ce65d99..8c3c6464 100644
--- a/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py
+++ b/overlays/cake-prometheus-exporter/cake-prometheus-exporter.py
@@ -83,8 +83,7 @@ class CAKEMetrics:
     def prometheus(self):
         metrics = ''
 
-        if self.attrs[dev]['bandwidth'] != "unlimited":
-            metrics += _format_prom_metrics('cake_bandwidth', 'gauge', [({'dev': dev}, self.attrs[dev]['bandwidth']) for dev in self.attrs])
+        metrics += _format_prom_metrics('cake_bandwidth', 'gauge', [({'dev': dev}, self.attrs[dev]['bandwidth']) for dev in self.attrs if self.attrs[dev]['bandwidth'] != "unlimited"])
 
         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])