Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c002331fd4 | |||
| 2ed4eca56c | |||
| 2e3cfb44f4 | |||
| be8a4f3bca | |||
| 96dfcf7e53 | |||
| 5fc16b39af | |||
| 1ae58f64ca | |||
| bb4e4aa2af |
1
.gitignore
vendored
1
.gitignore
vendored
@ -27,3 +27,4 @@ go.work.sum
|
||||
bin/*
|
||||
|
||||
config.yaml
|
||||
docker-compose.yml
|
||||
|
||||
1
TODO.md
1
TODO.md
@ -3,6 +3,7 @@
|
||||
- [ ] Configuration for app
|
||||
- [ ] Helm Chart
|
||||
- [ ] Update README
|
||||
- [ ] Add new fields from WS-2192
|
||||
|
||||
## Done
|
||||
- [x] Gitea CI
|
||||
|
||||
@ -10,6 +10,10 @@ services:
|
||||
APP_LOG_FORMAT: json ## console, json
|
||||
APP_LOG_TIME_FORMAT: rfc3339 ## long, short, unix, rfc3339, off
|
||||
APP_HTTP_LISTEN: 0.0.0.0:8080
|
||||
APP_HTTP_READ_TIMEOUT: 10s
|
||||
APP_HTTP_WRITE_TIMEOUT: 10s
|
||||
APP_HTTP_IDLE_TIMEOUT: 30s
|
||||
APP_HTTP_LOG_REQUESTS: true
|
||||
APP_OTEL_STDOUT_ENABLED: false
|
||||
APP_OTEL_METRIC_INTERVAL_SECS: 30
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: http://otel.libretechconsulting.com:4317 # Set to your otel collector
|
||||
3
go.mod
3
go.mod
@ -3,7 +3,7 @@ module gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter
|
||||
go 1.23.4
|
||||
|
||||
require (
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.2
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.2.0
|
||||
github.com/gorilla/schema v1.4.1
|
||||
github.com/rs/zerolog v1.33.0
|
||||
go.opentelemetry.io/otel v1.33.0
|
||||
@ -14,7 +14,6 @@ require (
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/caarlos0/env/v11 v11.3.1 // indirect
|
||||
github.com/caarlos0/env/v9 v9.0.0 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/felixge/httpsnoop v1.0.4 // indirect
|
||||
|
||||
12
go.sum
12
go.sum
@ -1,15 +1,11 @@
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.0 h1:H4TMgQ463oRNOyoi0FAvfGtOoDn651zNZStxM+sdNuU=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.0/go.mod h1:p0ajkpFvzzD6VZ4xSjuowtwGRb1DjMfo/iG6LyFqFCs=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.1 h1:Hrxqi1tqz8mf0baBsWgFe/S4jyMtIuPqH2FlanJUMNc=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.1/go.mod h1:p0ajkpFvzzD6VZ4xSjuowtwGRb1DjMfo/iG6LyFqFCs=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.2 h1:28ha36+TXKLW4imzNMNO8fubWbCxEX59+V1RNpKgqR8=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.2/go.mod h1:MJGwEJGW1vOgWnJdmKC0R/WvqWy2t0S0q+mKpPpd/xc=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.3 h1:EwmEJLpN+rQjJ5stGEkZsqEDa5F/YnDAEeqJB9XlFn4=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.1.3/go.mod h1:wHOWh4O4AMDATQ3WEUYjq5a5bnICPBpu5G6BsNxqN38=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.2.0 h1:pOm/PysC0IWPuEbmEjNSHHa8Qc5OhuoksYExcuJMFE4=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.2.0/go.mod h1:wHOWh4O4AMDATQ3WEUYjq5a5bnICPBpu5G6BsNxqN38=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
|
||||
github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
|
||||
github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc=
|
||||
github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020=
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
|
||||
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||
|
||||
@ -85,6 +85,7 @@ func (aw *AmbientWeather) handleProviderRequest(
|
||||
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte(err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
// Calculate any fields that may be missing
|
||||
|
||||
@ -60,6 +60,7 @@ func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate {
|
||||
BattOutdoorSensor: awnUpdate.BattOut,
|
||||
BattIndoorSensor: awnUpdate.BattIn,
|
||||
BattRainSensor: awnUpdate.BattRain,
|
||||
BattCO2Sensor: awnUpdate.BattCO2,
|
||||
TempIndoorF: awnUpdate.TempInF,
|
||||
HumidityIndoor: awnUpdate.HumidityIn,
|
||||
BaromRelativeIn: awnUpdate.BaromRelIn,
|
||||
|
||||
@ -27,4 +27,5 @@ type AmbientWeatherUpdate struct {
|
||||
BaromRelIn float64 `json:"baromrelin,omitempty" schema:"baromrelin"`
|
||||
BaromAbsIn float64 `json:"baromabsin,omitempty" schema:"baromabsin"`
|
||||
BattIn int `json:"battin,omitempty" schema:"battin"`
|
||||
BattCO2 int `json:"batt_co2,omitempty" schema:"batt_co2"`
|
||||
}
|
||||
|
||||
@ -5,11 +5,15 @@ import "math"
|
||||
// Attempts to complete missing fields that may not
|
||||
// be set by a specific provider, such as DewPoint and WindChill
|
||||
func (u *WeatherUpdate) Enrich() {
|
||||
if u == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if u.WindChillF == 0 {
|
||||
u.WindChillF = CalculateWindChill(u.TempOutdoorF, u.WindSpeedMPH)
|
||||
}
|
||||
|
||||
if u.DewPointF == 0 {
|
||||
if u.DewPointF == 0 && (u.TempOutdoorF != 0 && u.HumidityOudoor != 0) {
|
||||
u.DewPointF = CalculateDewPoint(u.TempOutdoorF, float64(u.HumidityOudoor))
|
||||
}
|
||||
|
||||
|
||||
@ -30,6 +30,7 @@ type WeatherUpdate struct {
|
||||
BattOutdoorSensor int
|
||||
BattIndoorSensor int
|
||||
BattRainSensor int
|
||||
BattCO2Sensor int
|
||||
BaromRelativeIn float64
|
||||
BaromAbsoluteIn float64
|
||||
// These fields may be calculated
|
||||
|
||||
Reference in New Issue
Block a user