diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index ee4544ba..99e59ff1 100644 --- a/collector/fixtures/e2e-64k-page-output.txt +++ b/collector/fixtures/e2e-64k-page-output.txt @@ -2283,14 +2283,14 @@ node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test" # TYPE node_mountstats_nfs_transport_pullup_copy_total counter node_mountstats_nfs_transport_pullup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_pullup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_rdma_reply_total Total number of rdma reply accessed when receiving a reply. -# TYPE node_mountstats_nfs_transport_rdma_reply_total gauge -node_mountstats_nfs_transport_rdma_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_rdma_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_rdma_request_total Total number of rdma request accessed when sending a call. -# TYPE node_mountstats_nfs_transport_rdma_request_total gauge -node_mountstats_nfs_transport_rdma_request_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_rdma_request_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_reply_sum Total number of rdma reply accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_rdma_reply_sum gauge +node_mountstats_nfs_transport_rdma_reply_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_reply_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_request_sum Total number of rdma request accessed when sending a call. +# TYPE node_mountstats_nfs_transport_rdma_request_sum gauge +node_mountstats_nfs_transport_rdma_request_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_request_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_read_chunk_total Total number of read chunk accessed when sending a call. # TYPE node_mountstats_nfs_transport_read_chunk_total counter node_mountstats_nfs_transport_read_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index 9d62c5c7..dd5e403e 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2305,14 +2305,14 @@ node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test" # TYPE node_mountstats_nfs_transport_pullup_copy_total counter node_mountstats_nfs_transport_pullup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_pullup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_rdma_reply_total Total number of rdma reply accessed when receiving a reply. -# TYPE node_mountstats_nfs_transport_rdma_reply_total gauge -node_mountstats_nfs_transport_rdma_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_rdma_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_rdma_request_total Total number of rdma request accessed when sending a call. -# TYPE node_mountstats_nfs_transport_rdma_request_total gauge -node_mountstats_nfs_transport_rdma_request_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_rdma_request_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_reply_sum Total number of rdma reply accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_rdma_reply_sum gauge +node_mountstats_nfs_transport_rdma_reply_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_reply_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_request_sum Total number of rdma request accessed when sending a call. +# TYPE node_mountstats_nfs_transport_rdma_request_sum gauge +node_mountstats_nfs_transport_rdma_request_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_request_sum{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_read_chunk_total Total number of read chunk accessed when sending a call. # TYPE node_mountstats_nfs_transport_read_chunk_total counter node_mountstats_nfs_transport_read_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go index 9840d700..1cc5897b 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -308,7 +308,7 @@ func NewMountStatsCollector(logger log.Logger) (Collector, error) { ), NFSTransportRdmaRequestTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_rdma_request_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_request_sum"), "Total number of rdma request accessed when sending a call.", labels, nil, @@ -371,7 +371,7 @@ func NewMountStatsCollector(logger log.Logger) (Collector, error) { ), NFSTransportRdmaReplyTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_sum"), "Total number of rdma reply accessed when receiving a reply.", labels, nil,