Comcast · derrick-dacosta · Feb 22, 2024 · Feb 7, 2024 · Feb 7, 2024 · Feb 7, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ project adheres to [Semantic Versioning](http://semver.org/) and this change
 log is based on the [Keep a CHANGELOG](http://keepachangelog.com/) project.
 
 ## Unreleased
+- Added HPE DL380 Gen10 support
+- Enhanced drive metrics collection for DL380 model servers to include NVME, Storage Disk Drives, and Logical Drives
 
 ## Fixed
 - Cisco UCS C220 - add additional edge cases when collecting memory metrics [#2](https://github.com/Comcast/fishymetrics/issues/2)

diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@ exports them via HTTP for Prometheus consumption.
 
 Current device models supported
 - HP Moonshot
+- HP DL380
 - HP DL360
 - HP DL20
 - Cisco UCS C220 M5
@@ -131,7 +132,7 @@ comcast/fishymetrics:latest
 ## Prometheus Configuration
 
 The fishymetrics exporter needs to be passed the address as a parameter, this can be
-done with relabelling. available module options `["moonshot", "dl360", "dl20", "c220", "s3260m4", "s3260m5"]`
+done with relabelling. available module options `["moonshot", "dl360", "dl20", "dl380", "c220", "s3260m4", "s3260m5"]`
 
 Example config:
 ```YAML

diff --git a/cmd/fishymetrics/main.go b/cmd/fishymetrics/main.go
@@ -40,6 +40,7 @@ import (
 	"github.com/comcast/fishymetrics/config"
 	"github.com/comcast/fishymetrics/hpe/dl20"
 	"github.com/comcast/fishymetrics/hpe/dl360"
+	"github.com/comcast/fishymetrics/hpe/dl380"
 	"github.com/comcast/fishymetrics/hpe/moonshot"
 	"github.com/comcast/fishymetrics/logger"
 	"github.com/comcast/fishymetrics/middleware/muxprom"
@@ -138,6 +139,8 @@ func handler(ctx context.Context, w http.ResponseWriter, r *http.Request) {
 	switch moduleName {
 	case "moonshot":
 		exporter = moonshot.NewExporter(r.Context(), target, uri)
+	case "dl380":
+		exporter = dl380.NewExporter(r.Context(), target, uri)
 	case "dl360":
 		exporter = dl360.NewExporter(r.Context(), target, uri)
 	case "dl20":
@@ -150,7 +153,7 @@ func handler(ctx context.Context, w http.ResponseWriter, r *http.Request) {
 		exporter, err = s3260m5.NewExporter(r.Context(), target, uri)
 	default:
 		log.Error("'module' parameter does not match available options", zap.String("module", moduleName), zap.String("target", target), zap.Any("trace_id", r.Context().Value("traceID")))
-		http.Error(w, "'module' parameter does not match available options: [moonshot, dl360, dl20, c220, s3260m4, s3260m5]", http.StatusBadRequest)
+		http.Error(w, "'module' parameter does not match available options: [moonshot, dl360, dl380, dl20, c220, s3260m4, s3260m5]", http.StatusBadRequest)
 		return
 	}
 

diff --git a/cmd/fishymetrics/templates.go b/cmd/fishymetrics/templates.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Copyright 2024 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,7 @@ const indexTmpl string = `<html>
       <label for="module">Module:</label>
       <select id="module" name="module">
         <option vaule="moonshot">moonshot</option>
+        <option vaule="dl380">dl380</option>
         <option vaule="dl360">dl360</option>
         <option vaule="dl20">dl20</option>
         <option vaule="c220">c220</option>

diff --git a/hpe/dl380/drive.go b/hpe/dl380/drive.go
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2024 Comcast Cable Communications Management, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dl380
+
+// NVME's
+// /redfish/v1/chassis/1/
+// NVMeMetrics is the top level json object for DL380 NVMe Metrics Metadata
+type NVMeDriveMetrics struct {
+	ID               string           `json:"Id"`
+	Model            string           `json:"Model"`
+	Name             string           `json:"Name"`
+	MediaType        string           `json:"MediaType"`
+	PhysicalLocation PhysicalLocation `json:"PhysicalLocation"`
+	Protocol         string           `json:"Protocol"`
+	Status           DriveStatus      `json:"Status"`
+	FailurePredicted bool             `json:"FailurePredicted"`
+	CapacityBytes    int              `json:"CapacityBytes"`
+}
+
+// Logical Drives
+type LogicalDriveMetrics struct {
+	Id                     string      `json:"Id"`
+	CapacityMiB            int         `json:"CapacityMiB"`
+	Description            string      `json:"Description"`
+	InterfaceType          string      `json:"InterfaceType"`
+	LogicalDriveName       string      `json:"LogicalDriveName"`
+	LogicalDriveNumber     int         `json:"LogicalDriveNumber"`
+	Name                   string      `json:"Name"`
+	Raid                   string      `json:"Raid"`
+	Status                 DriveStatus `json:"Status"`
+	StripeSizebytes        int         `json:"StripeSizebytes"`
+	VolumeUniqueIdentifier string      `json:"VolumeUniqueIdentifier"`
+}
+
+// Disk Drives
+type DiskDriveMetrics struct {
+	Id            string      `json:"Id"`
+	CapacityMiB   int         `json:"CapacityMiB"`
+	Description   string      `json:"Description"`
+	InterfaceType string      `json:"InterfaceType"`
+	Name          string      `json:"Name"`
+	Model         string      `json:"Model"`
+	Status        DriveStatus `json:"Status"`
+	Location      string      `json:"Location"`
+	SerialNumber  string      `json:"SerialNumber"`
+}
+
+// NVME, Logical, and Physical Disk Drive Status
+type DriveStatus struct {
+	Health string `json:"Health,omitempty"`
+	State  string `json:"Enabled,omitempty"`
+}
+
+// GenericDrive is used to iterate over differing drive endpoints
+type GenericDrive struct {
+	Members []struct {
+		URL string `json:"@odata.id"`
+	} `json:"Members,omitempty"`
+	Links struct {
+		Drives []struct {
+			URL string `json:"@odata.id"`
+		} `json:"Drives,omitempty"`
+		LogicalDrives struct {
+			URL string `json:"@odata.id"`
+		} `json:"LogicalDrives,omitempty"`
+		PhysicalDrives struct {
+			URL string `json:"@odata.id"`
+		} `json:"PhysicalDrives,omitempty"`
+	} `json:"Links,omitempty"`
+	MembersCount int `json:"[email protected],omitempty"`
+}
+
+// PhysicalLocation
+type PhysicalLocation struct {
+	PartLocation PartLocation `json:"PartLocation"`
+}
+
+// PartLocation is a variable that determines the Box and the Bay location of the NVMe drive
+type PartLocation struct {
+	ServiceLabel string `json:"ServiceLabel"`
+}
+
+// Contents of Oem
+type Oem struct {
+	Hpe HpeCont `json:"Hpe"`
+}
+
+// Contents of Hpe
+type HpeCont struct {
+	CurrentTemperatureCelsius int         `json:"CurrentTemperatureCelsius"`
+	DriveStatus               DriveStatus `json:"Status"`
+	NVMeID                    string      `json:"NVMeId"`
+}