From c4102f117584f92e18e9612d9a9eecd0815e89bd Mon Sep 17 00:00:00 2001 From: Jan Klat Date: Mon, 16 Jul 2018 15:08:18 +0200 Subject: [PATCH] Add sys/class/net parsing from procfs and expose its metrics (#851) * add sys/class/net parsing from procfs and expose its metrics Signed-off-by: Jan Klat * change code to use int pointers per procfs change, move netclass to separate collector, change metric naming Signed-off-by: Jan Klat * bump year in licence, remove redundant newline, correct fixtures Signed-off-by: Jan Klat * fix style Signed-off-by: Jan Klat * change carrier changes to counter type Signed-off-by: Jan Klat * fix e2e output Signed-off-by: Jan Klat * add fixtures Signed-off-by: Jan Klat * update vendor, use fixtures correctly Signed-off-by: Jan Klat * change fixtures (device in /sys/class/net should be symlinked) Signed-off-by: Jan Klat * correct fixtures for 64k page, updated readme Signed-off-by: Jan Klat --- README.md | 1 + collector/fixtures/e2e-64k-page-output.txt | 55 ++ collector/fixtures/e2e-output.txt | 55 ++ collector/fixtures/sys.ttar | 519 ++++++++++++++++++ collector/netclass_linux.go | 173 ++++++ end-to-end-test.sh | 1 + .../github.com/prometheus/procfs/net_dev.go | 2 +- .../prometheus/procfs/sysfs/net_class.go | 73 +-- vendor/vendor.json | 6 +- 9 files changed, 849 insertions(+), 36 deletions(-) create mode 100644 collector/netclass_linux.go diff --git a/README.md b/README.md index bb4f8a84..817bad9f 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ ipvs | Exposes IPVS status from `/proc/net/ip_vs` and stats from `/proc/net/ip_v loadavg | Exposes load average. | Darwin, Dragonfly, FreeBSD, Linux, NetBSD, OpenBSD, Solaris mdadm | Exposes statistics about devices in `/proc/mdstat` (does nothing if no `/proc/mdstat` present). | Linux meminfo | Exposes memory statistics. | Darwin, Dragonfly, FreeBSD, Linux, OpenBSD +netclass | Exposes network interface info from `/sys/class/net/` | Linux netdev | Exposes network interface statistics such as bytes transferred. | Darwin, Dragonfly, FreeBSD, Linux, OpenBSD netstat | Exposes network statistics from `/proc/net/netstat`. This is the same information as `netstat -s`. | Linux nfs | Exposes NFS client statistics from `/proc/net/rpc/nfs`. This is the same information as `nfsstat -c`. | Linux diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index f0372560..0bd39b43 100644 --- a/collector/fixtures/e2e-64k-page-output.txt +++ b/collector/fixtures/e2e-64k-page-output.txt @@ -1669,6 +1669,51 @@ node_netstat_Udp_NoPorts 120 # HELP node_netstat_Udp_OutDatagrams Statistic UdpOutDatagrams. # TYPE node_netstat_Udp_OutDatagrams untyped node_netstat_Udp_OutDatagrams 53028 +# HELP node_network_address_assign_type address_assign_type value of /sys/class/net/. +# TYPE node_network_address_assign_type gauge +node_network_address_assign_type{interface="eth0"} 3 +# HELP node_network_carrier carrier value of /sys/class/net/. +# TYPE node_network_carrier gauge +node_network_carrier{interface="eth0"} 1 +# HELP node_network_carrier_changes_total carrier_changes_total value of /sys/class/net/. +# TYPE node_network_carrier_changes_total counter +node_network_carrier_changes_total{interface="eth0"} 2 +# HELP node_network_carrier_down_changes_total carrier_down_changes_total value of /sys/class/net/. +# TYPE node_network_carrier_down_changes_total counter +node_network_carrier_down_changes_total{interface="eth0"} 1 +# HELP node_network_carrier_up_changes_total carrier_up_changes_total value of /sys/class/net/. +# TYPE node_network_carrier_up_changes_total counter +node_network_carrier_up_changes_total{interface="eth0"} 1 +# HELP node_network_device_id device_id value of /sys/class/net/. +# TYPE node_network_device_id gauge +node_network_device_id{interface="eth0"} 32 +# HELP node_network_dormant dormant value of /sys/class/net/. +# TYPE node_network_dormant gauge +node_network_dormant{interface="eth0"} 1 +# HELP node_network_flags flags value of /sys/class/net/. +# TYPE node_network_flags gauge +node_network_flags{interface="eth0"} 4867 +# HELP node_network_iface_id iface_id value of /sys/class/net/. +# TYPE node_network_iface_id gauge +node_network_iface_id{interface="eth0"} 2 +# HELP node_network_iface_link iface_link value of /sys/class/net/. +# TYPE node_network_iface_link gauge +node_network_iface_link{interface="eth0"} 2 +# HELP node_network_iface_link_mode iface_link_mode value of /sys/class/net/. +# TYPE node_network_iface_link_mode gauge +node_network_iface_link_mode{interface="eth0"} 1 +# HELP node_network_mtu_bytes mtu_bytes value of /sys/class/net/. +# TYPE node_network_mtu_bytes gauge +node_network_mtu_bytes{interface="eth0"} 1500 +# HELP node_network_name_assign_type name_assign_type value of /sys/class/net/. +# TYPE node_network_name_assign_type gauge +node_network_name_assign_type{interface="eth0"} 2 +# HELP node_network_net_dev_group net_dev_group value of /sys/class/net/. +# TYPE node_network_net_dev_group gauge +node_network_net_dev_group{interface="eth0"} 0 +# HELP node_network_protocol_type protocol_type value of /sys/class/net/. +# TYPE node_network_protocol_type gauge +node_network_protocol_type{interface="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 @@ -1765,6 +1810,9 @@ 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{interface="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 @@ -1861,6 +1909,12 @@ 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{interface="eth0"} 1000 +# HELP node_network_up Valid operstate for interface. +# TYPE node_network_up gauge +node_network_up{address="01:01:01:01:01:01",broadcast="ff:ff:ff:ff:ff:ff",duplex="full",ifalias="",interface="eth0",operstate="up"} 1 # HELP node_nf_conntrack_entries Number of currently allocated flow entries for connection tracking. # TYPE node_nf_conntrack_entries gauge node_nf_conntrack_entries 123 @@ -2165,6 +2219,7 @@ node_scrape_collector_success{collector="mdadm"} 1 node_scrape_collector_success{collector="meminfo"} 1 node_scrape_collector_success{collector="meminfo_numa"} 1 node_scrape_collector_success{collector="mountstats"} 1 +node_scrape_collector_success{collector="netclass"} 1 node_scrape_collector_success{collector="netdev"} 1 node_scrape_collector_success{collector="netstat"} 1 node_scrape_collector_success{collector="nfs"} 1 diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index efba674b..dc601e0b 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -1669,6 +1669,51 @@ node_netstat_Udp_NoPorts 120 # HELP node_netstat_Udp_OutDatagrams Statistic UdpOutDatagrams. # TYPE node_netstat_Udp_OutDatagrams untyped node_netstat_Udp_OutDatagrams 53028 +# HELP node_network_address_assign_type address_assign_type value of /sys/class/net/. +# TYPE node_network_address_assign_type gauge +node_network_address_assign_type{interface="eth0"} 3 +# HELP node_network_carrier carrier value of /sys/class/net/. +# TYPE node_network_carrier gauge +node_network_carrier{interface="eth0"} 1 +# HELP node_network_carrier_changes_total carrier_changes_total value of /sys/class/net/. +# TYPE node_network_carrier_changes_total counter +node_network_carrier_changes_total{interface="eth0"} 2 +# HELP node_network_carrier_down_changes_total carrier_down_changes_total value of /sys/class/net/. +# TYPE node_network_carrier_down_changes_total counter +node_network_carrier_down_changes_total{interface="eth0"} 1 +# HELP node_network_carrier_up_changes_total carrier_up_changes_total value of /sys/class/net/. +# TYPE node_network_carrier_up_changes_total counter +node_network_carrier_up_changes_total{interface="eth0"} 1 +# HELP node_network_device_id device_id value of /sys/class/net/. +# TYPE node_network_device_id gauge +node_network_device_id{interface="eth0"} 32 +# HELP node_network_dormant dormant value of /sys/class/net/. +# TYPE node_network_dormant gauge +node_network_dormant{interface="eth0"} 1 +# HELP node_network_flags flags value of /sys/class/net/. +# TYPE node_network_flags gauge +node_network_flags{interface="eth0"} 4867 +# HELP node_network_iface_id iface_id value of /sys/class/net/. +# TYPE node_network_iface_id gauge +node_network_iface_id{interface="eth0"} 2 +# HELP node_network_iface_link iface_link value of /sys/class/net/. +# TYPE node_network_iface_link gauge +node_network_iface_link{interface="eth0"} 2 +# HELP node_network_iface_link_mode iface_link_mode value of /sys/class/net/. +# TYPE node_network_iface_link_mode gauge +node_network_iface_link_mode{interface="eth0"} 1 +# HELP node_network_mtu_bytes mtu_bytes value of /sys/class/net/. +# TYPE node_network_mtu_bytes gauge +node_network_mtu_bytes{interface="eth0"} 1500 +# HELP node_network_name_assign_type name_assign_type value of /sys/class/net/. +# TYPE node_network_name_assign_type gauge +node_network_name_assign_type{interface="eth0"} 2 +# HELP node_network_net_dev_group net_dev_group value of /sys/class/net/. +# TYPE node_network_net_dev_group gauge +node_network_net_dev_group{interface="eth0"} 0 +# HELP node_network_protocol_type protocol_type value of /sys/class/net/. +# TYPE node_network_protocol_type gauge +node_network_protocol_type{interface="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 @@ -1765,6 +1810,9 @@ 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{interface="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 @@ -1861,6 +1909,12 @@ 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{interface="eth0"} 1000 +# HELP node_network_up Valid operstate for interface. +# TYPE node_network_up gauge +node_network_up{address="01:01:01:01:01:01",broadcast="ff:ff:ff:ff:ff:ff",duplex="full",ifalias="",interface="eth0",operstate="up"} 1 # HELP node_nf_conntrack_entries Number of currently allocated flow entries for connection tracking. # TYPE node_nf_conntrack_entries gauge node_nf_conntrack_entries 123 @@ -2165,6 +2219,7 @@ node_scrape_collector_success{collector="mdadm"} 1 node_scrape_collector_success{collector="meminfo"} 1 node_scrape_collector_success{collector="meminfo_numa"} 1 node_scrape_collector_success{collector="mountstats"} 1 +node_scrape_collector_success{collector="netclass"} 1 node_scrape_collector_success{collector="netdev"} 1 node_scrape_collector_success{collector="netstat"} 1 node_scrape_collector_success{collector="nfs"} 1 diff --git a/collector/fixtures/sys.ttar b/collector/fixtures/sys.ttar index 92d6c79f..d8982edb 100644 --- a/collector/fixtures/sys.ttar +++ b/collector/fixtures/sys.ttar @@ -299,6 +299,21 @@ Mode: 755 Directory: sys/class/net/bond0 Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/addr_assign_type +Lines: 1 +3 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/addr_len +Lines: 1 +6 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/address +Lines: 1 +01:01:01:01:01:01 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/net/bond0/bonding Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -306,6 +321,117 @@ Path: sys/class/net/bond0/bonding/slaves Lines: 0 Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/broadcast +Lines: 1 +ff:ff:ff:ff:ff:ff +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/carrier +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/carrier_changes +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/carrier_down_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/carrier_up_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/dev_id +Lines: 1 +0x20 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/dormant +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/duplex +Lines: 1 +full +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/flags +Lines: 1 +0x1303 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/ifalias +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/ifindex +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/iflink +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/link_mode +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/mtu +Lines: 1 +1500 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/name_assign_type +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/netdev_group +Lines: 1 +0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/operstate +Lines: 1 +up +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/phys_port_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/phys_port_name +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/phys_switch_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/speed +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/tx_queue_len +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/bond0/type +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Path: sys/class/net/bonding_masters Lines: 1 bond0 dmz int @@ -314,6 +440,21 @@ Mode: 644 Directory: sys/class/net/dmz Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/addr_assign_type +Lines: 1 +3 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/addr_len +Lines: 1 +6 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/address +Lines: 1 +01:01:01:01:01:01 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/net/dmz/bonding Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -322,6 +463,102 @@ Lines: 1 eth0 eth4 Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/broadcast +Lines: 1 +ff:ff:ff:ff:ff:ff +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/carrier +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/carrier_changes +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/carrier_down_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/carrier_up_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/dev_id +Lines: 1 +0x20 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/dormant +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/duplex +Lines: 1 +full +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/flags +Lines: 1 +0x1303 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/ifalias +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/ifindex +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/iflink +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/link_mode +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/mtu +Lines: 1 +1500 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/name_assign_type +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/netdev_group +Lines: 1 +0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/operstate +Lines: 1 +up +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/phys_port_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/phys_port_name +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/phys_switch_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/net/dmz/slave_eth0 Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -338,9 +575,42 @@ Lines: 1 up Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/speed +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/tx_queue_len +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/dmz/type +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/eth0 +SymlinkTo: ../../devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/ +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/net/int Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/addr_assign_type +Lines: 1 +3 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/addr_len +Lines: 1 +6 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/address +Lines: 1 +01:01:01:01:01:01 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/net/int/bonding Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -349,6 +619,102 @@ Lines: 1 eth5 eth1 Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/broadcast +Lines: 1 +ff:ff:ff:ff:ff:ff +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/carrier +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/carrier_changes +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/carrier_down_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/carrier_up_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/dev_id +Lines: 1 +0x20 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/dormant +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/duplex +Lines: 1 +full +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/flags +Lines: 1 +0x1303 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/ifalias +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/ifindex +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/iflink +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/link_mode +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/mtu +Lines: 1 +1500 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/name_assign_type +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/netdev_group +Lines: 1 +0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/operstate +Lines: 1 +up +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/phys_port_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/phys_port_name +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/phys_switch_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/net/int/slave_eth1 Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -365,12 +731,165 @@ Lines: 1 up Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/speed +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/tx_queue_len +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/net/int/type +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/devices Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/devices/pci0000:00 Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/pci0000:00/0000:00:03.0 +Mode: 755 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0 +Mode: 755 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net +Mode: 755 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0 +Mode: 755 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/addr_assign_type +Lines: 1 +3 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/addr_len +Lines: 1 +6 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/address +Lines: 1 +01:01:01:01:01:01 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/broadcast +Lines: 1 +ff:ff:ff:ff:ff:ff +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/carrier +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/carrier_changes +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/carrier_down_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/carrier_up_count +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/dev_id +Lines: 1 +0x20 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/dormant +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/duplex +Lines: 1 +full +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/flags +Lines: 1 +0x1303 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/ifalias +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/ifindex +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/iflink +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/link_mode +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/mtu +Lines: 1 +1500 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/name_assign_type +Lines: 1 +2 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/netdev_group +Lines: 1 +0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/operstate +Lines: 1 +up +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/phys_port_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/phys_port_name +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/phys_switch_id +Lines: 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/speed +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/tx_queue_len +Lines: 1 +1000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/net/eth0/type +Lines: 1 +1 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/devices/pci0000:00/0000:00:0d.0 Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/collector/netclass_linux.go b/collector/netclass_linux.go new file mode 100644 index 00000000..a71f3027 --- /dev/null +++ b/collector/netclass_linux.go @@ -0,0 +1,173 @@ +// Copyright 2018 The Prometheus Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build !nonetclass +// +build linux + +package collector + +import ( + "fmt" + "regexp" + + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/procfs/sysfs" + "gopkg.in/alecthomas/kingpin.v2" +) + +var ( + netclassIgnoredDevices = kingpin.Flag("collector.netclass.ignored-devices", "Regexp of net devices to ignore for netclass collector.").Default("^$").String() +) + +type netClassCollector struct { + subsystem string + ignoredDevicesPattern *regexp.Regexp + metricDescs map[string]*prometheus.Desc +} + +func init() { + registerCollector("netclass", defaultEnabled, NewNetClassCollector) +} + +// NewNetClassCollector returns a new Collector exposing network class stats. +func NewNetClassCollector() (Collector, error) { + pattern := regexp.MustCompile(*netclassIgnoredDevices) + return &netClassCollector{ + subsystem: "network", + ignoredDevicesPattern: pattern, + metricDescs: map[string]*prometheus.Desc{}, + }, nil +} + +func (c *netClassCollector) Update(ch chan<- prometheus.Metric) error { + netClass, err := getNetClassInfo(c.ignoredDevicesPattern) + if err != nil { + return fmt.Errorf("could not get net class info: %s", err) + } + for _, ifaceInfo := range netClass { + upDesc := prometheus.NewDesc( + prometheus.BuildFQName(namespace, c.subsystem, "up"), + "Valid operstate for interface.", + []string{"interface", "address", "broadcast", "duplex", "operstate", "ifalias"}, + nil, + ) + upValue := 0.0 + if ifaceInfo.OperState == "up" { + upValue = 1.0 + } + + ch <- prometheus.MustNewConstMetric(upDesc, prometheus.GaugeValue, upValue, ifaceInfo.Name, ifaceInfo.Address, ifaceInfo.Broadcast, ifaceInfo.Duplex, ifaceInfo.OperState, ifaceInfo.IfAlias) + + if ifaceInfo.AddrAssignType != nil { + pushMetric(ch, c.subsystem, "address_assign_type", *ifaceInfo.AddrAssignType, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.Carrier != nil { + pushMetric(ch, c.subsystem, "carrier", *ifaceInfo.Carrier, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.CarrierChanges != nil { + pushMetric(ch, c.subsystem, "carrier_changes_total", *ifaceInfo.CarrierChanges, ifaceInfo.Name, prometheus.CounterValue) + } + + if ifaceInfo.CarrierUpCount != nil { + pushMetric(ch, c.subsystem, "carrier_up_changes_total", *ifaceInfo.CarrierUpCount, ifaceInfo.Name, prometheus.CounterValue) + } + + if ifaceInfo.CarrierDownCount != nil { + pushMetric(ch, c.subsystem, "carrier_down_changes_total", *ifaceInfo.CarrierDownCount, ifaceInfo.Name, prometheus.CounterValue) + } + + if ifaceInfo.DevID != nil { + pushMetric(ch, c.subsystem, "device_id", *ifaceInfo.DevID, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.Dormant != nil { + pushMetric(ch, c.subsystem, "dormant", *ifaceInfo.Dormant, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.Flags != nil { + pushMetric(ch, c.subsystem, "flags", *ifaceInfo.Flags, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.IfIndex != nil { + pushMetric(ch, c.subsystem, "iface_id", *ifaceInfo.IfIndex, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.IfLink != nil { + pushMetric(ch, c.subsystem, "iface_link", *ifaceInfo.IfLink, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.LinkMode != nil { + pushMetric(ch, c.subsystem, "iface_link_mode", *ifaceInfo.LinkMode, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.MTU != nil { + pushMetric(ch, c.subsystem, "mtu_bytes", *ifaceInfo.MTU, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.NameAssignType != nil { + pushMetric(ch, c.subsystem, "name_assign_type", *ifaceInfo.NameAssignType, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.NetDevGroup != nil { + pushMetric(ch, c.subsystem, "net_dev_group", *ifaceInfo.NetDevGroup, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.Speed != nil { + speedBytes := int64(*ifaceInfo.Speed / 8 * 1000 * 1000) + pushMetric(ch, c.subsystem, "speed_bytes", speedBytes, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.TxQueueLen != nil { + pushMetric(ch, c.subsystem, "transmit_queue_length", *ifaceInfo.TxQueueLen, ifaceInfo.Name, prometheus.GaugeValue) + } + + if ifaceInfo.Type != nil { + pushMetric(ch, c.subsystem, "protocol_type", *ifaceInfo.Type, ifaceInfo.Name, prometheus.GaugeValue) + } + } + + return nil +} + +func pushMetric(ch chan<- prometheus.Metric, subsystem string, name string, value int64, ifaceName string, valueType prometheus.ValueType) { + fieldDesc := prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, name), + fmt.Sprintf("%s value of /sys/class/net/.", name), + []string{"interface"}, + nil, + ) + + ch <- prometheus.MustNewConstMetric(fieldDesc, valueType, float64(value), ifaceName) +} + +func getNetClassInfo(ignore *regexp.Regexp) (sysfs.NetClass, error) { + fs, err := sysfs.NewFS(*sysPath) + if err != nil { + return nil, err + } + netClass, err := fs.NewNetClass() + + if err != nil { + return netClass, fmt.Errorf("error obtaining net class info: %s", err) + } + + for device := range netClass { + if ignore.MatchString(device) { + delete(netClass, device) + } + } + + return netClass, nil +} diff --git a/end-to-end-test.sh b/end-to-end-test.sh index 469d2441..43f8fbf1 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh @@ -98,6 +98,7 @@ fi --collector.textfile.directory="collector/fixtures/textfile/two_metric_files/" \ --collector.wifi.fixtures="collector/fixtures/wifi" \ --collector.qdisc.fixtures="collector/fixtures/qdisc/" \ + --collector.netclass.ignored-devices="(bond0|dmz|int)" \ --web.listen-address "127.0.0.1:${port}" \ --log.level="debug" > "${tmpdir}/node_exporter.log" 2>&1 & diff --git a/vendor/github.com/prometheus/procfs/net_dev.go b/vendor/github.com/prometheus/procfs/net_dev.go index 6c17affe..3f252337 100644 --- a/vendor/github.com/prometheus/procfs/net_dev.go +++ b/vendor/github.com/prometheus/procfs/net_dev.go @@ -184,7 +184,7 @@ func (nd NetDev) parseLine(rawLine string) (*NetDevLine, error) { } // Total aggregates the values across interfaces and returns a new NetDevLine. -// The Name field will be a sorted comma seperated list of interface names. +// The Name field will be a sorted comma separated list of interface names. func (nd NetDev) Total() NetDevLine { total := NetDevLine{} diff --git a/vendor/github.com/prometheus/procfs/sysfs/net_class.go b/vendor/github.com/prometheus/procfs/sysfs/net_class.go index 46affd7f..562ce159 100644 --- a/vendor/github.com/prometheus/procfs/sysfs/net_class.go +++ b/vendor/github.com/prometheus/procfs/sysfs/net_class.go @@ -27,32 +27,32 @@ import ( // for single interface (iface). type NetClassIface struct { Name string // Interface name - AddrAssignType int64 `fileName:"addr_assign_type"` // /sys/class/net//addr_assign_type - AddrLen int64 `fileName:"addr_len"` // /sys/class/net//addr_len + AddrAssignType *int64 `fileName:"addr_assign_type"` // /sys/class/net//addr_assign_type + AddrLen *int64 `fileName:"addr_len"` // /sys/class/net//addr_len Address string `fileName:"address"` // /sys/class/net//address Broadcast string `fileName:"broadcast"` // /sys/class/net//broadcast - Carrier int64 `fileName:"carrier"` // /sys/class/net//carrier - CarrierChanges int64 `fileName:"carrier_changes"` // /sys/class/net//carrier_changes - CarrierUpCount int64 `fileName:"carrier_up_count"` // /sys/class/net//carrier_up_count - CarrierDownCount int64 `fileName:"carrier_down_count"` // /sys/class/net//carrier_down_count - DevID int64 `fileName:"dev_id"` // /sys/class/net//dev_id - Dormant int64 `fileName:"dormant"` // /sys/class/net//dormant + Carrier *int64 `fileName:"carrier"` // /sys/class/net//carrier + CarrierChanges *int64 `fileName:"carrier_changes"` // /sys/class/net//carrier_changes + CarrierUpCount *int64 `fileName:"carrier_up_count"` // /sys/class/net//carrier_up_count + CarrierDownCount *int64 `fileName:"carrier_down_count"` // /sys/class/net//carrier_down_count + DevID *int64 `fileName:"dev_id"` // /sys/class/net//dev_id + Dormant *int64 `fileName:"dormant"` // /sys/class/net//dormant Duplex string `fileName:"duplex"` // /sys/class/net//duplex - Flags int64 `fileName:"flags"` // /sys/class/net//flags + Flags *int64 `fileName:"flags"` // /sys/class/net//flags IfAlias string `fileName:"ifalias"` // /sys/class/net//ifalias - IfIndex int64 `fileName:"ifindex"` // /sys/class/net//ifindex - IfLink int64 `fileName:"iflink"` // /sys/class/net//iflink - LinkMode int64 `fileName:"link_mode"` // /sys/class/net//link_mode - MTU int64 `fileName:"mtu"` // /sys/class/net//mtu - NameAssignType int64 `fileName:"name_assign_type"` // /sys/class/net//name_assign_type - NetDevGroup int64 `fileName:"netdev_group"` // /sys/class/net//netdev_group + IfIndex *int64 `fileName:"ifindex"` // /sys/class/net//ifindex + IfLink *int64 `fileName:"iflink"` // /sys/class/net//iflink + LinkMode *int64 `fileName:"link_mode"` // /sys/class/net//link_mode + MTU *int64 `fileName:"mtu"` // /sys/class/net//mtu + NameAssignType *int64 `fileName:"name_assign_type"` // /sys/class/net//name_assign_type + NetDevGroup *int64 `fileName:"netdev_group"` // /sys/class/net//netdev_group OperState string `fileName:"operstate"` // /sys/class/net//operstate PhysPortID string `fileName:"phys_port_id"` // /sys/class/net//phys_port_id PhysPortName string `fileName:"phys_port_name"` // /sys/class/net//phys_port_name PhysSwitchID string `fileName:"phys_switch_id"` // /sys/class/net//phys_switch_id - Speed int64 `fileName:"speed"` // /sys/class/net//speed - TxQueueLen int64 `fileName:"tx_queue_len"` // /sys/class/net//tx_queue_len - Type int64 `fileName:"type"` // /sys/class/net//type + Speed *int64 `fileName:"speed"` // /sys/class/net//speed + TxQueueLen *int64 `fileName:"tx_queue_len"` // /sys/class/net//tx_queue_len + Type *int64 `fileName:"type"` // /sys/class/net//type } // NetClass is collection of info for every interface (iface) in /sys/class/net. The map keys @@ -80,6 +80,9 @@ func (fs FS) NewNetClass() (NetClass, error) { netClass := NetClass{} for _, deviceDir := range devices { + if deviceDir.Mode().IsRegular() { + continue + } interfaceClass, err := netClass.parseNetClassIface(path + "/" + deviceDir.Name()) if err != nil { return nil, err @@ -117,22 +120,28 @@ func (nc NetClass) parseNetClassIface(devicePath string) (*NetClassIface, error) value := strings.TrimSpace(string(fileContents)) switch fieldValue.Kind() { - case reflect.Int64: - if strings.HasPrefix(value, "0x") { - intValue, err := strconv.ParseInt(value[2:], 16, 64) - if err != nil { - return nil, fmt.Errorf("expected hex value for %s, got: %s", fieldType.Name, value) - } - fieldValue.SetInt(intValue) - } else { - intValue, err := strconv.ParseInt(value, 10, 64) - if err != nil { - return nil, fmt.Errorf("expected Uint64 value for %s, got: %s", fieldType.Name, value) - } - fieldValue.SetInt(intValue) - } case reflect.String: fieldValue.SetString(value) + case reflect.Ptr: + var int64ptr *int64 + switch fieldValue.Type() { + case reflect.TypeOf(int64ptr): + var intValue int64 + if strings.HasPrefix(value, "0x") { + intValue, err = strconv.ParseInt(value[2:], 16, 64) + if err != nil { + return nil, fmt.Errorf("expected hex value for %s, got: %s", fieldType.Name, value) + } + } else { + intValue, err = strconv.ParseInt(value, 10, 64) + if err != nil { + return nil, fmt.Errorf("expected Uint64 value for %s, got: %s", fieldType.Name, value) + } + } + fieldValue.Set(reflect.ValueOf(&intValue)) + default: + return nil, fmt.Errorf("unhandled pointer type %q", fieldValue.Type()) + } default: return nil, fmt.Errorf("unhandled type %q", fieldValue.Kind()) } diff --git a/vendor/vendor.json b/vendor/vendor.json index 242f5c46..983a3788 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -163,10 +163,10 @@ "revisionTime": "2018-03-26T16:04:09Z" }, { - "checksumSHA1": "Etvt6mgzvD7ARf4Ux03LHfgSlzU=", + "checksumSHA1": "qG0ClCTt2wuQnYLsFvtlQB8J5FQ=", "path": "github.com/prometheus/procfs", - "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", - "revisionTime": "2018-03-21T23:08:12Z" + "revision": "add1f1c0b8971a8cdb88ab8bb152878e5074780b", + "revisionTime": "2018-05-31T12:13:16Z" }, { "checksumSHA1": "O64FotgWPYIpl3m2gvTEPIem+xg=",