github
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ethtool: minor changes to resolve review nits. 

Signed-off-by: W. Andrew Denton <git@flying-snail.net>
pull/2216/head
W. Andrew Denton 2021-10-18 11:16:10 -07:00 committed by Johannes 'fish' Ziemke
parent 77a3c9bc20
commit 0f6c84214c
2 changed files with 66 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
collector/ethtool_linux.go
View File

@ -225,16 +225,18 @@ func NewEthtoolCollector(logger log.Logger) (Collector, error) {
// The bit offsets here correspond to ethtool_link_mode_bit_indices in linux/include/uapi/linux/ethtool.h // The bit offsets here correspond to ethtool_link_mode_bit_indices in linux/include/uapi/linux/ethtool.h
// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/ethtool.h // https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/ethtool.h
func (c *ethtoolCollector) updatePortCapabilities(ch chan<- prometheus.Metric, prefix string, device string, linkModes uint32) { func (c *ethtoolCollector) updatePortCapabilities(ch chan<- prometheus.Metric, prefix string, device string, linkModes uint32) {
autonegotiate := 0.0 var (
pause := 0.0 autonegotiate = 0.0
asymmetricPause := 0.0 pause = 0.0
if linkModes&(1<<6) != 0 { asymmetricPause = 0.0
)
if linkModes&(1<<unix.ETHTOOL_LINK_MODE_Autoneg_BIT) != 0 {
autonegotiate = 1.0 autonegotiate = 1.0
} }
if linkModes&(1<<13) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_Pause_BIT) != 0 {
pause = 1.0 pause = 1.0
} }
if linkModes&(1<<14) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_Asym_Pause_BIT) != 0 {
asymmetricPause = 1.0 asymmetricPause = 1.0
} }
ch <- prometheus.MustNewConstMetric(c.entries[fmt.Sprintf("%s_autonegotiate", prefix)], prometheus.GaugeValue, autonegotiate, device) ch <- prometheus.MustNewConstMetric(c.entries[fmt.Sprintf("%s_autonegotiate", prefix)], prometheus.GaugeValue, autonegotiate, device)
@ -246,23 +248,18 @@ func (c *ethtoolCollector) updatePortCapabilities(ch chan<- prometheus.Metric, p
// The bit offsets here correspond to ethtool_link_mode_bit_indices in linux/include/uapi/linux/ethtool.h // The bit offsets here correspond to ethtool_link_mode_bit_indices in linux/include/uapi/linux/ethtool.h
// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/ethtool.h // https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/ethtool.h
func (c *ethtoolCollector) updatePortInfo(ch chan<- prometheus.Metric, device string, linkModes uint32) { func (c *ethtoolCollector) updatePortInfo(ch chan<- prometheus.Metric, device string, linkModes uint32) {
if linkModes&(1<<7) != 0 { for name, bit := range map[string]int{
ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, "TP") "TP": unix.ETHTOOL_LINK_MODE_TP_BIT,
} "AUI": unix.ETHTOOL_LINK_MODE_AUI_BIT,
if linkModes&(1<<8) != 0 { "MII": unix.ETHTOOL_LINK_MODE_MII_BIT,
ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, "AUI") "FIBRE": unix.ETHTOOL_LINK_MODE_FIBRE_BIT,
} "BNC": unix.ETHTOOL_LINK_MODE_BNC_BIT,
if linkModes&(1<<9) != 0 { "Backplane": unix.ETHTOOL_LINK_MODE_Backplane_BIT,
ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, "MII") } {
} if linkModes&(1<<bit) != 0 {
if linkModes&(1<<10) != 0 { ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, name)
ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, "FIBRE") }
}
if linkModes&(1<<11) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, "BNC")
}
if linkModes&(1<<16) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries["supported_port"], prometheus.GaugeValue, 1.0, device, "Backplane")
} }
} }
@ -272,73 +269,73 @@ func (c *ethtoolCollector) updatePortInfo(ch chan<- prometheus.Metric, device st
func (c *ethtoolCollector) updateSpeeds(ch chan<- prometheus.Metric, prefix string, device string, linkModes uint32) { func (c *ethtoolCollector) updateSpeeds(ch chan<- prometheus.Metric, prefix string, device string, linkModes uint32) {
linkMode := fmt.Sprintf("%s_speed", prefix) linkMode := fmt.Sprintf("%s_speed", prefix)
if linkModes&(1<<0) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_10baseT_Half_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Mbps, device, "half", "10baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Mbps, device, "half", "10baseT")
} }
if linkModes&(1<<1) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_10baseT_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Mbps, device, "full", "10baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Mbps, device, "full", "10baseT")
} }
if linkModes&(1<<2) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_100baseT_Half_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 100*Mbps, device, "half", "100baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 100*Mbps, device, "half", "100baseT")
} }
if linkModes&(1<<3) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_100baseT_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 100*Mbps, device, "full", "100baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 100*Mbps, device, "full", "100baseT")
} }
if linkModes&(1<<4) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_1000baseT_Half_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 1000*Mbps, device, "half", "1000baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 1000*Mbps, device, "half", "1000baseT")
} }
if linkModes&(1<<5) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_1000baseT_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 1000*Mbps, device, "full", "1000baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 1000*Mbps, device, "full", "1000baseT")
} }
if linkModes&(1<<12) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_10000baseT_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseT") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseT")
} }
if linkModes&(1<<15) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_2500baseX_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 2.5*Gbps, device, "full", "2500baseX") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 2.5*Gbps, device, "full", "2500baseX")
} }
if linkModes&(1<<17) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_1000baseKX_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 1*Gbps, device, "full", "1000baseKX") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 1*Gbps, device, "full", "1000baseKX")
} }
if linkModes&(1<<18) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseKX4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseKX4")
} }
if linkModes&(1<<19) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_10000baseKR_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseKR") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseKR")
} }
if linkModes&(1<<20) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_10000baseR_FEC_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseR_FEC") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 10*Gbps, device, "full", "10000baseR_FEC")
} }
if linkModes&(1<<21) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 20*Gbps, device, "full", "20000baseMLD2") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 20*Gbps, device, "full", "20000baseMLD2")
} }
if linkModes&(1<<22) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 20*Gbps, device, "full", "20000baseKR2") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 20*Gbps, device, "full", "20000baseKR2")
} }
if linkModes&(1<<23) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseKR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseKR4")
} }
if linkModes&(1<<24) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseCR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseCR4")
} }
if linkModes&(1<<25) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseSR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseSR4")
} }
if linkModes&(1<<26) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseLR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 40*Gbps, device, "full", "40000baseLR4")
} }
if linkModes&(1<<27) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseKR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseKR4")
} }
if linkModes&(1<<28) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseCR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseCR4")
} }
if linkModes&(1<<29) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseSR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseSR4")
} }
if linkModes&(1<<30) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseLR4") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 56*Gbps, device, "full", "56000baseLR4")
} }
if linkModes&(1<<31) != 0 { if linkModes&(1<<unix.ETHTOOL_LINK_MODE_25000baseCR_Full_BIT) != 0 {
ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 25*Gbps, device, "full", "25000baseCR") ch <- prometheus.MustNewConstMetric(c.entries[linkMode], prometheus.GaugeValue, 25*Gbps, device, "full", "25000baseCR")
} }
} }

