bump 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

api/v1alpha1/weather/weather.pb.go

@@ -296,6 +296,9 @@ type WeatherUpdate struct {
 	WindChillF          *float64               `protobuf:"fixed64,26,opt,name=wind_chill_f,json=windChillF,proto3,oneof" json:"wind_chill_f,omitempty"`
 	TempHumiditySensors []*TempHumiditySensor  `protobuf:"bytes,27,rep,name=temp_humidity_sensors,json=tempHumiditySensors,proto3" json:"temp_humidity_sensors,omitempty"`
 	UpdateTimestamp     *timestamppb.Timestamp `protobuf:"bytes,28,opt,name=update_timestamp,json=updateTimestamp,proto3" json:"update_timestamp,omitempty"`
+	LightningDay        *int32                 `protobuf:"varint,29,opt,name=lightning_day,json=lightningDay,proto3,oneof" json:"lightning_day,omitempty"`
+	LightningDistance   *int32                 `protobuf:"varint,30,opt,name=lightning_distance,json=lightningDistance,proto3,oneof" json:"lightning_distance,omitempty"`
+	LightningLastTime   *timestamppb.Timestamp `protobuf:"bytes,31,opt,name=lightning_last_time,json=lightningLastTime,proto3,oneof" json:"lightning_last_time,omitempty"`
 	unknownFields       protoimpl.UnknownFields
 	sizeCache           protoimpl.SizeCache
 }
@@ -526,6 +529,27 @@ func (x *WeatherUpdate) GetUpdateTimestamp() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *WeatherUpdate) GetLightningDay() int32 {
+	if x != nil && x.LightningDay != nil {
+		return *x.LightningDay
+	}
+	return 0
+}
+
+func (x *WeatherUpdate) GetLightningDistance() int32 {
+	if x != nil && x.LightningDistance != nil {
+		return *x.LightningDistance
+	}
+	return 0
+}
+
+func (x *WeatherUpdate) GetLightningLastTime() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LightningLastTime
+	}
+	return nil
+}
+
 // Represents a temperature and humidity sensor
 type TempHumiditySensor struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
@@ -660,7 +684,7 @@ const file_weather_weather_proto_rawDesc = "" +
 	"\fstation_name\x18\x01 \x01(\tH\x00R\vstationName\x88\x01\x01\x12&\n" +
 	"\fstation_type\x18\x02 \x01(\tH\x01R\vstationType\x88\x01\x01B\x0f\n" +
 	"\r_station_nameB\x0f\n" +
-	"\r_station_type\"\xfe\f\n" +
+	"\r_station_type\"\xee\x0e\n" +
 	"\rWeatherUpdate\x12!\n" +
 	"\fstation_name\x18\x01 \x01(\tR\vstationName\x12!\n" +
 	"\fstation_type\x18\x02 \x01(\tR\vstationType\x12\x1d\n" +
@@ -693,7 +717,10 @@ const file_weather_weather_proto_rawDesc = "" +
 	"\fwind_chill_f\x18\x1a \x01(\x01H\x15R\n" +
 	"windChillF\x88\x01\x01\x12W\n" +
 	"\x15temp_humidity_sensors\x18\x1b \x03(\v2#.ambient.weather.TempHumiditySensorR\x13tempHumiditySensors\x12E\n" +
-	"\x10update_timestamp\x18\x1c \x01(\v2\x1a.google.protobuf.TimestampR\x0fupdateTimestampB\x11\n" +
+	"\x10update_timestamp\x18\x1c \x01(\v2\x1a.google.protobuf.TimestampR\x0fupdateTimestamp\x12(\n" +
+	"\rlightning_day\x18\x1d \x01(\x05H\x16R\flightningDay\x88\x01\x01\x122\n" +
+	"\x12lightning_distance\x18\x1e \x01(\x05H\x17R\x11lightningDistance\x88\x01\x01\x12O\n" +
+	"\x13lightning_last_time\x18\x1f \x01(\v2\x1a.google.protobuf.TimestampH\x18R\x11lightningLastTime\x88\x01\x01B\x11\n" +
 	"\x0f_temp_outdoor_fB\x10\n" +
 	"\x0e_temp_indoor_fB\x13\n" +
 	"\x11_humidity_outdoorB\x12\n" +
