From 90700a22ab6bf1bffab67f454b73bddf793c8abf Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Mon, 16 Oct 2023 22:04:36 +0800 Subject: [PATCH 1/9] support NFS RDMA protocol stats parse Signed-off-by: dongjiang1989 --- collector/mountstats_linux.go | 269 ++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go index 9dea6fad..33966597 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -65,6 +65,26 @@ type mountStatsCollector struct { NFSTransportMaximumRPCSlots *prometheus.Desc NFSTransportSendingQueueTotal *prometheus.Desc NFSTransportPendingQueueTotal *prometheus.Desc + // Transport over RDMA. + // Stats below only available with stat version 1.1. + NFSTransportReadChunkTotal *prometheus.Desc + NFSTransportWriteChunkTotal *prometheus.Desc + NFSTransportReplyChunkTotal *prometheus.Desc + NFSTransportRdmaRequestTotal *prometheus.Desc + NFSTransportPullupCopyTotal *prometheus.Desc + NFSTransportHardwayRegisterTotal *prometheus.Desc + NFSTransportFailedMarshalTotal *prometheus.Desc + NFSTransportBadReplyTotal *prometheus.Desc + NFSTransportMrsRecycledTotal *prometheus.Desc + NFSTransportMrsOrphanedTotal *prometheus.Desc + NFSTransportMrsAllocatedTotal *prometheus.Desc + NFSTransportEmptySendctxQTotal *prometheus.Desc + NFSTransportRdmaReplyTotal *prometheus.Desc + NFSTransportFixupCopyTotal *prometheus.Desc + NFSTransportReplyWaitsForSendTotal *prometheus.Desc + NFSTransportLocalInvNeededTotal *prometheus.Desc + NFSTransportNomsgCallTotal *prometheus.Desc + NFSTransportBcallCountTotal *prometheus.Desc // Event statistics NFSEventInodeRevalidateTotal *prometheus.Desc @@ -266,6 +286,129 @@ func NewMountStatsCollector(logger log.Logger) (Collector, error) { nil, ), + NFSTransportReadChunkTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_read_chunk_total"), + "Total number of read chunk accessed when sending a call.", + labels, + nil, + ), + + NFSTransportWriteChunkTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_write_chunk_total"), + "Total number of write chunk accessed when sending a call.", + labels, + nil, + ), + + NFSTransportReplyChunkTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_reply_chunk_total"), + "Total number of reply chunk accessed when sending a call.", + labels, + nil, + ), + + NFSTransportRdmaRequestTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_request_total"), + "Total number of rdma request accessed when sending a call.", + labels, + nil, + ), + + NFSTransportPullupCopyTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_pullup_copy_total"), + "Total number of pullup copy when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportHardwayRegisterTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_hardway_register_total"), + "Total number of hardway register when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportFailedMarshalTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_failed_marshal_total"), + "Total number of failed marshal when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportBadReplyTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_bad_reply_total"), + "Total number of bad reply when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportMrsRecycledTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_mrs_recycled_total"), + "Total number of mrs recycled when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportMrsOrphanedTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_mrs_orphaned_total"), + "Total number of mrs orphaned when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportMrsAllocatedTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_mrs_allocated_total"), + "Total number of mrs allocated when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportEmptySendctxQTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_empty_sendctx_q_total"), + "Total number of empty sendctx q when rarely accessed error counters.", + labels, + nil, + ), + + NFSTransportRdmaReplyTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_total"), + "Total number of rdma reply accessed when receiving a reply.", + labels, + nil, + ), + + NFSTransportFixupCopyTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_fixup_copy_total"), + "Total number of fixup copy accessed when receiving a reply.", + labels, + nil, + ), + + NFSTransportReplyWaitsForSendTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_reply_waitsfor_send_total"), + "Total number of reply waits for send accessed when receiving a reply.", + labels, + nil, + ), + NFSTransportLocalInvNeededTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_local_inv_needed_total"), + "Total number of local inv needed accessed when receiving a reply.", + labels, + nil, + ), + NFSTransportNomsgCallTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_nomsg_call_total"), + "Total number of nomsg call when rarely accessed error counters.", + labels, + nil, + ), + NFSTransportBcallCountTotal: prometheus.NewDesc( + prometheus.BuildFQName(namespace, subsystem, "transport_bcall_total"), + "Total number of bcall when rarely accessed error counters.", + labels, + nil, + ), + NFSOperationsRequestsTotal: prometheus.NewDesc( prometheus.BuildFQName(namespace, subsystem, "operations_requests_total"), "Number of requests performed for a given operation.", @@ -687,6 +830,132 @@ func (c *mountStatsCollector) updateNFSStats(ch chan<- prometheus.Metric, s *pro labelValues..., ) + ch <- prometheus.MustNewConstMetric( + c.NFSTransportReadChunkTotal, + prometheus.CounterValue, + float64(s.Transport.ReadChunkCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportWriteChunkTotal, + prometheus.CounterValue, + float64(s.Transport.WriteChunkCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportReplyChunkTotal, + prometheus.CounterValue, + float64(s.Transport.ReplyChunkCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportRdmaRequestTotal, + prometheus.ValueType, + float64(s.Transport.TotalRdmaRequest), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportPullupCopyTotal, + prometheus.CounterValue, + float64(s.Transport.PullupCopyCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportHardwayRegisterTotal, + prometheus.CounterValue, + float64(s.Transport.HardwayRegisterCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportFailedMarshalTotal, + prometheus.CounterValue, + float64(s.Transport.FailedMarshalCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportBadReplyTotal, + prometheus.CounterValue, + float64(s.Transport.BadReplyCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportMrsRecycledTotal, + prometheus.CounterValue, + float64(s.Transport.MrsRecovered), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportMrsOrphanedTotal, + prometheus.CounterValue, + float64(s.Transport.MrsOrphaned), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportMrsAllocatedTotal, + prometheus.CounterValue, + float64(s.Transport.MrsAllocated), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportEmptySendctxQTotal, + prometheus.CounterValue, + float64(s.Transport.EmptySendctxQ), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportRdmaReplyTotal, + prometheus.ValueType, + float64(s.Transport.TotalRdmaReply), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportFixupCopyTotal, + prometheus.CounterValue, + float64(s.Transport.FixupCopyCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportReplyWaitsForSendTotal, + prometheus.CounterValue, + float64(s.Transport.ReplyWaitsForSend), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportLocalInvNeededTotal, + prometheus.CounterValue, + float64(s.Transport.LocalInvNeeded), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportNomsgCallTotal, + prometheus.CounterValue, + float64(s.Transport.NomsgCallCount), + labelValues..., + ) + + ch <- prometheus.MustNewConstMetric( + c.NFSTransportBcallCountTotal, + prometheus.CounterValue, + float64(s.Transport.BcallCount), + labelValues..., + ) + for _, op := range s.Operations { opLabelValues := []string{export, protocol, mountAddress, op.Operation} From b731319d47c763a9a3d1895b2907bf465e7ae04b Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Mon, 16 Oct 2023 22:12:34 +0800 Subject: [PATCH 2/9] fix value type Signed-off-by: dongjiang1989 --- collector/mountstats_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go index 33966597..9840d700 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -853,7 +853,7 @@ func (c *mountStatsCollector) updateNFSStats(ch chan<- prometheus.Metric, s *pro ch <- prometheus.MustNewConstMetric( c.NFSTransportRdmaRequestTotal, - prometheus.ValueType, + prometheus.GaugeValue, float64(s.Transport.TotalRdmaRequest), labelValues..., ) @@ -916,7 +916,7 @@ func (c *mountStatsCollector) updateNFSStats(ch chan<- prometheus.Metric, s *pro ch <- prometheus.MustNewConstMetric( c.NFSTransportRdmaReplyTotal, - prometheus.ValueType, + prometheus.GaugeValue, float64(s.Transport.TotalRdmaReply), labelValues..., ) From 8d8b4a415e7eb4c9ed1fb7af55d3db5ca1b706d2 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Mon, 16 Oct 2023 22:27:54 +0800 Subject: [PATCH 3/9] fix e2e test case Signed-off-by: dongjiang1989 --- collector/fixtures/e2e-64k-page-output.txt | 72 ++++++++++++++++++++++ collector/fixtures/e2e-output.txt | 72 ++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index 8c08fa5a..ee4544ba 100644 --- a/collector/fixtures/e2e-64k-page-output.txt +++ b/collector/fixtures/e2e-64k-page-output.txt @@ -2211,10 +2211,18 @@ node_mountstats_nfs_total_write_bytes_total{export="192.168.1.1:/srv/test",mount # TYPE node_mountstats_nfs_transport_backlog_queue_total counter node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bad_reply_total Total number of bad reply when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bad_reply_total counter +node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bad_transaction_ids_total Number of times the NFS server sent a response with a transaction ID unknown to this client. # TYPE node_mountstats_nfs_transport_bad_transaction_ids_total counter node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bcall_total Total number of bcall when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bcall_total counter +node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bind_total Number of times the client has had to establish a connection from scratch to the NFS server. # TYPE node_mountstats_nfs_transport_bind_total counter node_mountstats_nfs_transport_bind_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 @@ -2223,22 +2231,82 @@ node_mountstats_nfs_transport_bind_total{export="192.168.1.1:/srv/test",mountadd # TYPE node_mountstats_nfs_transport_connect_total counter node_mountstats_nfs_transport_connect_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 1 node_mountstats_nfs_transport_connect_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_empty_sendctx_q_total Total number of empty sendctx q when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_empty_sendctx_q_total counter +node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_failed_marshal_total Total number of failed marshal when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_failed_marshal_total counter +node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_fixup_copy_total Total number of fixup copy accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_fixup_copy_total counter +node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_hardway_register_total Total number of hardway register when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_hardway_register_total counter +node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_idle_time_seconds Duration since the NFS mount last saw any RPC traffic, in seconds. # TYPE node_mountstats_nfs_transport_idle_time_seconds gauge node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 11 node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_local_inv_needed_total Total number of local inv needed accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_local_inv_needed_total counter +node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_maximum_rpc_slots Maximum number of simultaneously active RPC requests ever used. # TYPE node_mountstats_nfs_transport_maximum_rpc_slots gauge node_mountstats_nfs_transport_maximum_rpc_slots{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 24 node_mountstats_nfs_transport_maximum_rpc_slots{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 24 +# HELP node_mountstats_nfs_transport_mrs_allocated_total Total number of mrs allocated when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_mrs_allocated_total counter +node_mountstats_nfs_transport_mrs_allocated_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_mrs_allocated_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_mrs_orphaned_total Total number of mrs orphaned when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_mrs_orphaned_total counter +node_mountstats_nfs_transport_mrs_orphaned_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_mrs_orphaned_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_mrs_recycled_total Total number of mrs recycled when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_mrs_recycled_total counter +node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_nomsg_call_total Total number of nomsg call when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_nomsg_call_total counter +node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_pending_queue_total Total number of items added to the RPC transmission pending queue. # TYPE node_mountstats_nfs_transport_pending_queue_total counter node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 5726 node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 5726 +# HELP node_mountstats_nfs_transport_pullup_copy_total Total number of pullup copy when rarely accessed error counters. +# 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_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 +node_mountstats_nfs_transport_read_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_receives_total Number of RPC responses for this mount received from the NFS server. # TYPE node_mountstats_nfs_transport_receives_total counter node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 +# HELP node_mountstats_nfs_transport_reply_chunk_total Total number of reply chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_reply_chunk_total counter +node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_reply_waitsfor_send_total Total number of reply waits for send accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_reply_waitsfor_send_total counter +node_mountstats_nfs_transport_reply_waitsfor_send_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_reply_waitsfor_send_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_sending_queue_total Total number of items added to the RPC transmission sending queue. # TYPE node_mountstats_nfs_transport_sending_queue_total counter node_mountstats_nfs_transport_sending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 26 @@ -2247,6 +2315,10 @@ node_mountstats_nfs_transport_sending_queue_total{export="192.168.1.1:/srv/test" # TYPE node_mountstats_nfs_transport_sends_total counter node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 +# HELP node_mountstats_nfs_transport_write_chunk_total Total number of write chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_write_chunk_total counter +node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_write_bytes_total Number of bytes written using the write() syscall. # TYPE node_mountstats_nfs_write_bytes_total counter node_mountstats_nfs_write_bytes_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 47e6a453..9d62c5c7 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2233,10 +2233,18 @@ node_mountstats_nfs_total_write_bytes_total{export="192.168.1.1:/srv/test",mount # TYPE node_mountstats_nfs_transport_backlog_queue_total counter node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bad_reply_total Total number of bad reply when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bad_reply_total counter +node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bad_transaction_ids_total Number of times the NFS server sent a response with a transaction ID unknown to this client. # TYPE node_mountstats_nfs_transport_bad_transaction_ids_total counter node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bcall_total Total number of bcall when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bcall_total counter +node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bind_total Number of times the client has had to establish a connection from scratch to the NFS server. # TYPE node_mountstats_nfs_transport_bind_total counter node_mountstats_nfs_transport_bind_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 @@ -2245,22 +2253,82 @@ node_mountstats_nfs_transport_bind_total{export="192.168.1.1:/srv/test",mountadd # TYPE node_mountstats_nfs_transport_connect_total counter node_mountstats_nfs_transport_connect_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 1 node_mountstats_nfs_transport_connect_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_empty_sendctx_q_total Total number of empty sendctx q when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_empty_sendctx_q_total counter +node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_failed_marshal_total Total number of failed marshal when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_failed_marshal_total counter +node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_fixup_copy_total Total number of fixup copy accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_fixup_copy_total counter +node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_hardway_register_total Total number of hardway register when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_hardway_register_total counter +node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_idle_time_seconds Duration since the NFS mount last saw any RPC traffic, in seconds. # TYPE node_mountstats_nfs_transport_idle_time_seconds gauge node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 11 node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_local_inv_needed_total Total number of local inv needed accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_local_inv_needed_total counter +node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_maximum_rpc_slots Maximum number of simultaneously active RPC requests ever used. # TYPE node_mountstats_nfs_transport_maximum_rpc_slots gauge node_mountstats_nfs_transport_maximum_rpc_slots{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 24 node_mountstats_nfs_transport_maximum_rpc_slots{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 24 +# HELP node_mountstats_nfs_transport_mrs_allocated_total Total number of mrs allocated when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_mrs_allocated_total counter +node_mountstats_nfs_transport_mrs_allocated_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_mrs_allocated_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_mrs_orphaned_total Total number of mrs orphaned when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_mrs_orphaned_total counter +node_mountstats_nfs_transport_mrs_orphaned_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_mrs_orphaned_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_mrs_recycled_total Total number of mrs recycled when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_mrs_recycled_total counter +node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_nomsg_call_total Total number of nomsg call when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_nomsg_call_total counter +node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_pending_queue_total Total number of items added to the RPC transmission pending queue. # TYPE node_mountstats_nfs_transport_pending_queue_total counter node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 5726 node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 5726 +# HELP node_mountstats_nfs_transport_pullup_copy_total Total number of pullup copy when rarely accessed error counters. +# 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_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 +node_mountstats_nfs_transport_read_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_receives_total Number of RPC responses for this mount received from the NFS server. # TYPE node_mountstats_nfs_transport_receives_total counter node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 +# HELP node_mountstats_nfs_transport_reply_chunk_total Total number of reply chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_reply_chunk_total counter +node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_reply_waitsfor_send_total Total number of reply waits for send accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_reply_waitsfor_send_total counter +node_mountstats_nfs_transport_reply_waitsfor_send_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_reply_waitsfor_send_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_sending_queue_total Total number of items added to the RPC transmission sending queue. # TYPE node_mountstats_nfs_transport_sending_queue_total counter node_mountstats_nfs_transport_sending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 26 @@ -2269,6 +2337,10 @@ node_mountstats_nfs_transport_sending_queue_total{export="192.168.1.1:/srv/test" # TYPE node_mountstats_nfs_transport_sends_total counter node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 +# HELP node_mountstats_nfs_transport_write_chunk_total Total number of write chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_write_chunk_total counter +node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_write_bytes_total Number of bytes written using the write() syscall. # TYPE node_mountstats_nfs_write_bytes_total counter node_mountstats_nfs_write_bytes_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 From 42c96a05a1e6a58437c6806e63307dc0ee2d0797 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Mon, 16 Oct 2023 22:46:17 +0800 Subject: [PATCH 4/9] fix lint Signed-off-by: dongjiang1989 --- collector/fixtures/e2e-64k-page-output.txt | 16 ++++++++-------- collector/fixtures/e2e-output.txt | 16 ++++++++-------- collector/mountstats_linux.go | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) 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, From e1d0e2e9e837b43b5c570cab071514fe3dd40866 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Mon, 16 Oct 2023 22:54:45 +0800 Subject: [PATCH 5/9] fix GaugeValue type Signed-off-by: dongjiang1989 --- collector/fixtures/e2e-64k-page-output.txt | 16 ++++++++-------- collector/fixtures/e2e-output.txt | 16 ++++++++-------- collector/mountstats_linux.go | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index 99e59ff1..8683f1cf 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_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 dd5e403e..5e5cd093 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_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 1cc5897b..97349a89 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_sum"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_requests"), "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_sum"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_requests"), "Total number of rdma reply accessed when receiving a reply.", labels, nil, From 32e04146c5fa3a368ee43aacaecdf99fcd23fee5 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Wed, 25 Oct 2023 11:02:16 +0800 Subject: [PATCH 6/9] set counter counts to plural Signed-off-by: dongjiang1989 --- collector/mountstats_linux.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go index 97349a89..d800d31f 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -287,56 +287,56 @@ func NewMountStatsCollector(logger log.Logger) (Collector, error) { ), NFSTransportReadChunkTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_read_chunk_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_read_chunks_total"), "Total number of read chunk accessed when sending a call.", labels, nil, ), NFSTransportWriteChunkTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_write_chunk_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_write_chunks_total"), "Total number of write chunk accessed when sending a call.", labels, nil, ), NFSTransportReplyChunkTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_reply_chunk_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_reply_chunks_total"), "Total number of reply chunk accessed when sending a call.", labels, nil, ), NFSTransportRdmaRequestTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_rdma_requests"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_requests_total"), "Total number of rdma request accessed when sending a call.", labels, nil, ), NFSTransportPullupCopyTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_pullup_copy_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_pullup_copies_total"), "Total number of pullup copy when rarely accessed error counters.", labels, nil, ), NFSTransportHardwayRegisterTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_hardway_register_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_hardway_registrations_total"), "Total number of hardway register when rarely accessed error counters.", labels, nil, ), NFSTransportFailedMarshalTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_failed_marshal_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_marshal_failures_total"), "Total number of failed marshal when rarely accessed error counters.", labels, nil, ), NFSTransportBadReplyTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_bad_reply_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_bad_replies_total"), "Total number of bad reply when rarely accessed error counters.", labels, nil, @@ -371,14 +371,14 @@ func NewMountStatsCollector(logger log.Logger) (Collector, error) { ), NFSTransportRdmaReplyTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_requests"), + prometheus.BuildFQName(namespace, subsystem, "transport_rdma_reply_requests_total"), "Total number of rdma reply accessed when receiving a reply.", labels, nil, ), NFSTransportFixupCopyTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_fixup_copy_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_fixup_copies_total"), "Total number of fixup copy accessed when receiving a reply.", labels, nil, @@ -391,19 +391,19 @@ func NewMountStatsCollector(logger log.Logger) (Collector, error) { nil, ), NFSTransportLocalInvNeededTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_local_inv_needed_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_local_inv_requests_total"), "Total number of local inv needed accessed when receiving a reply.", labels, nil, ), NFSTransportNomsgCallTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_nomsg_call_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_nomsg_call_requests_total"), "Total number of nomsg call when rarely accessed error counters.", labels, nil, ), NFSTransportBcallCountTotal: prometheus.NewDesc( - prometheus.BuildFQName(namespace, subsystem, "transport_bcall_total"), + prometheus.BuildFQName(namespace, subsystem, "transport_bcall_requests_total"), "Total number of bcall when rarely accessed error counters.", labels, nil, @@ -853,7 +853,7 @@ func (c *mountStatsCollector) updateNFSStats(ch chan<- prometheus.Metric, s *pro ch <- prometheus.MustNewConstMetric( c.NFSTransportRdmaRequestTotal, - prometheus.GaugeValue, + prometheus.CounterValue, float64(s.Transport.TotalRdmaRequest), labelValues..., ) @@ -916,7 +916,7 @@ func (c *mountStatsCollector) updateNFSStats(ch chan<- prometheus.Metric, s *pro ch <- prometheus.MustNewConstMetric( c.NFSTransportRdmaReplyTotal, - prometheus.GaugeValue, + prometheus.CounterValue, float64(s.Transport.TotalRdmaReply), labelValues..., ) From f96eda75e241d008ab723fb3034b903c547c5e96 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Wed, 25 Oct 2023 11:15:49 +0800 Subject: [PATCH 7/9] fix e2e unittest Signed-off-by: dongjiang1989 --- collector/fixtures/e2e-output.txt | 88 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index fe59d787..1ed6ffd2 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2233,18 +2233,18 @@ node_mountstats_nfs_total_write_bytes_total{export="192.168.1.1:/srv/test",mount # TYPE node_mountstats_nfs_transport_backlog_queue_total counter node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_bad_reply_total Total number of bad reply when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_bad_reply_total counter -node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bad_replies_total Total number of bad reply when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bad_replies_total counter +node_mountstats_nfs_transport_bad_replies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bad_replies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bad_transaction_ids_total Number of times the NFS server sent a response with a transaction ID unknown to this client. # TYPE node_mountstats_nfs_transport_bad_transaction_ids_total counter node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_bcall_total Total number of bcall when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_bcall_total counter -node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bcall_requests_total Total number of bcall when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bcall_requests_total counter +node_mountstats_nfs_transport_bcall_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bcall_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bind_total Number of times the client has had to establish a connection from scratch to the NFS server. # TYPE node_mountstats_nfs_transport_bind_total counter node_mountstats_nfs_transport_bind_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 @@ -2257,26 +2257,26 @@ node_mountstats_nfs_transport_connect_total{export="192.168.1.1:/srv/test",mount # TYPE node_mountstats_nfs_transport_empty_sendctx_q_total counter node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_failed_marshal_total Total number of failed marshal when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_failed_marshal_total counter -node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_fixup_copy_total Total number of fixup copy accessed when receiving a reply. -# TYPE node_mountstats_nfs_transport_fixup_copy_total counter -node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_hardway_register_total Total number of hardway register when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_hardway_register_total counter -node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_fixup_copies_total Total number of fixup copy accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_fixup_copies_total counter +node_mountstats_nfs_transport_fixup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_fixup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_hardway_registrations_total Total number of hardway register when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_hardway_registrations_total counter +node_mountstats_nfs_transport_hardway_registrations_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_hardway_registrations_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_idle_time_seconds Duration since the NFS mount last saw any RPC traffic, in seconds. # TYPE node_mountstats_nfs_transport_idle_time_seconds gauge node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 11 node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_local_inv_needed_total Total number of local inv needed accessed when receiving a reply. -# TYPE node_mountstats_nfs_transport_local_inv_needed_total counter -node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_local_inv_requests_total Total number of local inv needed accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_local_inv_requests_total counter +node_mountstats_nfs_transport_local_inv_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_local_inv_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_marshal_failures_total Total number of failed marshal when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_marshal_failures_total counter +node_mountstats_nfs_transport_marshal_failures_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_marshal_failures_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_maximum_rpc_slots Maximum number of simultaneously active RPC requests ever used. # TYPE node_mountstats_nfs_transport_maximum_rpc_slots gauge node_mountstats_nfs_transport_maximum_rpc_slots{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 24 @@ -2293,30 +2293,30 @@ node_mountstats_nfs_transport_mrs_orphaned_total{export="192.168.1.1:/srv/test", # TYPE node_mountstats_nfs_transport_mrs_recycled_total counter node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_nomsg_call_total Total number of nomsg call when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_nomsg_call_total counter -node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_nomsg_call_requests_total Total number of nomsg call when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_nomsg_call_requests_total counter +node_mountstats_nfs_transport_nomsg_call_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_nomsg_call_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_pending_queue_total Total number of items added to the RPC transmission pending queue. # TYPE node_mountstats_nfs_transport_pending_queue_total counter node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 5726 node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 5726 -# HELP node_mountstats_nfs_transport_pullup_copy_total Total number of pullup copy when rarely accessed error counters. -# 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_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 -node_mountstats_nfs_transport_read_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_pullup_copies_total Total number of pullup copy when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_pullup_copies_total counter +node_mountstats_nfs_transport_pullup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_pullup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_reply_requests_total Total number of rdma reply accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_rdma_reply_requests_total counter +node_mountstats_nfs_transport_rdma_reply_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_reply_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_requests_total Total number of rdma request accessed when sending a call. +# TYPE node_mountstats_nfs_transport_rdma_requests_total counter +node_mountstats_nfs_transport_rdma_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_read_chunks_total Total number of read chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_read_chunks_total counter +node_mountstats_nfs_transport_read_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_read_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_receives_total Number of RPC responses for this mount received from the NFS server. # TYPE node_mountstats_nfs_transport_receives_total counter node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 From af47b3b5be7a743982f8b440872f4a1d2bb1d871 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Wed, 25 Oct 2023 11:22:19 +0800 Subject: [PATCH 8/9] update e2e arm unittest Signed-off-by: dongjiang1989 --- collector/fixtures/e2e-64k-page-output.txt | 104 ++++++++++----------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt index 13e835c5..9108b307 100644 --- a/collector/fixtures/e2e-64k-page-output.txt +++ b/collector/fixtures/e2e-64k-page-output.txt @@ -2211,18 +2211,18 @@ node_mountstats_nfs_total_write_bytes_total{export="192.168.1.1:/srv/test",mount # TYPE node_mountstats_nfs_transport_backlog_queue_total counter node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_backlog_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_bad_reply_total Total number of bad reply when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_bad_reply_total counter -node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_bad_reply_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bad_replies_total Total number of bad reply when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bad_replies_total counter +node_mountstats_nfs_transport_bad_replies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bad_replies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bad_transaction_ids_total Number of times the NFS server sent a response with a transaction ID unknown to this client. # TYPE node_mountstats_nfs_transport_bad_transaction_ids_total counter node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_bad_transaction_ids_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_bcall_total Total number of bcall when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_bcall_total counter -node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_bcall_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_bcall_requests_total Total number of bcall when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_bcall_requests_total counter +node_mountstats_nfs_transport_bcall_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_bcall_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_bind_total Number of times the client has had to establish a connection from scratch to the NFS server. # TYPE node_mountstats_nfs_transport_bind_total counter node_mountstats_nfs_transport_bind_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 @@ -2235,26 +2235,26 @@ node_mountstats_nfs_transport_connect_total{export="192.168.1.1:/srv/test",mount # TYPE node_mountstats_nfs_transport_empty_sendctx_q_total counter node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_empty_sendctx_q_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_failed_marshal_total Total number of failed marshal when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_failed_marshal_total counter -node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_failed_marshal_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_fixup_copy_total Total number of fixup copy accessed when receiving a reply. -# TYPE node_mountstats_nfs_transport_fixup_copy_total counter -node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_fixup_copy_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_hardway_register_total Total number of hardway register when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_hardway_register_total counter -node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_hardway_register_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_fixup_copies_total Total number of fixup copy accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_fixup_copies_total counter +node_mountstats_nfs_transport_fixup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_fixup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_hardway_registrations_total Total number of hardway register when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_hardway_registrations_total counter +node_mountstats_nfs_transport_hardway_registrations_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_hardway_registrations_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_idle_time_seconds Duration since the NFS mount last saw any RPC traffic, in seconds. # TYPE node_mountstats_nfs_transport_idle_time_seconds gauge node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 11 node_mountstats_nfs_transport_idle_time_seconds{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_local_inv_needed_total Total number of local inv needed accessed when receiving a reply. -# TYPE node_mountstats_nfs_transport_local_inv_needed_total counter -node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_local_inv_needed_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_local_inv_requests_total Total number of local inv needed accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_local_inv_requests_total counter +node_mountstats_nfs_transport_local_inv_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_local_inv_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_marshal_failures_total Total number of failed marshal when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_marshal_failures_total counter +node_mountstats_nfs_transport_marshal_failures_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_marshal_failures_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_maximum_rpc_slots Maximum number of simultaneously active RPC requests ever used. # TYPE node_mountstats_nfs_transport_maximum_rpc_slots gauge node_mountstats_nfs_transport_maximum_rpc_slots{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 24 @@ -2271,38 +2271,38 @@ node_mountstats_nfs_transport_mrs_orphaned_total{export="192.168.1.1:/srv/test", # TYPE node_mountstats_nfs_transport_mrs_recycled_total counter node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 node_mountstats_nfs_transport_mrs_recycled_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 -# HELP node_mountstats_nfs_transport_nomsg_call_total Total number of nomsg call when rarely accessed error counters. -# TYPE node_mountstats_nfs_transport_nomsg_call_total counter -node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_nomsg_call_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_nomsg_call_requests_total Total number of nomsg call when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_nomsg_call_requests_total counter +node_mountstats_nfs_transport_nomsg_call_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_nomsg_call_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_pending_queue_total Total number of items added to the RPC transmission pending queue. # TYPE node_mountstats_nfs_transport_pending_queue_total counter node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 5726 node_mountstats_nfs_transport_pending_queue_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 5726 -# HELP node_mountstats_nfs_transport_pullup_copy_total Total number of pullup copy when rarely accessed error counters. -# 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_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 -node_mountstats_nfs_transport_read_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_pullup_copies_total Total number of pullup copy when rarely accessed error counters. +# TYPE node_mountstats_nfs_transport_pullup_copies_total counter +node_mountstats_nfs_transport_pullup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_pullup_copies_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_reply_requests_total Total number of rdma reply accessed when receiving a reply. +# TYPE node_mountstats_nfs_transport_rdma_reply_requests_total counter +node_mountstats_nfs_transport_rdma_reply_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_reply_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_rdma_requests_total Total number of rdma request accessed when sending a call. +# TYPE node_mountstats_nfs_transport_rdma_requests_total counter +node_mountstats_nfs_transport_rdma_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_rdma_requests_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_read_chunks_total Total number of read chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_read_chunks_total counter +node_mountstats_nfs_transport_read_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_read_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_receives_total Number of RPC responses for this mount received from the NFS server. # TYPE node_mountstats_nfs_transport_receives_total counter node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 -# HELP node_mountstats_nfs_transport_reply_chunk_total Total number of reply chunk accessed when sending a call. -# TYPE node_mountstats_nfs_transport_reply_chunk_total counter -node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_reply_chunks_total Total number of reply chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_reply_chunks_total counter +node_mountstats_nfs_transport_reply_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_reply_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_reply_waitsfor_send_total Total number of reply waits for send accessed when receiving a reply. # TYPE node_mountstats_nfs_transport_reply_waitsfor_send_total counter node_mountstats_nfs_transport_reply_waitsfor_send_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 @@ -2315,10 +2315,10 @@ node_mountstats_nfs_transport_sending_queue_total{export="192.168.1.1:/srv/test" # TYPE node_mountstats_nfs_transport_sends_total counter node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 -# HELP node_mountstats_nfs_transport_write_chunk_total Total number of write chunk accessed when sending a call. -# TYPE node_mountstats_nfs_transport_write_chunk_total counter -node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_write_chunks_total Total number of write chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_write_chunks_total counter +node_mountstats_nfs_transport_write_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_write_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_write_bytes_total Number of bytes written using the write() syscall. # TYPE node_mountstats_nfs_write_bytes_total counter node_mountstats_nfs_write_bytes_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 From 503d422754e3c9949e7242ebae66ac54da8df1d0 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Wed, 25 Oct 2023 11:24:49 +0800 Subject: [PATCH 9/9] update e2e unittest Signed-off-by: dongjiang1989 --- collector/fixtures/e2e-output.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index 1ed6ffd2..c80d955a 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2321,10 +2321,10 @@ node_mountstats_nfs_transport_read_chunks_total{export="192.168.1.1:/srv/test",m # TYPE node_mountstats_nfs_transport_receives_total counter node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_receives_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 -# HELP node_mountstats_nfs_transport_reply_chunk_total Total number of reply chunk accessed when sending a call. -# TYPE node_mountstats_nfs_transport_reply_chunk_total counter -node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_reply_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_reply_chunks_total Total number of reply chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_reply_chunks_total counter +node_mountstats_nfs_transport_reply_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_reply_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_transport_reply_waitsfor_send_total Total number of reply waits for send accessed when receiving a reply. # TYPE node_mountstats_nfs_transport_reply_waitsfor_send_total counter node_mountstats_nfs_transport_reply_waitsfor_send_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 @@ -2337,10 +2337,10 @@ node_mountstats_nfs_transport_sending_queue_total{export="192.168.1.1:/srv/test" # TYPE node_mountstats_nfs_transport_sends_total counter node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 6428 node_mountstats_nfs_transport_sends_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 6428 -# HELP node_mountstats_nfs_transport_write_chunk_total Total number of write chunk accessed when sending a call. -# TYPE node_mountstats_nfs_transport_write_chunk_total counter -node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 -node_mountstats_nfs_transport_write_chunk_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 +# HELP node_mountstats_nfs_transport_write_chunks_total Total number of write chunk accessed when sending a call. +# TYPE node_mountstats_nfs_transport_write_chunks_total counter +node_mountstats_nfs_transport_write_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0 +node_mountstats_nfs_transport_write_chunks_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="udp"} 0 # HELP node_mountstats_nfs_write_bytes_total Number of bytes written using the write() syscall. # TYPE node_mountstats_nfs_write_bytes_total counter node_mountstats_nfs_write_bytes_total{export="192.168.1.1:/srv/test",mountaddr="192.168.1.1",protocol="tcp"} 0