From a71d0bddc8a143a5fcdc17bca706470ddabed3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Knecht?= Date: Tue, 20 Jul 2021 13:47:08 +0200 Subject: [PATCH] end-to-end-test.sh: Fix netdev metrics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since netdev metrics are now read from netlink instead of `/proc/net/dev`, we can't easily spoof them for the end-to-end tests by reading a fixture file in place of `/proc/net/dev`. Therefore, we only get metrics for `lo` and ignore those that would return unpredictable values (i.e. the byte and packet counters). Signed-off-by: Benoรฎt Knecht --- collector/fixtures/e2e-64k-page-output.txt | 151 +-------------------- collector/fixtures/e2e-output.txt | 151 +-------------------- collector/fixtures/proc/net/dev | 12 -- end-to-end-test.sh | 3 +- 4 files changed, 8 insertions(+), 309 deletions(-) delete mode 100644 collector/fixtures/proc/net/dev diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index 7e0ef4c6..1bbb9894 100644 --- a/collector/fixtures/e2e-64k-page-output.txt +++ b/collector/fixtures/e2e-64k-page-output.txt @@ -2414,199 +2414,54 @@ node_network_protocol_type{device="bond0"} 1 node_network_protocol_type{device="eth0"} 1 # HELP node_network_receive_bytes_total Network device statistic receive_bytes. # TYPE node_network_receive_bytes_total counter -node_network_receive_bytes_total{device="docker0"} 6.4910168e+07 -node_network_receive_bytes_total{device="eth0"} 6.8210035552e+10 -node_network_receive_bytes_total{device="flannel.1"} 1.8144009813e+10 -node_network_receive_bytes_total{device="ibr10:30"} 0 -node_network_receive_bytes_total{device="lo"} 4.35303245e+08 -node_network_receive_bytes_total{device="lxcbr0"} 0 -node_network_receive_bytes_total{device="tun0"} 1888 -node_network_receive_bytes_total{device="veth4B09XN"} 648 -node_network_receive_bytes_total{device="wlan0"} 1.0437182923e+10 -node_network_receive_bytes_total{device="๐Ÿ’ฉ0"} 5.7750104e+07 # HELP node_network_receive_compressed_total Network device statistic receive_compressed. # TYPE node_network_receive_compressed_total counter -node_network_receive_compressed_total{device="docker0"} 0 -node_network_receive_compressed_total{device="eth0"} 0 -node_network_receive_compressed_total{device="flannel.1"} 0 -node_network_receive_compressed_total{device="ibr10:30"} 0 node_network_receive_compressed_total{device="lo"} 0 -node_network_receive_compressed_total{device="lxcbr0"} 0 -node_network_receive_compressed_total{device="tun0"} 0 -node_network_receive_compressed_total{device="veth4B09XN"} 0 -node_network_receive_compressed_total{device="wlan0"} 0 -node_network_receive_compressed_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_drop_total Network device statistic receive_drop. # TYPE node_network_receive_drop_total counter -node_network_receive_drop_total{device="docker0"} 0 -node_network_receive_drop_total{device="eth0"} 0 -node_network_receive_drop_total{device="flannel.1"} 0 -node_network_receive_drop_total{device="ibr10:30"} 0 node_network_receive_drop_total{device="lo"} 0 -node_network_receive_drop_total{device="lxcbr0"} 0 -node_network_receive_drop_total{device="tun0"} 0 -node_network_receive_drop_total{device="veth4B09XN"} 0 -node_network_receive_drop_total{device="wlan0"} 0 -node_network_receive_drop_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_errs_total Network device statistic receive_errs. # TYPE node_network_receive_errs_total counter -node_network_receive_errs_total{device="docker0"} 0 -node_network_receive_errs_total{device="eth0"} 0 -node_network_receive_errs_total{device="flannel.1"} 0 -node_network_receive_errs_total{device="ibr10:30"} 0 node_network_receive_errs_total{device="lo"} 0 -node_network_receive_errs_total{device="lxcbr0"} 0 -node_network_receive_errs_total{device="tun0"} 0 -node_network_receive_errs_total{device="veth4B09XN"} 0 -node_network_receive_errs_total{device="wlan0"} 0 -node_network_receive_errs_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_fifo_total Network device statistic receive_fifo. # TYPE node_network_receive_fifo_total counter -node_network_receive_fifo_total{device="docker0"} 0 -node_network_receive_fifo_total{device="eth0"} 0 -node_network_receive_fifo_total{device="flannel.1"} 0 -node_network_receive_fifo_total{device="ibr10:30"} 0 node_network_receive_fifo_total{device="lo"} 0 -node_network_receive_fifo_total{device="lxcbr0"} 0 -node_network_receive_fifo_total{device="tun0"} 0 -node_network_receive_fifo_total{device="veth4B09XN"} 0 -node_network_receive_fifo_total{device="wlan0"} 0 -node_network_receive_fifo_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_frame_total Network device statistic receive_frame. # TYPE node_network_receive_frame_total counter -node_network_receive_frame_total{device="docker0"} 0 -node_network_receive_frame_total{device="eth0"} 0 -node_network_receive_frame_total{device="flannel.1"} 0 -node_network_receive_frame_total{device="ibr10:30"} 0 node_network_receive_frame_total{device="lo"} 0 -node_network_receive_frame_total{device="lxcbr0"} 0 -node_network_receive_frame_total{device="tun0"} 0 -node_network_receive_frame_total{device="veth4B09XN"} 0 -node_network_receive_frame_total{device="wlan0"} 0 -node_network_receive_frame_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_multicast_total Network device statistic receive_multicast. # TYPE node_network_receive_multicast_total counter -node_network_receive_multicast_total{device="docker0"} 0 -node_network_receive_multicast_total{device="eth0"} 0 -node_network_receive_multicast_total{device="flannel.1"} 0 -node_network_receive_multicast_total{device="ibr10:30"} 0 node_network_receive_multicast_total{device="lo"} 0 -node_network_receive_multicast_total{device="lxcbr0"} 0 -node_network_receive_multicast_total{device="tun0"} 0 -node_network_receive_multicast_total{device="veth4B09XN"} 0 -node_network_receive_multicast_total{device="wlan0"} 0 -node_network_receive_multicast_total{device="๐Ÿ’ฉ0"} 72 +# HELP node_network_receive_nohandler_total Network device statistic receive_nohandler. +# TYPE node_network_receive_nohandler_total counter +node_network_receive_nohandler_total{device="lo"} 0 # HELP node_network_receive_packets_total Network device statistic receive_packets. # TYPE node_network_receive_packets_total counter -node_network_receive_packets_total{device="docker0"} 1.065585e+06 -node_network_receive_packets_total{device="eth0"} 5.20993275e+08 -node_network_receive_packets_total{device="flannel.1"} 2.28499337e+08 -node_network_receive_packets_total{device="ibr10:30"} 0 -node_network_receive_packets_total{device="lo"} 1.832522e+06 -node_network_receive_packets_total{device="lxcbr0"} 0 -node_network_receive_packets_total{device="tun0"} 24 -node_network_receive_packets_total{device="veth4B09XN"} 8 -node_network_receive_packets_total{device="wlan0"} 1.3899359e+07 -node_network_receive_packets_total{device="๐Ÿ’ฉ0"} 105557 # HELP node_network_speed_bytes speed_bytes value of /sys/class/net/. # TYPE node_network_speed_bytes gauge node_network_speed_bytes{device="eth0"} 1.25e+08 # HELP node_network_transmit_bytes_total Network device statistic transmit_bytes. # TYPE node_network_transmit_bytes_total counter -node_network_transmit_bytes_total{device="docker0"} 2.681662018e+09 -node_network_transmit_bytes_total{device="eth0"} 9.315587528e+09 -node_network_transmit_bytes_total{device="flannel.1"} 2.0758990068e+10 -node_network_transmit_bytes_total{device="ibr10:30"} 0 -node_network_transmit_bytes_total{device="lo"} 4.35303245e+08 -node_network_transmit_bytes_total{device="lxcbr0"} 2.630299e+06 -node_network_transmit_bytes_total{device="tun0"} 67120 -node_network_transmit_bytes_total{device="veth4B09XN"} 1.943284e+06 -node_network_transmit_bytes_total{device="wlan0"} 2.85164936e+09 -node_network_transmit_bytes_total{device="๐Ÿ’ฉ0"} 4.04570255e+08 # HELP node_network_transmit_carrier_total Network device statistic transmit_carrier. # TYPE node_network_transmit_carrier_total counter -node_network_transmit_carrier_total{device="docker0"} 0 -node_network_transmit_carrier_total{device="eth0"} 0 -node_network_transmit_carrier_total{device="flannel.1"} 0 -node_network_transmit_carrier_total{device="ibr10:30"} 0 node_network_transmit_carrier_total{device="lo"} 0 -node_network_transmit_carrier_total{device="lxcbr0"} 0 -node_network_transmit_carrier_total{device="tun0"} 0 -node_network_transmit_carrier_total{device="veth4B09XN"} 0 -node_network_transmit_carrier_total{device="wlan0"} 0 -node_network_transmit_carrier_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_colls_total Network device statistic transmit_colls. # TYPE node_network_transmit_colls_total counter -node_network_transmit_colls_total{device="docker0"} 0 -node_network_transmit_colls_total{device="eth0"} 0 -node_network_transmit_colls_total{device="flannel.1"} 0 -node_network_transmit_colls_total{device="ibr10:30"} 0 node_network_transmit_colls_total{device="lo"} 0 -node_network_transmit_colls_total{device="lxcbr0"} 0 -node_network_transmit_colls_total{device="tun0"} 0 -node_network_transmit_colls_total{device="veth4B09XN"} 0 -node_network_transmit_colls_total{device="wlan0"} 0 -node_network_transmit_colls_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_compressed_total Network device statistic transmit_compressed. # TYPE node_network_transmit_compressed_total counter -node_network_transmit_compressed_total{device="docker0"} 0 -node_network_transmit_compressed_total{device="eth0"} 0 -node_network_transmit_compressed_total{device="flannel.1"} 0 -node_network_transmit_compressed_total{device="ibr10:30"} 0 node_network_transmit_compressed_total{device="lo"} 0 -node_network_transmit_compressed_total{device="lxcbr0"} 0 -node_network_transmit_compressed_total{device="tun0"} 0 -node_network_transmit_compressed_total{device="veth4B09XN"} 0 -node_network_transmit_compressed_total{device="wlan0"} 0 -node_network_transmit_compressed_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_drop_total Network device statistic transmit_drop. # TYPE node_network_transmit_drop_total counter -node_network_transmit_drop_total{device="docker0"} 0 -node_network_transmit_drop_total{device="eth0"} 0 -node_network_transmit_drop_total{device="flannel.1"} 64 -node_network_transmit_drop_total{device="ibr10:30"} 0 node_network_transmit_drop_total{device="lo"} 0 -node_network_transmit_drop_total{device="lxcbr0"} 0 -node_network_transmit_drop_total{device="tun0"} 0 -node_network_transmit_drop_total{device="veth4B09XN"} 0 -node_network_transmit_drop_total{device="wlan0"} 0 -node_network_transmit_drop_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_errs_total Network device statistic transmit_errs. # TYPE node_network_transmit_errs_total counter -node_network_transmit_errs_total{device="docker0"} 0 -node_network_transmit_errs_total{device="eth0"} 0 -node_network_transmit_errs_total{device="flannel.1"} 0 -node_network_transmit_errs_total{device="ibr10:30"} 0 node_network_transmit_errs_total{device="lo"} 0 -node_network_transmit_errs_total{device="lxcbr0"} 0 -node_network_transmit_errs_total{device="tun0"} 0 -node_network_transmit_errs_total{device="veth4B09XN"} 0 -node_network_transmit_errs_total{device="wlan0"} 0 -node_network_transmit_errs_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_fifo_total Network device statistic transmit_fifo. # TYPE node_network_transmit_fifo_total counter -node_network_transmit_fifo_total{device="docker0"} 0 -node_network_transmit_fifo_total{device="eth0"} 0 -node_network_transmit_fifo_total{device="flannel.1"} 0 -node_network_transmit_fifo_total{device="ibr10:30"} 0 node_network_transmit_fifo_total{device="lo"} 0 -node_network_transmit_fifo_total{device="lxcbr0"} 0 -node_network_transmit_fifo_total{device="tun0"} 0 -node_network_transmit_fifo_total{device="veth4B09XN"} 0 -node_network_transmit_fifo_total{device="wlan0"} 0 -node_network_transmit_fifo_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_packets_total Network device statistic transmit_packets. # TYPE node_network_transmit_packets_total counter -node_network_transmit_packets_total{device="docker0"} 1.929779e+06 -node_network_transmit_packets_total{device="eth0"} 4.3451486e+07 -node_network_transmit_packets_total{device="flannel.1"} 2.58369223e+08 -node_network_transmit_packets_total{device="ibr10:30"} 0 -node_network_transmit_packets_total{device="lo"} 1.832522e+06 -node_network_transmit_packets_total{device="lxcbr0"} 28339 -node_network_transmit_packets_total{device="tun0"} 934 -node_network_transmit_packets_total{device="veth4B09XN"} 10640 -node_network_transmit_packets_total{device="wlan0"} 1.17262e+07 -node_network_transmit_packets_total{device="๐Ÿ’ฉ0"} 304261 # HELP node_network_transmit_queue_length transmit_queue_length value of /sys/class/net/. # TYPE node_network_transmit_queue_length gauge node_network_transmit_queue_length{device="bond0"} 1000 diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index 97c899ac..5c15de28 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2436,199 +2436,54 @@ node_network_protocol_type{device="bond0"} 1 node_network_protocol_type{device="eth0"} 1 # HELP node_network_receive_bytes_total Network device statistic receive_bytes. # TYPE node_network_receive_bytes_total counter -node_network_receive_bytes_total{device="docker0"} 6.4910168e+07 -node_network_receive_bytes_total{device="eth0"} 6.8210035552e+10 -node_network_receive_bytes_total{device="flannel.1"} 1.8144009813e+10 -node_network_receive_bytes_total{device="ibr10:30"} 0 -node_network_receive_bytes_total{device="lo"} 4.35303245e+08 -node_network_receive_bytes_total{device="lxcbr0"} 0 -node_network_receive_bytes_total{device="tun0"} 1888 -node_network_receive_bytes_total{device="veth4B09XN"} 648 -node_network_receive_bytes_total{device="wlan0"} 1.0437182923e+10 -node_network_receive_bytes_total{device="๐Ÿ’ฉ0"} 5.7750104e+07 # HELP node_network_receive_compressed_total Network device statistic receive_compressed. # TYPE node_network_receive_compressed_total counter -node_network_receive_compressed_total{device="docker0"} 0 -node_network_receive_compressed_total{device="eth0"} 0 -node_network_receive_compressed_total{device="flannel.1"} 0 -node_network_receive_compressed_total{device="ibr10:30"} 0 node_network_receive_compressed_total{device="lo"} 0 -node_network_receive_compressed_total{device="lxcbr0"} 0 -node_network_receive_compressed_total{device="tun0"} 0 -node_network_receive_compressed_total{device="veth4B09XN"} 0 -node_network_receive_compressed_total{device="wlan0"} 0 -node_network_receive_compressed_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_drop_total Network device statistic receive_drop. # TYPE node_network_receive_drop_total counter -node_network_receive_drop_total{device="docker0"} 0 -node_network_receive_drop_total{device="eth0"} 0 -node_network_receive_drop_total{device="flannel.1"} 0 -node_network_receive_drop_total{device="ibr10:30"} 0 node_network_receive_drop_total{device="lo"} 0 -node_network_receive_drop_total{device="lxcbr0"} 0 -node_network_receive_drop_total{device="tun0"} 0 -node_network_receive_drop_total{device="veth4B09XN"} 0 -node_network_receive_drop_total{device="wlan0"} 0 -node_network_receive_drop_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_errs_total Network device statistic receive_errs. # TYPE node_network_receive_errs_total counter -node_network_receive_errs_total{device="docker0"} 0 -node_network_receive_errs_total{device="eth0"} 0 -node_network_receive_errs_total{device="flannel.1"} 0 -node_network_receive_errs_total{device="ibr10:30"} 0 node_network_receive_errs_total{device="lo"} 0 -node_network_receive_errs_total{device="lxcbr0"} 0 -node_network_receive_errs_total{device="tun0"} 0 -node_network_receive_errs_total{device="veth4B09XN"} 0 -node_network_receive_errs_total{device="wlan0"} 0 -node_network_receive_errs_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_fifo_total Network device statistic receive_fifo. # TYPE node_network_receive_fifo_total counter -node_network_receive_fifo_total{device="docker0"} 0 -node_network_receive_fifo_total{device="eth0"} 0 -node_network_receive_fifo_total{device="flannel.1"} 0 -node_network_receive_fifo_total{device="ibr10:30"} 0 node_network_receive_fifo_total{device="lo"} 0 -node_network_receive_fifo_total{device="lxcbr0"} 0 -node_network_receive_fifo_total{device="tun0"} 0 -node_network_receive_fifo_total{device="veth4B09XN"} 0 -node_network_receive_fifo_total{device="wlan0"} 0 -node_network_receive_fifo_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_frame_total Network device statistic receive_frame. # TYPE node_network_receive_frame_total counter -node_network_receive_frame_total{device="docker0"} 0 -node_network_receive_frame_total{device="eth0"} 0 -node_network_receive_frame_total{device="flannel.1"} 0 -node_network_receive_frame_total{device="ibr10:30"} 0 node_network_receive_frame_total{device="lo"} 0 -node_network_receive_frame_total{device="lxcbr0"} 0 -node_network_receive_frame_total{device="tun0"} 0 -node_network_receive_frame_total{device="veth4B09XN"} 0 -node_network_receive_frame_total{device="wlan0"} 0 -node_network_receive_frame_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_receive_multicast_total Network device statistic receive_multicast. # TYPE node_network_receive_multicast_total counter -node_network_receive_multicast_total{device="docker0"} 0 -node_network_receive_multicast_total{device="eth0"} 0 -node_network_receive_multicast_total{device="flannel.1"} 0 -node_network_receive_multicast_total{device="ibr10:30"} 0 node_network_receive_multicast_total{device="lo"} 0 -node_network_receive_multicast_total{device="lxcbr0"} 0 -node_network_receive_multicast_total{device="tun0"} 0 -node_network_receive_multicast_total{device="veth4B09XN"} 0 -node_network_receive_multicast_total{device="wlan0"} 0 -node_network_receive_multicast_total{device="๐Ÿ’ฉ0"} 72 +# HELP node_network_receive_nohandler_total Network device statistic receive_nohandler. +# TYPE node_network_receive_nohandler_total counter +node_network_receive_nohandler_total{device="lo"} 0 # HELP node_network_receive_packets_total Network device statistic receive_packets. # TYPE node_network_receive_packets_total counter -node_network_receive_packets_total{device="docker0"} 1.065585e+06 -node_network_receive_packets_total{device="eth0"} 5.20993275e+08 -node_network_receive_packets_total{device="flannel.1"} 2.28499337e+08 -node_network_receive_packets_total{device="ibr10:30"} 0 -node_network_receive_packets_total{device="lo"} 1.832522e+06 -node_network_receive_packets_total{device="lxcbr0"} 0 -node_network_receive_packets_total{device="tun0"} 24 -node_network_receive_packets_total{device="veth4B09XN"} 8 -node_network_receive_packets_total{device="wlan0"} 1.3899359e+07 -node_network_receive_packets_total{device="๐Ÿ’ฉ0"} 105557 # HELP node_network_speed_bytes speed_bytes value of /sys/class/net/. # TYPE node_network_speed_bytes gauge node_network_speed_bytes{device="eth0"} 1.25e+08 # HELP node_network_transmit_bytes_total Network device statistic transmit_bytes. # TYPE node_network_transmit_bytes_total counter -node_network_transmit_bytes_total{device="docker0"} 2.681662018e+09 -node_network_transmit_bytes_total{device="eth0"} 9.315587528e+09 -node_network_transmit_bytes_total{device="flannel.1"} 2.0758990068e+10 -node_network_transmit_bytes_total{device="ibr10:30"} 0 -node_network_transmit_bytes_total{device="lo"} 4.35303245e+08 -node_network_transmit_bytes_total{device="lxcbr0"} 2.630299e+06 -node_network_transmit_bytes_total{device="tun0"} 67120 -node_network_transmit_bytes_total{device="veth4B09XN"} 1.943284e+06 -node_network_transmit_bytes_total{device="wlan0"} 2.85164936e+09 -node_network_transmit_bytes_total{device="๐Ÿ’ฉ0"} 4.04570255e+08 # HELP node_network_transmit_carrier_total Network device statistic transmit_carrier. # TYPE node_network_transmit_carrier_total counter -node_network_transmit_carrier_total{device="docker0"} 0 -node_network_transmit_carrier_total{device="eth0"} 0 -node_network_transmit_carrier_total{device="flannel.1"} 0 -node_network_transmit_carrier_total{device="ibr10:30"} 0 node_network_transmit_carrier_total{device="lo"} 0 -node_network_transmit_carrier_total{device="lxcbr0"} 0 -node_network_transmit_carrier_total{device="tun0"} 0 -node_network_transmit_carrier_total{device="veth4B09XN"} 0 -node_network_transmit_carrier_total{device="wlan0"} 0 -node_network_transmit_carrier_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_colls_total Network device statistic transmit_colls. # TYPE node_network_transmit_colls_total counter -node_network_transmit_colls_total{device="docker0"} 0 -node_network_transmit_colls_total{device="eth0"} 0 -node_network_transmit_colls_total{device="flannel.1"} 0 -node_network_transmit_colls_total{device="ibr10:30"} 0 node_network_transmit_colls_total{device="lo"} 0 -node_network_transmit_colls_total{device="lxcbr0"} 0 -node_network_transmit_colls_total{device="tun0"} 0 -node_network_transmit_colls_total{device="veth4B09XN"} 0 -node_network_transmit_colls_total{device="wlan0"} 0 -node_network_transmit_colls_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_compressed_total Network device statistic transmit_compressed. # TYPE node_network_transmit_compressed_total counter -node_network_transmit_compressed_total{device="docker0"} 0 -node_network_transmit_compressed_total{device="eth0"} 0 -node_network_transmit_compressed_total{device="flannel.1"} 0 -node_network_transmit_compressed_total{device="ibr10:30"} 0 node_network_transmit_compressed_total{device="lo"} 0 -node_network_transmit_compressed_total{device="lxcbr0"} 0 -node_network_transmit_compressed_total{device="tun0"} 0 -node_network_transmit_compressed_total{device="veth4B09XN"} 0 -node_network_transmit_compressed_total{device="wlan0"} 0 -node_network_transmit_compressed_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_drop_total Network device statistic transmit_drop. # TYPE node_network_transmit_drop_total counter -node_network_transmit_drop_total{device="docker0"} 0 -node_network_transmit_drop_total{device="eth0"} 0 -node_network_transmit_drop_total{device="flannel.1"} 64 -node_network_transmit_drop_total{device="ibr10:30"} 0 node_network_transmit_drop_total{device="lo"} 0 -node_network_transmit_drop_total{device="lxcbr0"} 0 -node_network_transmit_drop_total{device="tun0"} 0 -node_network_transmit_drop_total{device="veth4B09XN"} 0 -node_network_transmit_drop_total{device="wlan0"} 0 -node_network_transmit_drop_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_errs_total Network device statistic transmit_errs. # TYPE node_network_transmit_errs_total counter -node_network_transmit_errs_total{device="docker0"} 0 -node_network_transmit_errs_total{device="eth0"} 0 -node_network_transmit_errs_total{device="flannel.1"} 0 -node_network_transmit_errs_total{device="ibr10:30"} 0 node_network_transmit_errs_total{device="lo"} 0 -node_network_transmit_errs_total{device="lxcbr0"} 0 -node_network_transmit_errs_total{device="tun0"} 0 -node_network_transmit_errs_total{device="veth4B09XN"} 0 -node_network_transmit_errs_total{device="wlan0"} 0 -node_network_transmit_errs_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_fifo_total Network device statistic transmit_fifo. # TYPE node_network_transmit_fifo_total counter -node_network_transmit_fifo_total{device="docker0"} 0 -node_network_transmit_fifo_total{device="eth0"} 0 -node_network_transmit_fifo_total{device="flannel.1"} 0 -node_network_transmit_fifo_total{device="ibr10:30"} 0 node_network_transmit_fifo_total{device="lo"} 0 -node_network_transmit_fifo_total{device="lxcbr0"} 0 -node_network_transmit_fifo_total{device="tun0"} 0 -node_network_transmit_fifo_total{device="veth4B09XN"} 0 -node_network_transmit_fifo_total{device="wlan0"} 0 -node_network_transmit_fifo_total{device="๐Ÿ’ฉ0"} 0 # HELP node_network_transmit_packets_total Network device statistic transmit_packets. # TYPE node_network_transmit_packets_total counter -node_network_transmit_packets_total{device="docker0"} 1.929779e+06 -node_network_transmit_packets_total{device="eth0"} 4.3451486e+07 -node_network_transmit_packets_total{device="flannel.1"} 2.58369223e+08 -node_network_transmit_packets_total{device="ibr10:30"} 0 -node_network_transmit_packets_total{device="lo"} 1.832522e+06 -node_network_transmit_packets_total{device="lxcbr0"} 28339 -node_network_transmit_packets_total{device="tun0"} 934 -node_network_transmit_packets_total{device="veth4B09XN"} 10640 -node_network_transmit_packets_total{device="wlan0"} 1.17262e+07 -node_network_transmit_packets_total{device="๐Ÿ’ฉ0"} 304261 # HELP node_network_transmit_queue_length transmit_queue_length value of /sys/class/net/. # TYPE node_network_transmit_queue_length gauge node_network_transmit_queue_length{device="bond0"} 1000 diff --git a/collector/fixtures/proc/net/dev b/collector/fixtures/proc/net/dev deleted file mode 100644 index a3534c13..00000000 --- a/collector/fixtures/proc/net/dev +++ /dev/null @@ -1,12 +0,0 @@ -Inter-| Receive | Transmit - face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed - tun0: 1888 24 0 0 0 0 0 0 67120 934 0 0 0 0 0 0 -veth4B09XN: 648 8 0 0 0 0 0 0 1943284 10640 0 0 0 0 0 0 - lo: 435303245 1832522 0 0 0 0 0 0 435303245 1832522 0 0 0 0 0 0 - eth0:68210035552 520993275 0 0 0 0 0 0 9315587528 43451486 0 0 0 0 0 0 -lxcbr0: 0 0 0 0 0 0 0 0 2630299 28339 0 0 0 0 0 0 - wlan0: 10437182923 13899359 0 0 0 0 0 0 2851649360 11726200 0 0 0 0 0 0 -docker0: 64910168 1065585 0 0 0 0 0 0 2681662018 1929779 0 0 0 0 0 0 -ibr10:30: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -flannel.1: 18144009813 228499337 0 0 0 0 0 0 20758990068 258369223 0 64 0 0 0 0 - ๐Ÿ’ฉ0: 57750104 105557 0 0 0 0 0 72 404570255 304261 0 0 0 0 0 0 diff --git a/end-to-end-test.sh b/end-to-end-test.sh index 555cd1e1..808c1cdd 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh @@ -65,7 +65,7 @@ cd "$(dirname $0)" port="$((10000 + (RANDOM % 10000)))" tmpdir=$(mktemp -d /tmp/node_exporter_e2e_test.XXXXXX) -skip_re="^(go_|node_exporter_build_info|node_scrape_collector_duration_seconds|process_|node_textfile_mtime_seconds|node_time_(zone|seconds))" +skip_re="^(go_|node_exporter_build_info|node_scrape_collector_duration_seconds|process_|node_textfile_mtime_seconds|node_time_(zone|seconds)|node_network_(receive|transmit)_(bytes|packets)_total)" arch="$(uname -m)" @@ -131,6 +131,7 @@ fi --collector.arp.device-exclude="nope" \ --collector.netclass.ignored-devices="(dmz|int)" \ --collector.netclass.ignore-invalid-speed \ + --collector.netdev.device-include="lo" \ --collector.bcache.priorityStats \ "${cpu_info_collector}" \ --collector.cpu.info.bugs-include="${cpu_info_bugs}" \