@@ -715,7 +742,10 @@ const file_weather_weather_proto_rawDesc = "" +
 	"\x12_barom_relative_inB\x14\n" +
 	"\x12_barom_absolute_inB\x0e\n" +
 	"\f_dew_point_fB\x0f\n" +
-	"\r_wind_chill_f\"}\n" +
+	"\r_wind_chill_fB\x10\n" +
+	"\x0e_lightning_dayB\x15\n" +
+	"\x13_lightning_distanceB\x16\n" +
+	"\x14_lightning_last_time\"}\n" +
 	"\x12TempHumiditySensor\x12\x12\n" +
 	"\x04name\x18\x01 \x01(\tR\x04name\x12\x1a\n" +
 	"\x06temp_f\x18\x02 \x01(\x01H\x00R\x05tempF\x88\x01\x01\x12\x1f\n" +
@@ -759,11 +789,12 @@ var file_weather_weather_proto_depIdxs = []int32{
 	7, // 4: ambient.weather.WeatherUpdate.batteries:type_name -> ambient.weather.BatteryStatus
 	6, // 5: ambient.weather.WeatherUpdate.temp_humidity_sensors:type_name -> ambient.weather.TempHumiditySensor
 	8, // 6: ambient.weather.WeatherUpdate.update_timestamp:type_name -> google.protobuf.Timestamp
-	7, // [7:7] is the sub-list for method output_type
+	8, // 7: ambient.weather.WeatherUpdate.lightning_last_time:type_name -> google.protobuf.Timestamp
-	7, // [7:7] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension extendee
+	8, // [8:8] is the sub-list for extension type_name
-	0, // [0:7] is the sub-list for field type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_weather_weather_proto_init() }

api/v1alpha1/weather/weather_service.swagger.json

@@ -308,6 +308,18 @@
         "updateTimestamp": {
           "type": "string",
           "format": "date-time"
+        },
+        "lightningDay": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "lightningDistance": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "lightningLastTime": {
+          "type": "string",
+          "format": "date-time"
         }
       }
     }

contrib/schema.json

@@ -121,6 +121,10 @@
           "default": "127.0.0.1",
           "type": "string"
         },
+        "redisKeyTTL": {
+          "default": "24h",
+          "type": "string"
+        },
         "redisPassword": {
           "type": "string"
         },

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.12
 
 # 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.18.1"
 
 dependencies:
   - name: hull

pkg/ambient/ambientgrpc/mapupdate.go

@@ -59,6 +59,9 @@ func UpdateToPbUpdate(u *weather.WeatherUpdate) *pb.WeatherUpdate {
 		WindChillF:          u.WindChillF,
 		TempHumiditySensors: thSensorsToPbSensors(u.TempHumiditySensors),
 		UpdateTimestamp:     timestamppb.New(*u.DateUTC),
+		LightningDay:        util.Int32ptr(u.LightningDay),
+		LightningDistance:   util.Int32ptr(u.LightningDistance),
+		LightningLastTime:   util.TimestampFromIntPtr(u.LightningLastTime),
 	}
 }
 

pkg/ambient/ambientgrpc/mapupdate_test.go

