Merge pull request #9 from treydock/metric-changes

Convert microseconds to seconds and add _ratio suffix to CPU utilization metrics

Author: treydock

CHANGELOG.md

@@ -26,7 +26,7 @@
 ** eseries_system_read_response_time_milliseconds to eseries_system_read_response_time_seconds
 ** eseries_system_write_hit_response_time_milliseconds to eseries_system_write_hit_response_time_seconds
 ** eseries_system_write_response_time_milliseconds to eseries_system_write_response_time_seconds
-** CPU utilization metrics are now ratios of 0.0-1.0
+** 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

collector/controller-statistics.go

@@ -125,9 +125,9 @@ func NewControllerStatisticsExporter(target config.Target, logger log.Logger) Co
 			"Controller statistic readResponseTime", labels, nil),
 		WriteResponseTime: prometheus.NewDesc(prometheus.BuildFQName(namespace, "controller", "write_response_time_seconds"),
 			"Controller statistic writeResponseTime", labels, nil),
-		MaxCpuUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "controller", "cpu_max_utilization"),
+		MaxCpuUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "controller", "cpu_max_utilization_ratio"),
 			"Controller statistic maxCpuUtilization (0.0-1.0 ratio of CPU percent utilization)", labels, nil),
-		CpuAvgUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "controller", "cpu_average_utilization"),
+		CpuAvgUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "controller", "cpu_average_utilization_ratio"),
 			"Controller statistic cpuAvgUtilization (0.0-1.0 ratio of CPU percent utilization)", labels, nil),
 		TotalIopsServiced: prometheus.NewDesc(prometheus.BuildFQName(namespace, "controller", "iops_total"),
 			"Controller statistic totalIopsServiced", labels, nil),

collector/drive-statistics.go

@@ -279,9 +279,17 @@ func (c *DriveStatisticsCollector) collect() (DrivesInventory, []AnalysedDriveSt
 	for i := range analysedDriveStatistics {
 		s := &analysedDriveStatistics[i]
 		// Convert milliseconds to seconds
-		s.CombinedResponseTime = s.CombinedResponseTime * 0.001
-		s.ReadResponseTime = s.ReadResponseTime * 0.001
-		s.WriteResponseTime = s.WriteResponseTime * 0.001
+		s.CombinedResponseTime = s.CombinedResponseTime / 1000
+		s.ReadResponseTime = s.ReadResponseTime / 1000
+		s.WriteResponseTime = s.WriteResponseTime / 1000
+	}
+	for i := range driveStatistics {
+		s := &driveStatistics[i]
+		// Convert microseconds to seconds
+		s.IdleTime = s.IdleTime / 1000000
+		s.OtherTimeTotal = s.OtherTimeTotal / 1000000
+		s.ReadTimeTotal = s.ReadTimeTotal / 1000000
+		s.WriteTimeTotal = s.WriteTimeTotal / 1000000
 	}
 	return inventory, analysedDriveStatistics, driveStatistics, nil
 }

collector/system-statistics.go

@@ -70,9 +70,9 @@ func NewSystemStatisticsExporter(target config.Target, logger log.Logger) Collec
 			"System statistic CombinedHitResponseTime", nil, nil),
 		CombinedResponseTime: prometheus.NewDesc(prometheus.BuildFQName(namespace, "system", "combined_response_time_seconds"),
 			"System statistic combinedResponseTime", nil, nil),
-		CpuAvgUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "system", "cpu_average_utilization"),
+		CpuAvgUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "system", "cpu_average_utilization_ratio"),
 			"System statistic CpuAvgUtilization (0.0-1.0 ratio of CPU percent utilization)", nil, nil),
-		MaxCpuUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "system", "cpu_max_utilization"),
+		MaxCpuUtilization: prometheus.NewDesc(prometheus.BuildFQName(namespace, "system", "cpu_max_utilization_ratio"),
 			"System statistic MaxCpuUtilization (0.0-1.0 ratio of CPU percent utilization)", nil, nil),
 		ReadHitResponseTime: prometheus.NewDesc(prometheus.BuildFQName(namespace, "system", "read_hit_response_time_seconds"),
 			"System statistic ReadHitResponseTime", nil, nil),