From 544488ddd6e279d609d460a47c6f487314f30ea7 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 12 Feb 2018 12:53:31 -0500 Subject: [PATCH] Fix remaining metric naming issues (#799) --- collector/bcache_linux.go | 2 +- collector/buddyinfo.go | 2 +- collector/fixtures/e2e-output.txt | 288 +++++++++++----------- collector/fixtures/e2e-ppc64le-output.txt | 288 +++++++++++----------- collector/nfs_linux.go | 12 +- 5 files changed, 296 insertions(+), 296 deletions(-) diff --git a/collector/bcache_linux.go b/collector/bcache_linux.go index 33d48df8..800a030c 100644 --- a/collector/bcache_linux.go +++ b/collector/bcache_linux.go @@ -204,7 +204,7 @@ func (c *bcacheCollector) updateBcacheStats(ch chan<- prometheus.Metric, s *bcac metricType: prometheus.GaugeValue, }, { - name: "cache_read_races", + name: "cache_read_races_total", desc: "Counts instances where while data was being read from the cache, the bucket was reused and invalidated - i.e. where the pointer was stale after the read completed.", value: float64(s.Bcache.Internal.CacheReadRaces), metricType: prometheus.CounterValue, diff --git a/collector/buddyinfo.go b/collector/buddyinfo.go index ca99b983..72e5f207 100644 --- a/collector/buddyinfo.go +++ b/collector/buddyinfo.go @@ -40,7 +40,7 @@ func init() { // NewBuddyinfoCollector returns a new Collector exposing buddyinfo stats. func NewBuddyinfoCollector() (Collector, error) { desc := prometheus.NewDesc( - prometheus.BuildFQName(namespace, buddyInfoSubsystem, "count"), + prometheus.BuildFQName(namespace, buddyInfoSubsystem, "blocks"), "Count of free blocks according to size.", []string{"node", "zone", "size"}, nil, ) diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index 34625d07..cb1cbc67 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -115,9 +115,9 @@ node_bcache_cache_miss_collisions_total{backing_device="bdev0",uuid="deaddd54-c7 # HELP node_bcache_cache_misses_total Misses counted per individual IO as bcache sees them. # TYPE node_bcache_cache_misses_total counter node_bcache_cache_misses_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 -# HELP node_bcache_cache_read_races Counts instances where while data was being read from the cache, the bucket was reused and invalidated - i.e. where the pointer was stale after the read completed. -# TYPE node_bcache_cache_read_races counter -node_bcache_cache_read_races{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 +# HELP node_bcache_cache_read_races_total Counts instances where while data was being read from the cache, the bucket was reused and invalidated - i.e. where the pointer was stale after the read completed. +# TYPE node_bcache_cache_read_races_total counter +node_bcache_cache_read_races_total{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 # HELP node_bcache_cache_readaheads_total Count of times readahead occurred. # TYPE node_bcache_cache_readaheads_total counter node_bcache_cache_readaheads_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 @@ -161,41 +161,41 @@ node_bonding_slaves{master="int"} 2 # HELP node_boot_time_seconds Node boot time, in unixtime. # TYPE node_boot_time_seconds gauge node_boot_time_seconds 1.418183276e+09 -# HELP node_buddyinfo_count Count of free blocks according to size. -# TYPE node_buddyinfo_count gauge -node_buddyinfo_count{node="0",size="0",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="0",zone="DMA32"} 759 -node_buddyinfo_count{node="0",size="0",zone="Normal"} 4381 -node_buddyinfo_count{node="0",size="1",zone="DMA"} 0 -node_buddyinfo_count{node="0",size="1",zone="DMA32"} 572 -node_buddyinfo_count{node="0",size="1",zone="Normal"} 1093 -node_buddyinfo_count{node="0",size="10",zone="DMA"} 3 -node_buddyinfo_count{node="0",size="10",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="10",zone="Normal"} 0 -node_buddyinfo_count{node="0",size="2",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="2",zone="DMA32"} 791 -node_buddyinfo_count{node="0",size="2",zone="Normal"} 185 -node_buddyinfo_count{node="0",size="3",zone="DMA"} 0 -node_buddyinfo_count{node="0",size="3",zone="DMA32"} 475 -node_buddyinfo_count{node="0",size="3",zone="Normal"} 1530 -node_buddyinfo_count{node="0",size="4",zone="DMA"} 2 -node_buddyinfo_count{node="0",size="4",zone="DMA32"} 194 -node_buddyinfo_count{node="0",size="4",zone="Normal"} 567 -node_buddyinfo_count{node="0",size="5",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="5",zone="DMA32"} 45 -node_buddyinfo_count{node="0",size="5",zone="Normal"} 102 -node_buddyinfo_count{node="0",size="6",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="6",zone="DMA32"} 12 -node_buddyinfo_count{node="0",size="6",zone="Normal"} 4 -node_buddyinfo_count{node="0",size="7",zone="DMA"} 0 -node_buddyinfo_count{node="0",size="7",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="7",zone="Normal"} 0 -node_buddyinfo_count{node="0",size="8",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="8",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="8",zone="Normal"} 0 -node_buddyinfo_count{node="0",size="9",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="9",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="9",zone="Normal"} 0 +# HELP node_buddyinfo_blocks Count of free blocks according to size. +# TYPE node_buddyinfo_blocks gauge +node_buddyinfo_blocks{node="0",size="0",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="0",zone="DMA32"} 759 +node_buddyinfo_blocks{node="0",size="0",zone="Normal"} 4381 +node_buddyinfo_blocks{node="0",size="1",zone="DMA"} 0 +node_buddyinfo_blocks{node="0",size="1",zone="DMA32"} 572 +node_buddyinfo_blocks{node="0",size="1",zone="Normal"} 1093 +node_buddyinfo_blocks{node="0",size="10",zone="DMA"} 3 +node_buddyinfo_blocks{node="0",size="10",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="10",zone="Normal"} 0 +node_buddyinfo_blocks{node="0",size="2",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="2",zone="DMA32"} 791 +node_buddyinfo_blocks{node="0",size="2",zone="Normal"} 185 +node_buddyinfo_blocks{node="0",size="3",zone="DMA"} 0 +node_buddyinfo_blocks{node="0",size="3",zone="DMA32"} 475 +node_buddyinfo_blocks{node="0",size="3",zone="Normal"} 1530 +node_buddyinfo_blocks{node="0",size="4",zone="DMA"} 2 +node_buddyinfo_blocks{node="0",size="4",zone="DMA32"} 194 +node_buddyinfo_blocks{node="0",size="4",zone="Normal"} 567 +node_buddyinfo_blocks{node="0",size="5",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="5",zone="DMA32"} 45 +node_buddyinfo_blocks{node="0",size="5",zone="Normal"} 102 +node_buddyinfo_blocks{node="0",size="6",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="6",zone="DMA32"} 12 +node_buddyinfo_blocks{node="0",size="6",zone="Normal"} 4 +node_buddyinfo_blocks{node="0",size="7",zone="DMA"} 0 +node_buddyinfo_blocks{node="0",size="7",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="7",zone="Normal"} 0 +node_buddyinfo_blocks{node="0",size="8",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="8",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="8",zone="Normal"} 0 +node_buddyinfo_blocks{node="0",size="9",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="9",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="9",zone="Normal"} 0 # HELP node_context_switches_total Total number of context switches. # TYPE node_context_switches_total counter node_context_switches_total 3.8014093e+07 @@ -2470,112 +2470,112 @@ 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 Number of connections at the network layer. -# TYPE node_nfs_net_connections counter -node_nfs_net_connections{protocol="tcp"} 45 -# HELP node_nfs_net_reads Number of reads at the network layer. -# TYPE node_nfs_net_reads counter -node_nfs_net_reads{protocol="tcp"} 69 -node_nfs_net_reads{protocol="udp"} 70 -# HELP node_nfs_procedures Number of NFS procedures invoked. -# TYPE node_nfs_procedures counter -node_nfs_procedures{procedure="access",version="3"} 1.17661341e+08 -node_nfs_procedures{procedure="access",version="4"} 58 -node_nfs_procedures{procedure="close",version="4"} 28 -node_nfs_procedures{procedure="commit",version="3"} 23729 -node_nfs_procedures{procedure="commit",version="4"} 83 -node_nfs_procedures{procedure="create",version="2"} 52 -node_nfs_procedures{procedure="create",version="3"} 2.993289e+06 -node_nfs_procedures{procedure="create",version="4"} 15 -node_nfs_procedures{procedure="create_session",version="4"} 32 -node_nfs_procedures{procedure="delegreturn",version="4"} 97 -node_nfs_procedures{procedure="destroy_session",version="4"} 67 -node_nfs_procedures{procedure="exchange_id",version="4"} 58 -node_nfs_procedures{procedure="fs_locations",version="4"} 32 -node_nfs_procedures{procedure="fsid_present",version="4"} 11 -node_nfs_procedures{procedure="fsinfo",version="3"} 2 -node_nfs_procedures{procedure="fsinfo",version="4"} 68 -node_nfs_procedures{procedure="fsstat",version="3"} 13332 -node_nfs_procedures{procedure="get_lease_time",version="4"} 28 -node_nfs_procedures{procedure="getacl",version="4"} 36 -node_nfs_procedures{procedure="getattr",version="2"} 57 -node_nfs_procedures{procedure="getattr",version="3"} 1.061909262e+09 -node_nfs_procedures{procedure="getattr",version="4"} 88 -node_nfs_procedures{procedure="getdeviceinfo",version="4"} 1 -node_nfs_procedures{procedure="layoutcommit",version="4"} 26 -node_nfs_procedures{procedure="layoutget",version="4"} 90 -node_nfs_procedures{procedure="layoutreturn",version="4"} 0 -node_nfs_procedures{procedure="link",version="2"} 17 -node_nfs_procedures{procedure="link",version="3"} 0 -node_nfs_procedures{procedure="link",version="4"} 21 -node_nfs_procedures{procedure="lock",version="4"} 39 -node_nfs_procedures{procedure="lockt",version="4"} 68 -node_nfs_procedures{procedure="locku",version="4"} 59 -node_nfs_procedures{procedure="lookup",version="2"} 71 -node_nfs_procedures{procedure="lookup",version="3"} 4.077635e+06 -node_nfs_procedures{procedure="lookup",version="4"} 29 -node_nfs_procedures{procedure="lookup_root",version="4"} 74 -node_nfs_procedures{procedure="mkdir",version="2"} 50 -node_nfs_procedures{procedure="mkdir",version="3"} 590 -node_nfs_procedures{procedure="mknod",version="3"} 0 -node_nfs_procedures{procedure="null",version="2"} 16 -node_nfs_procedures{procedure="null",version="3"} 0 -node_nfs_procedures{procedure="null",version="4"} 98 -node_nfs_procedures{procedure="open",version="4"} 85 -node_nfs_procedures{procedure="open_confirm",version="4"} 23 -node_nfs_procedures{procedure="open_downgrade",version="4"} 1 -node_nfs_procedures{procedure="open_noattr",version="4"} 24 -node_nfs_procedures{procedure="pathconf",version="3"} 1 -node_nfs_procedures{procedure="pathconf",version="4"} 53 -node_nfs_procedures{procedure="read",version="2"} 45 -node_nfs_procedures{procedure="read",version="3"} 2.9391916e+07 -node_nfs_procedures{procedure="read",version="4"} 51 -node_nfs_procedures{procedure="readdir",version="2"} 70 -node_nfs_procedures{procedure="readdir",version="3"} 3983 -node_nfs_procedures{procedure="readdir",version="4"} 66 -node_nfs_procedures{procedure="readdirplus",version="3"} 92385 -node_nfs_procedures{procedure="readlink",version="2"} 73 -node_nfs_procedures{procedure="readlink",version="3"} 5 -node_nfs_procedures{procedure="readlink",version="4"} 54 -node_nfs_procedures{procedure="reclaim_complete",version="4"} 35 -node_nfs_procedures{procedure="release_lockowner",version="4"} 85 -node_nfs_procedures{procedure="remove",version="2"} 83 -node_nfs_procedures{procedure="remove",version="3"} 7815 -node_nfs_procedures{procedure="remove",version="4"} 69 -node_nfs_procedures{procedure="rename",version="2"} 61 -node_nfs_procedures{procedure="rename",version="3"} 1130 -node_nfs_procedures{procedure="rename",version="4"} 96 -node_nfs_procedures{procedure="renew",version="4"} 83 -node_nfs_procedures{procedure="rmdir",version="2"} 23 -node_nfs_procedures{procedure="rmdir",version="3"} 15 -node_nfs_procedures{procedure="root",version="2"} 52 -node_nfs_procedures{procedure="secinfo",version="4"} 81 -node_nfs_procedures{procedure="sequence",version="4"} 13 -node_nfs_procedures{procedure="server_caps",version="4"} 56 -node_nfs_procedures{procedure="setacl",version="4"} 49 -node_nfs_procedures{procedure="setattr",version="2"} 74 -node_nfs_procedures{procedure="setattr",version="3"} 48906 -node_nfs_procedures{procedure="setattr",version="4"} 73 -node_nfs_procedures{procedure="setclientid",version="4"} 12 -node_nfs_procedures{procedure="setclientid_confirm",version="4"} 84 -node_nfs_procedures{procedure="statfs",version="2"} 82 -node_nfs_procedures{procedure="statfs",version="4"} 86 -node_nfs_procedures{procedure="symlink",version="2"} 53 -node_nfs_procedures{procedure="symlink",version="3"} 0 -node_nfs_procedures{procedure="symlink",version="4"} 84 -node_nfs_procedures{procedure="write",version="2"} 0 -node_nfs_procedures{procedure="write",version="3"} 2.570425e+06 -node_nfs_procedures{procedure="write",version="4"} 54 -node_nfs_procedures{procedure="writecache",version="2"} 86 -# HELP node_nfs_rpc_authentication_refreshes Number of RPC authentication refreshes performed. -# TYPE node_nfs_rpc_authentication_refreshes counter -node_nfs_rpc_authentication_refreshes 1.218815394e+09 -# HELP node_nfs_rpc_operations Number of RPCs performed. -# TYPE node_nfs_rpc_operations counter -node_nfs_rpc_operations 1.218785755e+09 -# HELP node_nfs_rpc_retransmissions Number of RPC transmissions performed. -# TYPE node_nfs_rpc_retransmissions counter -node_nfs_rpc_retransmissions 374636 +# 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_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_nfsd_connections_total Total number of NFSd TCP connections. # TYPE node_nfsd_connections_total counter node_nfsd_connections_total 1 diff --git a/collector/fixtures/e2e-ppc64le-output.txt b/collector/fixtures/e2e-ppc64le-output.txt index 7e1a5c92..6938eb68 100644 --- a/collector/fixtures/e2e-ppc64le-output.txt +++ b/collector/fixtures/e2e-ppc64le-output.txt @@ -115,9 +115,9 @@ node_bcache_cache_miss_collisions_total{backing_device="bdev0",uuid="deaddd54-c7 # HELP node_bcache_cache_misses_total Misses counted per individual IO as bcache sees them. # TYPE node_bcache_cache_misses_total counter node_bcache_cache_misses_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 -# HELP node_bcache_cache_read_races Counts instances where while data was being read from the cache, the bucket was reused and invalidated - i.e. where the pointer was stale after the read completed. -# TYPE node_bcache_cache_read_races counter -node_bcache_cache_read_races{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 +# HELP node_bcache_cache_read_races_total Counts instances where while data was being read from the cache, the bucket was reused and invalidated - i.e. where the pointer was stale after the read completed. +# TYPE node_bcache_cache_read_races_total counter +node_bcache_cache_read_races_total{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 # HELP node_bcache_cache_readaheads_total Count of times readahead occurred. # TYPE node_bcache_cache_readaheads_total counter node_bcache_cache_readaheads_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0 @@ -161,41 +161,41 @@ node_bonding_slaves{master="int"} 2 # HELP node_boot_time Node boot time, in unixtime. # TYPE node_boot_time gauge node_boot_time 1.418183276e+09 -# HELP node_buddyinfo_count Count of free blocks according to size. -# TYPE node_buddyinfo_count gauge -node_buddyinfo_count{node="0",size="0",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="0",zone="DMA32"} 759 -node_buddyinfo_count{node="0",size="0",zone="Normal"} 4381 -node_buddyinfo_count{node="0",size="1",zone="DMA"} 0 -node_buddyinfo_count{node="0",size="1",zone="DMA32"} 572 -node_buddyinfo_count{node="0",size="1",zone="Normal"} 1093 -node_buddyinfo_count{node="0",size="10",zone="DMA"} 3 -node_buddyinfo_count{node="0",size="10",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="10",zone="Normal"} 0 -node_buddyinfo_count{node="0",size="2",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="2",zone="DMA32"} 791 -node_buddyinfo_count{node="0",size="2",zone="Normal"} 185 -node_buddyinfo_count{node="0",size="3",zone="DMA"} 0 -node_buddyinfo_count{node="0",size="3",zone="DMA32"} 475 -node_buddyinfo_count{node="0",size="3",zone="Normal"} 1530 -node_buddyinfo_count{node="0",size="4",zone="DMA"} 2 -node_buddyinfo_count{node="0",size="4",zone="DMA32"} 194 -node_buddyinfo_count{node="0",size="4",zone="Normal"} 567 -node_buddyinfo_count{node="0",size="5",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="5",zone="DMA32"} 45 -node_buddyinfo_count{node="0",size="5",zone="Normal"} 102 -node_buddyinfo_count{node="0",size="6",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="6",zone="DMA32"} 12 -node_buddyinfo_count{node="0",size="6",zone="Normal"} 4 -node_buddyinfo_count{node="0",size="7",zone="DMA"} 0 -node_buddyinfo_count{node="0",size="7",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="7",zone="Normal"} 0 -node_buddyinfo_count{node="0",size="8",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="8",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="8",zone="Normal"} 0 -node_buddyinfo_count{node="0",size="9",zone="DMA"} 1 -node_buddyinfo_count{node="0",size="9",zone="DMA32"} 0 -node_buddyinfo_count{node="0",size="9",zone="Normal"} 0 +# HELP node_buddyinfo_blocks Count of free blocks according to size. +# TYPE node_buddyinfo_blocks gauge +node_buddyinfo_blocks{node="0",size="0",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="0",zone="DMA32"} 759 +node_buddyinfo_blocks{node="0",size="0",zone="Normal"} 4381 +node_buddyinfo_blocks{node="0",size="1",zone="DMA"} 0 +node_buddyinfo_blocks{node="0",size="1",zone="DMA32"} 572 +node_buddyinfo_blocks{node="0",size="1",zone="Normal"} 1093 +node_buddyinfo_blocks{node="0",size="10",zone="DMA"} 3 +node_buddyinfo_blocks{node="0",size="10",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="10",zone="Normal"} 0 +node_buddyinfo_blocks{node="0",size="2",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="2",zone="DMA32"} 791 +node_buddyinfo_blocks{node="0",size="2",zone="Normal"} 185 +node_buddyinfo_blocks{node="0",size="3",zone="DMA"} 0 +node_buddyinfo_blocks{node="0",size="3",zone="DMA32"} 475 +node_buddyinfo_blocks{node="0",size="3",zone="Normal"} 1530 +node_buddyinfo_blocks{node="0",size="4",zone="DMA"} 2 +node_buddyinfo_blocks{node="0",size="4",zone="DMA32"} 194 +node_buddyinfo_blocks{node="0",size="4",zone="Normal"} 567 +node_buddyinfo_blocks{node="0",size="5",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="5",zone="DMA32"} 45 +node_buddyinfo_blocks{node="0",size="5",zone="Normal"} 102 +node_buddyinfo_blocks{node="0",size="6",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="6",zone="DMA32"} 12 +node_buddyinfo_blocks{node="0",size="6",zone="Normal"} 4 +node_buddyinfo_blocks{node="0",size="7",zone="DMA"} 0 +node_buddyinfo_blocks{node="0",size="7",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="7",zone="Normal"} 0 +node_buddyinfo_blocks{node="0",size="8",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="8",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="8",zone="Normal"} 0 +node_buddyinfo_blocks{node="0",size="9",zone="DMA"} 1 +node_buddyinfo_blocks{node="0",size="9",zone="DMA32"} 0 +node_buddyinfo_blocks{node="0",size="9",zone="Normal"} 0 # HELP node_context_switches Total number of context switches. # TYPE node_context_switches counter node_context_switches 3.8014093e+07 @@ -2500,112 +2500,112 @@ 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 Number of connections at the network layer. -# TYPE node_nfs_net_connections counter -node_nfs_net_connections{protocol="tcp"} 45 -# HELP node_nfs_net_reads Number of reads at the network layer. -# TYPE node_nfs_net_reads counter -node_nfs_net_reads{protocol="tcp"} 69 -node_nfs_net_reads{protocol="udp"} 70 -# HELP node_nfs_procedures Number of NFS procedures invoked. -# TYPE node_nfs_procedures counter -node_nfs_procedures{procedure="access",version="3"} 1.17661341e+08 -node_nfs_procedures{procedure="access",version="4"} 58 -node_nfs_procedures{procedure="close",version="4"} 28 -node_nfs_procedures{procedure="commit",version="3"} 23729 -node_nfs_procedures{procedure="commit",version="4"} 83 -node_nfs_procedures{procedure="create",version="2"} 52 -node_nfs_procedures{procedure="create",version="3"} 2.993289e+06 -node_nfs_procedures{procedure="create",version="4"} 15 -node_nfs_procedures{procedure="create_session",version="4"} 32 -node_nfs_procedures{procedure="delegreturn",version="4"} 97 -node_nfs_procedures{procedure="destroy_session",version="4"} 67 -node_nfs_procedures{procedure="exchange_id",version="4"} 58 -node_nfs_procedures{procedure="fs_locations",version="4"} 32 -node_nfs_procedures{procedure="fsid_present",version="4"} 11 -node_nfs_procedures{procedure="fsinfo",version="3"} 2 -node_nfs_procedures{procedure="fsinfo",version="4"} 68 -node_nfs_procedures{procedure="fsstat",version="3"} 13332 -node_nfs_procedures{procedure="get_lease_time",version="4"} 28 -node_nfs_procedures{procedure="getacl",version="4"} 36 -node_nfs_procedures{procedure="getattr",version="2"} 57 -node_nfs_procedures{procedure="getattr",version="3"} 1.061909262e+09 -node_nfs_procedures{procedure="getattr",version="4"} 88 -node_nfs_procedures{procedure="getdeviceinfo",version="4"} 1 -node_nfs_procedures{procedure="layoutcommit",version="4"} 26 -node_nfs_procedures{procedure="layoutget",version="4"} 90 -node_nfs_procedures{procedure="layoutreturn",version="4"} 0 -node_nfs_procedures{procedure="link",version="2"} 17 -node_nfs_procedures{procedure="link",version="3"} 0 -node_nfs_procedures{procedure="link",version="4"} 21 -node_nfs_procedures{procedure="lock",version="4"} 39 -node_nfs_procedures{procedure="lockt",version="4"} 68 -node_nfs_procedures{procedure="locku",version="4"} 59 -node_nfs_procedures{procedure="lookup",version="2"} 71 -node_nfs_procedures{procedure="lookup",version="3"} 4.077635e+06 -node_nfs_procedures{procedure="lookup",version="4"} 29 -node_nfs_procedures{procedure="lookup_root",version="4"} 74 -node_nfs_procedures{procedure="mkdir",version="2"} 50 -node_nfs_procedures{procedure="mkdir",version="3"} 590 -node_nfs_procedures{procedure="mknod",version="3"} 0 -node_nfs_procedures{procedure="null",version="2"} 16 -node_nfs_procedures{procedure="null",version="3"} 0 -node_nfs_procedures{procedure="null",version="4"} 98 -node_nfs_procedures{procedure="open",version="4"} 85 -node_nfs_procedures{procedure="open_confirm",version="4"} 23 -node_nfs_procedures{procedure="open_downgrade",version="4"} 1 -node_nfs_procedures{procedure="open_noattr",version="4"} 24 -node_nfs_procedures{procedure="pathconf",version="3"} 1 -node_nfs_procedures{procedure="pathconf",version="4"} 53 -node_nfs_procedures{procedure="read",version="2"} 45 -node_nfs_procedures{procedure="read",version="3"} 2.9391916e+07 -node_nfs_procedures{procedure="read",version="4"} 51 -node_nfs_procedures{procedure="readdir",version="2"} 70 -node_nfs_procedures{procedure="readdir",version="3"} 3983 -node_nfs_procedures{procedure="readdir",version="4"} 66 -node_nfs_procedures{procedure="readdirplus",version="3"} 92385 -node_nfs_procedures{procedure="readlink",version="2"} 73 -node_nfs_procedures{procedure="readlink",version="3"} 5 -node_nfs_procedures{procedure="readlink",version="4"} 54 -node_nfs_procedures{procedure="reclaim_complete",version="4"} 35 -node_nfs_procedures{procedure="release_lockowner",version="4"} 85 -node_nfs_procedures{procedure="remove",version="2"} 83 -node_nfs_procedures{procedure="remove",version="3"} 7815 -node_nfs_procedures{procedure="remove",version="4"} 69 -node_nfs_procedures{procedure="rename",version="2"} 61 -node_nfs_procedures{procedure="rename",version="3"} 1130 -node_nfs_procedures{procedure="rename",version="4"} 96 -node_nfs_procedures{procedure="renew",version="4"} 83 -node_nfs_procedures{procedure="rmdir",version="2"} 23 -node_nfs_procedures{procedure="rmdir",version="3"} 15 -node_nfs_procedures{procedure="root",version="2"} 52 -node_nfs_procedures{procedure="secinfo",version="4"} 81 -node_nfs_procedures{procedure="sequence",version="4"} 13 -node_nfs_procedures{procedure="server_caps",version="4"} 56 -node_nfs_procedures{procedure="setacl",version="4"} 49 -node_nfs_procedures{procedure="setattr",version="2"} 74 -node_nfs_procedures{procedure="setattr",version="3"} 48906 -node_nfs_procedures{procedure="setattr",version="4"} 73 -node_nfs_procedures{procedure="setclientid",version="4"} 12 -node_nfs_procedures{procedure="setclientid_confirm",version="4"} 84 -node_nfs_procedures{procedure="statfs",version="2"} 82 -node_nfs_procedures{procedure="statfs",version="4"} 86 -node_nfs_procedures{procedure="symlink",version="2"} 53 -node_nfs_procedures{procedure="symlink",version="3"} 0 -node_nfs_procedures{procedure="symlink",version="4"} 84 -node_nfs_procedures{procedure="write",version="2"} 0 -node_nfs_procedures{procedure="write",version="3"} 2.570425e+06 -node_nfs_procedures{procedure="write",version="4"} 54 -node_nfs_procedures{procedure="writecache",version="2"} 86 -# HELP node_nfs_rpc_authentication_refreshes Number of RPC authentication refreshes performed. -# TYPE node_nfs_rpc_authentication_refreshes counter -node_nfs_rpc_authentication_refreshes 1.218815394e+09 -# HELP node_nfs_rpc_operations Number of RPCs performed. -# TYPE node_nfs_rpc_operations counter -node_nfs_rpc_operations 1.218785755e+09 -# HELP node_nfs_rpc_retransmissions Number of RPC transmissions performed. -# TYPE node_nfs_rpc_retransmissions counter -node_nfs_rpc_retransmissions 374636 +# 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_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_procs_blocked Number of processes blocked waiting for I/O to complete. # TYPE node_procs_blocked gauge node_procs_blocked 0 diff --git a/collector/nfs_linux.go b/collector/nfs_linux.go index d1d75d41..8241a44f 100644 --- a/collector/nfs_linux.go +++ b/collector/nfs_linux.go @@ -66,39 +66,39 @@ var ( } nfsNetReadsDesc = prometheus.NewDesc( - prometheus.BuildFQName(namespace, "nfs", "net_reads"), + prometheus.BuildFQName(namespace, "nfs", "net_reads_total"), "Number of reads at the network layer.", []string{"protocol"}, nil, ) nfsNetConnectionsDesc = prometheus.NewDesc( - prometheus.BuildFQName(namespace, "nfs", "net_connections"), + prometheus.BuildFQName(namespace, "nfs", "net_connections_total"), "Number of connections at the network layer.", []string{"protocol"}, nil, ) nfsRPCOperationsDesc = prometheus.NewDesc( - prometheus.BuildFQName(namespace, "nfs", "rpc_operations"), + prometheus.BuildFQName(namespace, "nfs", "rpc_operations_total"), "Number of RPCs performed.", nil, nil, ) nfsRPCRetransmissionsDesc = prometheus.NewDesc( - prometheus.BuildFQName(namespace, "nfs", "rpc_retransmissions"), + prometheus.BuildFQName(namespace, "nfs", "rpc_retransmissions_total"), "Number of RPC transmissions performed.", nil, nil, ) nfsRPCAuthenticationRefreshesDesc = prometheus.NewDesc( - prometheus.BuildFQName(namespace, "nfs", "rpc_authentication_refreshes"), + prometheus.BuildFQName(namespace, "nfs", "rpc_authentication_refreshes_total"), "Number of RPC authentication refreshes performed.", nil, nil, ) nfsProceduresDesc = prometheus.NewDesc( - prometheus.BuildFQName(namespace, "nfs", "procedures"), + prometheus.BuildFQName(namespace, "nfs", "procedures_total"), "Number of NFS procedures invoked.", []string{"version", "procedure"}, nil,