Cleanup NFS metrics (#834)

* Cleanup NFS metrics

* Update `nfs` metric names to match `nfsd`.
* Remove uneeded `tcp` label from TCP connections metric.
* Remove uneeded `v` on `nfsd` metrics.
* Enable all `nfs` v4 client metrics.
* Remove `nfs` metric name overrides.

* Add ppc64le fixture.

* Fix typo.

4 files changed, 383 insertions, 406 deletions

diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt
index a7c1e2a..26ac840 100644
--- a/collector/fixtures/e2e-output.txt
+++ b/collector/fixtures/e2e-output.txt
@@ -2449,112 +2449,123 @@ node_nf_conntrack_entries 123
 # HELP node_nf_conntrack_entries_limit Maximum size of connection tracking table.
 # TYPE node_nf_conntrack_entries_limit gauge
 node_nf_conntrack_entries_limit 65536
-# HELP node_nfs_net_connections_total Number of connections at the network layer.
-# TYPE node_nfs_net_connections_total counter
-node_nfs_net_connections_total{protocol="tcp"} 45
-# HELP node_nfs_net_reads_total Number of reads at the network layer.
-# TYPE node_nfs_net_reads_total counter
-node_nfs_net_reads_total{protocol="tcp"} 69
-node_nfs_net_reads_total{protocol="udp"} 70
-# HELP node_nfs_procedures_total Number of NFS procedures invoked.
-# TYPE node_nfs_procedures_total counter
-node_nfs_procedures_total{procedure="access",version="3"} 1.17661341e+08
-node_nfs_procedures_total{procedure="access",version="4"} 58
-node_nfs_procedures_total{procedure="close",version="4"} 28
-node_nfs_procedures_total{procedure="commit",version="3"} 23729
-node_nfs_procedures_total{procedure="commit",version="4"} 83
-node_nfs_procedures_total{procedure="create",version="2"} 52
-node_nfs_procedures_total{procedure="create",version="3"} 2.993289e+06
-node_nfs_procedures_total{procedure="create",version="4"} 15
-node_nfs_procedures_total{procedure="create_session",version="4"} 32
-node_nfs_procedures_total{procedure="delegreturn",version="4"} 97
-node_nfs_procedures_total{procedure="destroy_session",version="4"} 67
-node_nfs_procedures_total{procedure="exchange_id",version="4"} 58
-node_nfs_procedures_total{procedure="fs_locations",version="4"} 32
-node_nfs_procedures_total{procedure="fsid_present",version="4"} 11
-node_nfs_procedures_total{procedure="fsinfo",version="3"} 2
-node_nfs_procedures_total{procedure="fsinfo",version="4"} 68
-node_nfs_procedures_total{procedure="fsstat",version="3"} 13332
-node_nfs_procedures_total{procedure="get_lease_time",version="4"} 28
-node_nfs_procedures_total{procedure="getacl",version="4"} 36
-node_nfs_procedures_total{procedure="getattr",version="2"} 57
-node_nfs_procedures_total{procedure="getattr",version="3"} 1.061909262e+09
-node_nfs_procedures_total{procedure="getattr",version="4"} 88
-node_nfs_procedures_total{procedure="getdeviceinfo",version="4"} 1
-node_nfs_procedures_total{procedure="layoutcommit",version="4"} 26
-node_nfs_procedures_total{procedure="layoutget",version="4"} 90
-node_nfs_procedures_total{procedure="layoutreturn",version="4"} 0
-node_nfs_procedures_total{procedure="link",version="2"} 17
-node_nfs_procedures_total{procedure="link",version="3"} 0
-node_nfs_procedures_total{procedure="link",version="4"} 21
-node_nfs_procedures_total{procedure="lock",version="4"} 39
-node_nfs_procedures_total{procedure="lockt",version="4"} 68
-node_nfs_procedures_total{procedure="locku",version="4"} 59
-node_nfs_procedures_total{procedure="lookup",version="2"} 71
-node_nfs_procedures_total{procedure="lookup",version="3"} 4.077635e+06
-node_nfs_procedures_total{procedure="lookup",version="4"} 29
-node_nfs_procedures_total{procedure="lookup_root",version="4"} 74
-node_nfs_procedures_total{procedure="mkdir",version="2"} 50
-node_nfs_procedures_total{procedure="mkdir",version="3"} 590
-node_nfs_procedures_total{procedure="mknod",version="3"} 0
-node_nfs_procedures_total{procedure="null",version="2"} 16
-node_nfs_procedures_total{procedure="null",version="3"} 0
-node_nfs_procedures_total{procedure="null",version="4"} 98
-node_nfs_procedures_total{procedure="open",version="4"} 85
-node_nfs_procedures_total{procedure="open_confirm",version="4"} 23
-node_nfs_procedures_total{procedure="open_downgrade",version="4"} 1
-node_nfs_procedures_total{procedure="open_noattr",version="4"} 24
-node_nfs_procedures_total{procedure="pathconf",version="3"} 1
-node_nfs_procedures_total{procedure="pathconf",version="4"} 53
-node_nfs_procedures_total{procedure="read",version="2"} 45
-node_nfs_procedures_total{procedure="read",version="3"} 2.9391916e+07
-node_nfs_procedures_total{procedure="read",version="4"} 51
-node_nfs_procedures_total{procedure="readdir",version="2"} 70
-node_nfs_procedures_total{procedure="readdir",version="3"} 3983
-node_nfs_procedures_total{procedure="readdir",version="4"} 66
-node_nfs_procedures_total{procedure="readdirplus",version="3"} 92385
-node_nfs_procedures_total{procedure="readlink",version="2"} 73
-node_nfs_procedures_total{procedure="readlink",version="3"} 5
-node_nfs_procedures_total{procedure="readlink",version="4"} 54
-node_nfs_procedures_total{procedure="reclaim_complete",version="4"} 35
-node_nfs_procedures_total{procedure="release_lockowner",version="4"} 85
-node_nfs_procedures_total{procedure="remove",version="2"} 83
-node_nfs_procedures_total{procedure="remove",version="3"} 7815
-node_nfs_procedures_total{procedure="remove",version="4"} 69
-node_nfs_procedures_total{procedure="rename",version="2"} 61
-node_nfs_procedures_total{procedure="rename",version="3"} 1130
-node_nfs_procedures_total{procedure="rename",version="4"} 96
-node_nfs_procedures_total{procedure="renew",version="4"} 83
-node_nfs_procedures_total{procedure="rmdir",version="2"} 23
-node_nfs_procedures_total{procedure="rmdir",version="3"} 15
-node_nfs_procedures_total{procedure="root",version="2"} 52
-node_nfs_procedures_total{procedure="secinfo",version="4"} 81
-node_nfs_procedures_total{procedure="sequence",version="4"} 13
-node_nfs_procedures_total{procedure="server_caps",version="4"} 56
-node_nfs_procedures_total{procedure="setacl",version="4"} 49
-node_nfs_procedures_total{procedure="setattr",version="2"} 74
-node_nfs_procedures_total{procedure="setattr",version="3"} 48906
-node_nfs_procedures_total{procedure="setattr",version="4"} 73
-node_nfs_procedures_total{procedure="setclientid",version="4"} 12
-node_nfs_procedures_total{procedure="setclientid_confirm",version="4"} 84
-node_nfs_procedures_total{procedure="statfs",version="2"} 82
-node_nfs_procedures_total{procedure="statfs",version="4"} 86
-node_nfs_procedures_total{procedure="symlink",version="2"} 53
-node_nfs_procedures_total{procedure="symlink",version="3"} 0
-node_nfs_procedures_total{procedure="symlink",version="4"} 84
-node_nfs_procedures_total{procedure="write",version="2"} 0
-node_nfs_procedures_total{procedure="write",version="3"} 2.570425e+06
-node_nfs_procedures_total{procedure="write",version="4"} 54
-node_nfs_procedures_total{procedure="writecache",version="2"} 86
+# HELP node_nfs_connections_total Total number of NFSd TCP connections.
+# TYPE node_nfs_connections_total counter
+node_nfs_connections_total 45
+# HELP node_nfs_packets_total Total NFSd network packets (sent+received) by protocol type.
+# TYPE node_nfs_packets_total counter
+node_nfs_packets_total{protocol="tcp"} 69
+node_nfs_packets_total{protocol="udp"} 70
+# HELP node_nfs_requests_total Number of NFS procedures invoked.
+# TYPE node_nfs_requests_total counter
+node_nfs_requests_total{method="Access",proto="3"} 1.17661341e+08
+node_nfs_requests_total{method="Access",proto="4"} 58
+node_nfs_requests_total{method="Allocate",proto="4"} 0
+node_nfs_requests_total{method="BindConnToSession",proto="4"} 0
+node_nfs_requests_total{method="Clone",proto="4"} 0
+node_nfs_requests_total{method="Close",proto="4"} 28
+node_nfs_requests_total{method="Commit",proto="3"} 23729
+node_nfs_requests_total{method="Commit",proto="4"} 83
+node_nfs_requests_total{method="Create",proto="2"} 52
+node_nfs_requests_total{method="Create",proto="3"} 2.993289e+06
+node_nfs_requests_total{method="Create",proto="4"} 15
+node_nfs_requests_total{method="CreateSession",proto="4"} 32
+node_nfs_requests_total{method="DeAllocate",proto="4"} 0
+node_nfs_requests_total{method="DelegReturn",proto="4"} 97
+node_nfs_requests_total{method="DestroyClientId",proto="4"} 0
+node_nfs_requests_total{method="DestroySession",proto="4"} 67
+node_nfs_requests_total{method="ExchangeId",proto="4"} 58
+node_nfs_requests_total{method="FreeStateId",proto="4"} 0
+node_nfs_requests_total{method="FsInfo",proto="3"} 2
+node_nfs_requests_total{method="FsInfo",proto="4"} 68
+node_nfs_requests_total{method="FsLocations",proto="4"} 32
+node_nfs_requests_total{method="FsStat",proto="2"} 82
+node_nfs_requests_total{method="FsStat",proto="3"} 13332
+node_nfs_requests_total{method="FsidPresent",proto="4"} 11
+node_nfs_requests_total{method="GetAcl",proto="4"} 36
+node_nfs_requests_total{method="GetAttr",proto="2"} 57
+node_nfs_requests_total{method="GetAttr",proto="3"} 1.061909262e+09
+node_nfs_requests_total{method="GetDeviceInfo",proto="4"} 1
+node_nfs_requests_total{method="GetDeviceList",proto="4"} 0
+node_nfs_requests_total{method="GetLeaseTime",proto="4"} 28
+node_nfs_requests_total{method="Getattr",proto="4"} 88
+node_nfs_requests_total{method="LayoutCommit",proto="4"} 26
+node_nfs_requests_total{method="LayoutGet",proto="4"} 90
+node_nfs_requests_total{method="LayoutReturn",proto="4"} 0
+node_nfs_requests_total{method="LayoutStats",proto="4"} 0
+node_nfs_requests_total{method="Link",proto="2"} 17
+node_nfs_requests_total{method="Link",proto="3"} 0
+node_nfs_requests_total{method="Link",proto="4"} 21
+node_nfs_requests_total{method="Lock",proto="4"} 39
+node_nfs_requests_total{method="Lockt",proto="4"} 68
+node_nfs_requests_total{method="Locku",proto="4"} 59
+node_nfs_requests_total{method="Lookup",proto="2"} 71
+node_nfs_requests_total{method="Lookup",proto="3"} 4.077635e+06
+node_nfs_requests_total{method="Lookup",proto="4"} 29
+node_nfs_requests_total{method="LookupRoot",proto="4"} 74
+node_nfs_requests_total{method="MkDir",proto="2"} 50
+node_nfs_requests_total{method="MkDir",proto="3"} 590
+node_nfs_requests_total{method="MkNod",proto="3"} 0
+node_nfs_requests_total{method="Null",proto="2"} 16
+node_nfs_requests_total{method="Null",proto="3"} 0
+node_nfs_requests_total{method="Null",proto="4"} 98
+node_nfs_requests_total{method="Open",proto="4"} 85
+node_nfs_requests_total{method="OpenConfirm",proto="4"} 23
+node_nfs_requests_total{method="OpenDowngrade",proto="4"} 1
+node_nfs_requests_total{method="OpenNoattr",proto="4"} 24
+node_nfs_requests_total{method="PathConf",proto="3"} 1
+node_nfs_requests_total{method="Pathconf",proto="4"} 53
+node_nfs_requests_total{method="Read",proto="2"} 45
+node_nfs_requests_total{method="Read",proto="3"} 2.9391916e+07
+node_nfs_requests_total{method="Read",proto="4"} 51
+node_nfs_requests_total{method="ReadDir",proto="2"} 70
+node_nfs_requests_total{method="ReadDir",proto="3"} 3983
+node_nfs_requests_total{method="ReadDir",proto="4"} 66
+node_nfs_requests_total{method="ReadDirPlus",proto="3"} 92385
+node_nfs_requests_total{method="ReadLink",proto="2"} 73
+node_nfs_requests_total{method="ReadLink",proto="3"} 5
+node_nfs_requests_total{method="ReadLink",proto="4"} 54
+node_nfs_requests_total{method="ReclaimComplete",proto="4"} 35
+node_nfs_requests_total{method="ReleaseLockowner",proto="4"} 85
+node_nfs_requests_total{method="Remove",proto="2"} 83
+node_nfs_requests_total{method="Remove",proto="3"} 7815
+node_nfs_requests_total{method="Remove",proto="4"} 69
+node_nfs_requests_total{method="Rename",proto="2"} 61
+node_nfs_requests_total{method="Rename",proto="3"} 1130
+node_nfs_requests_total{method="Rename",proto="4"} 96
+node_nfs_requests_total{method="Renew",proto="4"} 83
+node_nfs_requests_total{method="RmDir",proto="2"} 23
+node_nfs_requests_total{method="RmDir",proto="3"} 15
+node_nfs_requests_total{method="Root",proto="2"} 52
+node_nfs_requests_total{method="Secinfo",proto="4"} 81
+node_nfs_requests_total{method="SecinfoNoName",proto="4"} 0
+node_nfs_requests_total{method="Seek",proto="4"} 0
+node_nfs_requests_total{method="Sequence",proto="4"} 13
+node_nfs_requests_total{method="ServerCaps",proto="4"} 56
+node_nfs_requests_total{method="SetAcl",proto="4"} 49
+node_nfs_requests_total{method="SetAttr",proto="2"} 74
+node_nfs_requests_total{method="SetAttr",proto="3"} 48906
+node_nfs_requests_total{method="SetClientId",proto="4"} 12
+node_nfs_requests_total{method="SetClientIdConfirm",proto="4"} 84
+node_nfs_requests_total{method="Setattr",proto="4"} 73
+node_nfs_requests_total{method="StatFs",proto="4"} 86
+node_nfs_requests_total{method="SymLink",proto="2"} 53
+node_nfs_requests_total{method="SymLink",proto="3"} 0
+node_nfs_requests_total{method="Symlink",proto="4"} 84
+node_nfs_requests_total{method="TestStateId",proto="4"} 0
+node_nfs_requests_total{method="WrCache",proto="2"} 86
+node_nfs_requests_total{method="Write",proto="2"} 0
+node_nfs_requests_total{method="Write",proto="3"} 2.570425e+06
+node_nfs_requests_total{method="Write",proto="4"} 54
 # HELP node_nfs_rpc_authentication_refreshes_total Number of RPC authentication refreshes performed.
 # TYPE node_nfs_rpc_authentication_refreshes_total counter
 node_nfs_rpc_authentication_refreshes_total 1.218815394e+09
-# HELP node_nfs_rpc_operations_total Number of RPCs performed.
-# TYPE node_nfs_rpc_operations_total counter
-node_nfs_rpc_operations_total 1.218785755e+09
 # HELP node_nfs_rpc_retransmissions_total Number of RPC transmissions performed.
 # TYPE node_nfs_rpc_retransmissions_total counter
 node_nfs_rpc_retransmissions_total 374636
+# HELP node_nfs_rpcs_total Total number of RPCs performed.
+# TYPE node_nfs_rpcs_total counter
+node_nfs_rpcs_total 1.218785755e+09
 # HELP node_nfsd_connections_total Total number of NFSd TCP connections.
 # TYPE node_nfsd_connections_total counter
 node_nfsd_connections_total 1
@@ -2567,7 +2578,7 @@ node_nfsd_disk_bytes_written_total 72864
 # HELP node_nfsd_file_handles_stale_total Total number of NFSd stale file handles
 # TYPE node_nfsd_file_handles_stale_total counter
 node_nfsd_file_handles_stale_total 0
-# HELP node_nfsd_packets_total Total NFSd network packets (sent+recieved) by protocol type.
+# HELP node_nfsd_packets_total Total NFSd network packets (sent+received) by protocol type.
 # TYPE node_nfsd_packets_total counter
 node_nfsd_packets_total{proto="tcp"} 917
 node_nfsd_packets_total{proto="udp"} 55
@@ -2588,77 +2599,77 @@ node_nfsd_reply_cache_misses_total 6
 node_nfsd_reply_cache_nocache_total 18622
 # HELP node_nfsd_requests_total Total number NFSd Requests by method and protocol.
 # TYPE node_nfsd_requests_total counter
-node_nfsd_requests_total{method="Access",proto="v3"} 111
-node_nfsd_requests_total{method="Access",proto="v4"} 1098
-node_nfsd_requests_total{method="Close",proto="v4"} 2
-node_nfsd_requests_total{method="Commit",proto="v3"} 0
-node_nfsd_requests_total{method="Commit",proto="v4"} 0
-node_nfsd_requests_total{method="Create",proto="v2"} 0
-node_nfsd_requests_total{method="Create",proto="v3"} 0
-node_nfsd_requests_total{method="Create",proto="v4"} 0
-node_nfsd_requests_total{method="DelegPurge",proto="v4"} 0
-node_nfsd_requests_total{method="DelegReturn",proto="v4"} 0
-node_nfsd_requests_total{method="FsInfo",proto="v3"} 2
-node_nfsd_requests_total{method="FsStat",proto="v2"} 2
-node_nfsd_requests_total{method="FsStat",proto="v3"} 0
-node_nfsd_requests_total{method="GetAttr",proto="v2"} 69
-node_nfsd_requests_total{method="GetAttr",proto="v3"} 112
-node_nfsd_requests_total{method="GetAttr",proto="v4"} 8179
-node_nfsd_requests_total{method="GetFH",proto="v4"} 5896
-node_nfsd_requests_total{method="Link",proto="v2"} 0
-node_nfsd_requests_total{method="Link",proto="v3"} 0
-node_nfsd_requests_total{method="Link",proto="v4"} 0
-node_nfsd_requests_total{method="Lock",proto="v4"} 0
-node_nfsd_requests_total{method="Lockt",proto="v4"} 0
-node_nfsd_requests_total{method="Locku",proto="v4"} 0
-node_nfsd_requests_total{method="Lookup",proto="v2"} 4410
-node_nfsd_requests_total{method="Lookup",proto="v3"} 2719
-node_nfsd_requests_total{method="Lookup",proto="v4"} 5900
-node_nfsd_requests_total{method="LookupRoot",proto="v4"} 0
-node_nfsd_requests_total{method="MkDir",proto="v2"} 0
-node_nfsd_requests_total{method="MkDir",proto="v3"} 0
-node_nfsd_requests_total{method="MkNod",proto="v3"} 0
-node_nfsd_requests_total{method="Nverify",proto="v4"} 0
-node_nfsd_requests_total{method="Open",proto="v4"} 2
-node_nfsd_requests_total{method="OpenAttr",proto="v4"} 0
-node_nfsd_requests_total{method="OpenConfirm",proto="v4"} 2
-node_nfsd_requests_total{method="OpenDgrd",proto="v4"} 0
-node_nfsd_requests_total{method="PathConf",proto="v3"} 1
-node_nfsd_requests_total{method="PutFH",proto="v4"} 9609
-node_nfsd_requests_total{method="Read",proto="v2"} 0
-node_nfsd_requests_total{method="Read",proto="v3"} 0
-node_nfsd_requests_total{method="Read",proto="v4"} 150
-node_nfsd_requests_total{method="ReadDir",proto="v2"} 99
-node_nfsd_requests_total{method="ReadDir",proto="v3"} 27
-node_nfsd_requests_total{method="ReadDir",proto="v4"} 1272
-node_nfsd_requests_total{method="ReadDirPlus",proto="v3"} 216
-node_nfsd_requests_total{method="ReadLink",proto="v2"} 0
-node_nfsd_requests_total{method="ReadLink",proto="v3"} 0
-node_nfsd_requests_total{method="ReadLink",proto="v4"} 0
-node_nfsd_requests_total{method="RelLockOwner",proto="v4"} 0
-node_nfsd_requests_total{method="Remove",proto="v2"} 0
-node_nfsd_requests_total{method="Remove",proto="v3"} 0
-node_nfsd_requests_total{method="Remove",proto="v4"} 0
-node_nfsd_requests_total{method="Rename",proto="v2"} 0
-node_nfsd_requests_total{method="Rename",proto="v3"} 0
-node_nfsd_requests_total{method="Rename",proto="v4"} 0
-node_nfsd_requests_total{method="Renew",proto="v4"} 1236
-node_nfsd_requests_total{method="RestoreFH",proto="v4"} 0
-node_nfsd_requests_total{method="RmDir",proto="v2"} 0
-node_nfsd_requests_total{method="RmDir",proto="v3"} 0
-node_nfsd_requests_total{method="Root",proto="v2"} 0
-node_nfsd_requests_total{method="SaveFH",proto="v4"} 0
-node_nfsd_requests_total{method="SecInfo",proto="v4"} 0
-node_nfsd_requests_total{method="SetAttr",proto="v2"} 0
-node_nfsd_requests_total{method="SetAttr",proto="v3"} 0
-node_nfsd_requests_total{method="SetAttr",proto="v4"} 0
-node_nfsd_requests_total{method="SymLink",proto="v2"} 0
-node_nfsd_requests_total{method="SymLink",proto="v3"} 0
-node_nfsd_requests_total{method="Verify",proto="v4"} 3
-node_nfsd_requests_total{method="WrCache",proto="v2"} 0
-node_nfsd_requests_total{method="Write",proto="v2"} 0
-node_nfsd_requests_total{method="Write",proto="v3"} 0
-node_nfsd_requests_total{method="Write",proto="v4"} 3
+node_nfsd_requests_total{method="Access",proto="3"} 111
+node_nfsd_requests_total{method="Access",proto="4"} 1098
+node_nfsd_requests_total{method="Close",proto="4"} 2
+node_nfsd_requests_total{method="Commit",proto="3"} 0
+node_nfsd_requests_total{method="Commit",proto="4"} 0
+node_nfsd_requests_total{method="Create",proto="2"} 0
+node_nfsd_requests_total{method="Create",proto="3"} 0
+node_nfsd_requests_total{method="Create",proto="4"} 0
+node_nfsd_requests_total{method="DelegPurge",proto="4"} 0
+node_nfsd_requests_total{method="DelegReturn",proto="4"} 0
+node_nfsd_requests_total{method="FsInfo",proto="3"} 2
+node_nfsd_requests_total{method="FsStat",proto="2"} 2
+node_nfsd_requests_total{method="FsStat",proto="3"} 0
+node_nfsd_requests_total{method="GetAttr",proto="2"} 69
+node_nfsd_requests_total{method="GetAttr",proto="3"} 112
+node_nfsd_requests_total{method="GetAttr",proto="4"} 8179
+node_nfsd_requests_total{method="GetFH",proto="4"} 5896
+node_nfsd_requests_total{method="Link",proto="2"} 0
+node_nfsd_requests_total{method="Link",proto="3"} 0
+node_nfsd_requests_total{method="Link",proto="4"} 0
+node_nfsd_requests_total{method="Lock",proto="4"} 0
+node_nfsd_requests_total{method="Lockt",proto="4"} 0
+node_nfsd_requests_total{method="Locku",proto="4"} 0
+node_nfsd_requests_total{method="Lookup",proto="2"} 4410
+node_nfsd_requests_total{method="Lookup",proto="3"} 2719
+node_nfsd_requests_total{method="Lookup",proto="4"} 5900
+node_nfsd_requests_total{method="LookupRoot",proto="4"} 0
+node_nfsd_requests_total{method="MkDir",proto="2"} 0
+node_nfsd_requests_total{method="MkDir",proto="3"} 0
+node_nfsd_requests_total{method="MkNod",proto="3"} 0
+node_nfsd_requests_total{method="Nverify",proto="4"} 0
+node_nfsd_requests_total{method="Open",proto="4"} 2
+node_nfsd_requests_total{method="OpenAttr",proto="4"} 0
+node_nfsd_requests_total{method="OpenConfirm",proto="4"} 2
+node_nfsd_requests_total{method="OpenDgrd",proto="4"} 0
+node_nfsd_requests_total{method="PathConf",proto="3"} 1
+node_nfsd_requests_total{method="PutFH",proto="4"} 9609
+node_nfsd_requests_total{method="Read",proto="2"} 0
+node_nfsd_requests_total{method="Read",proto="3"} 0
+node_nfsd_requests_total{method="Read",proto="4"} 150
+node_nfsd_requests_total{method="ReadDir",proto="2"} 99
+node_nfsd_requests_total{method="ReadDir",proto="3"} 27
+node_nfsd_requests_total{method="ReadDir",proto="4"} 1272
+node_nfsd_requests_total{method="ReadDirPlus",proto="3"} 216
+node_nfsd_requests_total{method="ReadLink",proto="2"} 0
+node_nfsd_requests_total{method="ReadLink",proto="3"} 0
+node_nfsd_requests_total{method="ReadLink",proto="4"} 0
+node_nfsd_requests_total{method="RelLockOwner",proto="4"} 0
+node_nfsd_requests_total{method="Remove",proto="2"} 0
+node_nfsd_requests_total{method="Remove",proto="3"} 0
+node_nfsd_requests_total{method="Remove",proto="4"} 0
+node_nfsd_requests_total{method="Rename",proto="2"} 0
+node_nfsd_requests_total{method="Rename",proto="3"} 0
+node_nfsd_requests_total{method="Rename",proto="4"} 0
+node_nfsd_requests_total{method="Renew",proto="4"} 1236
+node_nfsd_requests_total{method="RestoreFH",proto="4"} 0
+node_nfsd_requests_total{method="RmDir",proto="2"} 0
+node_nfsd_requests_total{method="RmDir",proto="3"} 0
+node_nfsd_requests_total{method="Root",proto="2"} 0
+node_nfsd_requests_total{method="SaveFH",proto="4"} 0
+node_nfsd_requests_total{method="SecInfo",proto="4"} 0
+node_nfsd_requests_total{method="SetAttr",proto="2"} 0
+node_nfsd_requests_total{method="SetAttr",proto="3"} 0
+node_nfsd_requests_total{method="SetAttr",proto="4"} 0
+node_nfsd_requests_total{method="SymLink",proto="2"} 0
+node_nfsd_requests_total{method="SymLink",proto="3"} 0
+node_nfsd_requests_total{method="Verify",proto="4"} 3
+node_nfsd_requests_total{method="WrCache",proto="2"} 0
+node_nfsd_requests_total{method="Write",proto="2"} 0
+node_nfsd_requests_total{method="Write",proto="3"} 0
+node_nfsd_requests_total{method="Write",proto="4"} 3
 # HELP node_nfsd_rpc_errors_total Total number of NFSd RPC errors by error type.
 # TYPE node_nfsd_rpc_errors_total counter
 node_nfsd_rpc_errors_total{error="auth"} 2
diff --git a/collector/fixtures/e2e-ppc64le-output.txt b/collector/fixtures/e2e-ppc64le-output.txt
index 65df173..9edd081 100644
--- a/collector/fixtures/e2e-ppc64le-output.txt
+++ b/collector/fixtures/e2e-ppc64le-output.txt
@@ -2449,112 +2449,123 @@ node_nf_conntrack_entries 123
 # HELP node_nf_conntrack_entries_limit Maximum size of connection tracking table.
 # TYPE node_nf_conntrack_entries_limit gauge
 node_nf_conntrack_entries_limit 65536
-# HELP node_nfs_net_connections_total Number of connections at the network layer.
-# TYPE node_nfs_net_connections_total counter
-node_nfs_net_connections_total{protocol="tcp"} 45
-# HELP node_nfs_net_reads_total Number of reads at the network layer.
-# TYPE node_nfs_net_reads_total counter
-node_nfs_net_reads_total{protocol="tcp"} 69
-node_nfs_net_reads_total{protocol="udp"} 70
-# HELP node_nfs_procedures_total Number of NFS procedures invoked.
-# TYPE node_nfs_procedures_total counter
-node_nfs_procedures_total{procedure="access",version="3"} 1.17661341e+08
-node_nfs_procedures_total{procedure="access",version="4"} 58
-node_nfs_procedures_total{procedure="close",version="4"} 28
-node_nfs_procedures_total{procedure="commit",version="3"} 23729
-node_nfs_procedures_total{procedure="commit",version="4"} 83
-node_nfs_procedures_total{procedure="create",version="2"} 52
-node_nfs_procedures_total{procedure="create",version="3"} 2.993289e+06
-node_nfs_procedures_total{procedure="create",version="4"} 15
-node_nfs_procedures_total{procedure="create_session",version="4"} 32
-node_nfs_procedures_total{procedure="delegreturn",version="4"} 97
-node_nfs_procedures_total{procedure="destroy_session",version="4"} 67
-node_nfs_procedures_total{procedure="exchange_id",version="4"} 58
-node_nfs_procedures_total{procedure="fs_locations",version="4"} 32
-node_nfs_procedures_total{procedure="fsid_present",version="4"} 11
-node_nfs_procedures_total{procedure="fsinfo",version="3"} 2
-node_nfs_procedures_total{procedure="fsinfo",version="4"} 68
-node_nfs_procedures_total{procedure="fsstat",version="3"} 13332
-node_nfs_procedures_total{procedure="get_lease_time",version="4"} 28
-node_nfs_procedures_total{procedure="getacl",version="4"} 36
-node_nfs_procedures_total{procedure="getattr",version="2"} 57
-node_nfs_procedures_total{procedure="getattr",version="3"} 1.061909262e+09
-node_nfs_procedures_total{procedure="getattr",version="4"} 88
-node_nfs_procedures_total{procedure="getdeviceinfo",version="4"} 1
-node_nfs_procedures_total{procedure="layoutcommit",version="4"} 26
-node_nfs_procedures_total{procedure="layoutget",version="4"} 90
-node_nfs_procedures_total{procedure="layoutreturn",version="4"} 0
-node_nfs_procedures_total{procedure="link",version="2"} 17
-node_nfs_procedures_total{procedure="link",version="3"} 0
-node_nfs_procedures_total{procedure="link",version="4"} 21
-node_nfs_procedures_total{procedure="lock",version="4"} 39
-node_nfs_procedures_total{procedure="lockt",version="4"} 68
-node_nfs_procedures_total{procedure="locku",version="4"} 59
-node_nfs_procedures_total{procedure="lookup",version="2"} 71
-node_nfs_procedures_total{procedure="lookup",version="3"} 4.077635e+06
-node_nfs_procedures_total{procedure="lookup",version="4"} 29
-node_nfs_procedures_total{procedure="lookup_root",version="4"} 74
-node_nfs_procedures_total{procedure="mkdir",version="2"} 50
-node_nfs_procedures_total{procedure="mkdir",version="3"} 590
-node_nfs_procedures_total{procedure="mknod",version="3"} 0
-node_nfs_procedures_total{procedure="null",version="2"} 16
-node_nfs_procedures_total{procedure="null",version="3"} 0
-node_nfs_procedures_total{procedure="null",version="4"} 98
-node_nfs_procedures_total{procedure="open",version="4"} 85
-node_nfs_procedures_total{procedure="open_confirm",version="4"} 23
-node_nfs_procedures_total{procedure="open_downgrade",version="4"} 1
-node_nfs_procedures_total{procedure="open_noattr",version="4"} 24
-node_nfs_procedures_total{procedure="pathconf",version="3"} 1
-node_nfs_procedures_total{procedure="pathconf",version="4"} 53
-node_nfs_procedures_total{procedure="read",version="2"} 45
-node_nfs_procedures_total{procedure="read",version="3"} 2.9391916e+07
-node_nfs_procedures_total{procedure="read",version="4"} 51
-node_nfs_procedures_total{procedure="readdir",version="2"} 70
-node_nfs_procedures_total{procedure="readdir",version="3"} 3983
-node_nfs_procedures_total{procedure="readdir",version="4"} 66
-node_nfs_procedures_total{procedure="readdirplus",version="3"} 92385
-node_nfs_procedures_total{procedure="readlink",version="2"} 73
-node_nfs_procedures_total{procedure="readlink",version="3"} 5
-node_nfs_procedures_total{procedure="readlink",version="4"} 54
-node_nfs_procedures_total{procedure="reclaim_complete",version="4"} 35
-node_nfs_procedures_total{procedure="release_lockowner",version="4"} 85
-node_nfs_procedures_total{procedure="remove",version="2"} 83
-node_nfs_procedures_total{procedure="remove",version="3"} 7815
-node_nfs_procedures_total{procedure="remove",version="4"} 69
-node_nfs_procedures_total{procedure="rename",version="2"} 61
-node_nfs_procedures_total{procedure="rename",version="3"} 1130
-node_nfs_procedures_total{procedure="rename",version="4"} 96
-node_nfs_procedures_total{procedure="renew",version="4"} 83
-node_nfs_procedures_total{procedure="rmdir",version="2"} 23
-node_nfs_procedures_total{procedure="rmdir",version="3"} 15
-node_nfs_procedures_total{procedure="root",version="2"} 52
-node_nfs_procedures_total{procedure="secinfo",version="4"} 81
-node_nfs_procedures_total{procedure="sequence",version="4"} 13
-node_nfs_procedures_total{procedure="server_caps",version="4"} 56
-node_nfs_procedures_total{procedure="setacl",version="4"} 49
-node_nfs_procedures_total{procedure="setattr",version="2"} 74
-node_nfs_procedures_total{procedure="setattr",version="3"} 48906
-node_nfs_procedures_total{procedure="setattr",version="4"} 73
-node_nfs_procedures_total{procedure="setclientid",version="4"} 12
-node_nfs_procedures_total{procedure="setclientid_confirm",version="4"} 84
-node_nfs_procedures_total{procedure="statfs",version="2"} 82
-node_nfs_procedures_total{procedure="statfs",version="4"} 86
-node_nfs_procedures_total{procedure="symlink",version="2"} 53
-node_nfs_procedures_total{procedure="symlink",version="3"} 0
-node_nfs_procedures_total{procedure="symlink",version="4"} 84
-node_nfs_procedures_total{procedure="write",version="2"} 0
-node_nfs_procedures_total{procedure="write",version="3"} 2.570425e+06
-node_nfs_procedures_total{procedure="write",version="4"} 54
-node_nfs_procedures_total{procedure="writecache",version="2"} 86
+# HELP node_nfs_connections_total Total number of NFSd TCP connections.
+# TYPE node_nfs_connections_total counter
+node_nfs_connections_total 45
+# HELP node_nfs_packets_total Total NFSd network packets (sent+received) by protocol type.
+# TYPE node_nfs_packets_total counter
+node_nfs_packets_total{protocol="tcp"} 69
+node_nfs_packets_total{protocol="udp"} 70
+# HELP node_nfs_requests_total Number of NFS procedures invoked.
+# TYPE node_nfs_requests_total counter
+node_nfs_requests_total{method="Access",proto="3"} 1.17661341e+08
+node_nfs_requests_total{method="Access",proto="4"} 58
+node_nfs_requests_total{method="Allocate",proto="4"} 0
+node_nfs_requests_total{method="BindConnToSession",proto="4"} 0
+node_nfs_requests_total{method="Clone",proto="4"} 0
+node_nfs_requests_total{method="Close",proto="4"} 28
+node_nfs_requests_total{method="Commit",proto="3"} 23729
+node_nfs_requests_total{method="Commit",proto="4"} 83
+node_nfs_requests_total{method="Create",proto="2"} 52
+node_nfs_requests_total{method="Create",proto="3"} 2.993289e+06
+node_nfs_requests_total{method="Create",proto="4"} 15
+node_nfs_requests_total{method="CreateSession",proto="4"} 32
+node_nfs_requests_total{method="DeAllocate",proto="4"} 0
+node_nfs_requests_total{method="DelegReturn",proto="4"} 97
+node_nfs_requests_total{method="DestroyClientId",proto="4"} 0
+node_nfs_requests_total{method="DestroySession",proto="4"} 67
+node_nfs_requests_total{method="ExchangeId",proto="4"} 58
+node_nfs_requests_total{method="FreeStateId",proto="4"} 0
+node_nfs_requests_total{method="FsInfo",proto="3"} 2
+node_nfs_requests_total{method="FsInfo",proto="4"} 68
+node_nfs_requests_total{method="FsLocations",proto="4"} 32
+node_nfs_requests_total{method="FsStat",proto="2"} 82
+node_nfs_requests_total{method="FsStat",proto="3"} 13332
+node_nfs_requests_total{method="FsidPresent",proto="4"} 11
+node_nfs_requests_total{method="GetAcl",proto="4"} 36
+node_nfs_requests_total{method="GetAttr",proto="2"} 57
+node_nfs_requests_total{method="GetAttr",proto="3"} 1.061909262e+09
+node_nfs_requests_total{method="GetDeviceInfo",proto="4"} 1
+node_nfs_requests_total{method="GetDeviceList",proto="4"} 0
+node_nfs_requests_total{method="GetLeaseTime",proto="4"} 28
+node_nfs_requests_total{method="Getattr",proto="4"} 88
+node_nfs_requests_total{method="LayoutCommit",proto="4"} 26
+node_nfs_requests_total{method="LayoutGet",proto="4"} 90
+node_nfs_requests_total{method="LayoutReturn",proto="4"} 0
+node_nfs_requests_total{method="LayoutStats",proto="4"} 0
+node_nfs_requests_total{method="Link",proto="2"} 17
+node_nfs_requests_total{method="Link",proto="3"} 0
+node_nfs_requests_total{method="Link",proto="4"} 21
+node_nfs_requests_total{method="Lock",proto="4"} 39
+node_nfs_requests_total{method="Lockt",proto="4"} 68
+node_nfs_requests_total{method="Locku",proto="4"} 59
+node_nfs_requests_total{method="Lookup",proto="2"} 71
+node_nfs_requests_total{method="Lookup",proto="3"} 4.077635e+06
+node_nfs_requests_total{method="Lookup",proto="4"} 29
+node_nfs_requests_total{method="LookupRoot",proto="4"} 74
+node_nfs_requests_total{method="MkDir",proto="2"} 50
+node_nfs_requests_total{method="MkDir",proto="3"} 590
+node_nfs_requests_total{method="MkNod",proto="3"} 0
+node_nfs_requests_total{method="Null",proto="2"} 16
+node_nfs_requests_total{method="Null",proto="3"} 0
+node_nfs_requests_total{method="Null",proto="4"} 98
+node_nfs_requests_total{method="Open",proto="4"} 85
+node_nfs_requests_total{method="OpenConfirm",proto="4"} 23
+node_nfs_requests_total{method="OpenDowngrade",proto="4"} 1
+node_nfs_requests_total{method="OpenNoattr",proto="4"} 24
+node_nfs_requests_total{method="PathConf",proto="3"} 1
+node_nfs_requests_total{method="Pathconf",proto="4"} 53
+node_nfs_requests_total{method="Read",proto="2"} 45
+node_nfs_requests_total{method="Read",proto="3"} 2.9391916e+07
+node_nfs_requests_total{method="Read",proto="4"} 51
+node_nfs_requests_total{method="ReadDir",proto="2"} 70
+node_nfs_requests_total{method="ReadDir",proto="3"} 3983
+node_nfs_requests_total{method="ReadDir",proto="4"} 66
+node_nfs_requests_total{method="ReadDirPlus",proto="3"} 92385
+node_nfs_requests_total{method="ReadLink",proto="2"} 73
+node_nfs_requests_total{method="ReadLink",proto="3"} 5
+node_nfs_requests_total{method="ReadLink",proto="4"} 54
+node_nfs_requests_total{method="ReclaimComplete",proto="4"} 35
+node_nfs_requests_total{method="ReleaseLockowner",proto="4"} 85
+node_nfs_requests_total{method="Remove",proto="2"} 83
+node_nfs_requests_total{method="Remove",proto="3"} 7815
+node_nfs_requests_total{method="Remove",proto="4"} 69
+node_nfs_requests_total{method="Rename",proto="2"} 61
+node_nfs_requests_total{method="Rename",proto="3"} 1130
+node_nfs_requests_total{method="Rename",proto="4"} 96
+node_nfs_requests_total{method="Renew",proto="4"} 83
+node_nfs_requests_total{method="RmDir",proto="2"} 23
+node_nfs_requests_total{method="RmDir",proto="3"} 15
+node_nfs_requests_total{method="Root",proto="2"} 52
+node_nfs_requests_total{method="Secinfo",proto="4"} 81
+node_nfs_requests_total{method="SecinfoNoName",proto="4"} 0
+node_nfs_requests_total{method="Seek",proto="4"} 0
+node_nfs_requests_total{method="Sequence",proto="4"} 13
+node_nfs_requests_total{method="ServerCaps",proto="4"} 56
+node_nfs_requests_total{method="SetAcl",proto="4"} 49
+node_nfs_requests_total{method="SetAttr",proto="2"} 74
+node_nfs_requests_total{method="SetAttr",proto="3"} 48906
+node_nfs_requests_total{method="SetClientId",proto="4"} 12
+node_nfs_requests_total{method="SetClientIdConfirm",proto="4"} 84
+node_nfs_requests_total{method="Setattr",proto="4"} 73
+node_nfs_requests_total{method="StatFs",proto="4"} 86
+node_nfs_requests_total{method="SymLink",proto="2"} 53
+node_nfs_requests_total{method="SymLink",proto="3"} 0
+node_nfs_requests_total{method="Symlink",proto="4"} 84
+node_nfs_requests_total{method="TestStateId",proto="4"} 0
+node_nfs_requests_total{method="WrCache",proto="2"} 86
+node_nfs_requests_total{method="Write",proto="2"} 0
+node_nfs_requests_total{method="Write",proto="3"} 2.570425e+06
+node_nfs_requests_total{method="Write",proto="4"} 54
 # HELP node_nfs_rpc_authentication_refreshes_total Number of RPC authentication refreshes performed.
 # TYPE node_nfs_rpc_authentication_refreshes_total counter
 node_nfs_rpc_authentication_refreshes_total 1.218815394e+09
-# HELP node_nfs_rpc_operations_total Number of RPCs performed.
-# TYPE node_nfs_rpc_operations_total counter
-node_nfs_rpc_operations_total 1.218785755e+09
 # HELP node_nfs_rpc_retransmissions_total Number of RPC transmissions performed.
 # TYPE node_nfs_rpc_retransmissions_total counter
 node_nfs_rpc_retransmissions_total 374636
+# HELP node_nfs_rpcs_total Total number of RPCs performed.
+# TYPE node_nfs_rpcs_total counter
+node_nfs_rpcs_total 1.218785755e+09
 # HELP node_nfsd_connections_total Total number of NFSd TCP connections.
 # TYPE node_nfsd_connections_total counter
 node_nfsd_connections_total 1
@@ -2567,7 +2578,7 @@ node_nfsd_disk_bytes_written_total 72864
 # HELP node_nfsd_file_handles_stale_total Total number of NFSd stale file handles
 # TYPE node_nfsd_file_handles_stale_total counter
 node_nfsd_file_handles_stale_total 0
-# HELP node_nfsd_packets_total Total NFSd network packets (sent+recieved) by protocol type.
+# HELP node_nfsd_packets_total Total NFSd network packets (sent+received) by protocol type.
 # TYPE node_nfsd_packets_total counter
 node_nfsd_packets_total{proto="tcp"} 917
 node_nfsd_packets_total{proto="udp"} 55
@@ -2588,77 +2599,77 @@ node_nfsd_reply_cache_misses_total 6
 node_nfsd_reply_cache_nocache_total 18622
 # HELP node_nfsd_requests_total Total number NFSd Requests by method and protocol.
 # TYPE node_nfsd_requests_total counter
-node_nfsd_requests_total{method="Access",proto="v3"} 111
-node_nfsd_requests_total{method="Access",proto="v4"} 1098
-node_nfsd_requests_total{method="Close",proto="v4"} 2
-node_nfsd_requests_total{method="Commit",proto="v3"} 0
-node_nfsd_requests_total{method="Commit",proto="v4"} 0
-node_nfsd_requests_total{method="Create",proto="v2"} 0
-node_nfsd_requests_total{method="Create",proto="v3"} 0
-node_nfsd_requests_total{method="Create",proto="v4"} 0
-node_nfsd_requests_total{method="DelegPurge",proto="v4"} 0
-node_nfsd_requests_total{method="DelegReturn",proto="v4"} 0
-node_nfsd_requests_total{method="FsInfo",proto="v3"} 2
-node_nfsd_requests_total{method="FsStat",proto="v2"} 2
-node_nfsd_requests_total{method="FsStat",proto="v3"} 0
-node_nfsd_requests_total{method="GetAttr",proto="v2"} 69
-node_nfsd_requests_total{method="GetAttr",proto="v3"} 112
-node_nfsd_requests_total{method="GetAttr",proto="v4"} 8179
-node_nfsd_requests_total{method="GetFH",proto="v4"} 5896
-node_nfsd_requests_total{method="Link",proto="v2"} 0
-node_nfsd_requests_total{method="Link",proto="v3"} 0
-node_nfsd_requests_total{method="Link",proto="v4"} 0
-node_nfsd_requests_total{method="Lock",proto="v4"} 0
-node_nfsd_requests_total{method="Lockt",proto="v4"} 0
-node_nfsd_requests_total{method="Locku",proto="v4"} 0
-node_nfsd_requests_total{method="Lookup",proto="v2"} 4410
-node_nfsd_requests_total{method="Lookup",proto="v3"} 2719
-node_nfsd_requests_total{method="Lookup",proto="v4"} 5900
-node_nfsd_requests_total{method="LookupRoot",proto="v4"} 0
-node_nfsd_requests_total{method="MkDir",proto="v2"} 0
-node_nfsd_requests_total{method="MkDir",proto="v3"} 0
-node_nfsd_requests_total{method="MkNod",proto="v3"} 0
-node_nfsd_requests_total{method="Nverify",proto="v4"} 0
-node_nfsd_requests_total{method="Open",proto="v4"} 2
-node_nfsd_requests_total{method="OpenAttr",proto="v4"} 0
-node_nfsd_requests_total{method="OpenConfirm",proto="v4"} 2
-node_nfsd_requests_total{method="OpenDgrd",proto="v4"} 0
-node_nfsd_requests_total{method="PathConf",proto="v3"} 1
-node_nfsd_requests_total{method="PutFH",proto="v4"} 9609
-node_nfsd_requests_total{method="Read",proto="v2"} 0
-node_nfsd_requests_total{method="Read",proto="v3"} 0
-node_nfsd_requests_total{method="Read",proto="v4"} 150
-node_nfsd_requests_total{method="ReadDir",proto="v2"} 99
-node_nfsd_requests_total{method="ReadDir",proto="v3"} 27
-node_nfsd_requests_total{method="ReadDir",proto="v4"} 1272
-node_nfsd_requests_total{method="ReadDirPlus",proto="v3"} 216
-node_nfsd_requests_total{method="ReadLink",proto="v2"} 0
-node_nfsd_requests_total{method="ReadLink",proto="v3"} 0
-node_nfsd_requests_total{method="ReadLink",proto="v4"} 0
-node_nfsd_requests_total{method="RelLockOwner",proto="v4"} 0
-node_nfsd_requests_total{method="Remove",proto="v2"} 0
-node_nfsd_requests_total{method="Remove",proto="v3"} 0
-node_nfsd_requests_total{method="Remove",proto="v4"} 0
-node_nfsd_requests_total{method="Rename",proto="v2"} 0
-node_nfsd_requests_total{method="Rename",proto="v3"} 0
-node_nfsd_requests_total{method="Rename",proto="v4"} 0
-node_nfsd_requests_total{method="Renew",proto="v4"} 1236
-node_nfsd_requests_total{method="RestoreFH",proto="v4"} 0
-node_nfsd_requests_total{method="RmDir",proto="v2"} 0
-node_nfsd_requests_total{method="RmDir",proto="v3"} 0
-node_nfsd_requests_total{method="Root",proto="v2"} 0
-node_nfsd_requests_total{method="SaveFH",proto="v4"} 0
-node_nfsd_requests_total{method="SecInfo",proto="v4"} 0
-node_nfsd_requests_total{method="SetAttr",proto="v2"} 0
-node_nfsd_requests_total{method="SetAttr",proto="v3"} 0
-node_nfsd_requests_total{method="SetAttr",proto="v4"} 0
-node_nfsd_requests_total{method="SymLink",proto="v2"} 0
-node_nfsd_requests_total{method="SymLink",proto="v3"} 0
-node_nfsd_requests_total{method="Verify",proto="v4"} 3
-node_nfsd_requests_total{method="WrCache",proto="v2"} 0
-node_nfsd_requests_total{method="Write",proto="v2"} 0
-node_nfsd_requests_total{method="Write",proto="v3"} 0
-node_nfsd_requests_total{method="Write",proto="v4"} 3
+node_nfsd_requests_total{method="Access",proto="3"} 111
+node_nfsd_requests_total{method="Access",proto="4"} 1098
+node_nfsd_requests_total{method="Close",proto="4"} 2
+node_nfsd_requests_total{method="Commit",proto="3"} 0
+node_nfsd_requests_total{method="Commit",proto="4"} 0
+node_nfsd_requests_total{method="Create",proto="2"} 0
+node_nfsd_requests_total{method="Create",proto="3"} 0
+node_nfsd_requests_total{method="Create",proto="4"} 0
+node_nfsd_requests_total{method="DelegPurge",proto="4"} 0
+node_nfsd_requests_total{method="DelegReturn",proto="4"} 0
+node_nfsd_requests_total{method="FsInfo",proto="3"} 2
+node_nfsd_requests_total{method="FsStat",proto="2"} 2
+node_nfsd_requests_total{method="FsStat",proto="3"} 0
+node_nfsd_requests_total{method="GetAttr",proto="2"} 69
+node_nfsd_requests_total{method="GetAttr",proto="3"} 112
+node_nfsd_requests_total{method="GetAttr",proto="4"} 8179
+node_nfsd_requests_total{method="GetFH",proto="4"} 5896
+node_nfsd_requests_total{method="Link",proto="2"} 0
+node_nfsd_requests_total{method="Link",proto="3"} 0
+node_nfsd_requests_total{method="Link",proto="4"} 0
+node_nfsd_requests_total{method="Lock",proto="4"} 0
+node_nfsd_requests_total{method="Lockt",proto="4"} 0
+node_nfsd_requests_total{method="Locku",proto="4"} 0
+node_nfsd_requests_total{method="Lookup",proto="2"} 4410
+node_nfsd_requests_total{method="Lookup",proto="3"} 2719
+node_nfsd_requests_total{method="Lookup",proto="4"} 5900
+node_nfsd_requests_total{method="LookupRoot",proto="4"} 0
+node_nfsd_requests_total{method="MkDir",proto="2"} 0
+node_nfsd_requests_total{method="MkDir",proto="3"} 0
+node_nfsd_requests_total{method="MkNod",proto="3"} 0
+node_nfsd_requests_total{method="Nverify",proto="4"} 0
+node_nfsd_requests_total{method="Open",proto="4"} 2
+node_nfsd_requests_total{method="OpenAttr",proto="4"} 0
+node_nfsd_requests_total{method="OpenConfirm",proto="4"} 2
+node_nfsd_requests_total{method="OpenDgrd",proto="4"} 0
+node_nfsd_requests_total{method="PathConf",proto="3"} 1
+node_nfsd_requests_total{method="PutFH",proto="4"} 9609
+node_nfsd_requests_total{method="Read",proto="2"} 0
+node_nfsd_requests_total{method="Read",proto="3"} 0
+node_nfsd_requests_total{method="Read",proto="4"} 150
+node_nfsd_requests_total{method="ReadDir",proto="2"} 99
+node_nfsd_requests_total{method="ReadDir",proto="3"} 27
+node_nfsd_requests_total{method="ReadDir",proto="4"} 1272
+node_nfsd_requests_total{method="ReadDirPlus",proto="3"} 216
+node_nfsd_requests_total{method="ReadLink",proto="2"} 0
+node_nfsd_requests_total{method="ReadLink",proto="3"} 0
+node_nfsd_requests_total{method="ReadLink",proto="4"} 0
+node_nfsd_requests_total{method="RelLockOwner",proto="4"} 0
+node_nfsd_requests_total{method="Remove",proto="2"} 0
+node_nfsd_requests_total{method="Remove",proto="3"} 0
+node_nfsd_requests_total{method="Remove",proto="4"} 0
+node_nfsd_requests_total{method="Rename",proto="2"} 0
+node_nfsd_requests_total{method="Rename",proto="3"} 0
+node_nfsd_requests_total{method="Rename",proto="4"} 0
+node_nfsd_requests_total{method="Renew",proto="4"} 1236
+node_nfsd_requests_total{method="RestoreFH",proto="4"} 0
+node_nfsd_requests_total{method="RmDir",proto="2"} 0
+node_nfsd_requests_total{method="RmDir",proto="3"} 0
+node_nfsd_requests_total{method="Root",proto="2"} 0
+node_nfsd_requests_total{method="SaveFH",proto="4"} 0
+node_nfsd_requests_total{method="SecInfo",proto="4"} 0
+node_nfsd_requests_total{method="SetAttr",proto="2"} 0
+node_nfsd_requests_total{method="SetAttr",proto="3"} 0
+node_nfsd_requests_total{method="SetAttr",proto="4"} 0
+node_nfsd_requests_total{method="SymLink",proto="2"} 0
+node_nfsd_requests_total{method="SymLink",proto="3"} 0
+node_nfsd_requests_total{method="Verify",proto="4"} 3
+node_nfsd_requests_total{method="WrCache",proto="2"} 0
+node_nfsd_requests_total{method="Write",proto="2"} 0
+node_nfsd_requests_total{method="Write",proto="3"} 0
+node_nfsd_requests_total{method="Write",proto="4"} 3
 # HELP node_nfsd_rpc_errors_total Total number of NFSd RPC errors by error type.
 # TYPE node_nfsd_rpc_errors_total counter
 node_nfsd_rpc_errors_total{error="auth"} 2
diff --git a/collector/nfs_linux.go b/collector/nfs_linux.go
index 9f6cf29..074a8c2 100644
--- a/collector/nfs_linux.go
+++ b/collector/nfs_linux.go
@@ -17,7 +17,6 @@ import (
         "fmt"
         "os"
         "reflect"
-        "strings"
 
         "github.com/prometheus/client_golang/prometheus"
         "github.com/prometheus/common/log"
@@ -53,20 +52,20 @@ func NewNfsCollector() (Collector, error) {
         return &nfsCollector{
                 fs: fs,
                 nfsNetReadsDesc: prometheus.NewDesc(
-                        prometheus.BuildFQName(namespace, nfsSubsystem, "net_reads_total"),
-                        "Number of reads at the network layer.",
+                        prometheus.BuildFQName(namespace, nfsSubsystem, "packets_total"),
+                        "Total NFSd network packets (sent+received) by protocol type.",
                         []string{"protocol"},
                         nil,
                 ),
                 nfsNetConnectionsDesc: prometheus.NewDesc(
-                        prometheus.BuildFQName(namespace, nfsSubsystem, "net_connections_total"),
-                        "Number of connections at the network layer.",
-                        []string{"protocol"},
+                        prometheus.BuildFQName(namespace, nfsSubsystem, "connections_total"),
+                        "Total number of NFSd TCP connections.",
+                        nil,
                         nil,
                 ),
                 nfsRPCOperationsDesc: prometheus.NewDesc(
-                        prometheus.BuildFQName(namespace, nfsSubsystem, "rpc_operations_total"),
-                        "Number of RPCs performed.",
+                        prometheus.BuildFQName(namespace, nfsSubsystem, "rpcs_total"),
+                        "Total number of RPCs performed.",
                         nil,
                         nil,
                 ),
@@ -83,9 +82,9 @@ func NewNfsCollector() (Collector, error) {
                         nil,
                 ),
                 nfsProceduresDesc: prometheus.NewDesc(
-                        prometheus.BuildFQName(namespace, "nfs", "procedures_total"),
+                        prometheus.BuildFQName(namespace, nfsSubsystem, "requests_total"),
                         "Number of NFS procedures invoked.",
-                        []string{"version", "procedure"},
+                        []string{"proto", "method"},
                         nil,
                 ),
         }, nil
@@ -117,7 +116,7 @@ func (c *nfsCollector) updateNFSNetworkStats(ch chan<- prometheus.Metric, s *nfs
         ch <- prometheus.MustNewConstMetric(c.nfsNetReadsDesc, prometheus.CounterValue,
                 float64(s.TCPCount), "tcp")
         ch <- prometheus.MustNewConstMetric(c.nfsNetConnectionsDesc, prometheus.CounterValue,
-                float64(s.TCPConnect), "tcp")
+                float64(s.TCPConnect))
 }
 
 // updateNFSClientRPCStats collects statistics for kernel server RPCs.
@@ -137,17 +136,9 @@ func (c *nfsCollector) updateNFSRequestsv2Stats(ch chan<- prometheus.Metric, s *
         v := reflect.ValueOf(s).Elem()
         for i := 0; i < v.NumField(); i++ {
                 field := v.Field(i)
-                name := strings.ToLower(v.Type().Field(i).Name)
-
-                switch name {
-                case "wrcache":
-                        name = "writecache"
-                case "fsstat":
-                        name = "statfs"
-                }
 
                 ch <- prometheus.MustNewConstMetric(c.nfsProceduresDesc, prometheus.CounterValue,
-                        float64(field.Uint()), proto, name)
+                        float64(field.Uint()), proto, v.Type().Field(i).Name)
         }
 }
 
@@ -158,10 +149,9 @@ func (c *nfsCollector) updateNFSRequestsv3Stats(ch chan<- prometheus.Metric, s *
         v := reflect.ValueOf(s).Elem()
         for i := 0; i < v.NumField(); i++ {
                 field := v.Field(i)
-                name := strings.ToLower(v.Type().Field(i).Name)
 
                 ch <- prometheus.MustNewConstMetric(c.nfsProceduresDesc, prometheus.CounterValue,
-                        float64(field.Uint()), proto, name)
+                        float64(field.Uint()), proto, v.Type().Field(i).Name)
         }
 }
 
