bump helm chart

TODO.md

@@ -2,6 +2,7 @@
 - [x] Redis recorder panic
 
 # TODO
+- [ ] Make lightning distance unit configurable (kph|mph)
 - [ ] Set TTL on redis key
 - [ ] Add json schema to CI and README
 - [ ] Update README

helm/ambient-local-exporter/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.8
+version: 0.1.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.14.0"
+appVersion: "v0.15.6"
 
 dependencies:
   - name: hull

pkg/ambient/ambientgrpc/mapupdate_test.go

@@ -52,10 +52,8 @@ var mockUpdate = &weather.WeatherUpdate{
 	TempHumiditySensors: []*weather.TempHumiditySensor{
 		{Name: "sensor1", TempF: ptr.To(99.999), Humidity: nil},
 	},
-	LightningData: &weather.LightningData{
+	LightningDay:      ptr.To(1),
-		LightningDay:      ptr.To(1),
+	LightningDistance: ptr.To(20),
-		LightningDistance: ptr.To(20),
-	},
 }
 
 func TestUpdateToPbUpdate(t *testing.T) {
@@ -107,7 +105,9 @@ func TestUpdateToPbUpdate(t *testing.T) {
 						Humidity: nil,
 					},
 				},
-				UpdateTimestamp: timestamppb.New(now),
+				UpdateTimestamp:   timestamppb.New(now),
+				LightningDay:      ptr.To(int32(1)),
+				LightningDistance: ptr.To(int32(20)),
 			},
 		},
 	}

pkg/provider/awn/provider.go

@@ -143,11 +143,9 @@ func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate {
 			{Name: THSensor + "7", TempF: awnUpdate.Temp7F, Humidity: awnUpdate.Humidity7},
 			{Name: THSensor + "8", TempF: awnUpdate.Temp8F, Humidity: awnUpdate.Humidity8},
 		},
-		LightningData: &weather.LightningData{
+		LightningDay:      awnUpdate.LightningDay,
-			LightningDay:      awnUpdate.LightningDay,
+		LightningDistance: awnUpdate.LightningDistance,
-			LightningDistance: awnUpdate.LightningDistance,
+		LightningTime:     awnUpdate.LightningTime,
-			LightningTime:     awnUpdate.LightningTime,
-		},
 	}
 }
 

pkg/weather/metrics_record.go

