|
22 | 22 | ChassisPowerVoltageLabelNames = []string{"resource", "chassis_id", "power_voltage", "power_voltage_id"}
|
23 | 23 | ChassisPowerSupplyLabelNames = []string{"resource", "chassis_id", "power_supply", "power_supply_id"}
|
24 | 24 | ChassisNetworkAdapterLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id"}
|
25 |
| - ChassisNetworkPortLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id", "network_port", "network_port_id", "network_port_type", "network_port_speed"} |
| 25 | + ChassisNetworkPortLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id", "network_port", "network_port_id", "network_port_type", "network_port_speed","network_port_connectiont_type","network_physical_port_number"} |
26 | 26 | ChassisPhysicalSecurityLabelNames = []string{"resource", "chassis_id", "intrusion_sensor_number", "intrusion_sensor_rearm"}
|
27 | 27 |
|
28 | 28 | chassisMetrics = map[string]chassisMetric{
|
@@ -605,7 +605,11 @@ func parseNetworkPort(ch chan<- prometheus.Metric, chassisID string, networkPort
|
605 | 605 | networkPortLinkType := networkPort.ActiveLinkTechnology
|
606 | 606 | networkPortLinkSpeed := fmt.Sprintf("%d Mbps", networkPort.CurrentLinkSpeedMbps)
|
607 | 607 | networkPortHealthState := networkPort.Status.Health
|
608 |
| - chassisNetworkPortLabelValues := []string{"network_port", chassisID, networkAdapterName, networkAdapterID, networkPortName, networkPortID, string(networkPortLinkType), networkPortLinkSpeed} |
| 608 | + networkPortConnectionType :=networkPort.FCPortConnectionType |
| 609 | + networkPhysicalPortNumber :=networkPort.PhysicalPortNumber |
| 610 | + chassisNetworkPortLabelValues := []string{"network_port", chassisID, networkAdapterName, networkAdapterID, networkPortName, networkPortID, string(networkPortLinkType), networkPortLinkSpeed,string(networkPortConnectionType),networkPhysicalPortNumber} |
| 611 | + |
| 612 | + |
609 | 613 | if networkPortStateValue, ok := parseCommonStatusState(networkPortState); ok {
|
610 | 614 | ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_network_port_state"].desc, prometheus.GaugeValue, networkPortStateValue, chassisNetworkPortLabelValues...)
|
611 | 615 | }
|
|
0 commit comments