@@ -172,43 +162,8 @@ func (c *nfsCollector) updateNFSRequestsv4Stats(ch chan<- prometheus.Metric, s *
         v := reflect.ValueOf(s).Elem()
         for i := 0; i < v.NumField(); i++ {
                 field := v.Field(i)
-                name := strings.ToLower(v.Type().Field(i).Name)
-
-                switch name {
-                case "openconfirm":
-                        name = "open_confirm"
-                case "opendowngrade":
-                        name = "open_downgrade"
-                case "opennoattr":
-                        name = "open_noattr"
-                case "setclientidconfirm":
-                        name = "setclientid_confirm"
-                case "lookuproot":
-                        name = "lookup_root"
-                case "servercaps":
-                        name = "server_caps"
-                case "fslocations":
-                        name = "fs_locations"
-                case "releaselockowner":
-                        name = "release_lockowner"
-                case "fsidpresent":
-                        name = "fsid_present"
-                case "exchangeid":
-                        name = "exchange_id"
-                case "createsession":
-                        name = "create_session"
-                case "destroysession":
-                        name = "destroy_session"
-                case "getleasetime":
-                        name = "get_lease_time"
-                case "reclaimcomplete":
-                        name = "reclaim_complete"
-                // TODO: Enable these metrics
-                case "secinfononame", "teststateid", "freestateid", "getdevicelist", "bindconntosession", "destroyclientid", "seek", "allocate", "deallocate", "layoutstats", "clone":
-                        continue
-                }
 
                 ch <- prometheus.MustNewConstMetric(c.nfsProceduresDesc, prometheus.CounterValue,
-                        float64(field.Uint()), proto, name)
+                        float64(field.Uint()), proto, v.Type().Field(i).Name)
         }
 }
