conform to metric naming conventions

Signed-off-by: mhiles <hiles@hpe.com>
This commit is contained in:
mhiles 2020-07-13 10:30:52 -04:00
parent 076c953488
commit d80ae383b7
2 changed files with 62 additions and 62 deletions

View file

@ -52,20 +52,20 @@ func NewFibreChannelCollector(logger log.Logger) (Collector, error) {
// Detailed description for all metrics. // Detailed description for all metrics.
descriptions := map[string]string{ descriptions := map[string]string{
"dumped_frames": "", "dumped_frames_total": "Number of dumped frames",
"loss_of_signal_count": "Number of times signal has been lost", "loss_of_signal_total": "Number of times signal has been lost",
"loss_of_sync_count": "Number of failures on either bit or transmission word boundaries", "loss_of_sync_total": "Number of failures on either bit or transmission word boundaries",
"rx_frames": "Number of frames received", "rx_frames_total": "Number of frames received",
"error_frames": "Number of errors in frames", "error_frames_total": "Number of errors in frames",
"invalid_tx_word_count": "Number of invalid words transmitted by host port", "invalid_tx_word_total": "Number of invalid words transmitted by host port",
"seconds_since_last_reset": "Number of seconds since last host port reset", "seconds_since_last_reset": "Number of seconds since last host port reset",
"tx_words": "Number of words transmitted by host port", "tx_words_total": "Number of words transmitted by host port",
"invalid_crc_count": "Invalid Cyclic Redundancy Check count", "invalid_crc_total": "Invalid Cyclic Redundancy Check count",
"nos_count": "Number Not_Operational Primitive Sequence received by host port", "nos_total": "Number Not_Operational Primitive Sequence received by host port",
"fcp_packet_aborts": "Number of aborted packets", "fcp_packet_aborts_total": "Number of aborted packets",
"rx_words": "Number of words received by host port", "rx_words_total": "Number of words received by host port",
"tx_frames": "Number of frames transmitted by host port", "tx_frames_total": "Number of frames transmitted by host port",
"link_failure_count": "Number of times the host port link has failed", "link_failure_total": "Number of times the host port link has failed",
"name": "Name of Fibre Channel HBA", "name": "Name of Fibre Channel HBA",
"speed": "Current operating speed", "speed": "Current operating speed",
"port_state": "Current port state", "port_state": "Current port state",
@ -129,20 +129,20 @@ func (c *fibrechannelCollector) Update(ch chan<- prometheus.Metric) error {
ch <- prometheus.MustNewConstMetric(infoDesc, prometheus.GaugeValue, infoValue, host.Name, host.Speed, host.PortState, host.PortType, host.PortID, host.PortName, host.FabricName, host.SymbolicName, host.SupportedClasses, host.SupportedSpeeds, host.DevLossTMO) ch <- prometheus.MustNewConstMetric(infoDesc, prometheus.GaugeValue, infoValue, host.Name, host.Speed, host.PortState, host.PortType, host.PortID, host.PortName, host.FabricName, host.SymbolicName, host.SupportedClasses, host.SupportedSpeeds, host.DevLossTMO)
// Then the counters // Then the counters
c.pushCounter(ch, "dumped_frames", host.Counters.DumpedFrames, host.Name) c.pushCounter(ch, "dumped_frames_total", host.Counters.DumpedFrames, host.Name)
c.pushCounter(ch, "error_frames", host.Counters.ErrorFrames, host.Name) c.pushCounter(ch, "error_frames_total", host.Counters.ErrorFrames, host.Name)
c.pushCounter(ch, "invalid_crc_count", host.Counters.InvalidCRCCount, host.Name) c.pushCounter(ch, "invalid_crc_total", host.Counters.InvalidCRCCount, host.Name)
c.pushCounter(ch, "rx_frames", host.Counters.RXFrames, host.Name) c.pushCounter(ch, "rx_frames_total", host.Counters.RXFrames, host.Name)
c.pushCounter(ch, "rx_words", host.Counters.RXWords, host.Name) c.pushCounter(ch, "rx_words_total", host.Counters.RXWords, host.Name)
c.pushCounter(ch, "tx_frames", host.Counters.TXFrames, host.Name) c.pushCounter(ch, "tx_frames_total", host.Counters.TXFrames, host.Name)
c.pushCounter(ch, "tx_words", host.Counters.TXWords, host.Name) c.pushCounter(ch, "tx_words_total", host.Counters.TXWords, host.Name)
c.pushCounter(ch, "seconds_since_last_reset", host.Counters.SecondsSinceLastReset, host.Name) c.pushCounter(ch, "seconds_since_last_reset", host.Counters.SecondsSinceLastReset, host.Name)
c.pushCounter(ch, "invalid_tx_word_count", host.Counters.InvalidTXWordCount, host.Name) c.pushCounter(ch, "invalid_tx_word_total", host.Counters.InvalidTXWordCount, host.Name)
c.pushCounter(ch, "link_failure_count", host.Counters.LinkFailureCount, host.Name) c.pushCounter(ch, "link_failure_total", host.Counters.LinkFailureCount, host.Name)
c.pushCounter(ch, "loss_of_sync_count", host.Counters.LossOfSyncCount, host.Name) c.pushCounter(ch, "loss_of_sync_total", host.Counters.LossOfSyncCount, host.Name)
c.pushCounter(ch, "loss_of_signal_count", host.Counters.LossOfSignalCount, host.Name) c.pushCounter(ch, "loss_of_signal_total", host.Counters.LossOfSignalCount, host.Name)
c.pushCounter(ch, "nos_count", host.Counters.NosCount, host.Name) c.pushCounter(ch, "nos_total", host.Counters.NosCount, host.Name)
c.pushCounter(ch, "fcp_packet_aborts", host.Counters.FCPPacketAborts, host.Name) c.pushCounter(ch, "fcp_packet_aborts_total", host.Counters.FCPPacketAborts, host.Name)
} }
return nil return nil

View file

@ -629,48 +629,48 @@ node_edac_uncorrectable_errors_total{controller="0"} 5
node_entropy_available_bits 1337 node_entropy_available_bits 1337
# HELP node_exporter_build_info A metric with a constant '1' value labeled by version, revision, branch, and goversion from which node_exporter was built. # HELP node_exporter_build_info A metric with a constant '1' value labeled by version, revision, branch, and goversion from which node_exporter was built.
# TYPE node_exporter_build_info gauge # TYPE node_exporter_build_info gauge
# HELP node_fibrechannel_error_frames Number of errors in frames # HELP node_fibrechannel_error_frames_total Number of errors in frames
# TYPE node_fibrechannel_error_frames counter # TYPE node_fibrechannel_error_frames_total counter
node_fibrechannel_error_frames{host="host0"} 0 node_fibrechannel_error_frames_total{host="host0"} 0
# HELP node_fibrechannel_fcp_packet_aborts Number of aborted packets # HELP node_fibrechannel_fcp_packet_aborts_total Number of aborted packets
# TYPE node_fibrechannel_fcp_packet_aborts counter # TYPE node_fibrechannel_fcp_packet_aborts_total counter
node_fibrechannel_fcp_packet_aborts{host="host0"} 19 node_fibrechannel_fcp_packet_aborts_total{host="host0"} 19
# HELP node_fibrechannel_info Non-numeric data from /sys/class/fc_host/<host>, value is always 1. # HELP node_fibrechannel_info Non-numeric data from /sys/class/fc_host/<host>, value is always 1.
# TYPE node_fibrechannel_info gauge # TYPE node_fibrechannel_info gauge
node_fibrechannel_info{dev_loss_tmo="30",fabric_name="0",host="host0",port_id="000002",port_name="1000e0071bce95f2",port_state="Online",port_type="Point-To-Point (direct nport connection)",speed="16 Gbit",supported_classes="Class 3",supported_speeds="4 Gbit, 8 Gbit, 16 Gbit",symbolic_name="Emulex SN1100E2P FV12.4.270.3 DV12.4.0.0. HN:gotest. OS:Linux"} 1 node_fibrechannel_info{dev_loss_tmo="30",fabric_name="0",host="host0",port_id="000002",port_name="1000e0071bce95f2",port_state="Online",port_type="Point-To-Point (direct nport connection)",speed="16 Gbit",supported_classes="Class 3",supported_speeds="4 Gbit, 8 Gbit, 16 Gbit",symbolic_name="Emulex SN1100E2P FV12.4.270.3 DV12.4.0.0. HN:gotest. OS:Linux"} 1
# HELP node_fibrechannel_invalid_crc_count Invalid Cyclic Redundancy Check count # HELP node_fibrechannel_invalid_crc_total Invalid Cyclic Redundancy Check count
# TYPE node_fibrechannel_invalid_crc_count counter # TYPE node_fibrechannel_invalid_crc_total counter
node_fibrechannel_invalid_crc_count{host="host0"} 2 node_fibrechannel_invalid_crc_total{host="host0"} 2
# HELP node_fibrechannel_invalid_tx_word_count Number of invalid words transmitted by host port # HELP node_fibrechannel_invalid_tx_word_total Number of invalid words transmitted by host port
# TYPE node_fibrechannel_invalid_tx_word_count counter # TYPE node_fibrechannel_invalid_tx_word_total counter
node_fibrechannel_invalid_tx_word_count{host="host0"} 8 node_fibrechannel_invalid_tx_word_total{host="host0"} 8
# HELP node_fibrechannel_link_failure_count Number of times the host port link has failed # HELP node_fibrechannel_link_failure_total Number of times the host port link has failed
# TYPE node_fibrechannel_link_failure_count counter # TYPE node_fibrechannel_link_failure_total counter
node_fibrechannel_link_failure_count{host="host0"} 9 node_fibrechannel_link_failure_total{host="host0"} 9
# HELP node_fibrechannel_loss_of_signal_count Number of times signal has been lost # HELP node_fibrechannel_loss_of_signal_total Number of times signal has been lost
# TYPE node_fibrechannel_loss_of_signal_count counter # TYPE node_fibrechannel_loss_of_signal_total counter
node_fibrechannel_loss_of_signal_count{host="host0"} 17 node_fibrechannel_loss_of_signal_total{host="host0"} 17
# HELP node_fibrechannel_loss_of_sync_count Number of failures on either bit or transmission word boundaries # HELP node_fibrechannel_loss_of_sync_total Number of failures on either bit or transmission word boundaries
# TYPE node_fibrechannel_loss_of_sync_count counter # TYPE node_fibrechannel_loss_of_sync_total counter
node_fibrechannel_loss_of_sync_count{host="host0"} 16 node_fibrechannel_loss_of_sync_total{host="host0"} 16
# HELP node_fibrechannel_nos_count Number Not_Operational Primitive Sequence received by host port # HELP node_fibrechannel_nos_total Number Not_Operational Primitive Sequence received by host port
# TYPE node_fibrechannel_nos_count counter # TYPE node_fibrechannel_nos_total counter
node_fibrechannel_nos_count{host="host0"} 18 node_fibrechannel_nos_total{host="host0"} 18
# HELP node_fibrechannel_rx_frames Number of frames received # HELP node_fibrechannel_rx_frames_total Number of frames received
# TYPE node_fibrechannel_rx_frames counter # TYPE node_fibrechannel_rx_frames_total counter
node_fibrechannel_rx_frames{host="host0"} 3 node_fibrechannel_rx_frames_total{host="host0"} 3
# HELP node_fibrechannel_rx_words Number of words received by host port # HELP node_fibrechannel_rx_words_total Number of words received by host port
# TYPE node_fibrechannel_rx_words counter # TYPE node_fibrechannel_rx_words_total counter
node_fibrechannel_rx_words{host="host0"} 4 node_fibrechannel_rx_words_total{host="host0"} 4
# HELP node_fibrechannel_seconds_since_last_reset Number of seconds since last host port reset # HELP node_fibrechannel_seconds_since_last_reset Number of seconds since last host port reset
# TYPE node_fibrechannel_seconds_since_last_reset counter # TYPE node_fibrechannel_seconds_since_last_reset counter
node_fibrechannel_seconds_since_last_reset{host="host0"} 7 node_fibrechannel_seconds_since_last_reset{host="host0"} 7
# HELP node_fibrechannel_tx_frames Number of frames transmitted by host port # HELP node_fibrechannel_tx_frames_total Number of frames transmitted by host port
# TYPE node_fibrechannel_tx_frames counter # TYPE node_fibrechannel_tx_frames_total counter
node_fibrechannel_tx_frames{host="host0"} 5 node_fibrechannel_tx_frames_total{host="host0"} 5
# HELP node_fibrechannel_tx_words Number of words transmitted by host port # HELP node_fibrechannel_tx_words_total Number of words transmitted by host port
# TYPE node_fibrechannel_tx_words counter # TYPE node_fibrechannel_tx_words_total counter
node_fibrechannel_tx_words{host="host0"} 6 node_fibrechannel_tx_words_total{host="host0"} 6
# HELP node_filefd_allocated File descriptor statistics: allocated. # HELP node_filefd_allocated File descriptor statistics: allocated.
# TYPE node_filefd_allocated gauge # TYPE node_filefd_allocated gauge
node_filefd_allocated 1024 node_filefd_allocated 1024