support sensor name mapping

Add support for temp+humidity sensors
allow skip go list
2025-03-05 12:53:57 -05:00 · 2025-03-04 20:11:08 -05:00 · 2025-02-15 15:06:30 -05:00 · 2025-02-15 14:44:29 -05:00 · 2025-01-29 19:46:00 -05:00 · 2025-01-29 19:37:23 -05:00
22 changed files with 5734 additions and 179 deletions
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@ -54,6 +54,7 @@ jobs:
          done

      - name: Run Go List
+        continue-on-error: true
        env:
          TAG_NAME: ${{ github.ref_name }} # Use the pushed tag name
        run: |
--- a/TODO.md
+++ b/TODO.md
@ -2,12 +2,12 @@
 - [ ] Helm Chart
 - [ ] Update README
 - [ ] Add Grafana dashboard
- [ ] Add proxy to upstream support
 - [ ] Add new spans
- [ ] Fix wunderground 401
- [ ] Perform proxy calls in goroutines

 ## Done
+- [x] Add proxy to upstream support
+- [x] Fix wunderground 401
+- [x] Perform proxy calls in goroutines
 - [x] Configuration for app
 - [x] Configurable metric prefix
 - [x] Add device name field with ID/Key mappings
--- a/contrib/docker-compose-sample.yml
+++ b/contrib/docker-compose-sample.yml
--- a/contrib/grafana-dashboard.json
+++ b/contrib/grafana-dashboard.json
--- a/contrib/unset_env.sh
+++ b/contrib/unset_env.sh
--- a/go.mod
+++ b/go.mod
@ -3,13 +3,13 @@ module gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter
 go 1.23.4

 require (
-	gitea.libretechconsulting.com/rmcguire/go-app v0.3.1
-	github.com/go-resty/resty/v2 v2.16.3
+	gitea.libretechconsulting.com/rmcguire/go-app v0.5.1
+	github.com/go-resty/resty/v2 v2.16.5
 	github.com/gorilla/schema v1.4.1
 	github.com/rs/zerolog v1.33.0
-	go.opentelemetry.io/otel v1.33.0
-	go.opentelemetry.io/otel/metric v1.33.0
-	golang.org/x/sys v0.29.0
+	go.opentelemetry.io/otel v1.34.0
+	go.opentelemetry.io/otel/metric v1.34.0
+	golang.org/x/sys v0.30.0
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 )

@ -22,32 +22,32 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus/client_golang v1.21.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.61.0 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.55.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	golang.org/x/net v0.36.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
+	google.golang.org/grpc v1.71.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,5 +1,13 @@
-gitea.libretechconsulting.com/rmcguire/go-app v0.3.1 h1:jydcJ+Vv8sk+Le7nTI2+b6E7FfV+ShBJo7YdxmdaCYc=
-gitea.libretechconsulting.com/rmcguire/go-app v0.3.1/go.mod h1:wHOWh4O4AMDATQ3WEUYjq5a5bnICPBpu5G6BsNxqN38=
+gitea.libretechconsulting.com/rmcguire/go-app v0.4.0 h1:iEGuA2D15rniiKlgejykxvs0TBD9JigEVnhYiCNppw4=
+gitea.libretechconsulting.com/rmcguire/go-app v0.4.0/go.mod h1:ug6g+FyEi2LguWTQfd+bZrTd1ECsot8BylxgMFEO5DM=
+gitea.libretechconsulting.com/rmcguire/go-app v0.4.1 h1:gjDg2M/j1AdMCtkXqQnLCo6jJUSWQOj56ehfU1S6BGE=
+gitea.libretechconsulting.com/rmcguire/go-app v0.4.1/go.mod h1:9c71S+sJb2NqvOwt3CFsW5WjE895goiRlMTdLimgwHs=
+gitea.libretechconsulting.com/rmcguire/go-app v0.4.2 h1:LQxVLXEHruY32GaMsS5K/tMdjS5kvw6reUh25gshn40=
+gitea.libretechconsulting.com/rmcguire/go-app v0.4.2/go.mod h1:9c71S+sJb2NqvOwt3CFsW5WjE895goiRlMTdLimgwHs=
+gitea.libretechconsulting.com/rmcguire/go-app v0.5.0 h1:5yYyaXXN5KcxMIPBYLZKztvKGMlYol3+oqzUnkvHBaQ=
+gitea.libretechconsulting.com/rmcguire/go-app v0.5.0/go.mod h1:9c71S+sJb2NqvOwt3CFsW5WjE895goiRlMTdLimgwHs=
+gitea.libretechconsulting.com/rmcguire/go-app v0.5.1 h1:ONphNgJUWMcLIAR9OqCsRa1IuEBChMbRvS1he9xRt2Y=
+gitea.libretechconsulting.com/rmcguire/go-app v0.5.1/go.mod h1:QMAlmZVUYvXiEiTvYUDzJ0A5oUu7wSMLy2fM+ma21ME=
 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=
@ -18,21 +26,28 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-resty/resty/v2 v2.16.3 h1:zacNT7lt4b8M/io2Ahj6yPypL7bqx9n1iprfQuodV+E=
-github.com/go-resty/resty/v2 v2.16.3/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
+github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
+github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
 github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 h1:VD1gqscl4nYs1YxVuSdemTrSgTKrwOWDK0FVFMqm+Cg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0/go.mod h1:4EgsQoS4TOhJizV+JTFg40qx1Ofh3XmXEQNBpgvNT40=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@ -53,10 +68,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
 github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
