diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index 4dc46a37..a1a4b3bb 100644 --- a/collector/fixtures/e2e-64k-page-output.txt +++ b/collector/fixtures/e2e-64k-page-output.txt @@ -2341,14 +2341,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_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_rdma_reply_requests Total number of rdma reply accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_rdma_reply_requests gauge +node_mountstats_nfs_transport_rdma_reply_requests{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_reply_requests{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_requests Total number of rdma request accessed when sending a call. +# TYPE node_mountstats_nfs_transport_rdma_requests gauge +node_mountstats_nfs_transport_rdma_requests{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_requests{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 d6758e58..77f4f4fd 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2373,14 +2373,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_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_rdma_reply_requests Total number of rdma reply accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_rdma_reply_requests gauge +node_mountstats_nfs_transport_rdma_reply_requests{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_reply_requests{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_requests Total number of rdma request accessed when sending a call. +# TYPE node_mountstats_nfs_transport_rdma_requests gauge +node_mountstats_nfs_transport_rdma_requests{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_requests{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 bf8a4ecd..b7076572 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -306,7 +306,7 @@ func NewMountStatsCollector(logger *slog.Logger) (Collector, error) { ), NFSTransportRdmaRequestTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_rdma_request_sum"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_requests"), "Total number of rdma request accessed when sending a call.", labels, nil, @@ -369,7 +369,7 @@ func NewMountStatsCollector(logger *slog.Logger) (Collector, error) { ), NFSTransportRdmaReplyTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_sum"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_requests"), "Total number of rdma reply accessed when receiving a reply.", labels, nil,