Add/move DFSR metric units to end of metric name

Signed-off-by: Ben Reedy <breed808@breed808.com>
This commit is contained in:
Ben Reedy
2020-12-09 19:49:32 +10:00
parent a1a986f4d0
commit 2837bdfb50

View File

@@ -122,7 +122,7 @@ func NewDFSRCollector() (Collector, error) {
// Connection // Connection
ConnectionBandwidthSavingsUsingDFSReplicationTotal: prometheus.NewDesc( ConnectionBandwidthSavingsUsingDFSReplicationTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "bandwidth_savings_using_dfs_replication_total"), prometheus.BuildFQName(Namespace, subsystem, "bandwidth_savings_using_dfs_replication_bytes_total"),
"Total amount of bandwidth savings using DFS Replication for this connection, in bytes", "Total amount of bandwidth savings using DFS Replication for this connection, in bytes",
[]string{"name"}, []string{"name"},
nil, nil,
@@ -143,14 +143,14 @@ func NewDFSRCollector() (Collector, error) {
), ),
ConnectionFilesReceivedTotal: prometheus.NewDesc( ConnectionFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "received_files_total"),
"Total number of files receieved for connection", "Total number of files receieved for connection",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
ConnectionRDCBytesReceivedTotal: prometheus.NewDesc( ConnectionRDCBytesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_bytes_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_received_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
@@ -164,22 +164,22 @@ func NewDFSRCollector() (Collector, error) {
), ),
ConnectionRDCNumberofFilesReceivedTotal: prometheus.NewDesc( ConnectionRDCNumberofFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_number_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_received_files_total"),
"", "Total number of Remote Differential Compression files received",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
ConnectionRDCSizeOfFilesReceivedTotal: prometheus.NewDesc( ConnectionRDCSizeOfFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_size_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_size_of_received_files_bytes_total"),
"", "Total size of received Remote Differential Compression files, in bytes.",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
ConnectionSizeOfFilesReceivedTotal: prometheus.NewDesc( ConnectionSizeOfFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "size_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "files_received_bytes_total"),
"", "Total size of files received, in bytes",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
@@ -200,28 +200,28 @@ func NewDFSRCollector() (Collector, error) {
), ),
FolderConflictBytesCleanedupTotal: prometheus.NewDesc( FolderConflictBytesCleanedupTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "conflict_bytes_cleaned_up_total"), prometheus.BuildFQName(Namespace, subsystem, "conflict_cleaned_up_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderConflictBytesGeneratedTotal: prometheus.NewDesc( FolderConflictBytesGeneratedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "conflict_bytes_generated_total"), prometheus.BuildFQName(Namespace, subsystem, "conflict_generated_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderConflictFilesCleanedUpTotal: prometheus.NewDesc( FolderConflictFilesCleanedUpTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "conflict_files_cleaned_up_total"), prometheus.BuildFQName(Namespace, subsystem, "conflict_cleaned_up_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderConflictFilesGeneratedTotal: prometheus.NewDesc( FolderConflictFilesGeneratedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "conflict_files_generated_total"), prometheus.BuildFQName(Namespace, subsystem, "conflict_generated_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
@@ -235,42 +235,42 @@ func NewDFSRCollector() (Collector, error) {
), ),
FolderConflictSpaceInUse: prometheus.NewDesc( FolderConflictSpaceInUse: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "conflict_space_in_use"), prometheus.BuildFQName(Namespace, subsystem, "conflict_space_in_use_bytes"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderDeletedSpaceInUse: prometheus.NewDesc( FolderDeletedSpaceInUse: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "deleted_space_in_use"), prometheus.BuildFQName(Namespace, subsystem, "deleted_space_in_use_bytes"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderDeletedBytesCleanedUpTotal: prometheus.NewDesc( FolderDeletedBytesCleanedUpTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "deleted_bytes_cleaned_up_total"), prometheus.BuildFQName(Namespace, subsystem, "deleted_cleaned_up_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderDeletedBytesGeneratedTotal: prometheus.NewDesc( FolderDeletedBytesGeneratedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "deleted_bytes_generated_total"), prometheus.BuildFQName(Namespace, subsystem, "deleted_generated_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderDeletedFilesCleanedUpTotal: prometheus.NewDesc( FolderDeletedFilesCleanedUpTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "deleted_files_cleaned_up_total"), prometheus.BuildFQName(Namespace, subsystem, "deleted_cleaned_up_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderDeletedFilesGeneratedTotal: prometheus.NewDesc( FolderDeletedFilesGeneratedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "deleted_files_generated_total"), prometheus.BuildFQName(Namespace, subsystem, "deleted_generated_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
@@ -291,84 +291,84 @@ func NewDFSRCollector() (Collector, error) {
), ),
FolderFilesReceivedTotal: prometheus.NewDesc( FolderFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "received_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderRDCBytesReceivedTotal: prometheus.NewDesc( FolderRDCBytesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_bytes_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_received_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderRDCCompressedSizeOfFilesReceivedTotal: prometheus.NewDesc( FolderRDCCompressedSizeOfFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_compressed_size_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_compressed_size_of_files_received_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderRDCNumberofFilesReceivedTotal: prometheus.NewDesc( FolderRDCNumberofFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_number_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_received_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderRDCSizeOfFilesReceivedTotal: prometheus.NewDesc( FolderRDCSizeOfFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "rdc_size_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "rdc_files_received_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderSizeOfFilesReceivedTotal: prometheus.NewDesc( FolderSizeOfFilesReceivedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "size_of_files_received_total"), prometheus.BuildFQName(Namespace, subsystem, "files_received_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderStagingSpaceInUse: prometheus.NewDesc( FolderStagingSpaceInUse: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "staging_space_in_use"), prometheus.BuildFQName(Namespace, subsystem, "staging_space_in_use_bytes"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderStagingBytesCleanedUpTotal: prometheus.NewDesc( FolderStagingBytesCleanedUpTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "staging_bytes_cleaned_up_total"), prometheus.BuildFQName(Namespace, subsystem, "staging_cleaned_up_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderStagingBytesGeneratedTotal: prometheus.NewDesc( FolderStagingBytesGeneratedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "staging_bytes_generated_total"), prometheus.BuildFQName(Namespace, subsystem, "staging_generated_bytes_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderStagingFilesCleanedUpTotal: prometheus.NewDesc( FolderStagingFilesCleanedUpTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "staging_files_cleaned_up_total"), prometheus.BuildFQName(Namespace, subsystem, "staging_cleaned_up_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderStagingFilesGeneratedTotal: prometheus.NewDesc( FolderStagingFilesGeneratedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "staging_files_generated_total"), prometheus.BuildFQName(Namespace, subsystem, "staging_generated_files_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
FolderUpdatesDroppedTotal: prometheus.NewDesc( FolderUpdatesDroppedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "updates_dropped_total"), prometheus.BuildFQName(Namespace, subsystem, "dropped_updates_total"),
"", "",
[]string{"name"}, []string{"name"},
nil, nil,
@@ -397,14 +397,14 @@ func NewDFSRCollector() (Collector, error) {
), ),
VolumeUSNJournalRecordsAcceptedTotal: prometheus.NewDesc( VolumeUSNJournalRecordsAcceptedTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "usn_journal_records_accepted_total"), prometheus.BuildFQName(Namespace, subsystem, "usn_journal_accepted_records_total"),
"Total number of USN journal records accepted", "Total number of USN journal records accepted",
[]string{"name"}, []string{"name"},
nil, nil,
), ),
VolumeUSNJournalRecordsReadTotal: prometheus.NewDesc( VolumeUSNJournalRecordsReadTotal: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "usn_journal_records_read_total"), prometheus.BuildFQName(Namespace, subsystem, "usn_journal_read_records_total"),
"Total number of DFSR Volume USN journal records read", "Total number of DFSR Volume USN journal records read",
[]string{"name"}, []string{"name"},
nil, nil,