Merge pull request #10 from treydock/seconds

Ensure time metrics have seconds in name

Author: treydock

CHANGELOG.md

@@ -28,11 +28,11 @@
 ** eseries_system_write_response_time_milliseconds to eseries_system_write_response_time_seconds
 ** CPU utilization metrics are now ratios of 0.0-1.0, add _ratio suffix to metrics
 * Add metrics
-** eseries_drive_idle_time_total, eseries_drive_other_ops_total, eseries_drive_other_time_total
-** eseries_drive_read_bytes_total, eseries_drive_read_ops_total, eseries_drive_read_time_total
+** eseries_drive_idle_time_seconds_total, eseries_drive_other_ops_total, eseries_drive_other_time_seconds_total
+** eseries_drive_read_bytes_total, eseries_drive_read_ops_total, eseries_drive_read_time_seconds_total
 ** eseries_drive_recovered_errors_total, eseries_drive_retried_ios_total, eseries_drive_timeouts_total
 ** eseries_drive_unrecovered_errors_total
-** eseries_drive_write_bytes_total, eseries_drive_write_ops_total, eseries_drive_write_time_total
+** eseries_drive_write_bytes_total, eseries_drive_write_ops_total, eseries_drive_write_time_seconds_total
 ** eseries_drive_queue_depth_total, eseries_drive_random_ios_total, eseries_drive_random_bytes_total
 
 ### Improvements

collector/drive-statistics.go

@@ -105,17 +105,17 @@ func NewDriveStatisticsExporter(target config.Target, logger log.Logger) Collect
 			"Drive statistic writePhysicalIOps", []string{"tray", "slot"}, nil),
 		WriteResponseTime: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "write_response_time_seconds"),
 			"Drive statistic writeResponseTime", []string{"tray", "slot"}, nil),
-		IdleTime: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "idle_time_total"),
+		IdleTime: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "idle_time_seconds_total"),
 			"Drive statistic idleTime", []string{"tray", "slot"}, nil),
 		OtherOPs: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "other_ops_total"),
 			"Drive statistic otherOps", []string{"tray", "slot"}, nil),
-		OtherTimeTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "other_time_total"),
+		OtherTimeTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "other_time_seconds_total"),
 			"Drive statistic otherTimeTotal", []string{"tray", "slot"}, nil),
 		ReadBytes: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "read_bytes_total"),
 			"Drive statistic readBytes", []string{"tray", "slot"}, nil),
 		ReadOPs: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "read_ops_total"),
 			"Drive statistic readOps", []string{"tray", "slot"}, nil),
-		ReadTimeTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "read_time_total"),
+		ReadTimeTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "read_time_seconds_total"),
 			"Drive statistic readTimeTotal", []string{"tray", "slot"}, nil),
 		RecoveredErrors: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "recovered_errors_total"),
 			"Drive statistic recoveredErrors", []string{"tray", "slot"}, nil),
@@ -129,7 +129,7 @@ func NewDriveStatisticsExporter(target config.Target, logger log.Logger) Collect
 			"Drive statistic writeBytes", []string{"tray", "slot"}, nil),
 		WriteOPs: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "write_ops_total"),
 			"Drive statistic writeOPs", []string{"tray", "slot"}, nil),
-		WriteTimeTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "write_time_total"),
+		WriteTimeTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "write_time_seconds_total"),
 			"Drive statistic writeTimeTotal", []string{"tray", "slot"}, nil),
 		QueueDepthTotal: prometheus.NewDesc(prometheus.BuildFQName(namespace, "drive", "queue_depth_total"),
 			"Drive statistic queueDepthTotal", []string{"tray", "slot"}, nil),