@@ -52,6 +52,8 @@ var mockUpdate = &weather.WeatherUpdate{
 	TempHumiditySensors: []*weather.TempHumiditySensor{
 		{Name: "sensor1", TempF: ptr.To(99.999), Humidity: nil},
 	},
+	LightningDay:      ptr.To(1),
+	LightningDistance: ptr.To(20),
 }
 
 func TestUpdateToPbUpdate(t *testing.T) {
@@ -103,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/ambient/config/config_recorder.go

@@ -22,4 +22,5 @@ type RedisConfig struct {
 	RedisDB          int    `yaml:"redisDB" env:"REDIS_DB" default:"0" json:"redisDB,omitempty"`
 	RedisTLS         bool   `yaml:"redisTLS" env:"REDIS_TLS" default:"false" json:"redisTLS,omitempty"`
 	RedisTLSInsecure bool   `yaml:"redisTLSInsecure" env:"REDIS_TLS_INSECURE" default:"false" json:"redisTLSInsecure,omitempty"`
+	RedisKeyTTL      string `yaml:"redisKeyTTL" env:"REDIS_KEY_TTL" default:"24h" json:"redisKeyTTL,omitempty"`
 }

pkg/provider/awn/provider.go

@@ -20,11 +20,12 @@ const (
 
 // Battery Sensors
 const (
-	BattOutdoorSensor = "OutdoorSensor"
+	BattOutdoorSensor   = "OutdoorSensor"
-	BattIndoorSensor  = "IndoorSensor"
+	BattIndoorSensor    = "IndoorSensor"
-	BattRainSensor    = "RainSensor"
+	BattRainSensor      = "RainSensor"
-	BattCO2Sensor     = "CO2Sensor"
+	BattCO2Sensor       = "CO2Sensor"
-	THSensor          = "TempHumiditySensor"
+	BattLightningSensor = "LightningSensor"
+	THSensor            = "TempHumiditySensor"
 )
 
 func (awn *AWNProvider) Name() string {
@@ -74,6 +75,10 @@ func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate {
 		YearlyRainIn:   awnUpdate.YearlyRainIn,
 		TotalRainIn:    awnUpdate.TotalRainIn,
 		Batteries: []weather.BatteryStatus{
+			{
+				Component: BattLightningSensor,
+				Status:    awnUpdate.BattLightning,
+			},
 			{
 				Component: BattOutdoorSensor,
 				Status:    awnUpdate.BattOut,
@@ -138,6 +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},
 		},
+		LightningDay:      awnUpdate.LightningDay,
+		LightningDistance: awnUpdate.LightningDistance,
+		LightningLastTime: awnUpdate.LightningLastTime,
 	}
 }
 

pkg/provider/awn/types.go

@@ -33,8 +33,10 @@ type AmbientWeatherUpdate struct {
 }
 
 type AmbientLightningData struct {
-	BattLightning *int `json:"batt_lightning,omitempty" schema:"batt_lightning"`
+	BattLightning     *int `json:"batt_lightning,omitempty" schema:"batt_lightning"`
-	LightningDay  *int `json:"lightning_day,omitempty" schema:"lightning_day"`
+	LightningDay      *int `json:"lightning_day,omitempty" schema:"lightning_day" description:"count of lightning detections"`
+	LightningDistance *int `json:"lightning_distance,omitempty" schema:"lightning_distance" description:"distance in kilometers"`
+	LightningLastTime *int `json:"lightning_time,omitempty" schema:"lightning_time" description:"last lightning detection time"`
 }
 
 type AmbientTempHumiditySensors struct {

pkg/util/util.go

@@ -5,8 +5,10 @@ import (
 	"encoding/hex"
 	"fmt"
 	"slices"
+	"time"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	"k8s.io/utils/ptr"
 
 	pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
@@ -29,6 +31,13 @@ func Int32ptr(i *int) *int32 {
 	return ptr.To(int32(*i))
 }
 
+func TimestampFromIntPtr(i *int) *timestamppb.Timestamp {
+	if i == nil {
+		return nil
+	}
+	return timestamppb.New(time.Unix(int64(*i), 0))
+}
+
 // Generates a hash that will be consistent
 // across all running replicas
 func GetAppHash(conf *config.AppConfig) string {

pkg/weather/metrics.go

@@ -37,6 +37,11 @@ type WeatherMetrics struct {
 	DewPointF       metric.Float64Gauge
 	WindChillF      metric.Float64Gauge
 
+	// Lightning Sensor
+	LightningCountDay     metric.Int64Gauge
+	LightningLastDistance metric.Int64Gauge
+	LightningLastTime     metric.Int64Gauge
+
 	// Temp and Humidity Sensors
 	SensorTempF    metric.Float64Gauge
 	SensorHumidity metric.Int64Gauge
@@ -75,6 +80,10 @@ func (wm *WeatherMetrics) Update(u *WeatherUpdate) {
 	wm.recorder.Record(&RecordOpts{Float64Gauge: wm.DewPointF, FloatVal: u.DewPointF, Field: FieldDewPointF, Attributes: attributes, Station: u.StationConfig})
 	wm.recorder.Record(&RecordOpts{Float64Gauge: wm.WindChillF, FloatVal: u.WindChillF, Field: FieldWindChillF, Attributes: attributes, Station: u.StationConfig})
 
+	wm.recorder.Record(&RecordOpts{Int64Gauge: wm.LightningLastDistance, IntVal: u.LightningDistance, Field: FieldLightningDistance, Attributes: attributes, Station: u.StationConfig})
+	wm.recorder.Record(&RecordOpts{Int64Gauge: wm.LightningCountDay, IntVal: u.LightningDay, Field: FieldLightningDay, Attributes: attributes, Station: u.StationConfig})
+	wm.recorder.Record(&RecordOpts{Int64Gauge: wm.LightningLastTime, IntVal: u.LightningLastTime, Field: FieldLightningLastTime, Attributes: attributes, Station: u.StationConfig})
+
 	wm.RecordBatteries(u, attributes)
 	wm.RecordTempHumiditySensors(u, attributes)
 

pkg/weather/metrics_init.go

@@ -66,6 +66,16 @@ func MustInitMetrics(appCtx context.Context) *WeatherMetrics {
 	wm.WindChillF, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_chill_f",
 		metric.WithDescription("Wind Chill in Faherenheit"))
 
+	// Lightning Sensor
+	wm.LightningCountDay, _ = wm.meter.Int64Gauge(MetricPrefix+"_lightning_day",
+		metric.WithDescription("Count of lightning strikes for current day"))
+	wm.LightningLastDistance, _ = wm.meter.Int64Gauge(MetricPrefix+"_lightning_last_distance",
+		metric.WithDescription("Last measured lightning distance"),
+		metric.WithUnit("km"))
+	wm.LightningLastTime, _ = wm.meter.Int64Gauge(MetricPrefix+"_lightning_last_time",
+		metric.WithDescription("Last lightning time (epoch)"),
+		metric.WithUnit("s"))
+
 	// Temp and Humidity Sensors
 	wm.SensorTempF, _ = wm.meter.Float64Gauge(MetricPrefix+"_sensor_temp_f",
 		metric.WithDescription("Temperature Sensor in Faherenheit"))

pkg/weather/metrics_record.go

@@ -3,6 +3,7 @@ package weather
 import (
 	"context"
 	"errors"
+	"slices"
 
 	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/attribute"
@@ -19,6 +20,7 @@ type MetricRecorder struct {
 type RecordOpts struct {
 	Float64Gauge metric.Float64Gauge
 	Int64Gauge   metric.Int64Gauge
+	Int64Counter metric.Int64Counter
 	IntVal       *int
 	FloatVal     *float64
 	Attributes   []attribute.KeyValue
@@ -58,26 +60,39 @@ func (r *MetricRecorder) Record(opts *RecordOpts) {
 			return
 		}
 		r.recordFloat(opts.Float64Gauge, *opts.FloatVal, opts.Attributes...)
+	} else if opts.Int64Counter != nil {
+		if opts.IntVal == nil {
+			log := r.l.Trace().Str("field", string(opts.Field))
+			if opts.Station != nil {
+				log = log.Str("station", opts.Station.Name)
+			}
+			log.Msg("Dropping nil float metric")
+			return
+		}
+		r.recordCounter(opts.Int64Counter, *opts.IntVal, opts.Attributes...)
 	}
 }
 
 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
+
-		}
+func (r *MetricRecorder) recordCounter(
+	m metric.Int64Counter, value int, attributes ...attribute.KeyValue,
+) {
+	// Prepare metric attributes
+	options := make([]metric.AddOption, 0, len(attributes))
+	if len(attributes) > 0 {
+		options = append(options, metric.WithAttributes(attributes...))
 	}
-	return true
+
+	val := int64(value)
+	m.Add(r.ctx, val, options...)
 }
 
 func (r *MetricRecorder) recordInt(

pkg/weather/recorder/recorders/redis/redis.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"sync"
+	"time"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -20,6 +21,7 @@ import (
 )
 
 const (
+	DEF_TTL     = "24h"
 	DEF_RETAIN  = 120
 	UPDATES_KEY = "weatherUpdates"
 	NAME        = "redis recorder"
@@ -27,6 +29,7 @@ const (
 
 type RedisRecorder struct {
 	baseCtx context.Context
+	keyTTL  time.Duration
 	tracer  trace.Tracer
 	redis   *redis.Client
 	config  *config.AmbientLocalExporterConfig
@@ -42,8 +45,11 @@ func (r *RedisRecorder) Ping(ctx context.Context) error {
 }
 
 func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts) {
+	r.baseCtx = opts.BaseCtx
+	r.log = zerolog.Ctx(r.baseCtx)
+
 	if opts.AppConfig.RecorderConfig.RedisConfig == nil {
-		panic("refusing to init redis recorder with no redisConfig")
+		r.log.Panic().Msg("refusing to init redis recorder with no redisConfig")
 	}
 
 	if opts.RetainLast < 1 {
@@ -53,8 +59,18 @@ func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts)
 	r.config = opts.AppConfig
 	r.keep = opts.RetainLast
 	r.RWMutex = &sync.RWMutex{}
-	r.baseCtx = opts.BaseCtx
+
-	r.log = zerolog.Ctx(r.baseCtx)
+	keyTTL := opts.AppConfig.RecorderConfig.RedisConfig.RedisKeyTTL
+	if keyTTL == "" {
+		keyTTL = DEF_TTL
+	}
+
+	var err error
+	r.keyTTL, err = time.ParseDuration(keyTTL)
+	if err != nil {
+		r.log.Panic().Str("redisKeyTTL", keyTTL).Err(err).
+			Msg("invalid redis key ttl provided")
+	}
 
 	r.tracer = otel.GetTracer(r.baseCtx, "redisRecorder")
 	ctx, span := r.tracer.Start(ctx, "redisRecorder.init", trace.WithAttributes(
@@ -62,6 +78,7 @@ func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts)
 		attribute.Int("retainLast", opts.RetainLast),
 		attribute.Int("redisPort", opts.AppConfig.RecorderConfig.RedisConfig.RedisPort),
 		attribute.Bool("tls", opts.AppConfig.RecorderConfig.RedisConfig.RedisTLS),
+		attribute.String("keyTTL", r.keyTTL.String()),
 	))
 	defer span.End()
 

pkg/weather/recorder/recorders/redis/set.go

@@ -48,6 +48,7 @@ func (r *RedisRecorder) set(ctx context.Context, data []byte) error {
 		pipe.LPush(ctx, r.Key(), data)
 		pipe.LTrim(ctx, r.Key(), 0, int64(r.keep)-1)
 		count = pipe.LLen(ctx, r.Key())
+		pipe.Expire(ctx, r.Key(), r.keyTTL)
 		return nil
 	})
 	if err != nil {

pkg/weather/types.go

@@ -9,81 +9,88 @@ 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
+	LightningDay      *int `json:"lightningDay,omitempty"`      // Count of detections
+	LightningDistance *int `json:"lightningDistance,omitempty"` // Last detection distance [kilometers]
+	LightningLastTime *int `json:"lightningLastTime,omitempty"` // 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
 // keep and drop lists
 // TODO: Use refelct/ast to generate code
 const (
-	FieldDateUTC         = "DateUTC"
+	FieldDateUTC           = "DateUTC"
-	FieldStationType     = "StationType"
+	FieldStationType       = "StationType"
-	FieldTempOutdoorF    = "TempOutdoorF"
+	FieldTempOutdoorF      = "TempOutdoorF"
-	FieldTempIndoorF     = "TempIndoorF"
+	FieldTempIndoorF       = "TempIndoorF"
-	FieldHumidityOudoor  = "HumidityOudoor"
+	FieldHumidityOudoor    = "HumidityOudoor"
-	FieldHumidityIndoor  = "HumidityIndoor"
+	FieldHumidityIndoor    = "HumidityIndoor"
-	FieldWindSpeedMPH    = "WindSpeedMPH"
+	FieldWindSpeedMPH      = "WindSpeedMPH"
-	FieldWindGustMPH     = "WindGustMPH"
+	FieldWindGustMPH       = "WindGustMPH"
-	FieldMaxDailyGust    = "MaxDailyGust"
+	FieldMaxDailyGust      = "MaxDailyGust"
-	FieldWindDir         = "WindDir"
+	FieldWindDir           = "WindDir"
-	FieldWindDirAvg10m   = "WindDirAvg10m"
+	FieldWindDirAvg10m     = "WindDirAvg10m"
-	FieldUV              = "UV"
+	FieldUV                = "UV"
-	FieldSolarRadiation  = "SolarRadiation"
+	FieldSolarRadiation    = "SolarRadiation"
-	FieldHourlyRainIn    = "HourlyRainIn"
+	FieldHourlyRainIn      = "HourlyRainIn"
-	FieldEventRainIn     = "EventRainIn"
+	FieldEventRainIn       = "EventRainIn"
-	FieldDailyRainIn     = "DailyRainIn"
+	FieldDailyRainIn       = "DailyRainIn"
-	FieldWeeklyRainIn    = "WeeklyRainIn"
+	FieldWeeklyRainIn      = "WeeklyRainIn"
-	FieldMonthlyRainIn   = "MonthlyRainIn"
+	FieldMonthlyRainIn     = "MonthlyRainIn"
-	FieldYearlyRainIn    = "YearlyRainIn"
+	FieldYearlyRainIn      = "YearlyRainIn"
-	FieldTotalRainIn     = "TotalRainIn"
+	FieldTotalRainIn       = "TotalRainIn"
-	FieldBatteries       = "Batteries"
+	FieldBatteries         = "Batteries"
-	FieldBaromRelativeIn = "BaromRelativeIn"
+	FieldBaromRelativeIn   = "BaromRelativeIn"
-	FieldBaromAbsoluteIn = "BaromAbsoluteIn"
+	FieldBaromAbsoluteIn   = "BaromAbsoluteIn"
-	FieldDewPointF       = "DewPointF"
+	FieldDewPointF         = "DewPointF"
-	FieldWindChillF      = "WindChillF"
+	FieldWindChillF        = "WindChillF"
-	FieldSensorTempF     = "SensorTempF"
+	FieldSensorTempF       = "SensorTempF"
-	FieldSensorHumidity  = "SensorHumidity"
+	FieldSensorHumidity    = "SensorHumidity"
+	FieldLightningDay      = "LightningDay"
+	FieldLightningDistance = "LightningDistance"
+	FieldLightningLastTime = "LightningLastTime"
 )
 
 func (u *WeatherUpdate) GetStationName() string {

proto/weather/weather.proto

@@ -6,68 +6,71 @@ import "google/protobuf/timestamp.proto";
 option go_package = "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather";
 
 message CountWeatherUpdatesRequest {
-	GetWeatherOpts opts = 1;
+  GetWeatherOpts opts = 1;
 }
 
 message CountWeatherUpdatesResponse {
-	int32 count = 1;
+  int32 count = 1;
 }
 
 message GetWeatherRequest {
-	GetWeatherOpts opts = 1;
+  GetWeatherOpts opts = 1;
-	optional int32 limit = 2;
+  optional int32 limit = 2;
 }
 
-message GetWeatherResponse{
+message GetWeatherResponse {
-	google.protobuf.Timestamp last_updated = 1;
+  google.protobuf.Timestamp last_updated = 1;
-	repeated WeatherUpdate weather_updates = 2;
+  repeated WeatherUpdate weather_updates = 2;
 }
 
 message GetWeatherOpts {
-	optional string station_name = 1;
+  optional string station_name = 1;
-	optional string station_type = 2;
+  optional string station_type = 2;
 }
 
 message WeatherUpdate {
-	string station_name = 1;
+  string station_name = 1;
-	string station_type = 2;
+  string station_type = 2;
-	string station_id = 3;
+  string station_id = 3;
-	optional double temp_outdoor_f = 4;
+  optional double temp_outdoor_f = 4;
-	optional double temp_indoor_f = 5;
+  optional double temp_indoor_f = 5;
-	optional int32 humidity_outdoor = 6;
+  optional int32 humidity_outdoor = 6;
-	optional int32 humidity_indoor = 7;
+  optional int32 humidity_indoor = 7;
-	optional double wind_speed_mph = 8;
+  optional double wind_speed_mph = 8;
-	optional double wind_gust_mph = 9;
+  optional double wind_gust_mph = 9;
-	optional double max_daily_gust = 10;
+  optional double max_daily_gust = 10;
-	optional int32 wind_dir = 11;
+  optional int32 wind_dir = 11;
-	optional int32 wind_dir_avg_10m = 12;
+  optional int32 wind_dir_avg_10m = 12;
-	optional int32 uv = 13;
+  optional int32 uv = 13;
-	optional double solar_radiation = 14;
+  optional double solar_radiation = 14;
-	optional double hourly_rain_in = 15;
+  optional double hourly_rain_in = 15;
-	optional double event_rain_in = 16;
+  optional double event_rain_in = 16;
-	optional double daily_rain_in = 17;
+  optional double daily_rain_in = 17;
-	optional double weekly_rain_in = 18;
+  optional double weekly_rain_in = 18;
-	optional double monthly_rain_in = 19;
+  optional double monthly_rain_in = 19;
-	optional double yearly_rain_in = 20;
+  optional double yearly_rain_in = 20;
-	optional double total_rain_in = 21;
+  optional double total_rain_in = 21;
-	repeated BatteryStatus batteries = 22;
+  repeated BatteryStatus batteries = 22;
-	optional double barom_relative_in = 23;
+  optional double barom_relative_in = 23;
-	optional double barom_absolute_in = 24;
+  optional double barom_absolute_in = 24;
-	optional double dew_point_f = 25;
+  optional double dew_point_f = 25;
-	optional double wind_chill_f = 26;
+  optional double wind_chill_f = 26;
-	repeated TempHumiditySensor temp_humidity_sensors = 27;
+  repeated TempHumiditySensor temp_humidity_sensors = 27;
-	google.protobuf.Timestamp update_timestamp = 28;
+  google.protobuf.Timestamp update_timestamp = 28;
+  optional int32 lightning_day = 29;
+  optional int32 lightning_distance = 30;
+  optional google.protobuf.Timestamp lightning_last_time = 31;
 }
 
 // Represents a temperature and humidity sensor
 message TempHumiditySensor {
-	string name = 1;
+  string name = 1;
-	optional double temp_f = 2;
+  optional double temp_f = 2;
-	optional int32 humidity = 3;
+  optional int32 humidity = 3;
 }
 
 // Represents battery status for different components
 message BatteryStatus {
-	string component = 1;
+  string component = 1;
-	optional int32 status = 2;
+  optional int32 status = 2;
 }