51
collector/ethtool_linux_test.go
View File

@ -136,26 +136,21 @@ func (e *EthtoolFixture) Stats(intf string) (map[string]uint64, error) {
func readModes(modes string) uint32 { func readModes(modes string) uint32 {
var out uint32 var out uint32
for _, mode := range strings.Split(modes, " ") { for _, mode := range strings.Split(modes, " ") {
if mode == "10baseT/Half" { switch mode {
out |= (1 << 0) case "10baseT/Half":
} out |= (1 << unix.ETHTOOL_LINK_MODE_10baseT_Half_BIT)
if mode == "10baseT/Full" { case "10baseT/Full":
out |= (1 << 1) out |= (1 << unix.ETHTOOL_LINK_MODE_10baseT_Full_BIT)
} case "100baseT/Half":
if mode == "100baseT/Half" { out |= (1 << unix.ETHTOOL_LINK_MODE_100baseT_Half_BIT)
out |= (1 << 2) case "100baseT/Full":
} out |= (1 << unix.ETHTOOL_LINK_MODE_100baseT_Full_BIT)
if mode == "100baseT/Full" { case "1000baseT/Half":
out |= (1 << 3) out |= (1 << unix.ETHTOOL_LINK_MODE_1000baseT_Half_BIT)
} case "1000baseT/Full":
if mode == "1000baseT/Half" { out |= (1 << unix.ETHTOOL_LINK_MODE_1000baseT_Full_BIT)
out |= (1 << 4) case "10000baseT/Full":
} out |= (1 << unix.ETHTOOL_LINK_MODE_10000baseT_Full_BIT)
if mode == "1000baseT/Full" {
out |= (1 << 5)
}
if mode == "10000baseT/Full" {
out |= (1 << 12)
} }
} }
return out return out
@ -166,10 +161,10 @@ func readPortTypes(portTypes string) uint32 {
for _, ptype := range strings.Split(portTypes, " ") { for _, ptype := range strings.Split(portTypes, " ") {
ptype = strings.Trim(ptype, " \t") ptype = strings.Trim(ptype, " \t")
if ptype == "TP" { if ptype == "TP" {
out |= (1 << 7) out |= (1 << unix.ETHTOOL_LINK_MODE_TP_BIT)
} }
if ptype == "MII" { if ptype == "MII" {
out |= (1 << 9) out |= (1 << unix.ETHTOOL_LINK_MODE_MII_BIT)
} }
} }
return out return out
@ -214,16 +209,16 @@ func (e *EthtoolFixture) LinkInfo(intf string) (ethtool.EthtoolCmd, error) {
items := strings.Split(line, ": ") items := strings.Split(line, ": ")
if items[0] == "Supported pause frame use" { if items[0] == "Supported pause frame use" {
if items[1] == "Symmetric" { if items[1] == "Symmetric" {
res.Supported |= (1 << 13) res.Supported |= (1 << unix.ETHTOOL_LINK_MODE_Pause_BIT)
} else if items[1] == "Receive-only" { } else if items[1] == "Receive-only" {
res.Supported |= (1 << 14) res.Supported |= (1 << unix.ETHTOOL_LINK_MODE_Asym_Pause_BIT)
} }
} }
if items[0] == "Advertised pause frame use" { if items[0] == "Advertised pause frame use" {
if items[1] == "Symmetric" { if items[1] == "Symmetric" {
res.Advertising |= (1 << 13) res.Advertising |= (1 << unix.ETHTOOL_LINK_MODE_Pause_BIT)
} else if items[1] == "Receive-only" { } else if items[1] == "Receive-only" {
res.Advertising |= (1 << 14) res.Advertising |= (1 << unix.ETHTOOL_LINK_MODE_Asym_Pause_BIT)
} }
} }
if items[0] == "Supported ports" { if items[0] == "Supported ports" {
@ -239,12 +234,12 @@ func (e *EthtoolFixture) LinkInfo(intf string) (ethtool.EthtoolCmd, error) {
} }
if items[0] == "Supports auto-negotiation" { if items[0] == "Supports auto-negotiation" {
if items[1] == "Yes" { if items[1] == "Yes" {
res.Supported |= (1 << 6) res.Supported |= (1 << unix.ETHTOOL_LINK_MODE_Autoneg_BIT)
} }
} }
if items[0] == "Advertised auto-negotiation" { if items[0] == "Advertised auto-negotiation" {
if items[1] == "Yes" { if items[1] == "Yes" {
res.Advertising |= (1 << 6) res.Advertising |= (1 << unix.ETHTOOL_LINK_MODE_Autoneg_BIT)
} }
} }
if items[0] == "Auto-negotiation" { if items[0] == "Auto-negotiation" {