diff --git a/collector/nfsd_linux.go b/collector/nfsd_linux.go
index d1d28c2..fd2be58 100644
--- a/collector/nfsd_linux.go
+++ b/collector/nfsd_linux.go
@@ -186,7 +186,7 @@ func (c *nfsdCollector) updateNFSdReadAheadCacheStats(ch chan<- prometheus.Metri
 func (c *nfsdCollector) updateNFSdNetworkStats(ch chan<- prometheus.Metric, s *nfs.Network) {
         packetDesc := prometheus.NewDesc(
                 prometheus.BuildFQName(namespace, nfsdSubsystem, "packets_total"),
-                "Total NFSd network packets (sent+recieved) by protocol type.",
+                "Total NFSd network packets (sent+received) by protocol type.",
                 []string{"proto"},
                 nil,
         )
@@ -242,7 +242,7 @@ func (c *nfsdCollector) updateNFSdServerRPCStats(ch chan<- prometheus.Metric, s
 
 // updateNFSdRequestsv2Stats collects statistics for NFSv2 requests.
 func (c *nfsdCollector) updateNFSdRequestsv2Stats(ch chan<- prometheus.Metric, s *nfs.V2Stats) {
-        const proto = "v2"
+        const proto = "2"
         ch <- prometheus.MustNewConstMetric(c.requestsDesc, prometheus.CounterValue,
                 float64(s.GetAttr), proto, "GetAttr")
         ch <- prometheus.MustNewConstMetric(c.requestsDesc, prometheus.CounterValue,
@@ -281,7 +281,7 @@ func (c *nfsdCollector) updateNFSdRequestsv2Stats(ch chan<- prometheus.Metric, s
 
 // updateNFSdRequestsv3Stats collects statistics for NFSv3 requests.
 func (c *nfsdCollector) updateNFSdRequestsv3Stats(ch chan<- prometheus.Metric, s *nfs.V3Stats) {
-        const proto = "v3"
+        const proto = "3"
         ch <- prometheus.MustNewConstMetric(c.requestsDesc, prometheus.CounterValue,
                 float64(s.GetAttr), proto, "GetAttr")
         ch <- prometheus.MustNewConstMetric(c.requestsDesc, prometheus.CounterValue,
@@ -328,7 +328,7 @@ func (c *nfsdCollector) updateNFSdRequestsv3Stats(ch chan<- prometheus.Metric, s
 
 // updateNFSdRequestsv4Stats collects statistics for NFSv4 requests.
 func (c *nfsdCollector) updateNFSdRequestsv4Stats(ch chan<- prometheus.Metric, s *nfs.V4Ops) {
-        const proto = "v4"
+        const proto = "4"
         ch <- prometheus.MustNewConstMetric(c.requestsDesc, prometheus.CounterValue,
                 float64(s.Access), proto, "Access")
         ch <- prometheus.MustNewConstMetric(c.requestsDesc, prometheus.CounterValue,