-github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@ -68,53 +85,73 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0/go.mod h1:ZiGDq7xwDMKmWDrN1XsXAj0iC7hns+2DhxBFSncNHSE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
-go.opentelemetry.io/otel/exporters/prometheus v0.55.0 h1:sSPw658Lk2NWAv74lkD3B/RSDb+xRFx46GjkrL3VUZo=
-go.opentelemetry.io/otel/exporters/prometheus v0.55.0/go.mod h1:nC00vyCmQixoeaxF6KNyP42II/RHa9UdruK02qBmHvI=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 h1:FiOTYABOX4tdzi8A0+mtzcsTmi6WBOxk66u0f1Mj9Gs=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0/go.mod h1:xyo5rS8DgzV0Jtsht+LCEMwyiDbjpsxBpWETwFRF0/4=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 h1:W5AWUn/IVe8RFb5pZx1Uh9Laf/4+Qmm4kJL5zPuvR+0=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0/go.mod h1:mzKxJywMNBdEX8TSJais3NnsVZUaJ+bAy6UxPTng2vk=
-go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
-go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 h1:ajl4QczuJVA2TU9W9AGw++86Xga/RKt//16z/yxPgdk=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0/go.mod h1:Vn3/rlOJ3ntf/Q3zAI0V5lDnTbHGaUsNUeF6nZmm7pA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE=
+go.opentelemetry.io/otel/exporters/prometheus v0.56.0 h1:GnCIi0QyG0yy2MrJLzVrIM7laaJstj//flf1zEJCG+E=
+go.opentelemetry.io/otel/exporters/prometheus v0.56.0/go.mod h1:JQcVZtbIIPM+7SWBB+T6FK+xunlyidwLp++fN0sUaOk=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 h1:czJDQwFrMbOr9Kk+BPo1y8WZIIFIK58SA1kykuVeiOU=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0/go.mod h1:lT7bmsxOe58Tq+JIOkTQMCGXdu47oA+VJKLZHbaBKbs=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 h1:jBpDk4HAUsrnVO1FsfCfCOTEc/MkInJmvfCHYLFiT80=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0/go.mod h1:H9LUIM1daaeZaz91vZcfeM0fejXPmgCYE8ZhzqfJuiU=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
 go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
 golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
-google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 h1:A2ni10G3UlplFrWdCDJTl7D7mJ7GSRm37S+PDimaKRw=
+google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b h1:i+d0RZa8Hs2L/MuaOQYI+krthcxdEbEM2N+Tf3kJ4zk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
+google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b h1:FQtJ1MxbXoIIrZHZ33M+w5+dAP9o86rgpjoKr/ZmT7k=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
+google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/main.go
+++ b/main.go
@ -10,6 +10,7 @@ import (
 	"golang.org/x/sys/unix"

 	"gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter/pkg/ambient"
+	"gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter/pkg/ambient/ambienthttp"
 	"gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter/pkg/ambient/config"
 )

@ -46,6 +47,8 @@ func main() {
 					HandlerFunc: aw.GetAWNHandlerFunc(ctx),
 				},
 			},
