FIX-51 second draft by making sure the data output is as expected.

Author: Owaiseimdad

cmd/capture/main.go

@@ -50,7 +50,7 @@ func main() {
 	apiV1.GET("/metrics/memory", handler.MetricsMemory)
 	apiV1.GET("/metrics/disk", handler.MetricsDisk)
 	apiV1.GET("/metrics/host", handler.MetricsHost)
-	apiV1.GET("/metrics/smartmetrics", handler.SmartMetrics)
+	apiV1.GET("/metrics/smart", handler.SmartMetrics)
 
 
 	server := &http.Server{

internal/handler/metrics.go

@@ -42,6 +42,6 @@ func MetricsHost(c *gin.Context) {
 }
 
 func SmartMetrics(c *gin.Context) {
-    smartMetrics, smartErrs := metric.GetSmartMetrics() // Returns []*SmartMetric
-    handleMetricResponse(c, smartMetrics, smartErrs)
-}
+    smartMetrics, smartErrs := metric.GetSmartMetrics()
+	handleMetricResponse(c,smartMetrics.Data, append(smartMetrics.Errors, smartErrs...))
+}

internal/metric/metric.go

@@ -14,12 +14,34 @@ type APIResponse struct {
 }
 
 type SmartMetric struct {
-	Data   map[string]string `json:"data"`
-	Errors []CustomErr `json:"errors"`
+	Data   SmartData    `json:"data"`   // The SMART data
+	Errors []CustomErr  `json:"errors"` // Any errors encountered
 }
 
 func (s SmartMetric) isMetric() {}
 
+type SmartData struct {
+	AvailableSpare                string `json:"available_spare"`
+	AvailableSpareThreshold       string `json:"available_spare_threshold"`
+	ControllerBusyTime            string `json:"controller_busy_time"`
+	CriticalWarning               string `json:"critical_warning"`
+	DataUnitsRead                 string `json:"data_units_read"`
+	DataUnitsWritten              string `json:"data_units_written"`
+	ErrorInformationLogEntries    string `json:"error_information_log_entries"`
+	HostReadCommands              string `json:"host_read_commands"`
+	HostWriteCommands             string `json:"host_write_commands"`
+	MediaAndDataIntegrityErrors  string `json:"media_and_data_integrity_errors"`
+	PercentageUsed                string `json:"percentage_used"`
+	PowerCycles                   string `json:"power_cycles"`
+	PowerOnHours                  string `json:"power_on_hours"`
+	Read1EntriesFromErrorLogFailed string `json:"read_1_entries_from_error_information_log_failed"`
+	SmartOverallHealthResult      string `json:"smart_overall-health_self-assessment_test_result"`
+	Temperature                   string `json:"temperature"`
+	UnsafeShutdowns               string `json:"unsafe_shutdowns"`
+}
+
+func (s SmartData) isMetric() {}
+
 type AllMetrics struct {
 	CPU    CPUData      `json:"cpu"`
 	Memory MemoryData   `json:"memory"`

internal/metric/smart_metrics.go

@@ -26,11 +26,12 @@ func scanDevices() ([]string, error) {
 	return devices, nil
 }
 
+// parseSmartctlOutput parses the output from smartctl command
 func parseSmartctlOutput(output string) *SmartMetric {
 	startMarker := "=== START OF SMART DATA SECTION ==="
 	startIdx := strings.Index(output, startMarker)
 	if startIdx == -1 {
-		return &SmartMetric{Data: make(map[string]string)}
+		return &SmartMetric{Data: SmartData{}, Errors: []CustomErr{}}
 	}
 
 	section := output[startIdx:]
@@ -39,7 +40,8 @@ func parseSmartctlOutput(output string) *SmartMetric {
 		section = section[:endIdx]
 	}
 
-	data := make(map[string]string)
+	data := SmartData{}
+	var errors []CustomErr
 	lines := strings.Split(section, "\n")
 
 	for _, line := range lines {
@@ -59,12 +61,56 @@ func parseSmartctlOutput(output string) *SmartMetric {
 		// Clean up value: remove extra spaces and brackets
 		value = regexp.MustCompile(`\s+`).ReplaceAllString(value, " ")
 		value = strings.Trim(value, "[]")
-		
-		data[key] = value
+
+		switch strings.ToLower(key) {
+		case "available spare":
+			data.AvailableSpare = value
+		case "available spare threshold":
+			data.AvailableSpareThreshold = value
+		case "controller busy time":
+			data.ControllerBusyTime = value
+		case "critical warning":
+			data.CriticalWarning = value
+		case "data units read":
+			data.DataUnitsRead = value
+		case "data units written":
+			data.DataUnitsWritten = value
+		case "error information log entries":
+			data.ErrorInformationLogEntries = value
+		case "host read commands":
+			data.HostReadCommands = value
+		case "host write commands":
+			data.HostWriteCommands = value
+		case "media and data integrity errors":
+			data.MediaAndDataIntegrityErrors = value
+		case "percentage used":
+			data.PercentageUsed = value
+		case "power cycles":
+			data.PowerCycles = value
+		case "power on hours":
+			data.PowerOnHours = value
+		case "read 1 entries from error information log failed":
+			data.Read1EntriesFromErrorLogFailed = value
+		case "smart overall-health self-assessment test result":
+			data.SmartOverallHealthResult = value
+		case "temperature":
+			data.Temperature = value
+		case "unsafe shutdowns":
+			data.UnsafeShutdowns = value
+		}
+
+		// If the key contains "error" or "failed", add it to the errors
+		if strings.Contains(key, "failed") || strings.Contains(key, "error") {
+			errors = append(errors, CustomErr{
+				Metric: []string{key},
+				Error:  fmt.Sprintf("Unable to retrieve the '%s'", key),
+			})
+		}
 	}
 
 	return &SmartMetric{
 		Data:   data,
+		Errors: errors,
 	}
 }
 
@@ -83,25 +129,26 @@ func getMetrics(device string) (*SmartMetric, error) {
 	return parseSmartctlOutput(string(out)), nil
 }
 
-func GetSmartMetrics() (MetricsSlice, []CustomErr) { 
+// GetSmartMetrics retrieves the SMART metrics from all available devices.
+func GetSmartMetrics() (SmartMetric, []CustomErr) {
 	var smartCtlrErrs []CustomErr
 	devices, err := scanDevices()
 	if err != nil {
-		smartCtlrErrs =append(smartCtlrErrs,CustomErr{
-            Metric: []string{"smart"},
-            Error:  err.Error(),
-        })
+		smartCtlrErrs = append(smartCtlrErrs, CustomErr{
+			Metric: []string{"smart"},
+			Error:  err.Error(),
+		})
 	}
 
-	var metrics MetricsSlice  // Use MetricsSlice instead of []*SmartMetric
+	var metrics SmartMetric
 	for _, device := range devices {
 		metric, err := getMetrics(device)
 		if err != nil {
 			log.Printf("Skipping %s: %v", device, err)
 			continue
 		}
-		metrics = append(metrics, metric)
+	
+		metrics = *metric
 	}
-
 	return metrics, smartCtlrErrs
-}
+}