Include transmit_power

Author: zachfi

pkg/iot/routers/zigbee2mqtt/message.go

@@ -16,22 +16,23 @@ const (
 )
 
 type ZigbeeMessage struct {
-	Action       *string  `json:"action,omitempty"`
-	Battery      *float64 `json:"battery,omitempty"`
-	BatteryState *string  `json:"battery_state,omitempty"`
-	Co2          *float64 `json:"co2,omitempty"`
-	Formaldehyde *float64 `json:"formaldehyd,omitempty"`
-	Humidity     *float64 `json:"humidity,omitempty"`
-	Illuminance  *int     `json:"illuminance,omitempty"`
-	LinkQuality  *int     `json:"linkquality,omitempty"`
-	Occupancy    *bool    `json:"occupancy,omitempty"`
-	SoilMoisture *float64 `json:"soil_moisture,omitempty"`
-	State        *string  `json:"state,omitempty"`
-	Tamper       *bool    `json:"tamper,omitempty"`
-	Temperature  *float64 `json:"temperature,omitempty"`
-	VOC          *int     `json:"voc,omitempty"`
-	Voltage      *int     `json:"voltage,omitempty"`
-	WaterLeak    *bool    `json:"water_leak,omitempty"`
+	Action        *string  `json:"action,omitempty"`
+	Battery       *float64 `json:"battery,omitempty"`
+	BatteryState  *string  `json:"battery_state,omitempty"`
+	Co2           *float64 `json:"co2,omitempty"`
+	Formaldehyde  *float64 `json:"formaldehyd,omitempty"`
+	Humidity      *float64 `json:"humidity,omitempty"`
+	Illuminance   *int     `json:"illuminance,omitempty"`
+	LinkQuality   *int     `json:"linkquality,omitempty"`
+	Occupancy     *bool    `json:"occupancy,omitempty"`
+	SoilMoisture  *float64 `json:"soil_moisture,omitempty"`
+	State         *string  `json:"state,omitempty"`
+	Tamper        *bool    `json:"tamper,omitempty"`
+	Temperature   *float64 `json:"temperature,omitempty"`
+	TransmitPower *int     `json:"transmit_power,omitempty"`
+	VOC           *int     `json:"voc,omitempty"`
+	Voltage       *int     `json:"voltage,omitempty"`
+	WaterLeak     *bool    `json:"water_leak,omitempty"`
 }
 
 // zigbee2mqtt/0xa4c1386fc2751121 {"battery":20,"battery_state":"low","linkquality":87,"soil_moisture":76,"temperature":23}

pkg/iot/routers/zigbee2mqtt/metrics.go

@@ -32,6 +32,12 @@ var (
 		Help:      "The reported link quality",
 	}, []string{"device", "component", "zone", "type"})
 
+	metricIOTTransmitPower = promauto.NewGaugeVec(prometheus.GaugeOpts{
+		Name:      "transmit_power",
+		Namespace: metricsNamespace,
+		Help:      "The reported transmit power",
+	}, []string{"device", "component", "zone", "type"})
+
 	metricIOTBridgeState = promauto.NewGaugeVec(prometheus.GaugeOpts{
 		Name:      "bridge_state",
 		Namespace: metricsNamespace,

pkg/iot/routers/zigbee2mqtt/zigbee2mqtt.go

@@ -56,6 +56,7 @@ func New(logger *slog.Logger, tracer trace.Tracer, kubeclient kubeclient.Client,
 				metricIOTReport,
 				metricIOTBatteryPercent,
 				metricIOTLinkQuality,
+				metricIOTTransmitPower,
 				metricIOTBridgeState,
 				metricIOTOccupancy,
 				metricIOTWaterLeak,
@@ -300,6 +301,10 @@ func (z *Zigbee2Mqtt) updateZigbeeMessageMetrics(_ context.Context, m ZigbeeMess
 		metricIOTLinkQuality.WithLabelValues(device.Name, routeName, zone, device.Spec.Type).Set(float64(*m.LinkQuality))
 	}
 
+	if m.TransmitPower != nil {
+		metricIOTTransmitPower.WithLabelValues(device.Name, routeName, zone, device.Spec.Type).Set(float64(*m.TransmitPower))
+	}
+
 	if m.Temperature != nil {
 		metricIOTTemperature.WithLabelValues(device.Name, routeName, zone).Set(*m.Temperature)
 	}