[machines] Don't include the temp and battery levels as dimensions
This causes multiple alerts to fire for each quarantined machine, one
for each observed value.
Change-Id: Ib615c8f0403175a401f55db808e8ec287531a6eb
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/306057
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
diff --git a/machine/go/machine/processor/impl.go b/machine/go/machine/processor/impl.go
index 0533b02..d316408 100644
--- a/machine/go/machine/processor/impl.go
+++ b/machine/go/machine/processor/impl.go
@@ -134,7 +134,7 @@
battery, ok := batteryFromAndroidDumpSys(event.Android.DumpsysBattery)
if ok {
if battery < minBatteryLevel {
- dimensions[machine.DimQuarantined] = []string{fmt.Sprintf("Battery is too low: %d < %d (%%)", battery, minBatteryLevel)}
+ dimensions[machine.DimQuarantined] = []string{"Battery is too low"}
}
metrics2.GetInt64Metric("machine_processor_device_battery_level", map[string]string{"machine": machineID}).Update(int64(battery))
}
@@ -143,7 +143,7 @@
if ok {
temperature := findMaxTemperature(temperatures)
if temperature > maxTemperatureC {
- dimensions[machine.DimQuarantined] = []string{fmt.Sprintf("Temperature is too hot: %g > %g (C)", temperature, maxTemperatureC)}
+ dimensions[machine.DimQuarantined] = []string{"Temperature is too hot"}
}
for sensor, temp := range temperatures {
metrics2.GetFloat64Metric("machine_processor_device_temperature_c", map[string]string{"machine": machineID, "sensor": sensor}).Update(temp)
diff --git a/machine/go/machine/processor/impl_test.go b/machine/go/machine/processor/impl_test.go
index 09821e2..1e15f5c 100644
--- a/machine/go/machine/processor/impl_test.go
+++ b/machine/go/machine/processor/impl_test.go
@@ -433,7 +433,7 @@
p := newProcessorForTest(t)
next := p.Process(ctx, previous, event)
- assert.Equal(t, "Battery is too low: 9 < 30 (%)", next.Dimensions[machine.DimQuarantined][0])
+ assert.Equal(t, "Battery is too low", next.Dimensions[machine.DimQuarantined][0])
assert.Equal(t, 9, next.Battery)
assert.Equal(t, int64(9), metrics2.GetInt64Metric("machine_processor_device_battery_level", map[string]string{"machine": "skia-rpi2-0001"}).Get())
}
@@ -544,7 +544,7 @@
p := newProcessorForTest(t)
next := p.Process(ctx, previous, event)
- assert.Equal(t, "Temperature is too hot: 44.1 > 35 (C)", next.Dimensions[machine.DimQuarantined][0])
+ assert.Equal(t, "Temperature is too hot", next.Dimensions[machine.DimQuarantined][0])
assert.Equal(t, float64(44.1), metrics2.GetFloat64Metric("machine_processor_device_temperature_c", map[string]string{"machine": "skia-rpi2-0001", "sensor": "cpu1-silver-usr"}).Get())
}