@@ -3,6 +3,7 @@ package weather
 import (
 	"context"
 	"errors"
+	"slices"
 
 	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/attribute"
@@ -64,20 +65,10 @@ func (r *MetricRecorder) Record(opts *RecordOpts) {
 func (o *RecordOpts) keep() bool {
 	// If keep fields are given, only check keep fields
 	if len(o.Station.KeepMetrics) > 0 {
-		for _, f := range o.Station.KeepMetrics {
+		return slices.Contains(o.Station.KeepMetrics, o.Field)
-			if f == o.Field {
-				return true
-			}
-		}
-		return false
 	}
 
-	for _, f := range o.Station.DropMetrics {
+	return !slices.Contains(o.Station.DropMetrics, o.Field)
-		if f == o.Field {
-			return false
-		}
-	}
-	return true
 }
 
 func (r *MetricRecorder) recordInt(

pkg/weather/types.go

@@ -9,56 +9,52 @@ import (
 // Stable intermediate struct containing superset of fields
 // between AWN and Wunderground style updates from Ambient devices
 type WeatherUpdate struct {
-	DateUTC         *time.Time
+	DateUTC         *time.Time             `json:"dateUTC,omitempty"`
-	StationConfig   *config.WeatherStation
+	StationConfig   *config.WeatherStation `json:"stationConfig,omitempty"`
-	StationID       *string
+	StationID       *string                `json:"stationID,omitempty"`
-	StationType     *string
+	StationType     *string                `json:"stationType,omitempty"`
-	TempOutdoorF    *float64
+	TempOutdoorF    *float64               `json:"tempOutdoorF,omitempty"`
-	TempIndoorF     *float64
+	TempIndoorF     *float64               `json:"tempIndoorF,omitempty"`
-	HumidityOudoor  *int
+	HumidityOudoor  *int                   `json:"humidityOudoor,omitempty"`
-	HumidityIndoor  *int
+	HumidityIndoor  *int                   `json:"humidityIndoor,omitempty"`
-	WindSpeedMPH    *float64
+	WindSpeedMPH    *float64               `json:"windSpeedMPH,omitempty"`
-	WindGustMPH     *float64
+	WindGustMPH     *float64               `json:"windGustMPH,omitempty"`
-	MaxDailyGust    *float64
+	MaxDailyGust    *float64               `json:"maxDailyGust,omitempty"`
-	WindDir         *int
+	WindDir         *int                   `json:"windDir,omitempty"`
-	WindDirAvg10m   *int
+	WindDirAvg10m   *int                   `json:"windDirAvg10M,omitempty"`
-	UV              *int
+	UV              *int                   `json:"uv,omitempty"`
-	SolarRadiation  *float64
+	SolarRadiation  *float64               `json:"solarRadiation,omitempty"`
-	HourlyRainIn    *float64
+	HourlyRainIn    *float64               `json:"hourlyRainIn,omitempty"`
-	EventRainIn     *float64
+	EventRainIn     *float64               `json:"eventRainIn,omitempty"`
-	DailyRainIn     *float64
+	DailyRainIn     *float64               `json:"dailyRainIn,omitempty"`
-	WeeklyRainIn    *float64
+	WeeklyRainIn    *float64               `json:"weeklyRainIn,omitempty"`
-	MonthlyRainIn   *float64
+	MonthlyRainIn   *float64               `json:"monthlyRainIn,omitempty"`
-	YearlyRainIn    *float64
+	YearlyRainIn    *float64               `json:"yearlyRainIn,omitempty"`
-	TotalRainIn     *float64
+	TotalRainIn     *float64               `json:"totalRainIn,omitempty"`
-	Batteries       []BatteryStatus
+	Batteries       []BatteryStatus        `json:"batteries,omitempty"`
-	BaromRelativeIn *float64
+	BaromRelativeIn *float64               `json:"baromRelativeIn,omitempty"`
-	BaromAbsoluteIn *float64
+	BaromAbsoluteIn *float64               `json:"baromAbsoluteIn,omitempty"`
 	// These fields may be calculated
 	// if not otherwise set
-	DewPointF  *float64
+	DewPointF  *float64 `json:"dewPointF,omitempty"`
-	WindChillF *float64
+	WindChillF *float64 `json:"windChillF,omitempty"`
 	// Extra Temp+Humidity Sensors
-	TempHumiditySensors []*TempHumiditySensor
+	TempHumiditySensors []*TempHumiditySensor `json:"tempHumiditySensors,omitempty"`
 	// Lightning Data
-	*LightningData
+	LightningDay      *int `json:"lightningDay,omitempty"`      // Count of detections
-}
+	LightningDistance *int `json:"lightningDistance,omitempty"` // Last detection distance [kilometers]
-
+	LightningTime     *int `json:"lightningTime,omitempty"`     // Last detection time
-type LightningData struct {
-	LightningDay      *int // Count of detections
-	LightningDistance *int // Last detection distance [kilometers]
-	LightningTime     *int // Last detection time
 }
 
 type TempHumiditySensor struct {
-	Name     string
+	Name     string   `json:"name,omitempty"`
-	TempF    *float64
+	TempF    *float64 `json:"tempF,omitempty"`
-	Humidity *int
+	Humidity *int     `json:"humidity,omitempty"`
 }
 
 type BatteryStatus struct {
-	Component string
+	Component string `json:"component,omitempty"`
-	Status    *int
+	Status    *int   `json:"status,omitempty"`
 }
 
 // CHORE: Maintain this, used to check against