fix(linux/hwmon): 🐛 fix naming of alarm sensors

joshuar · Sep 9, 2024 · ee78240 · ee78240
1 parent fecb599
commit ee78240
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/pkg/linux/hwmon/hwmon.go b/pkg/linux/hwmon/hwmon.go
@@ -311,11 +311,6 @@ func (s *Sensor) ID() string {
 	id.WriteString("_")
 	id.WriteString(s.id)
 
-	if s.MonitorType == Alarm || s.MonitorType == Intrusion {
-		id.WriteString("_")
-		id.WriteString(s.MonitorType.String())
-	}
-
 	return strcase.ToSnake(id.String())
 }
 
@@ -365,7 +360,7 @@ func (s *Sensor) updateInfo(file *sensorFile) error {
 
 		if len(parts) == 2 { // 2 parts, limit alarm
 			s.label = strings.Join([]string{id, parts[0], file.sensorType.String()}, " ")
-			s.id = strings.Join([]string{id, parts[0], file.sensorType.String()}, "_")
+			s.id = strings.Join([]string{id, parts[0], "alarm"}, "_")
 		} else { // channel alarm
 			s.label = strings.Join([]string{id, file.sensorType.String()}, " ")
 		}

diff --git a/pkg/linux/hwmon/hwmon_test.go b/pkg/linux/hwmon/hwmon_test.go
@@ -85,12 +85,8 @@ func TestChip_getSensors(t *testing.T) {
 	alarmSensor := &Sensor{
 		value:       false,
 		label:       "Temp1 Crit Alarm",
-		id:          "temp1_crit",
+		id:          "temp1_crit_alarm",
 		MonitorType: Alarm,
-		Attributes: []Attribute{
-			{Name: "max", Value: 80},
-			{Name: "crit", Value: 100},
-		},
 	}
 
 	type fields struct {
@@ -143,6 +139,7 @@ func TestChip_getSensors(t *testing.T) {
 			if !tt.wantErr {
 				for i := range tt.want {
 					if !slices.ContainsFunc(got, func(s *Sensor) bool {
+						t.Logf("Chip.getSensors() = %v, want %v", s.id, tt.want[i].id)
 						return s.id == tt.want[i].id
 					}) {
 						t.Errorf("Chip.getSensors() = %v, want %v", got, tt.want)