+			CustomListener: ambienthttp.NewAWNMutatingListener(ctx,
+				awConfig.HTTP.Listen), // Necessary to fix certain bad AWN firmware
 			HealthChecks: []srv.HealthCheckFunc{
 				// TODO: Implement
 				func(ctx context.Context) error {
--- a/pkg/ambient/ambient.go
+++ b/pkg/ambient/ambient.go
@ -7,11 +7,13 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"sync"

 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
 	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"

 	"gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter/pkg/ambient/config"
 	"gitea.libretechconsulting.com/rmcguire/ambient-weather-local-exporter/pkg/provider"
@ -66,6 +68,11 @@ func (aw *AmbientWeather) GetWundergroundHandlerFunc(appCtx context.Context) fun
 // stable type. Enrich is called on the type to complete
 // any missing fields as the two providers supported by Ambient
 // devices (awn/wunderground) produce different fields
+//
+// This will call Update on metrics, and will also proxy
+// requests to AWN/Wunderground if enabled
+// This is the main work performed when a weather station or
+// weather hub sends an update
 func (aw *AmbientWeather) handleProviderRequest(
 	p provider.AmbientProvider,
 	w http.ResponseWriter,
@ -95,20 +102,17 @@ func (aw *AmbientWeather) handleProviderRequest(
 		return
 	}

-	// Calculate any fields that may be missing
-	// such as dew point and wind chill
-	update.Enrich()
+	// Perform enrichment
+	aw.enrichUpdate(ctx, p, update)

-	// Prepare metrics if this is the first update
+	// Update metrics
+	ctx, updateSpan := tracer.Start(ctx, p.Name()+".update.metrics")
 	if aw.metrics == nil {
 		aw.InitMetrics()
 	}
-
-	// Enrich station if configured
-	aw.enrichStation(update)
-
-	// Update metrics
 	aw.metrics.Update(update)
+	updateSpan.SetStatus(codes.Ok, "")
+	updateSpan.End()

 	l.Debug().
 		Str("provider", p.Name()).
@ -119,28 +123,88 @@ func (aw *AmbientWeather) handleProviderRequest(
 	// Proxy update to one or both services if configured to do so
 	// Uses a weather update to allow awn to publish to wunderground and
 	// visa versa.
-	if station := update.StationConfig; station != nil {
+	if update.StationConfig != nil {
+		aw.proxyUpdate(ctx, p, update)
+	}
+}
+
+func (aw *AmbientWeather) enrichUpdate(
+	ctx context.Context,
+	p provider.AmbientProvider,
+	update *weather.WeatherUpdate,
+) {
+	tracer := otel.GetTracer(aw.appCtx, p.Name()+".http.handler")
+
+	// Calculate any fields that may be missing
+	// such as dew point and wind chill
+	ctx, enrichSpan := tracer.Start(ctx, p.Name()+".update.enrich")
+	update.Enrich()
+
+	// Enrich station if configured
+	aw.enrichStation(update)
+
+	// Map sensor names
+	update.MapSensors()
+
+	enrichSpan.SetStatus(codes.Ok, "")
+	enrichSpan.End()
+}
+
+func (aw *AmbientWeather) proxyUpdate(
+	ctx context.Context,
+	p provider.AmbientProvider,
+	update *weather.WeatherUpdate,
+) {
+	var proxyWg sync.WaitGroup
+
+	tracer := otel.GetTracer(aw.appCtx, p.Name()+".http.handler")
+	station := update.StationConfig
+
+	ctx, proxySpan := tracer.Start(ctx, p.Name()+".update.proxy", trace.WithAttributes(
+		attribute.Bool("proxyToWunderground", station.ProxyToWunderground),
+		attribute.Bool("proxyToAWN", station.ProxyToAWN),
+	))
+	defer proxySpan.End()
+
+	// Perform proxy updates in parallel if enabled
+
 	if station.ProxyToAWN {
+		proxyWg.Add(1)
+		go func() {
+			defer proxyWg.Done()
+			defer proxySpan.AddEvent("proxied to ambient weather network")
 			err := aw.awnProvider.ProxyReq(ctx, update)
 			if err != nil {
 				zerolog.Ctx(aw.appCtx).Err(err).Msg("failed to proxy to ambient weather")
+				proxySpan.RecordError(err)
+				proxySpan.SetStatus(codes.Error, err.Error())
 				return
 			}
 			zerolog.Ctx(aw.appCtx).Debug().
 				Str("station", station.Name).
 				Msg("proxied weather update to awn")
+		}()
 	}
+
 	if station.ProxyToWunderground {
+		proxyWg.Add(1)
+		go func() {
+			defer proxyWg.Done()
+			defer proxySpan.AddEvent("proxied to wunderground")
 			err := aw.wuProvider.ProxyReq(ctx, update)
 			if err != nil {
 				zerolog.Ctx(aw.appCtx).Err(err).Msg("failed to proxy to ambient weather")
+				proxySpan.RecordError(err)
+				proxySpan.SetStatus(codes.Error, err.Error())
 				return
 			}
 			zerolog.Ctx(aw.appCtx).Debug().
 				Str("station", station.Name).
 				Msg("proxied weather update to wunderground")
+		}()
 	}
-	}
+
+	proxyWg.Wait()
 }

 func (aw *AmbientWeather) InitMetrics() {
--- a/pkg/ambient/ambienthttp/ambienthttp.go
+++ b/pkg/ambient/ambienthttp/ambienthttp.go
@ -0,0 +1,112 @@
+// This package exists purely to override the net.Listener used
+// by the application's http server. This is necessary for certain versions
+// of firmware which errantly put an 0x0a (LF) following PASSKEY for
+// AmbientWeather type http reporting.
+//
+// This needs to be fixed upstream by Ambient Weather and is a complete
+// hack that should never be necessary. Without this, the http server
+// will silently crank back an HTTP:400
+package ambienthttp
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"io"
+	"net"
+	"regexp"
+
+	"github.com/rs/zerolog"
+)
+
+// Invalid Request Pattern
+var badReqURI = regexp.MustCompile(`PASSKEY=[^\n&]{16,}$`)
+
+// Listener encapsulates LFStrippingConn to perform
+// infuriating strip of newline character present after PASSKEY
+// sent errantly by specific versions of firmware sending updates
+// in AmbientWeather protocol
+type LFStrippingListener struct {
+	ctx context.Context
+	net.Listener
+}
+
+type LFStrippingConn struct {
+	ctx    context.Context
+	reader io.Reader
+	net.Conn
+}
+
+func (l *LFStrippingListener) WrapConn(conn net.Conn) net.Conn {
+	buf := new(bytes.Buffer)
+	reader := io.TeeReader(conn, buf)
+
+	scanner := bufio.NewScanner(reader)
+	var newData []byte
+	for scanner.Scan() {
+		line := scanner.Bytes()
+		newData = append(newData, line...)
+
+		// Only restore newline if not a bad request
+		if !badReqURI.Match(line) {
+			newData = append(newData, '\n')
+		} else {
+			zerolog.Ctx(l.ctx).Warn().Bytes("line", line).
+				Msg("malformed request found, stripped 0x0a")
+		}
+
+		if len(line) == 0 {
+			break
+		}
+	}
+	if scanner.Err() != nil {
+		zerolog.Ctx(l.ctx).Err(scanner.Err()).Send()
+	}
+
+	zerolog.Ctx(l.ctx).Trace().
+		Int("numBytes", len(newData)).
+		Bytes("request", newData).
+		Msg("stripping conn complete")
+
+	// Use a multi-reader to prepend the modified request
+	finalReader := io.MultiReader(bytes.NewReader(newData), conn)
+
+	return &LFStrippingConn{
+		Conn:   conn,
+		ctx:    l.ctx,
+		reader: finalReader,
+	}
+}
+
+func NewAWNMutatingListener(ctx context.Context, listen string) net.Listener {
+	rawListener, err := net.Listen("tcp", listen)
+	if err != nil {
+		panic(err)
+	}
+
+	// Encapsulate the raw listener with ours
+	return &LFStrippingListener{
+		Listener: rawListener,
+		ctx:      ctx,
+	}
+}
+
+func (l *LFStrippingListener) Accept() (net.Conn, error) {
+	conn, err := l.Listener.Accept()
+	if err != nil {
+		return nil, err
+	}
+	return l.WrapConn(conn), nil
+}
+
+func (l *LFStrippingListener) Close() error {
+	return l.Listener.Close()
+}
+
+func (l *LFStrippingListener) Addr() net.Addr {
+	return l.Listener.Addr()
+}
+
+func (c *LFStrippingConn) Read(b []byte) (int, error) {
+	return c.reader.Read(b)
+}
--- a/pkg/ambient/config/config.go
+++ b/pkg/ambient/config/config.go
@ -33,4 +33,14 @@ type WeatherStation struct {
 	// Check weather.WeatherUpdateField for options
 	KeepMetrics []string `yaml:"keepMetrics"`
 	DropMetrics []string `yaml:"dropMetrics"`
+
+	// Relabels battery and sensor names
+	// Temp+Humidity Sensors:
+	//   - TempHumiditySensor[1-8]
+	// Batteries:
+	//   - IndoorSensor
+	//   - OutdoorSensor
+	//   - RainSensor
+	//   - CO2Sensor
+	SensorMappings map[string]string `yaml:"sensorMappings"`
 }
--- a/pkg/ambient/config/ws_map.go
+++ b/pkg/ambient/config/ws_map.go
@ -0,0 +1,12 @@
+package config
+
+// If the weather-station has a mapping, returns the new
+// name for the sensor
+func (ws *WeatherStation) MapSensor(sensor string) string {
+	for name, replacement := range ws.SensorMappings {
+		if name == sensor && replacement != "" {
+			return replacement
+		}
+	}
+	return sensor
+}
--- a/pkg/ambient/config/ws_map_test.go
+++ b/pkg/ambient/config/ws_map_test.go
@ -0,0 +1,67 @@
+package config
+
+import "testing"
+
+func TestWeatherStation_MapSensor(t *testing.T) {
+	type fields struct {
+		Name                 string
+		Equipment            string
+		WundergroundID       string
+		WundergroundPassword string
+		AWNPassKey           string
+		ProxyToAWN           bool
+		ProxyToWunderground  bool
+		KeepMetrics          []string
+		DropMetrics          []string
+		SensorMappings       map[string]string
+	}
+	type args struct {
+		sensor string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   string
+	}{
+		{
+			name: "Check sensor mapping",
+			fields: fields{
+				SensorMappings: map[string]string{
+					"TempHumiditySensor1": "TestSensor",
+				},
+			},
+			args: args{sensor: "TempHumiditySensor1"},
+			want: "TestSensor",
+		},
+		{
+			name: "Check sensor no mapping",
+			fields: fields{
+				SensorMappings: map[string]string{
+					"TempHumiditySensor1": "TestSensor",
+				},
+			},
+			args: args{sensor: "TempHumiditySensor2"},
+			want: "TempHumiditySensor2",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ws := &WeatherStation{
+				Name:                 tt.fields.Name,
+				Equipment:            tt.fields.Equipment,
+				WundergroundID:       tt.fields.WundergroundID,
+				WundergroundPassword: tt.fields.WundergroundPassword,
+				AWNPassKey:           tt.fields.AWNPassKey,
+				ProxyToAWN:           tt.fields.ProxyToAWN,
+				ProxyToWunderground:  tt.fields.ProxyToWunderground,
+				KeepMetrics:          tt.fields.KeepMetrics,
+				DropMetrics:          tt.fields.DropMetrics,
+				SensorMappings:       tt.fields.SensorMappings,
+			}
+			if got := ws.MapSensor(tt.args.sensor); got != tt.want {
+				t.Errorf("WeatherStation.MapSensor() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
--- a/pkg/provider/awn/provider.go
+++ b/pkg/provider/awn/provider.go
@ -24,6 +24,7 @@ const (
 	BattIndoorSensor  = "IndoorSensor"
 	BattRainSensor    = "RainSensor"
 	BattCO2Sensor     = "CO2Sensor"
+	THSensor          = "TempHumiditySensor"
 )

 func (awn *AWNProvider) Name() string {
@ -89,11 +90,54 @@ func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate {
 				Component: BattCO2Sensor,
 				Status:    awnUpdate.BattCO2,
 			},
+			// Temp and Humidity Sensors
+			{
+				Component: THSensor + "1",
+				Status:    awnUpdate.Batt1,
+			},
+			{
+				Component: THSensor + "2",
+				Status:    awnUpdate.Batt2,
+			},
+			{
+				Component: THSensor + "3",
+				Status:    awnUpdate.Batt3,
+			},
+			{
+				Component: THSensor + "4",
+				Status:    awnUpdate.Batt4,
+			},
+			{
+				Component: THSensor + "5",
+				Status:    awnUpdate.Batt5,
+			},
+			{
+				Component: THSensor + "6",
+				Status:    awnUpdate.Batt6,
+			},
+			{
+				Component: THSensor + "7",
+				Status:    awnUpdate.Batt7,
+			},
+			{
+				Component: THSensor + "8",
+				Status:    awnUpdate.Batt8,
+			},
 		},
 		TempIndoorF:     awnUpdate.TempInF,
 		HumidityIndoor:  awnUpdate.HumidityIn,
 		BaromRelativeIn: awnUpdate.BaromRelIn,
 		BaromAbsoluteIn: awnUpdate.BaromAbsIn,
+		TempHumiditySensors: []*weather.TempHumiditySensor{
+			{Name: THSensor + "1", TempF: awnUpdate.Temp1F, Humidity: awnUpdate.Humidity1},
+			{Name: THSensor + "2", TempF: awnUpdate.Temp2F, Humidity: awnUpdate.Humidity2},
+			{Name: THSensor + "3", TempF: awnUpdate.Temp3F, Humidity: awnUpdate.Humidity3},
+			{Name: THSensor + "4", TempF: awnUpdate.Temp4F, Humidity: awnUpdate.Humidity4},
+			{Name: THSensor + "5", TempF: awnUpdate.Temp5F, Humidity: awnUpdate.Humidity5},
+			{Name: THSensor + "6", TempF: awnUpdate.Temp6F, Humidity: awnUpdate.Humidity6},
+			{Name: THSensor + "7", TempF: awnUpdate.Temp7F, Humidity: awnUpdate.Humidity7},
+			{Name: THSensor + "8", TempF: awnUpdate.Temp8F, Humidity: awnUpdate.Humidity8},
+		},
 	}
 }

--- a/pkg/provider/awn/proxy.go
+++ b/pkg/provider/awn/proxy.go
@ -8,6 +8,7 @@ import (

 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
 	"github.com/go-resty/resty/v2"
+	"github.com/rs/zerolog/log"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"

@ -43,12 +44,18 @@ func (awn *AWNProvider) ProxyReq(ctx context.Context, update *weather.WeatherUpd
 		Get(awnURL)
 	if err != nil {
 		span.RecordError(err)
+		span.SetAttributes(
+			attribute.String("query", resp.Request.QueryParam.Encode()),
+			attribute.String("body", string(resp.Body())),
+		)
 		span.SetStatus(codes.Error, err.Error())
+		log.Err(err).Any("query", resp.Request.PathParams).
+			Int("statusCode", resp.StatusCode()).
+			Msg("awn proxy failed")
 	}

 	span.SetAttributes(
 		attribute.Int("statusCode", resp.StatusCode()),
-		attribute.String("body", string(resp.Body())),
 	)

 	return err
--- a/pkg/provider/awn/types.go
+++ b/pkg/provider/awn/types.go
@ -28,4 +28,32 @@ type AmbientWeatherUpdate struct {
 	BaromAbsIn     *float64 `json:"baromabsin,omitempty" schema:"baromabsin"`
 	BattIn         *int     `json:"battin,omitempty" schema:"battin"`
 	BattCO2        *int     `json:"batt_co2,omitempty" schema:"batt_co2"`
+	*AmbientTempHumiditySensors
+}
+
+type AmbientTempHumiditySensors struct {
+	Temp1F    *float64 `json:"temp1f,omitempty" schema:"temp1f"`
+	Temp2F    *float64 `json:"temp2f,omitempty" schema:"temp2f"`
+	Temp3F    *float64 `json:"temp3f,omitempty" schema:"temp3f"`
+	Temp4F    *float64 `json:"temp4f,omitempty" schema:"temp4f"`
+	Temp5F    *float64 `json:"temp5f,omitempty" schema:"temp5f"`
+	Temp6F    *float64 `json:"temp6f,omitempty" schema:"temp6f"`
+	Temp7F    *float64 `json:"temp7f,omitempty" schema:"temp7f"`
+	Temp8F    *float64 `json:"temp8f,omitempty" schema:"temp8f"`
+	Humidity1 *int     `json:"humidity1,omitempty" schema:"humidity1"`
+	Humidity2 *int     `json:"humidity2,omitempty" schema:"humidity2"`
+	Humidity3 *int     `json:"humidity3,omitempty" schema:"humidity3"`
+	Humidity4 *int     `json:"humidity4,omitempty" schema:"humidity4"`
+	Humidity5 *int     `json:"humidity5,omitempty" schema:"humidity5"`
+	Humidity6 *int     `json:"humidity6,omitempty" schema:"humidity6"`
+	Humidity7 *int     `json:"humidity7,omitempty" schema:"humidity7"`
+	Humidity8 *int     `json:"humidity8,omitempty" schema:"humidity8"`
+	Batt1     *int     `json:"batt1,omitempty" schema:"batt1"`
+	Batt2     *int     `json:"batt2,omitempty" schema:"batt2"`
+	Batt3     *int     `json:"batt3,omitempty" schema:"batt3"`
+	Batt4     *int     `json:"batt4,omitempty" schema:"batt4"`
+	Batt5     *int     `json:"batt5,omitempty" schema:"batt5"`
+	Batt6     *int     `json:"batt6,omitempty" schema:"batt6"`
+	Batt7     *int     `json:"batt7,omitempty" schema:"batt7"`
+	Batt8     *int     `json:"batt8,omitempty" schema:"batt8"`
 }
--- a/pkg/provider/wunderground/provider.go
+++ b/pkg/provider/wunderground/provider.go
@ -51,7 +51,7 @@ func MapWUUpdate(wuUpdate *WundergroundUpdate) *weather.WeatherUpdate {
 		StationType:     wuUpdate.SoftwareType,
 		TempOutdoorF:    wuUpdate.Tempf,
 		HumidityOudoor:  wuUpdate.Humidity,
-		WindSpeedMPH:    wuUpdate.WindGustMPH,
+		WindSpeedMPH:    wuUpdate.WindSpeedMPH,
 		WindGustMPH:     wuUpdate.WindGustMPH,
 		WindDir:         wuUpdate.WindDir,
 		UV:              wuUpdate.UV,
--- a/pkg/provider/wunderground/proxy.go
+++ b/pkg/provider/wunderground/proxy.go
@ -6,6 +6,7 @@ import (
 	"net/url"

 	"github.com/go-resty/resty/v2"
+	"github.com/rs/zerolog/log"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"k8s.io/utils/ptr"
@ -40,13 +41,17 @@ func (wu *WUProvider) ProxyReq(ctx context.Context, update *weather.WeatherUpdat
 		span.SetStatus(codes.Error, err.Error())
 		span.SetAttributes(
 			attribute.String("query", resp.Request.QueryParam.Encode()),
+			attribute.String("body", string(resp.Body())),
 		)
 		span.RecordError(err)
+		log.Err(err).
+			Int("statusCode", resp.StatusCode()).
+			Any("query", resp.Request.PathParams).
+			Msg("wunderground proxy failed")
 	}

 	span.SetAttributes(
 		attribute.Int("statusCode", resp.StatusCode()),
-		attribute.String("body", string(resp.Body())),
 	)

 	return err
--- a/pkg/weather/enrich.go
+++ b/pkg/weather/enrich.go
@ -10,16 +10,33 @@ import (

 // Attempts to complete missing fields that may not
 // be set by a specific provider, such as DewPoint and WindChill
+// TODO: Add span
 func (u *WeatherUpdate) Enrich(weatherStations ...*config.WeatherStation) {
 	if u == nil {
 		return
 	}

+	// Clear invalid measurements, would be better if these weren't
+	// sent when sensor was out of range.
+	// TODO: This should probably just be done for all fields where
+	// the value is -9999
+	if u.BaromAbsoluteIn != nil && *u.BaromAbsoluteIn < 20 {
+		u.BaromAbsoluteIn = nil
+	}
+	if u.BaromRelativeIn != nil && *u.BaromRelativeIn < 20 {
+		u.BaromRelativeIn = nil
+	}
+	if u.TempIndoorF != nil && *u.TempIndoorF < -1000 {
+		u.TempIndoorF = nil
+	}
+
+	// Calculate Wind Chill
 	if u.WindChillF == nil && u.TempOutdoorF != nil && u.WindSpeedMPH != nil {
 		wc := CalculateWindChill(*u.TempOutdoorF, *u.WindSpeedMPH)
 		u.WindChillF = &wc
 	}

+	// Calculate Dew Point
 	if u.DewPointF == nil && (u.TempOutdoorF != nil && u.HumidityOudoor != nil) {
 		if *u.TempOutdoorF != 0 || *u.HumidityOudoor != 0 {
 			dp := CalculateDewPoint(*u.TempOutdoorF, float64(*u.HumidityOudoor))
@ -27,11 +44,30 @@ func (u *WeatherUpdate) Enrich(weatherStations ...*config.WeatherStation) {
 		}
 	}

+	// Use relative pressure if absolute isn't provided
 	if u.BaromAbsoluteIn == nil && u.BaromRelativeIn != nil {
 		u.BaromAbsoluteIn = u.BaromRelativeIn
 	}
 }

+// Swaps sensor and component names based on
+// user provided configuration
+func (u *WeatherUpdate) MapSensors() {
+	if u.StationConfig == nil {
+		return
+	}
+
+	// Map sensor battery components
+	for i, batt := range u.Batteries {
+		u.Batteries[i].Component = u.StationConfig.MapSensor(batt.Component)
+	}
+
+	// Map other sensors
+	for _, th := range u.TempHumiditySensors {
+		th.Name = u.StationConfig.MapSensor(th.Name)
+	}
+}
+
 func CalculateDewPoint(tempF, humidity float64) float64 {
 	// Convert temperature from Fahrenheit to Celsius
 	tempC := (tempF - 32) * 5 / 9
--- a/pkg/weather/metrics.go
+++ b/pkg/weather/metrics.go
@ -4,13 +4,13 @@ import (
 	"context"

 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
-	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
-	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 )

+var MetricPrefix = "weather"
+
 type WeatherMetrics struct {
 	// Weather Metrics
 	TempOutdoorF    metric.Float64Gauge
@ -37,6 +37,10 @@ type WeatherMetrics struct {
 	DewPointF       metric.Float64Gauge
 	WindChillF      metric.Float64Gauge

+	// Temp and Humidity Sensors
+	SensorTempF    metric.Float64Gauge
+	SensorHumidity metric.Int64Gauge
+
 	// Internal Telemetry
 	UpdatesReceived metric.Int64Counter
 	appCtx          context.Context
@ -45,90 +49,8 @@ type WeatherMetrics struct {
 	recorder        *MetricRecorder
 }

-var MetricPrefix = "weather"
-
-func MustInitMetrics(appCtx context.Context) *WeatherMetrics {
-	wm := &WeatherMetrics{
-		appCtx:   appCtx,
-		cfg:      config.MustFromCtx(appCtx),
-		recorder: &MetricRecorder{ctx: appCtx, l: zerolog.Ctx(appCtx)},
-	}
-
-	wm.meter = otel.GetMeter(appCtx, "weather", "metrics")
-
-	// Weather Metrics
-	wm.TempOutdoorF, _ = wm.meter.Float64Gauge(MetricPrefix+"_temp_outdoor_f",
-		metric.WithDescription("Outdoor Temperature in Faherenheit"))
-	wm.TempIndoorF, _ = wm.meter.Float64Gauge(MetricPrefix+"_temp_indoor_f",
-		metric.WithDescription("Indoor Temperature in Faherenheit"))
-	wm.HumidityOudoor, _ = wm.meter.Int64Gauge(MetricPrefix+"_humidity_outdoor",
-		metric.WithDescription("Outdoor Humidity %"))
-	wm.HumidityIndoor, _ = wm.meter.Int64Gauge(MetricPrefix+"_humidity_indoor",
-		metric.WithDescription("Indoor Humidity %"))
-	wm.WindSpeedMPH, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_speed_mph",
-		metric.WithDescription("Wind Speed in MPH"))
-	wm.WindGustMPH, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_gust_mph",
-		metric.WithDescription("Wind Gust in MPH"))
-	wm.MaxDailyGust, _ = wm.meter.Float64Gauge(MetricPrefix+"_max_daily_gust",
-		metric.WithDescription("Max Daily Wind Gust"))
-	wm.WindDir, _ = wm.meter.Int64Gauge(MetricPrefix+"_wind_dir",
-		metric.WithDescription("Wind Direction in Degrees"))
-	wm.WindDirAvg10m, _ = wm.meter.Int64Gauge(MetricPrefix+"_wind_dir_avg_10m",
-		metric.WithDescription("Wind Direction 10m Average"))
-	wm.UV, _ = wm.meter.Int64Gauge(MetricPrefix+"_uv",
-		metric.WithDescription("UV Index"))
-	wm.SolarRadiation, _ = wm.meter.Float64Gauge(MetricPrefix+"_solar_radiation",
-		metric.WithDescription("Solar Radiation in W/㎡"))
-	wm.HourlyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_hourly_rain_in",
-		metric.WithDescription("Hourly Rain in Inches"))
-	wm.EventRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_event_rain_in",
-		metric.WithDescription("Event Rain in Inches"))
-	wm.DailyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_daily_rain_in",
-		metric.WithDescription("Daily Rain in Inches"))
-	wm.WeeklyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_weekly_rain_in",
-		metric.WithDescription("Weekly Rain in Inches"))
-	wm.MonthlyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_monthly_rain_in",
-		metric.WithDescription("Monthly Rain in Inches"))
-	wm.YearlyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_yearly_rain_in",
-		metric.WithDescription("Yearly Rain in Inches"))
-	wm.TotalRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_total_rain_in",
-		metric.WithDescription("Total Rain in Inches"))
-	wm.BatteryStatus, _ = wm.meter.Int64Gauge(MetricPrefix+"_battery_status",
-		metric.WithDescription("Per-component battery status"))
-	wm.BaromRelativeIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_barometric_pressure_relative_in",
-		metric.WithDescription("Relative Pressure in Inches of Mercury"))
-	wm.BaromAbsoluteIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_barometric_pressure_absolute_in",
-		metric.WithDescription("Absolute Pressure in Inches of Mercury"))
-	wm.DewPointF, _ = wm.meter.Float64Gauge(MetricPrefix+"_dew_point_f",
-		metric.WithDescription("Dew Point in Faherenheit"))
-	wm.WindChillF, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_chill_f",
-		metric.WithDescription("Wind Chill in Faherenheit"))
-
-	// Internal Telemetry
-	wm.UpdatesReceived, _ = wm.meter.Int64Counter(MetricPrefix+"_updates_received",
-		metric.WithDescription("Metric Updates Processed by Exporter"))
-
-	return wm
-}
-
 func (wm *WeatherMetrics) Update(u *WeatherUpdate) {
-	attributes := []attribute.KeyValue{
-		semconv.ServiceVersion(wm.cfg.Version),
-	}
-	if u.StationType != nil {
-		attributes = append(attributes,
-			attribute.String("station_type", *u.StationType))
-	}
-	if u.StationConfig != nil {
-		if u.StationConfig.Name != "" {
-			attributes = append(attributes,
-				attribute.String("station_name", u.StationConfig.Name))
-		}
-		if u.StationConfig.Equipment != "" {
-			attributes = append(attributes,
-				attribute.String("station_equipment", u.StationConfig.Equipment))
-		}
-	}
+	attributes := wm.GetAttributes(u)

 	wm.recorder.Record(&RecordOpts{Float64Gauge: wm.TempOutdoorF, FloatVal: u.TempOutdoorF, Field: FieldTempOutdoorF, Attributes: attributes, Station: u.StationConfig})
 	wm.recorder.Record(&RecordOpts{Float64Gauge: wm.TempIndoorF, FloatVal: u.TempIndoorF, Field: FieldTempIndoorF, Attributes: attributes, Station: u.StationConfig})
@ -153,13 +75,73 @@ 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})

-	// Batteries
-	for _, battery := range u.Batteries {
-		batAttr := attributes
-		batAttr = append(batAttr, attribute.String("component", battery.Component))
-
-		wm.recorder.Record(&RecordOpts{Int64Gauge: wm.BatteryStatus, IntVal: battery.Status, Field: FieldBatteries, Attributes: batAttr, Station: u.StationConfig})
-	}
+	wm.RecordBatteries(u, attributes)
+	wm.RecordTempHumiditySensors(u, attributes)

 	wm.UpdatesReceived.Add(wm.appCtx, 1)
 }
+
+func (wm *WeatherMetrics) RecordBatteries(u *WeatherUpdate, attr []attribute.KeyValue) {
+	for _, battery := range u.Batteries {
+		batAttr := attr
+		batAttr = append(batAttr, attribute.String("component", battery.Component))
+
+		wm.recorder.Record(&RecordOpts{
+			Int64Gauge: wm.BatteryStatus,
+			IntVal:     battery.Status,
+			Field:      FieldBatteries,
+			Attributes: batAttr,
+			Station:    u.StationConfig,
+		})
+	}
+}
+
+func (wm *WeatherMetrics) RecordTempHumiditySensors(u *WeatherUpdate, attr []attribute.KeyValue) {
+	if u == nil || u.TempHumiditySensors == nil {
+		return
+	}
+
+	for _, sensor := range u.TempHumiditySensors {
+		sensorAttr := attr
+		sensorAttr = append(sensorAttr, attribute.String("sensorName", sensor.Name))
+
+		wm.recorder.Record(&RecordOpts{
+			Float64Gauge: wm.SensorTempF,
+			FloatVal:     sensor.TempF,
+			Field:        FieldSensorTempF,
+			Attributes:   sensorAttr,
+			Station:      u.StationConfig,
+		})
+		wm.recorder.Record(&RecordOpts{
+			Int64Gauge: wm.SensorHumidity,
+			IntVal:     sensor.Humidity,
+			Field:      FieldSensorHumidity,
+			Attributes: sensorAttr,
+			Station:    u.StationConfig,
+		})
+	}
+}
+
+func (wm *WeatherMetrics) GetAttributes(u *WeatherUpdate) []attribute.KeyValue {
+	attributes := []attribute.KeyValue{
+		semconv.ServiceVersion(wm.cfg.Version),
+		semconv.ServiceName(wm.cfg.Name),
+		semconv.DeploymentEnvironment(wm.cfg.Environment),
+	}
+	if u.StationType != nil {
+		attributes = append(attributes,
+			attribute.String("station_type", *u.StationType))
+	}
+	if u.StationConfig != nil {
+		if u.StationConfig.Name != "" {
+			attributes = append(attributes,
+				attribute.String("station_name", u.StationConfig.Name))
+		}
+		if u.StationConfig.Equipment != "" {
+			attributes = append(attributes,
+				attribute.String("station_equipment", u.StationConfig.Equipment))
+		}
+	}
+
+	return attributes
+}
--- a/pkg/weather/metrics_init.go
+++ b/pkg/weather/metrics_init.go
@ -0,0 +1,80 @@
+package weather
+
+import (
+	"context"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
+	"github.com/rs/zerolog"
+	"go.opentelemetry.io/otel/metric"
+)
+
+func MustInitMetrics(appCtx context.Context) *WeatherMetrics {
+	wm := &WeatherMetrics{
+		appCtx:   appCtx,
+		cfg:      config.MustFromCtx(appCtx),
+		recorder: &MetricRecorder{ctx: appCtx, l: zerolog.Ctx(appCtx)},
+	}
+
+	wm.meter = otel.GetMeter(appCtx, "weather", "metrics")
+
+	// Weather Metrics
+	wm.TempOutdoorF, _ = wm.meter.Float64Gauge(MetricPrefix+"_temp_outdoor_f",
+		metric.WithDescription("Outdoor Temperature in Faherenheit"))
+	wm.TempIndoorF, _ = wm.meter.Float64Gauge(MetricPrefix+"_temp_indoor_f",
+		metric.WithDescription("Indoor Temperature in Faherenheit"))
+	wm.HumidityOudoor, _ = wm.meter.Int64Gauge(MetricPrefix+"_humidity_outdoor",
+		metric.WithDescription("Outdoor Humidity %"))
+	wm.HumidityIndoor, _ = wm.meter.Int64Gauge(MetricPrefix+"_humidity_indoor",
+		metric.WithDescription("Indoor Humidity %"))
+	wm.WindSpeedMPH, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_speed_mph",
+		metric.WithDescription("Wind Speed in MPH"))
+	wm.WindGustMPH, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_gust_mph",
+		metric.WithDescription("Wind Gust in MPH"))
+	wm.MaxDailyGust, _ = wm.meter.Float64Gauge(MetricPrefix+"_max_daily_gust",
+		metric.WithDescription("Max Daily Wind Gust"))
+	wm.WindDir, _ = wm.meter.Int64Gauge(MetricPrefix+"_wind_dir",
+		metric.WithDescription("Wind Direction in Degrees"))
+	wm.WindDirAvg10m, _ = wm.meter.Int64Gauge(MetricPrefix+"_wind_dir_avg_10m",
+		metric.WithDescription("Wind Direction 10m Average"))
+	wm.UV, _ = wm.meter.Int64Gauge(MetricPrefix+"_uv",
+		metric.WithDescription("UV Index"))
+	wm.SolarRadiation, _ = wm.meter.Float64Gauge(MetricPrefix+"_solar_radiation",
+		metric.WithDescription("Solar Radiation in W/㎡"))
+	wm.HourlyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_hourly_rain_in",
+		metric.WithDescription("Hourly Rain in Inches"))
+	wm.EventRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_event_rain_in",
+		metric.WithDescription("Event Rain in Inches"))
+	wm.DailyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_daily_rain_in",
+		metric.WithDescription("Daily Rain in Inches"))
+	wm.WeeklyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_weekly_rain_in",
+		metric.WithDescription("Weekly Rain in Inches"))
+	wm.MonthlyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_monthly_rain_in",
+		metric.WithDescription("Monthly Rain in Inches"))
+	wm.YearlyRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_yearly_rain_in",
+		metric.WithDescription("Yearly Rain in Inches"))
+	wm.TotalRainIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_total_rain_in",
+		metric.WithDescription("Total Rain in Inches"))
+	wm.BatteryStatus, _ = wm.meter.Int64Gauge(MetricPrefix+"_battery_status",
+		metric.WithDescription("Per-component battery status"))
+	wm.BaromRelativeIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_barometric_pressure_relative_in",
+		metric.WithDescription("Relative Pressure in Inches of Mercury"))
+	wm.BaromAbsoluteIn, _ = wm.meter.Float64Gauge(MetricPrefix+"_barometric_pressure_absolute_in",
+		metric.WithDescription("Absolute Pressure in Inches of Mercury"))
+	wm.DewPointF, _ = wm.meter.Float64Gauge(MetricPrefix+"_dew_point_f",
+		metric.WithDescription("Dew Point in Faherenheit"))
+	wm.WindChillF, _ = wm.meter.Float64Gauge(MetricPrefix+"_wind_chill_f",
+		metric.WithDescription("Wind Chill in Faherenheit"))
+
+	// Temp and Humidity Sensors
+	wm.SensorTempF, _ = wm.meter.Float64Gauge(MetricPrefix+"_sensor_temp_f",
+		metric.WithDescription("Temperature Sensor in Faherenheit"))
+	wm.SensorHumidity, _ = wm.meter.Int64Gauge(MetricPrefix+"_sensor_humidity",
+		metric.WithDescription("Humidity % Sensor"))
+
+	// Internal Telemetry
+	wm.UpdatesReceived, _ = wm.meter.Int64Counter(MetricPrefix+"_updates_received",
+		metric.WithDescription("Metric Updates Processed by Exporter"))
+
+	return wm
+}
--- a/pkg/weather/types.go
+++ b/pkg/weather/types.go
@ -38,8 +38,14 @@ type WeatherUpdate struct {
 	// if not otherwise set
 	DewPointF  *float64
 	WindChillF *float64
-	// First URL parameters given to AWN/Wunderground
-	// if proxying is enabled
+	// Extra Temp+Humidity Sensors
+	TempHumiditySensors []*TempHumiditySensor
+}
+
+type TempHumiditySensor struct {
+	Name     string
+	TempF    *float64
+	Humidity *int
 }

 type BatteryStatus struct {
@ -76,6 +82,8 @@ const (
 	FieldBaromAbsoluteIn = "BaromAbsoluteIn"
 	FieldDewPointF       = "DewPointF"
 	FieldWindChillF      = "WindChillF"
+	FieldSensorTempF     = "SensorTempF"
+	FieldSensorHumidity  = "SensorHumidity"
 )

 func (u *WeatherUpdate) GetStationName() string {
Author	SHA1	Message	Date
Ryan McGuire	29433cddd7	support sensor name mapping All checks were successful Build and Publish / release (push) Successful in 4m6s Details	2025-03-05 12:53:57 -05:00
Ryan McGuire	f98a4cf348	Add support for temp+humidity sensors All checks were successful Build and Publish / release (push) Successful in 6m32s Details	2025-03-04 20:11:08 -05:00
Ryan McGuire	8b46238e49	allow skip go list All checks were successful Build and Publish / release (push) Successful in 4m5s Details	2025-02-15 15:06:30 -05:00
Ryan McGuire	4ed1e465d2	Upgrade framework Some checks failed Build and Publish / release (push) Failing after 1m45s Details	2025-02-15 14:44:29 -05:00
Ryan McGuire	ea93beb6b2	Reclassify malformed header log All checks were successful Build and Publish / release (push) Successful in 3m7s Details	2025-01-29 19:46:00 -05:00
Ryan McGuire	ae53a1d5fd	Invalid AWN Request Fixer All checks were successful Build and Publish / release (push) Successful in 4m31s Details	2025-01-29 19:37:23 -05:00
Ryan McGuire	cd04beeec6	Invalid AWN Request Fixer	2025-01-29 18:06:50 -05:00
Ryan McGuire	3d3492a283	Ignore invalid temp	2025-01-28 19:41:57 -05:00
Ryan McGuire	ce0ef7d291	Clear invalid measurements All checks were successful Build and Publish / release (push) Successful in 3m34s Details	2025-01-28 19:26:40 -05:00
Ryan McGuire	f2f160b112	Fix wunderground wind speed mapping All checks were successful Build and Publish / release (push) Successful in 2m40s Details	2025-01-28 17:05:25 -05:00
Ryan McGuire	2c29493229	Upgrade, fix attrs All checks were successful Build and Publish / release (push) Successful in 3m46s Details	2025-01-28 15:47:58 -05:00
Ryan McGuire	59433cc77f	Upgrades All checks were successful Build and Publish / release (push) Successful in 4m27s Details	2025-01-28 15:08:31 -05:00
Ryan D McGuire	16d3f9cb17	Add grafana dashboard	2025-01-12 21:44:34 -05:00
Ryan D McGuire	e93c7ec5c0	Update go-app All checks were successful Build and Publish / release (push) Successful in 6m10s Details	2025-01-12 20:22:56 -05:00
Ryan D McGuire	c2bde1e1dd	Update TODO	2025-01-12 19:27:10 -05:00
Ryan D McGuire	44bf293eab	Proxy observability updates All checks were successful Build and Publish / release (push) Successful in 2m51s Details	2025-01-12 19:14:24 -05:00
Ryan D McGuire	f87b35b306	Perform proxy updates in goroutines	2025-01-12 19:10:30 -05:00