Compare commits
43 Commits
Author | SHA1 | Date | |
---|---|---|---|
6d5075817e | |||
a02e8c5061 | |||
4a1a8fe8a0 | |||
2087f6829f | |||
f079d106a1 | |||
fc2d05e957 | |||
59f5bfbba1 | |||
0adab13221 | |||
3b0748da25 | |||
2d683e61b0 | |||
82bc3acfc3 | |||
6e1ec0b5c1 | |||
46a213f314 | |||
b483fc22a3 | |||
fb6941e6bd | |||
a5abbbec1f | |||
e9b70fe6e0 | |||
ca18eba167 | |||
c020c4eec8 | |||
df7c2dff40 | |||
0b27285b86 | |||
1f097b1fd7 | |||
42eea2346b | |||
a5948cf334 | |||
deb831a2c5 | |||
d8291150d4 | |||
4a35f11553 | |||
399c694c3e | |||
133c6f7315 | |||
220cc818e7 | |||
69fd27916b | |||
421c246cc6 | |||
6f297829fc | |||
797b0a2f3a | |||
be66762834 | |||
7e53afe035 | |||
be2895695f | |||
27af90322a | |||
a8e7b24656 | |||
2653825ac8 | |||
a99e52ae4c | |||
48828bf8d0 | |||
bcf4c0b5ce |
@ -2,6 +2,7 @@ name: Build and Publish
|
||||
on:
|
||||
push:
|
||||
tags: ["v*"]
|
||||
branches: ["main"]
|
||||
|
||||
env:
|
||||
PACKAGE_NAME: ambient-local-exporter
|
||||
@ -16,14 +17,15 @@ env:
|
||||
DOCKER_USER: rmcguire
|
||||
DOCKER_REPO: rmcguire/ambient-local-exporter
|
||||
DOCKER_IMG: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_REPO }}
|
||||
|
||||
CHART_DIR: helm/ambient-local-exporter
|
||||
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
if: startsWith(github.ref, 'refs/tags/v') # Only run on tag push
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Go Environment
|
||||
uses: actions/setup-go@v4
|
||||
@ -86,3 +88,46 @@ jobs:
|
||||
build-args: |
|
||||
VER_PKG=${{ env.VER_PKG }}
|
||||
VERSION=${{ github.ref_name }}
|
||||
|
||||
# Detect if the helm chart was updated
|
||||
check-chart:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
chart-updated: ${{ steps.filter.outputs.chart }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Check Chart Changed
|
||||
uses: dorny/paths-filter@v3
|
||||
id: filter
|
||||
with:
|
||||
base: ${{ github.ref }}
|
||||
filters: |
|
||||
chart:
|
||||
- helm/ambient-local-exporter/Chart.yaml
|
||||
|
||||
helm-release:
|
||||
runs-on: ubuntu-latest
|
||||
needs: check-chart
|
||||
if: ${{ needs.check-chart.outputs.chart-updated == 'true' }}
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install Helm
|
||||
env:
|
||||
BINARY_NAME: helm
|
||||
run: |
|
||||
curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
|
||||
|
||||
- name: Package Chart
|
||||
run: |
|
||||
helm package --app-version ${VERSION} ${CHART_DIR}
|
||||
|
||||
- name: Publish Chart
|
||||
env:
|
||||
API_TOKEN: ${{ secrets.API_TOKEN }}
|
||||
run: |
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${API_TOKEN}" \
|
||||
--upload-file ./${PACKAGE_NAME}-*.tgz \
|
||||
https://gitea.libretechconsulting.com/api/packages/${GITHUB_REPOSITORY_OWNER}/helm/api/charts
|
||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -30,3 +30,5 @@ config.y*ml
|
||||
docker-compose.yml
|
||||
|
||||
.vscode
|
||||
helm/values*.y*ml
|
||||
helm_upgrade.sh
|
||||
|
3
Makefile
3
Makefile
@ -33,6 +33,9 @@ build: test
|
||||
done
|
||||
go build -ldflags "-X $(VER_PKG)=$(VERSION)" -o bin/${CMD_NAME}
|
||||
|
||||
schema:
|
||||
go run . -schema > contrib/schema.json
|
||||
|
||||
docker:
|
||||
@echo "Building Docker image $(DOCKER_IMG):$(VERSION)"
|
||||
docker build \
|
||||
|
13
TODO.md
13
TODO.md
@ -1,11 +1,18 @@
|
||||
# Issues
|
||||
- [x] Redis recorder panic
|
||||
|
||||
# TODO
|
||||
- [ ] Finish implementing weather GRPC
|
||||
- [ ] Helm Chart
|
||||
- [ ] Make recorder.Set concurrent
|
||||
- [ ] Add json schema to CI and README
|
||||
- [ ] Update README
|
||||
- [ ] Add Grafana dashboard
|
||||
- [ ] Add new spans
|
||||
|
||||
## Done
|
||||
- [x] Stop Marshaling sensors / batteries with no data
|
||||
- [x] Finish implementing weather GRPC
|
||||
- [x] Add json schema for config
|
||||
- [x] Add new spans
|
||||
- [x] Helm Chart
|
||||
- [x] Add proxy to upstream support
|
||||
- [x] Fix wunderground 401
|
||||
- [x] Perform proxy calls in goroutines
|
||||
|
@ -25,6 +25,7 @@ const (
|
||||
type GetWeatherRequest struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
Opts *GetWeatherOpts `protobuf:"bytes,1,opt,name=opts,proto3" json:"opts,omitempty"`
|
||||
Limit *int32 `protobuf:"varint,2,opt,name=limit,proto3,oneof" json:"limit,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
@ -66,6 +67,13 @@ func (x *GetWeatherRequest) GetOpts() *GetWeatherOpts {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *GetWeatherRequest) GetLimit() int32 {
|
||||
if x != nil && x.Limit != nil {
|
||||
return *x.Limit
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type GetWeatherResponse struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
LastUpdated *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
|
||||
@ -199,6 +207,7 @@ type WeatherUpdate struct {
|
||||
DewPointF *float64 `protobuf:"fixed64,25,opt,name=dew_point_f,json=dewPointF,proto3,oneof" json:"dew_point_f,omitempty"`
|
||||
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"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
@ -422,6 +431,13 @@ func (x *WeatherUpdate) GetTempHumiditySensors() []*TempHumiditySensor {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *WeatherUpdate) GetUpdateTimestamp() *timestamppb.Timestamp {
|
||||
if x != nil {
|
||||
return x.UpdateTimestamp
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Represents a temperature and humidity sensor
|
||||
type TempHumiditySensor struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
@ -543,149 +559,156 @@ var file_weather_weather_proto_rawDesc = string([]byte{
|
||||
0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x61, 0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74,
|
||||
0x2e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
|
||||
0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
|
||||
0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x48, 0x0a, 0x11, 0x47, 0x65, 0x74,
|
||||
0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6d, 0x0a, 0x11, 0x47, 0x65, 0x74,
|
||||
0x57, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33,
|
||||
0x0a, 0x04, 0x6f, 0x70, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61,
|
||||
0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x47,
|
||||
0x65, 0x74, 0x57, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x73, 0x52, 0x04, 0x6f,
|
||||
0x70, 0x74, 0x73, 0x22, 0x9c, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x57, 0x65, 0x61, 0x74, 0x68,
|
||||
0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x6c, 0x61,
|
||||
0x73, 0x74, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
|
||||
0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x6c, 0x61,
|
||||
0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x47, 0x0a, 0x0f, 0x77, 0x65, 0x61,
|
||||
0x74, 0x68, 0x65, 0x72, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x77, 0x65, 0x61,
|
||||
0x74, 0x68, 0x65, 0x72, 0x2e, 0x57, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61,
|
||||
0x74, 0x65, 0x52, 0x0e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74,
|
||||
0x65, 0x73, 0x22, 0x82, 0x01, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x57, 0x65, 0x61, 0x74, 0x68, 0x65,
|
||||
0x72, 0x4f, 0x70, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73,
|
||||
0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a,
|
||||
0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79,
|
||||
0x70, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0xb7, 0x0c, 0x0a, 0x0d, 0x57, 0x65, 0x61, 0x74,
|
||||
0x68, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x74, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c,
|
||||
0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12,
|
||||
0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x29,
|
||||
0x0a, 0x0e, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x6f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x5f, 0x66,
|
||||
0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0c, 0x74, 0x65, 0x6d, 0x70, 0x4f, 0x75,
|
||||
0x74, 0x64, 0x6f, 0x6f, 0x72, 0x46, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0d, 0x74, 0x65, 0x6d,
|
||||
0x70, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x5f, 0x66, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01,
|
||||
0x48, 0x01, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x49, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x46, 0x88,
|
||||
0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x6f,
|
||||
0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x02, 0x52, 0x0f,
|
||||
0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x4f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x88,
|
||||
0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x69,
|
||||
0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x48, 0x03, 0x52, 0x0e, 0x68,
|
||||
0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x88, 0x01, 0x01,
|
||||
0x12, 0x29, 0x0a, 0x0e, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x6d,
|
||||
0x70, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x48, 0x04, 0x52, 0x0c, 0x77, 0x69, 0x6e, 0x64,
|
||||
0x53, 0x70, 0x65, 0x65, 0x64, 0x4d, 0x70, 0x68, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0d, 0x77,
|
||||
0x69, 0x6e, 0x64, 0x5f, 0x67, 0x75, 0x73, 0x74, 0x5f, 0x6d, 0x70, 0x68, 0x18, 0x09, 0x20, 0x01,
|
||||
0x28, 0x01, 0x48, 0x05, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x47, 0x75, 0x73, 0x74, 0x4d, 0x70,
|
||||
0x68, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x69, 0x6c,
|
||||
0x79, 0x5f, 0x67, 0x75, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x01, 0x48, 0x06, 0x52, 0x0c,
|
||||
0x6d, 0x61, 0x78, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x47, 0x75, 0x73, 0x74, 0x88, 0x01, 0x01, 0x12,
|
||||
0x1e, 0x0a, 0x08, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28,
|
||||
0x05, 0x48, 0x07, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x64, 0x44, 0x69, 0x72, 0x88, 0x01, 0x01, 0x12,
|
||||
0x2c, 0x0a, 0x10, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x5f, 0x61, 0x76, 0x67, 0x5f,
|
||||
0x31, 0x30, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x48, 0x08, 0x52, 0x0d, 0x77, 0x69, 0x6e,
|
||||
0x64, 0x44, 0x69, 0x72, 0x41, 0x76, 0x67, 0x31, 0x30, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x13, 0x0a,
|
||||
0x02, 0x75, 0x76, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x48, 0x09, 0x52, 0x02, 0x75, 0x76, 0x88,
|
||||
0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x73, 0x6f, 0x6c, 0x61, 0x72, 0x5f, 0x72, 0x61, 0x64, 0x69,
|
||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0a, 0x52, 0x0e, 0x73,
|
||||
0x6f, 0x6c, 0x61, 0x72, 0x52, 0x61, 0x64, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01,
|
||||
0x12, 0x29, 0x0a, 0x0e, 0x68, 0x6f, 0x75, 0x72, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f,
|
||||
0x69, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0b, 0x52, 0x0c, 0x68, 0x6f, 0x75, 0x72,
|
||||
0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0d, 0x65,
|
||||
0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x10, 0x20, 0x01,
|
||||
0x28, 0x01, 0x48, 0x0c, 0x52, 0x0b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x69, 0x6e, 0x49,
|
||||
0x6e, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0d, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x5f, 0x72, 0x61,
|
||||
0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0d, 0x52, 0x0b, 0x64,
|
||||
0x61, 0x69, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a,
|
||||
0x0e, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18,
|
||||
0x12, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0e, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x52,
|
||||
0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x74,
|
||||
0x68, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28,
|
||||
0x01, 0x48, 0x0f, 0x52, 0x0d, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e,
|
||||
0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x79, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x5f,
|
||||
0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x01, 0x48, 0x10, 0x52,
|
||||
0x0c, 0x79, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01,
|
||||
0x12, 0x27, 0x0a, 0x0d, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69,
|
||||
0x6e, 0x18, 0x15, 0x20, 0x01, 0x28, 0x01, 0x48, 0x11, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c,
|
||||
0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x3c, 0x0a, 0x09, 0x62, 0x61, 0x74,
|
||||
0x74, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61,
|
||||
0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x42,
|
||||
0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09, 0x62, 0x61,
|
||||
0x74, 0x74, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x2f, 0x0a, 0x11, 0x62, 0x61, 0x72, 0x6f, 0x6d,
|
||||
0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x18, 0x17, 0x20, 0x01,
|
||||
0x28, 0x01, 0x48, 0x12, 0x52, 0x0f, 0x62, 0x61, 0x72, 0x6f, 0x6d, 0x52, 0x65, 0x6c, 0x61, 0x74,
|
||||
0x69, 0x76, 0x65, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x11, 0x62, 0x61, 0x72, 0x6f,
|
||||
0x6d, 0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x18, 0x18, 0x20,
|
||||
0x01, 0x28, 0x01, 0x48, 0x13, 0x52, 0x0f, 0x62, 0x61, 0x72, 0x6f, 0x6d, 0x41, 0x62, 0x73, 0x6f,
|
||||
0x6c, 0x75, 0x74, 0x65, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0b, 0x64, 0x65, 0x77,
|
||||
0x5f, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x66, 0x18, 0x19, 0x20, 0x01, 0x28, 0x01, 0x48, 0x14,
|
||||
0x52, 0x09, 0x64, 0x65, 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x46, 0x88, 0x01, 0x01, 0x12, 0x25,
|
||||
0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x68, 0x69, 0x6c, 0x6c, 0x5f, 0x66, 0x18, 0x1a,
|
||||
0x20, 0x01, 0x28, 0x01, 0x48, 0x15, 0x52, 0x0a, 0x77, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x69, 0x6c,
|
||||
0x6c, 0x46, 0x88, 0x01, 0x01, 0x12, 0x57, 0x0a, 0x15, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x68, 0x75,
|
||||
0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x73, 0x18, 0x1b,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x77,
|
||||
0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x48, 0x75, 0x6d, 0x69, 0x64,
|
||||
0x69, 0x74, 0x79, 0x53, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x52, 0x13, 0x74, 0x65, 0x6d, 0x70, 0x48,
|
||||
0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x53, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x73, 0x42, 0x11,
|
||||
0x0a, 0x0f, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x6f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x5f,
|
||||
0x66, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f,
|
||||
0x72, 0x5f, 0x66, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79,
|
||||
0x5f, 0x6f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x68, 0x75, 0x6d,
|
||||
0x69, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x42, 0x11, 0x0a, 0x0f,
|
||||
0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x6d, 0x70, 0x68, 0x42,
|
||||
0x10, 0x0a, 0x0e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x67, 0x75, 0x73, 0x74, 0x5f, 0x6d, 0x70,
|
||||
0x68, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x5f,
|
||||
0x67, 0x75, 0x73, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69,
|
||||
0x72, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x5f, 0x61,
|
||||
0x76, 0x67, 0x5f, 0x31, 0x30, 0x6d, 0x42, 0x05, 0x0a, 0x03, 0x5f, 0x75, 0x76, 0x42, 0x12, 0x0a,
|
||||
0x10, 0x5f, 0x73, 0x6f, 0x6c, 0x61, 0x72, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69,
|
||||
0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72,
|
||||
0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x64, 0x61, 0x69, 0x6c, 0x79,
|
||||
0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x77, 0x65, 0x65,
|
||||
0x6b, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x12, 0x0a, 0x10, 0x5f,
|
||||
0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42,
|
||||
0x11, 0x0a, 0x0f, 0x5f, 0x79, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f,
|
||||
0x69, 0x6e, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x72, 0x61, 0x69,
|
||||
0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x62, 0x61, 0x72, 0x6f, 0x6d, 0x5f, 0x72,
|
||||
0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x62,
|
||||
0x61, 0x72, 0x6f, 0x6d, 0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x5f, 0x69, 0x6e,
|
||||
0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x77, 0x5f, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x66,
|
||||
0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x68, 0x69, 0x6c, 0x6c, 0x5f,
|
||||
0x66, 0x22, 0x7d, 0x0a, 0x12, 0x54, 0x65, 0x6d, 0x70, 0x48, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74,
|
||||
0x79, 0x53, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x06, 0x74,
|
||||
0x65, 0x6d, 0x70, 0x5f, 0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x05, 0x74,
|
||||
0x65, 0x6d, 0x70, 0x46, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x68, 0x75, 0x6d, 0x69, 0x64,
|
||||
0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x08, 0x68, 0x75, 0x6d,
|
||||
0x69, 0x64, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x74, 0x65, 0x6d,
|
||||
0x70, 0x5f, 0x66, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79,
|
||||
0x22, 0x55, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75,
|
||||
0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x12,
|
||||
0x1b, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48,
|
||||
0x00, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07,
|
||||
0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x54, 0x5a, 0x52, 0x67, 0x69, 0x74, 0x65, 0x61,
|
||||
0x2e, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x74, 0x65, 0x63, 0x68, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
|
||||
0x74, 0x69, 0x6e, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x6d, 0x63, 0x67, 0x75, 0x69, 0x72,
|
||||
0x65, 0x2f, 0x61, 0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d,
|
||||
0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x61,
|
||||
0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x70, 0x74, 0x73, 0x12, 0x19, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x48, 0x00, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x42, 0x08,
|
||||
0x0a, 0x06, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x9c, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74,
|
||||
0x57, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
|
||||
0x3d, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
|
||||
0x70, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x47,
|
||||
0x0a, 0x0f, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
|
||||
0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x6d, 0x62, 0x69, 0x65, 0x6e,
|
||||
0x74, 0x2e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x57, 0x65, 0x61, 0x74, 0x68, 0x65,
|
||||
0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x0e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72,
|
||||
0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x22, 0x82, 0x01, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x57,
|
||||
0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0c, 0x73, 0x74,
|
||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88,
|
||||
0x01, 0x01, 0x12, 0x26, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79,
|
||||
0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x73,
|
||||
0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0f, 0x0a, 0x0d, 0x5f,
|
||||
0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0xfe, 0x0c, 0x0a,
|
||||
0x0d, 0x57, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21,
|
||||
0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d,
|
||||
0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
|
||||
0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x49, 0x64, 0x12, 0x29, 0x0a, 0x0e, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x6f, 0x75, 0x74, 0x64,
|
||||
0x6f, 0x6f, 0x72, 0x5f, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0c, 0x74,
|
||||
0x65, 0x6d, 0x70, 0x4f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x46, 0x88, 0x01, 0x01, 0x12, 0x27,
|
||||
0x0a, 0x0d, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x5f, 0x66, 0x18,
|
||||
0x05, 0x20, 0x01, 0x28, 0x01, 0x48, 0x01, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x49, 0x6e, 0x64,
|
||||
0x6f, 0x6f, 0x72, 0x46, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10, 0x68, 0x75, 0x6d, 0x69, 0x64,
|
||||
0x69, 0x74, 0x79, 0x5f, 0x6f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
|
||||
0x05, 0x48, 0x02, 0x52, 0x0f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x4f, 0x75, 0x74,
|
||||
0x64, 0x6f, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x68, 0x75, 0x6d, 0x69, 0x64,
|
||||
0x69, 0x74, 0x79, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
|
||||
0x48, 0x03, 0x52, 0x0e, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x64, 0x6f,
|
||||
0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x73, 0x70,
|
||||
0x65, 0x65, 0x64, 0x5f, 0x6d, 0x70, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x48, 0x04, 0x52,
|
||||
0x0c, 0x77, 0x69, 0x6e, 0x64, 0x53, 0x70, 0x65, 0x65, 0x64, 0x4d, 0x70, 0x68, 0x88, 0x01, 0x01,
|
||||
0x12, 0x27, 0x0a, 0x0d, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x67, 0x75, 0x73, 0x74, 0x5f, 0x6d, 0x70,
|
||||
0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x01, 0x48, 0x05, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x47,
|
||||
0x75, 0x73, 0x74, 0x4d, 0x70, 0x68, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x6d, 0x61, 0x78,
|
||||
0x5f, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x5f, 0x67, 0x75, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28,
|
||||
0x01, 0x48, 0x06, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x47, 0x75, 0x73,
|
||||
0x74, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x08, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72,
|
||||
0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x48, 0x07, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x64, 0x44, 0x69,
|
||||
0x72, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x10, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72,
|
||||
0x5f, 0x61, 0x76, 0x67, 0x5f, 0x31, 0x30, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x48, 0x08,
|
||||
0x52, 0x0d, 0x77, 0x69, 0x6e, 0x64, 0x44, 0x69, 0x72, 0x41, 0x76, 0x67, 0x31, 0x30, 0x6d, 0x88,
|
||||
0x01, 0x01, 0x12, 0x13, 0x0a, 0x02, 0x75, 0x76, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x48, 0x09,
|
||||
0x52, 0x02, 0x75, 0x76, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x73, 0x6f, 0x6c, 0x61, 0x72,
|
||||
0x5f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x01,
|
||||
0x48, 0x0a, 0x52, 0x0e, 0x73, 0x6f, 0x6c, 0x61, 0x72, 0x52, 0x61, 0x64, 0x69, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x68, 0x6f, 0x75, 0x72, 0x6c, 0x79, 0x5f,
|
||||
0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0b, 0x52,
|
||||
0x0c, 0x68, 0x6f, 0x75, 0x72, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01,
|
||||
0x12, 0x27, 0x0a, 0x0d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69,
|
||||
0x6e, 0x18, 0x10, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0c, 0x52, 0x0b, 0x65, 0x76, 0x65, 0x6e, 0x74,
|
||||
0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0d, 0x64, 0x61, 0x69,
|
||||
0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x01,
|
||||
0x48, 0x0d, 0x52, 0x0b, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88,
|
||||
0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69,
|
||||
0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0e, 0x52, 0x0c, 0x77, 0x65,
|
||||
0x65, 0x6b, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a,
|
||||
0x0f, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
|
||||
0x18, 0x13, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0f, 0x52, 0x0d, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c,
|
||||
0x79, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e, 0x79, 0x65,
|
||||
0x61, 0x72, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x14, 0x20, 0x01,
|
||||
0x28, 0x01, 0x48, 0x10, 0x52, 0x0c, 0x79, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x52, 0x61, 0x69, 0x6e,
|
||||
0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0d, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x72,
|
||||
0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x18, 0x15, 0x20, 0x01, 0x28, 0x01, 0x48, 0x11, 0x52, 0x0b,
|
||||
0x74, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x61, 0x69, 0x6e, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x3c,
|
||||
0x0a, 0x09, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x6d, 0x62, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x74,
|
||||
0x68, 0x65, 0x72, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75,
|
||||
0x73, 0x52, 0x09, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x2f, 0x0a, 0x11,
|
||||
0x62, 0x61, 0x72, 0x6f, 0x6d, 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69,
|
||||
0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x01, 0x48, 0x12, 0x52, 0x0f, 0x62, 0x61, 0x72, 0x6f, 0x6d,
|
||||
0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a,
|
||||
0x11, 0x62, 0x61, 0x72, 0x6f, 0x6d, 0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x5f,
|
||||
0x69, 0x6e, 0x18, 0x18, 0x20, 0x01, 0x28, 0x01, 0x48, 0x13, 0x52, 0x0f, 0x62, 0x61, 0x72, 0x6f,
|
||||
0x6d, 0x41, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x49, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x23,
|
||||
0x0a, 0x0b, 0x64, 0x65, 0x77, 0x5f, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x66, 0x18, 0x19, 0x20,
|
||||
0x01, 0x28, 0x01, 0x48, 0x14, 0x52, 0x09, 0x64, 0x65, 0x77, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x46,
|
||||
0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x68, 0x69, 0x6c,
|
||||
0x6c, 0x5f, 0x66, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x01, 0x48, 0x15, 0x52, 0x0a, 0x77, 0x69, 0x6e,
|
||||
0x64, 0x43, 0x68, 0x69, 0x6c, 0x6c, 0x46, 0x88, 0x01, 0x01, 0x12, 0x57, 0x0a, 0x15, 0x74, 0x65,
|
||||
0x6d, 0x70, 0x5f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x65, 0x6e, 0x73,
|
||||
0x6f, 0x72, 0x73, 0x18, 0x1b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x6d, 0x62, 0x69,
|
||||
0x65, 0x6e, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x54, 0x65, 0x6d, 0x70,
|
||||
0x48, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x53, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x52, 0x13,
|
||||
0x74, 0x65, 0x6d, 0x70, 0x48, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x53, 0x65, 0x6e, 0x73,
|
||||
0x6f, 0x72, 0x73, 0x12, 0x45, 0x0a, 0x10, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
|
||||
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
|
||||
0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0f, 0x75, 0x70, 0x64, 0x61, 0x74,
|
||||
0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x74,
|
||||
0x65, 0x6d, 0x70, 0x5f, 0x6f, 0x75, 0x74, 0x64, 0x6f, 0x6f, 0x72, 0x5f, 0x66, 0x42, 0x10, 0x0a,
|
||||
0x0e, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x5f, 0x66, 0x42,
|
||||
0x13, 0x0a, 0x11, 0x5f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x6f, 0x75, 0x74,
|
||||
0x64, 0x6f, 0x6f, 0x72, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74,
|
||||
0x79, 0x5f, 0x69, 0x6e, 0x64, 0x6f, 0x6f, 0x72, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x77, 0x69, 0x6e,
|
||||
0x64, 0x5f, 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x6d, 0x70, 0x68, 0x42, 0x10, 0x0a, 0x0e, 0x5f,
|
||||
0x77, 0x69, 0x6e, 0x64, 0x5f, 0x67, 0x75, 0x73, 0x74, 0x5f, 0x6d, 0x70, 0x68, 0x42, 0x11, 0x0a,
|
||||
0x0f, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x5f, 0x67, 0x75, 0x73, 0x74,
|
||||
0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x42, 0x13, 0x0a,
|
||||
0x11, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x5f, 0x61, 0x76, 0x67, 0x5f, 0x31,
|
||||
0x30, 0x6d, 0x42, 0x05, 0x0a, 0x03, 0x5f, 0x75, 0x76, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x73, 0x6f,
|
||||
0x6c, 0x61, 0x72, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x11, 0x0a,
|
||||
0x0f, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
|
||||
0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f,
|
||||
0x69, 0x6e, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69,
|
||||
0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x5f,
|
||||
0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6d, 0x6f, 0x6e, 0x74,
|
||||
0x68, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x11, 0x0a, 0x0f, 0x5f,
|
||||
0x79, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x42, 0x10,
|
||||
0x0a, 0x0e, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
|
||||
0x42, 0x14, 0x0a, 0x12, 0x5f, 0x62, 0x61, 0x72, 0x6f, 0x6d, 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74,
|
||||
0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x62, 0x61, 0x72, 0x6f, 0x6d,
|
||||
0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x42, 0x0e, 0x0a, 0x0c,
|
||||
0x5f, 0x64, 0x65, 0x77, 0x5f, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x66, 0x42, 0x0f, 0x0a, 0x0d,
|
||||
0x5f, 0x77, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x68, 0x69, 0x6c, 0x6c, 0x5f, 0x66, 0x22, 0x7d, 0x0a,
|
||||
0x12, 0x54, 0x65, 0x6d, 0x70, 0x48, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x53, 0x65, 0x6e,
|
||||
0x73, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x06, 0x74, 0x65, 0x6d, 0x70, 0x5f,
|
||||
0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x05, 0x74, 0x65, 0x6d, 0x70, 0x46,
|
||||
0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x18,
|
||||
0x03, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x08, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74,
|
||||
0x79, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x66, 0x42,
|
||||
0x0b, 0x0a, 0x09, 0x5f, 0x68, 0x75, 0x6d, 0x69, 0x64, 0x69, 0x74, 0x79, 0x22, 0x55, 0x0a, 0x0d,
|
||||
0x42, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a,
|
||||
0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x73,
|
||||
0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x06, 0x73,
|
||||
0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61,
|
||||
0x74, 0x75, 0x73, 0x42, 0x54, 0x5a, 0x52, 0x67, 0x69, 0x74, 0x65, 0x61, 0x2e, 0x6c, 0x69, 0x62,
|
||||
0x72, 0x65, 0x74, 0x65, 0x63, 0x68, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x74, 0x69, 0x6e, 0x67,
|
||||
0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x6d, 0x63, 0x67, 0x75, 0x69, 0x72, 0x65, 0x2f, 0x61, 0x6d,
|
||||
0x62, 0x69, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x65, 0x78, 0x70, 0x6f,
|
||||
0x72, 0x74, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61,
|
||||
0x31, 0x2f, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x33,
|
||||
})
|
||||
|
||||
var (
|
||||
@ -716,11 +739,12 @@ var file_weather_weather_proto_depIdxs = []int32{
|
||||
3, // 2: ambient.weather.GetWeatherResponse.weather_updates:type_name -> ambient.weather.WeatherUpdate
|
||||
5, // 3: ambient.weather.WeatherUpdate.batteries:type_name -> ambient.weather.BatteryStatus
|
||||
4, // 4: ambient.weather.WeatherUpdate.temp_humidity_sensors:type_name -> ambient.weather.TempHumiditySensor
|
||||
5, // [5:5] is the sub-list for method output_type
|
||||
5, // [5:5] is the sub-list for method input_type
|
||||
5, // [5:5] is the sub-list for extension type_name
|
||||
5, // [5:5] is the sub-list for extension extendee
|
||||
0, // [0:5] is the sub-list for field type_name
|
||||
6, // 5: ambient.weather.WeatherUpdate.update_timestamp:type_name -> google.protobuf.Timestamp
|
||||
6, // [6:6] is the sub-list for method output_type
|
||||
6, // [6:6] is the sub-list for method input_type
|
||||
6, // [6:6] is the sub-list for extension type_name
|
||||
6, // [6:6] is the sub-list for extension extendee
|
||||
0, // [0:6] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_weather_weather_proto_init() }
|
||||
@ -728,6 +752,7 @@ func file_weather_weather_proto_init() {
|
||||
if File_weather_weather_proto != nil {
|
||||
return
|
||||
}
|
||||
file_weather_weather_proto_msgTypes[0].OneofWrappers = []any{}
|
||||
file_weather_weather_proto_msgTypes[2].OneofWrappers = []any{}
|
||||
file_weather_weather_proto_msgTypes[3].OneofWrappers = []any{}
|
||||
file_weather_weather_proto_msgTypes[4].OneofWrappers = []any{}
|
||||
|
61
app.go
Normal file
61
app.go
Normal file
@ -0,0 +1,61 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/app"
|
||||
grpcopts "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/grpc/opts"
|
||||
httpopts "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts"
|
||||
|
||||
weatherpb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/ambienthttp"
|
||||
weathergrpc "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/grpc"
|
||||
)
|
||||
|
||||
func prepareApp(ctx context.Context, aw *ambient.AmbientWeather) *app.App {
|
||||
// Load ambient routes into app
|
||||
awApp := &app.App{
|
||||
AppContext: ctx,
|
||||
|
||||
// HTTP Endpoints for Ambient Weather Stations
|
||||
HTTP: &httpopts.AppHTTP{
|
||||
Funcs: []httpopts.HTTPFunc{
|
||||
{
|
||||
Path: "/weatherstation/updateweatherstation.php",
|
||||
HandlerFunc: aw.GetWundergroundHandlerFunc(ctx),
|
||||
},
|
||||
{
|
||||
Path: "/data/report",
|
||||
HandlerFunc: aw.GetAWNHandlerFunc(ctx),
|
||||
},
|
||||
},
|
||||
|
||||
// HTTP Listener that fixes broken requests generated by
|
||||
// some versions of awn firmware
|
||||
CustomListener: ambienthttp.NewAWNMutatingListener(ctx,
|
||||
aw.Config.HTTP.Listen), // Necessary to fix certain bad AWN firmware
|
||||
|
||||
// Health check funcs
|
||||
HealthChecks: []httpopts.HealthCheckFunc{
|
||||
// TODO: Implement
|
||||
func(ctx context.Context) error {
|
||||
return nil
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
// GRPC Service for retrieving weather
|
||||
GRPC: &grpcopts.AppGRPC{
|
||||
Services: []*grpcopts.GRPCService{
|
||||
{
|
||||
Name: "Weather Service",
|
||||
Type: &weatherpb.AmbientLocalWeatherService_ServiceDesc,
|
||||
Service: weathergrpc.NewGRPCWeather(ctx, aw.GetRecorder()),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
return awApp
|
||||
}
|
226
contrib/schema.json
Normal file
226
contrib/schema.json
Normal file
@ -0,0 +1,226 @@
|
||||
{
|
||||
"definitions": {
|
||||
"ConfigGRPCConfig": {
|
||||
"properties": {
|
||||
"enableInstrumentation": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"enableReflection": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"enabled": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"listen": {
|
||||
"type": "string"
|
||||
},
|
||||
"logRequests": {
|
||||
"type": "boolean"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"ConfigHTTPConfig": {
|
||||
"properties": {
|
||||
"enabled": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"idleTimeout": {
|
||||
"type": "string"
|
||||
},
|
||||
"listen": {
|
||||
"type": "string"
|
||||
},
|
||||
"logRequests": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"readTimeout": {
|
||||
"type": "string"
|
||||
},
|
||||
"writeTimeout": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"ConfigLogConfig": {
|
||||
"properties": {
|
||||
"enabled": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"format": {
|
||||
"type": "string"
|
||||
},
|
||||
"level": {
|
||||
"type": "string"
|
||||
},
|
||||
"output": {
|
||||
"type": "string"
|
||||
},
|
||||
"timeFormat": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"ConfigOTELConfig": {
|
||||
"properties": {
|
||||
"enabled": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"metricIntervalSecs": {
|
||||
"type": "integer"
|
||||
},
|
||||
"prometheusEnabled": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"prometheusPath": {
|
||||
"type": "string"
|
||||
},
|
||||
"stdoutEnabled": {
|
||||
"type": "boolean"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"ConfigRecorderConfig": {
|
||||
"properties": {
|
||||
"keepLast": {
|
||||
"default": 120,
|
||||
"type": "integer"
|
||||
},
|
||||
"redisConfig": {
|
||||
"$ref": "#/definitions/ConfigRedisConfig"
|
||||
},
|
||||
"type": {
|
||||
"enum": [
|
||||
"memory",
|
||||
"redis",
|
||||
"noop"
|
||||
],
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"ConfigRedisConfig": {
|
||||
"properties": {
|
||||
"redisDB": {
|
||||
"default": 0,
|
||||
"type": "integer"
|
||||
},
|
||||
"redisHost": {
|
||||
"default": "127.0.0.1",
|
||||
"type": "string"
|
||||
},
|
||||
"redisPassword": {
|
||||
"type": "string"
|
||||
},
|
||||
"redisPort": {
|
||||
"default": 6379,
|
||||
"type": "integer"
|
||||
},
|
||||
"redisTLS": {
|
||||
"default": false,
|
||||
"type": "boolean"
|
||||
},
|
||||
"redisTLSInsecure": {
|
||||
"default": false,
|
||||
"type": "boolean"
|
||||
},
|
||||
"redisUser": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"ConfigWeatherStation": {
|
||||
"properties": {
|
||||
"awnPassKey": {
|
||||
"type": "string"
|
||||
},
|
||||
"dropMetrics": {
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "array"
|
||||
},
|
||||
"equipment": {
|
||||
"type": "string"
|
||||
},
|
||||
"keepMetrics": {
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "array"
|
||||
},
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
"proxyToAWN": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"proxyToWunderground": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"sensorMappings": {
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"wundergroundID": {
|
||||
"type": "string"
|
||||
},
|
||||
"wundergroundPassword": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
"environment": {
|
||||
"type": "string"
|
||||
},
|
||||
"grpc": {
|
||||
"$ref": "#/definitions/ConfigGRPCConfig"
|
||||
},
|
||||
"http": {
|
||||
"$ref": "#/definitions/ConfigHTTPConfig"
|
||||
},
|
||||
"logging": {
|
||||
"$ref": "#/definitions/ConfigLogConfig"
|
||||
},
|
||||
"metricPrefix": {
|
||||
"default": "weather",
|
||||
"type": "string"
|
||||
},
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
"otel": {
|
||||
"$ref": "#/definitions/ConfigOTELConfig"
|
||||
},
|
||||
"recorderConfig": {
|
||||
"$ref": "#/definitions/ConfigRecorderConfig"
|
||||
},
|
||||
"updatesToKeep": {
|
||||
"default": 1,
|
||||
"type": [
|
||||
"null",
|
||||
"integer"
|
||||
]
|
||||
},
|
||||
"version": {
|
||||
"type": "string"
|
||||
},
|
||||
"weatherStations": {
|
||||
"items": {
|
||||
"$ref": "#/definitions/ConfigWeatherStation"
|
||||
},
|
||||
"type": "array"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
}
|
89
contrib/wu_sample.json
Normal file
89
contrib/wu_sample.json
Normal file
@ -0,0 +1,89 @@
|
||||
{
|
||||
"PASSKEY": [
|
||||
"DE:AD:BE:EF:BE:EF"
|
||||
],
|
||||
"baromabsin": [
|
||||
"29.025"
|
||||
],
|
||||
"baromrelin": [
|
||||
"30.005"
|
||||
],
|
||||
"batt1": [
|
||||
"1"
|
||||
],
|
||||
"battin": [
|
||||
"1"
|
||||
],
|
||||
"battout": [
|
||||
"1"
|
||||
],
|
||||
"battrain": [
|
||||
"1"
|
||||
],
|
||||
"dailyrainin": [
|
||||
"0.000"
|
||||
],
|
||||
"dateutc": [
|
||||
"2025-03-23 14:07:59"
|
||||
],
|
||||
"eventrainin": [
|
||||
"0.000"
|
||||
],
|
||||
"hourlyrainin": [
|
||||
"0.000"
|
||||
],
|
||||
"humidity": [
|
||||
"55"
|
||||
],
|
||||
"humidity1": [
|
||||
"53"
|
||||
],
|
||||
"humidityin": [
|
||||
"36"
|
||||
],
|
||||
"maxdailygust": [
|
||||
"20.36"
|
||||
],
|
||||
"monthlyrainin": [
|
||||
"1.969"
|
||||
],
|
||||
"solarradiation": [
|
||||
"142.15"
|
||||
],
|
||||
"stationtype": [
|
||||
"WeatherHub_V1.0.2"
|
||||
],
|
||||
"temp1f": [
|
||||
"-2.74"
|
||||
],
|
||||
"tempf": [
|
||||
"33.98"
|
||||
],
|
||||
"tempinf": [
|
||||
"70.52"
|
||||
],
|
||||
"totalrainin": [
|
||||
"2.421"
|
||||
],
|
||||
"uv": [
|
||||
"1"
|
||||
],
|
||||
"weeklyrainin": [
|
||||
"0.000"
|
||||
],
|
||||
"winddir": [
|
||||
"117"
|
||||
],
|
||||
"winddir_avg10m": [
|
||||
"127"
|
||||
],
|
||||
"windgustmph": [
|
||||
"17.22"
|
||||
],
|
||||
"windspeedmph": [
|
||||
"10.29"
|
||||
],
|
||||
"yearlyrainin": [
|
||||
"2.421"
|
||||
]
|
||||
}
|
9
contrib/wu_test_sample.sh
Executable file
9
contrib/wu_test_sample.sh
Executable file
@ -0,0 +1,9 @@
|
||||
#!env sh
|
||||
SCRIPT_DIR=$( dirname $0 )
|
||||
JSON_FILE="${SCRIPT_DIR}/wu_sample.json"
|
||||
BASE_URL="http://127.0.0.1:8080/data/report"
|
||||
|
||||
# Convert JSON to query parameters
|
||||
QUERY_STRING=$(jq -r 'to_entries | map("\(.key)=\(.value[0] | @uri)") | join("&")' "$JSON_FILE")
|
||||
|
||||
curl -G --data "$QUERY_STRING" "$BASE_URL"
|
@ -3,7 +3,8 @@ services:
|
||||
ambient-local-exporter:
|
||||
build: .
|
||||
ports:
|
||||
- 8080:8080
|
||||
- 8080:8080 # HTTP
|
||||
- 8081:8081 # GRPC
|
||||
volumes:
|
||||
- ./config.yaml:/app/config.yaml
|
||||
command:
|
||||
|
18
go.mod
18
go.mod
@ -3,17 +3,18 @@ module gitea.libretechconsulting.com/rmcguire/ambient-local-exporter
|
||||
go 1.23.4
|
||||
|
||||
require (
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.6.3
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.7.0
|
||||
github.com/go-resty/resty/v2 v2.16.5
|
||||
github.com/gorilla/schema v1.4.1
|
||||
github.com/rs/zerolog v1.33.0
|
||||
github.com/redis/go-redis/v9 v9.7.3
|
||||
github.com/rs/zerolog v1.34.0
|
||||
go.opentelemetry.io/otel v1.35.0
|
||||
go.opentelemetry.io/otel/metric v1.35.0
|
||||
go.opentelemetry.io/otel/trace v1.35.0
|
||||
golang.org/x/sys v0.31.0
|
||||
google.golang.org/grpc v1.71.0
|
||||
google.golang.org/protobuf v1.36.5
|
||||
k8s.io/utils v0.0.0-20241210054802-24370beab758
|
||||
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
|
||||
)
|
||||
|
||||
require (
|
||||
@ -21,6 +22,7 @@ require (
|
||||
github.com/caarlos0/env/v11 v11.3.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/felixge/httpsnoop v1.0.4 // indirect
|
||||
github.com/go-logr/logr v1.4.2 // indirect
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
@ -33,8 +35,10 @@ require (
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||
github.com/prometheus/client_golang v1.21.1 // indirect
|
||||
github.com/prometheus/client_model v0.6.1 // indirect
|
||||
github.com/prometheus/common v0.62.0 // indirect
|
||||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
github.com/prometheus/common v0.63.0 // indirect
|
||||
github.com/prometheus/procfs v0.16.0 // indirect
|
||||
github.com/swaggest/jsonschema-go v0.3.73 // indirect
|
||||
github.com/swaggest/refl v1.3.1 // indirect
|
||||
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
|
||||
@ -49,7 +53,7 @@ require (
|
||||
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
|
||||
golang.org/x/net v0.37.0 // indirect
|
||||
golang.org/x/text v0.23.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/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
23
go.sum
23
go.sum
@ -4,6 +4,8 @@ gitea.libretechconsulting.com/rmcguire/go-app v0.6.2 h1:vpEdZu7WI8qIil5NLf6OUF/T
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.6.2/go.mod h1:S3/vdMEiRWWIdD0Fr+tjJc627VzxNzO4Ia2HgTBXe+g=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.6.3 h1:dXYHJxK/1vmWBj1wqbqEUncFt3O92agy9gNWoa9NpA0=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.6.3/go.mod h1:S3/vdMEiRWWIdD0Fr+tjJc627VzxNzO4Ia2HgTBXe+g=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.7.0 h1:yhRRwV/dxN4Bey1Qv8/rHHV5QvALrZuDJFI+zFPc7sU=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.7.0/go.mod h1:EM3Z9QcRD+b7UlKGA9y37ppfUBC0Reyf5sYEC6vFZcY=
|
||||
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=
|
||||
@ -15,6 +17,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
|
||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
|
||||
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
@ -63,15 +67,28 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
|
||||
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
|
||||
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/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
|
||||
github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
|
||||
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/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
|
||||
github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
|
||||
github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
|
||||
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
|
||||
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
||||
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
|
||||
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
|
||||
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/swaggest/jsonschema-go v0.3.73 h1:gU1pBzF3pkZ1GDD3dRMdQoCjrA0sldJ+QcM7aSSPgvc=
|
||||
github.com/swaggest/jsonschema-go v0.3.73/go.mod h1:qp+Ym2DIXHlHzch3HKz50gPf2wJhKOrAB/VYqLS2oJU=
|
||||
github.com/swaggest/refl v1.3.1 h1:XGplEkYftR7p9cz1lsiwXMM2yzmOymTE9vneVVpaOh4=
|
||||
github.com/swaggest/refl v1.3.1/go.mod h1:4uUVFVfPJ0NSX9FPwMPspeHos9wPFlCMGoPRllUbpvA=
|
||||
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/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
|
||||
@ -117,8 +134,12 @@ 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-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/api v0.0.0-20250313205543-e70fdf4c4cb4 h1:IFnXJq3UPB3oBREOodn1v1aGQeZYQclEmvWRMN0PSsY=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:c8q6Z6OCqnfVIqUFJkCzKcrj8eCvUrz+K4KRzSTuANg=
|
||||
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/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:iK2jbkWL86DXjEx0qiHcRE9dE4/Ahua5k6V8OWFb//c=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
|
||||
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.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
|
||||
@ -130,3 +151,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
|
||||
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
|
||||
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||
|
23
helm/ambient-local-exporter/.helmignore
Normal file
23
helm/ambient-local-exporter/.helmignore
Normal file
@ -0,0 +1,23 @@
|
||||
# Patterns to ignore when building packages.
|
||||
# This supports shell glob matching, relative path matching, and
|
||||
# negation (prefixed with !). Only one pattern per line.
|
||||
.DS_Store
|
||||
# Common VCS dirs
|
||||
.git/
|
||||
.gitignore
|
||||
.bzr/
|
||||
.bzrignore
|
||||
.hg/
|
||||
.hgignore
|
||||
.svn/
|
||||
# Common backup files
|
||||
*.swp
|
||||
*.bak
|
||||
*.tmp
|
||||
*.orig
|
||||
*~
|
||||
# Various IDEs
|
||||
.project
|
||||
.idea/
|
||||
*.tmproj
|
||||
.vscode/
|
6
helm/ambient-local-exporter/Chart.lock
Normal file
6
helm/ambient-local-exporter/Chart.lock
Normal file
@ -0,0 +1,6 @@
|
||||
dependencies:
|
||||
- name: hull
|
||||
repository: https://vidispine.github.io/hull
|
||||
version: 1.32.2
|
||||
digest: sha256:7b73a7f152916fed9842efe4f65081b1cda0fcebd8f36d27e48136b608ce305f
|
||||
generated: "2025-03-08T12:22:41.343082-05:00"
|
30
helm/ambient-local-exporter/Chart.yaml
Normal file
30
helm/ambient-local-exporter/Chart.yaml
Normal file
@ -0,0 +1,30 @@
|
||||
apiVersion: v2
|
||||
name: ambient-local-exporter
|
||||
description: Cloud-free metrics exporter for ambient weather stations
|
||||
|
||||
# A chart can be either an 'application' or a 'library' chart.
|
||||
#
|
||||
# Application charts are a collection of templates that can be packaged into versioned archives
|
||||
# to be deployed.
|
||||
#
|
||||
# Library charts provide useful utilities or functions for the chart developer. They're included as
|
||||
# a dependency of application charts to inject those utilities and functions into the rendering
|
||||
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
|
||||
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.6
|
||||
|
||||
# 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.12.1"
|
||||
|
||||
dependencies:
|
||||
- name: hull
|
||||
repository: https://vidispine.github.io/hull
|
||||
version: 1.32.2
|
||||
|
BIN
helm/ambient-local-exporter/charts/hull-1.32.2.tgz
Normal file
BIN
helm/ambient-local-exporter/charts/hull-1.32.2.tgz
Normal file
Binary file not shown.
643
helm/ambient-local-exporter/library-hull.yaml
Normal file
643
helm/ambient-local-exporter/library-hull.yaml
Normal file
@ -0,0 +1,643 @@
|
||||
################################
|
||||
### values.yaml for HULL
|
||||
### The basic pre-configuration takes place here.
|
||||
###
|
||||
### Do not change this file, use additional values.hull.yaml
|
||||
### to overwrite the selected fields!
|
||||
################################
|
||||
|
||||
###################################################
|
||||
### CONFIG
|
||||
config:
|
||||
general:
|
||||
rbac: true
|
||||
fullnameOverride: ""
|
||||
nameOverride: ""
|
||||
namespaceOverride: ""
|
||||
noObjectNamePrefixes: false
|
||||
createImagePullSecretsFromRegistries: true
|
||||
globalImageRegistryServer: ""
|
||||
globalImageRegistryToFirstRegistrySecretServer: false
|
||||
serialization:
|
||||
configmap:
|
||||
enabled: true
|
||||
fileExtensions:
|
||||
json: toPrettyJson
|
||||
yml: toYaml
|
||||
yaml: toYaml
|
||||
secret:
|
||||
enabled: true
|
||||
fileExtensions:
|
||||
json: toPrettyJson
|
||||
yml: toYaml
|
||||
yaml: toYaml
|
||||
render:
|
||||
passes: 3
|
||||
emptyLabels: false
|
||||
emptyAnnotations: false
|
||||
emptyTemplateLabels: false
|
||||
emptyTemplateAnnotations: false
|
||||
emptyHullObjects: false
|
||||
postRender:
|
||||
globalStringReplacements:
|
||||
instanceKey:
|
||||
enabled: false
|
||||
string: _HULL_OBJECT_TYPE_DEFAULT_
|
||||
replacement: OBJECT_INSTANCE_KEY
|
||||
instanceKeyResolved:
|
||||
enabled: false
|
||||
string: _HULL_OBJECT_TYPE_DEFAULT_
|
||||
replacement: OBJECT_INSTANCE_KEY_RESOLVED
|
||||
instanceName:
|
||||
enabled: false
|
||||
string: _HULL_OBJECT_TYPE_DEFAULT_
|
||||
replacement: OBJECT_INSTANCE_NAME
|
||||
errorChecks:
|
||||
objectYamlValid: true
|
||||
hullGetTransformationReferenceValid: true
|
||||
containerImageValid: true
|
||||
virtualFolderDataPathExists: true
|
||||
virtualFolderDataInlineValid: false
|
||||
debug:
|
||||
renderBrokenHullGetTransformationReferences: false
|
||||
renderNilWhenInlineIsNil: false
|
||||
renderPathMissingWhenPathIsNonExistent: false
|
||||
metadata:
|
||||
labels:
|
||||
common:
|
||||
'app.kubernetes.io/managed-by':
|
||||
'app.kubernetes.io/version':
|
||||
'app.kubernetes.io/part-of':
|
||||
'app.kubernetes.io/name':
|
||||
'app.kubernetes.io/instance':
|
||||
'app.kubernetes.io/component':
|
||||
'helm.sh/chart':
|
||||
'vidispine.hull/version':
|
||||
custom: {}
|
||||
annotations:
|
||||
hashes: false
|
||||
custom: {}
|
||||
data: {}
|
||||
specific: {}
|
||||
templates:
|
||||
pod:
|
||||
global: {}
|
||||
container:
|
||||
global: {}
|
||||
###################################################
|
||||
|
||||
###################################################
|
||||
### OBJECTS
|
||||
objects:
|
||||
|
||||
# NAMESPACE
|
||||
namespace:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
staticName: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# CONFIGMAPS
|
||||
configmap:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# SECRETS
|
||||
secret:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# REGISTRIES
|
||||
registry:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# SERVICEACCOUNTS
|
||||
serviceaccount:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
default:
|
||||
enabled: _HT?eq (dig "serviceAccountName" "" _HT*hull.config.templates.pod.global) ""
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# ROLES
|
||||
role:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
default:
|
||||
enabled: _HT?eq (dig "serviceAccountName" "" _HT*hull.config.templates.pod.global) ""
|
||||
rules: {}
|
||||
###################################################
|
||||
|
||||
# ROLEBINDINGS
|
||||
rolebinding:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
default:
|
||||
enabled: _HT?eq (dig "serviceAccountName" "" _HT*hull.config.templates.pod.global) ""
|
||||
roleRef:
|
||||
apiGroup: "rbac.authorization.k8s.io"
|
||||
kind: "Role"
|
||||
name: _HT^default
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: _HT^default
|
||||
namespace: _HT**Release.Namespace
|
||||
###################################################
|
||||
|
||||
# CLUSTERROLES
|
||||
clusterrole:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# CLUSTERROLEBINDINGS
|
||||
clusterrolebinding:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# CUSTOMRESOURCEDEFINITIONS (deprecated with Helm3)
|
||||
# customresourcedefinitions:
|
||||
# _HULL_OBJECT_TYPE_DEFAULT_:
|
||||
# enabled: true
|
||||
# annotations: {}
|
||||
# labels: {}
|
||||
###################################################
|
||||
|
||||
# CUSTOMRESOURCES
|
||||
customresource:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# PERSISTENTVOLUMECLAIMS
|
||||
persistentvolumeclaim:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# PERSISTENTVOLUMES
|
||||
persistentvolume:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# STORAGECLASSES
|
||||
storageclass:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# SERVICES
|
||||
service:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
ports:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
|
||||
###################################################
|
||||
|
||||
# INGRESSES
|
||||
ingress:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
tls:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
http:
|
||||
paths:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
|
||||
###################################################
|
||||
|
||||
# INGRESSCLASSES
|
||||
ingressclass:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
|
||||
###################################################
|
||||
|
||||
# DEPLOYMENTS
|
||||
deployment:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
templateAnnotations: {}
|
||||
templateLabels: {}
|
||||
pod:
|
||||
initContainers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
containers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumes:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# JOBS
|
||||
job:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
templateAnnotations: {}
|
||||
templateLabels: {}
|
||||
pod:
|
||||
initContainers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
containers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumes:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# CRONJOBS
|
||||
cronjob:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
job:
|
||||
templateAnnotations: {}
|
||||
templateLabels: {}
|
||||
pod:
|
||||
initContainers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
containers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumes:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# DAEMONSETS
|
||||
daemonset:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
templateAnnotations: {}
|
||||
templateLabels: {}
|
||||
pod:
|
||||
initContainers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
containers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumes:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# STATEFULSETS
|
||||
statefulset:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
templateAnnotations: {}
|
||||
templateLabels: {}
|
||||
pod:
|
||||
initContainers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
containers:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
env:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
envFrom:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumeMounts:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
volumes:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# SERVICEMONITORS
|
||||
servicemonitor:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# HORIZONTALPODAUTOSCALER
|
||||
horizontalpodautoscaler:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# PODDISRUPTIONBUDGET
|
||||
poddisruptionbudget:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# PRIORITYCLASS
|
||||
priorityclass:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# ENDPOINTS
|
||||
endpoints:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# ENDPOINTSLICE
|
||||
endpointslice:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# LIMITRANGE
|
||||
limitrange:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
###################################################
|
||||
|
||||
# MUTATINGWEBHOOKCONFIGURATION
|
||||
mutatingwebhookconfiguration:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
webhooks:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# VALIDATINGWEBHOOKCONFIGURATION
|
||||
validatingwebhookconfiguration:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
webhooks:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
###################################################
|
||||
|
||||
# RESOURCEQUOTA
|
||||
resourcequota:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
##################################################
|
||||
|
||||
# NETWORKPOLICY
|
||||
networkpolicy:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - BACKENDLBPOLICY
|
||||
backendlbpolicy:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
targetRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - BACKENDTLSPOLICY
|
||||
backendtlspolicy:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
targetRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - GATEWAYCLASS
|
||||
gatewayclass:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - GATEWAY
|
||||
gateway:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
addresses:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
listeners:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
tls:
|
||||
certificateRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
frontendValidation:
|
||||
caCertificateRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
allowedRoutes:
|
||||
kinds:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - GRPCROUTE
|
||||
grpcroute:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
parentRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
matches:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
filters:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
backendRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
filters:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - REFERENCEGRANT
|
||||
referencegrant:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
from:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
to:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - TCPROUTE
|
||||
tcproute:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
parentRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
backendRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - TLSROUTE
|
||||
tlsroute:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
parentRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
backendRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - UDPROUTE
|
||||
udproute:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
parentRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
backendRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
||||
|
||||
# GATEWAY API - HTTPROUTE
|
||||
httproute:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
enabled: true
|
||||
annotations: {}
|
||||
labels: {}
|
||||
parentRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
rules:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
matches:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
filters:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
backendRefs:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_:
|
||||
filters:
|
||||
_HULL_OBJECT_TYPE_DEFAULT_: {}
|
||||
##################################################
|
1
helm/ambient-local-exporter/templates/exporter.yaml
Normal file
1
helm/ambient-local-exporter/templates/exporter.yaml
Normal file
@ -0,0 +1 @@
|
||||
{{- include "hull.objects.prepare.all" (dict "HULL_ROOT_KEY" "hull" "ROOT_CONTEXT" $) }}
|
217
helm/ambient-local-exporter/values.yaml
Normal file
217
helm/ambient-local-exporter/values.yaml
Normal file
@ -0,0 +1,217 @@
|
||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/vidispine/hull/refs/heads/main/hull/values.schema.json
|
||||
hull:
|
||||
config:
|
||||
## Ambient-Local-Exporter settings (config.yaml)
|
||||
appConfig:
|
||||
## App Config
|
||||
environment: production
|
||||
name: ambient-local-exporter
|
||||
logging:
|
||||
level: info
|
||||
format: json
|
||||
output: stdout
|
||||
timeFormat: rfc3339
|
||||
http:
|
||||
listen: :8080
|
||||
logRequests: false
|
||||
grpc:
|
||||
enabled: true
|
||||
listen: :8081
|
||||
logRequests: true
|
||||
enableReflection: true
|
||||
enableInstrumentation: true
|
||||
otel:
|
||||
enabled: true
|
||||
metricIntervalSecs: 30
|
||||
stdoutEnabled: false
|
||||
## Ambient Config
|
||||
metricPrefix: weather
|
||||
weatherStations:
|
||||
[]
|
||||
# - name: Home Weather Station
|
||||
# equipment: Ambient WS-2909
|
||||
# awnPassKey: D3:AD:B3:3F:00:00
|
||||
# proxyToAWN: true
|
||||
# proxyToWunderground: false
|
||||
# keepMetrics:
|
||||
# - BaromAbsoluteIn
|
||||
# - BaromRelativeIn
|
||||
# - HumidityIndoor
|
||||
# - StationType
|
||||
# - TempIndoorF
|
||||
# discardMetrics: []
|
||||
# - name: Shop Weather Station
|
||||
# equipment: Ambient WS-5000
|
||||
# awnPassKey: D3:AD:B3:3F:00:00
|
||||
# wundergroundID: KINCOLUMXXX
|
||||
# wundergroundPassword: somekey
|
||||
# proxyToAWN: true
|
||||
# proxyToWunderground: true
|
||||
# keepMetrics: []
|
||||
# discardMetrics: []
|
||||
# sensorMappings:
|
||||
# TempHumiditySensor1: Deep Freezer
|
||||
## Chart settings
|
||||
settings:
|
||||
resources: {} # Applies to the exporter container
|
||||
repo: gitea.libretechconsulting.com/rmcguire/ambient-local-exporter
|
||||
tag: _HT**Chart.AppVersion
|
||||
|
||||
httpPort: 8080 # Should match appConfig http.listen
|
||||
grpcPort: 8081 # Should match appConfig grpc.listen
|
||||
|
||||
# Use this as a shortcut, or create your own hull.objects.httproute
|
||||
httproute:
|
||||
enabled: true
|
||||
hostnames:
|
||||
- ambient-local-exporter.mydomain.com
|
||||
gatewayName: istio-ingressgateway
|
||||
gatewayNamespace: istio-system
|
||||
|
||||
# Use this as a shortcut, or create your own hull.objects.grpcroute
|
||||
grpcroute:
|
||||
enabled: true
|
||||
hostnames:
|
||||
- ambient-local-exporter.mydomain.com
|
||||
gatewayName: istio-ingressgateway
|
||||
gatewayNamespace: istio-system
|
||||
|
||||
otelServiceName: ambient-local-exporter
|
||||
otelResourceAttributes: app=ambient-local-exporter
|
||||
otlpEndpoint: http://otel.otel.svc.cluster.local:4317 # Replace me
|
||||
|
||||
serviceType: ClusterIP
|
||||
serviceLbIP: "" # Used if serviceTyps=LoadBalancer
|
||||
|
||||
general:
|
||||
rbac: false
|
||||
render:
|
||||
passes: 2
|
||||
# Applies to all objects
|
||||
metadata:
|
||||
labels:
|
||||
custom:
|
||||
app: _HT**Release.Name
|
||||
version: _HT**Chart.AppVersion
|
||||
|
||||
objects:
|
||||
configmap:
|
||||
config:
|
||||
data:
|
||||
config.yaml:
|
||||
serialization: toYaml
|
||||
inline: _HT*hull.config.appConfig
|
||||
environment:
|
||||
data:
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT:
|
||||
serialization: none
|
||||
inline: _HT*hull.config.settings.otlpEndpoint
|
||||
OTEL_SERVICE_NAME:
|
||||
serialization: none
|
||||
inline: _HT*hull.config.settings.otelServiceName
|
||||
OTEL_RESOURCE_ATTRIBUTES:
|
||||
serialization: none
|
||||
inline: _HT!
|
||||
{{ printf "deployment.name=%s,%s" _HT**Release.Name _HT*hull.config.settings.otelResourceAttributes }}
|
||||
serviceaccount:
|
||||
default:
|
||||
enabled: false
|
||||
role:
|
||||
default:
|
||||
enabled: false
|
||||
rolebinding:
|
||||
default:
|
||||
enabled: false
|
||||
|
||||
deployment:
|
||||
main:
|
||||
pod:
|
||||
containers:
|
||||
main:
|
||||
image:
|
||||
repository: _HT*hull.config.settings.repo
|
||||
tag: _HT*hull.config.settings.tag
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
- -config
|
||||
- /app/config.yaml
|
||||
ports:
|
||||
http:
|
||||
containerPort: _HT*hull.config.settings.httpPort
|
||||
grpc:
|
||||
containerPort: _HT*hull.config.settings.grpcPort
|
||||
envFrom:
|
||||
main:
|
||||
configMapRef:
|
||||
name: environment
|
||||
resources: _HT*hull.config.settings.resources
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: 8080
|
||||
scheme: HTTP
|
||||
periodSeconds: 10
|
||||
failureThreshold: 2
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: 8080
|
||||
scheme: HTTP
|
||||
periodSeconds: 10
|
||||
failureThreshold: 2
|
||||
volumeMounts:
|
||||
config:
|
||||
name: config
|
||||
mountPath: /app/config.yaml
|
||||
subPath: config.yaml
|
||||
volumes:
|
||||
environment:
|
||||
configMap:
|
||||
name: environment
|
||||
config:
|
||||
configMap:
|
||||
name: config
|
||||
|
||||
service:
|
||||
main:
|
||||
type: _HT*hull.config.settings.serviceType
|
||||
loadBalancerIP: _HT*hull.config.settings.serviceLbIP
|
||||
ports:
|
||||
http:
|
||||
port: _HT*hull.config.settings.httpPort
|
||||
targetPort: http
|
||||
grpc:
|
||||
port: _HT*hull.config.settings.grpcPort
|
||||
targetPort: grpc
|
||||
|
||||
httproute:
|
||||
main:
|
||||
enabled: _HT*hull.config.settings.httproute.enabled
|
||||
hostnames: _HT*hull.config.settings.httproute.hostnames
|
||||
parentRefs:
|
||||
- group: gateway.networking.k8s.io
|
||||
kind: Gateway
|
||||
name: _HT*hull.config.settings.httproute.gatewayName
|
||||
namespace: _HT*hull.config.settings.httproute.gatewayNamespace
|
||||
rules:
|
||||
- backendRefs:
|
||||
- group: ""
|
||||
kind: Service
|
||||
name: _HT^main
|
||||
port: _HT*hull.config.settings.httpPort
|
||||
|
||||
grpcroute:
|
||||
main:
|
||||
enabled: _HT*hull.config.settings.grpcroute.enabled
|
||||
hostnames: _HT*hull.config.settings.grpcroute.hostnames
|
||||
parentRefs:
|
||||
- group: gateway.networking.k8s.io
|
||||
kind: Gateway
|
||||
name: _HT*hull.config.settings.grpcroute.gatewayName
|
||||
namespace: _HT*hull.config.settings.grpcroute.gatewayNamespace
|
||||
rules:
|
||||
- backendRefs:
|
||||
- group: ""
|
||||
kind: Service
|
||||
name: _HT^main
|
||||
port: _HT*hull.config.settings.grpcPort
|
84
main.go
84
main.go
@ -2,77 +2,63 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/signal"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/app"
|
||||
grpcopts "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/grpc/opts"
|
||||
httpopts "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts"
|
||||
"golang.org/x/sys/unix"
|
||||
|
||||
weatherpb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/ambienthttp"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/config"
|
||||
weathergrpc "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/grpc"
|
||||
)
|
||||
|
||||
const defaultMetricPrefix = "weather"
|
||||
const (
|
||||
defaultMetricPrefix = "weather"
|
||||
)
|
||||
|
||||
var schema bool
|
||||
|
||||
func main() {
|
||||
ctx, cncl := signal.NotifyContext(context.Background(), os.Kill, os.Interrupt, unix.SIGTERM)
|
||||
defer cncl()
|
||||
|
||||
// Config type for app, which implements go-app/config.AppConfig
|
||||
awConfig := &config.AmbientLocalExporterConfig{
|
||||
// Read config and environment, prepare an appCtx, and merge
|
||||
// go-app config into ambient weather exporter app config
|
||||
ctx, awConfig := app.MustLoadConfigInto(ctx, &config.AmbientLocalExporterConfig{
|
||||
MetricPrefix: defaultMetricPrefix,
|
||||
WeatherStations: make([]config.WeatherStation, 0),
|
||||
}
|
||||
})
|
||||
|
||||
// Read config and environment, set up logging, load up
|
||||
// an appCtx, and prepare ambient weather local exporter
|
||||
ctx, awConfig = app.MustLoadConfigInto(ctx, awConfig)
|
||||
|
||||
// Prepare the exporter
|
||||
// Prepare the ambient exporter with our prepared config
|
||||
// and set up logging, tracing, etc..
|
||||
aw := ambient.New(ctx, awConfig).Init()
|
||||
|
||||
// Define and prepare the app
|
||||
awApp := app.App{
|
||||
AppContext: ctx,
|
||||
// HTTP Endpoints for Ambient Weather Stations
|
||||
HTTP: &httpopts.AppHTTP{
|
||||
Funcs: []httpopts.HTTPFunc{
|
||||
{
|
||||
Path: "/weatherstation/updateweatherstation.php",
|
||||
HandlerFunc: aw.GetWundergroundHandlerFunc(ctx),
|
||||
},
|
||||
{
|
||||
Path: "/data/report",
|
||||
HandlerFunc: aw.GetAWNHandlerFunc(ctx),
|
||||
},
|
||||
},
|
||||
CustomListener: ambienthttp.NewAWNMutatingListener(ctx,
|
||||
awConfig.HTTP.Listen), // Necessary to fix certain bad AWN firmware
|
||||
HealthChecks: []httpopts.HealthCheckFunc{
|
||||
// TODO: Implement
|
||||
func(ctx context.Context) error {
|
||||
return nil
|
||||
},
|
||||
},
|
||||
},
|
||||
// GRPC Service for retrieving current weather
|
||||
GRPC: &grpcopts.AppGRPC{
|
||||
Services: []*grpcopts.GRPCService{
|
||||
{
|
||||
Name: "Weather Service",
|
||||
Type: &weatherpb.AmbientLocalWeatherService_ServiceDesc,
|
||||
Service: weathergrpc.GRPCWeather{},
|
||||
},
|
||||
},
|
||||
},
|
||||
// Just show schema if that's all we were asked to do
|
||||
if schema {
|
||||
printSchema(awConfig)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
// Run and wait
|
||||
// Load http and grpc routes, prepare the app
|
||||
awApp := prepareApp(ctx, aw)
|
||||
|
||||
// Run app and wait
|
||||
awApp.MustRun()
|
||||
<-awApp.Done()
|
||||
}
|
||||
|
||||
// flag.Parse will be called by go-app
|
||||
func init() {
|
||||
flag.BoolVar(&schema, "schema", false, "generate json schema and exit")
|
||||
}
|
||||
|
||||
func printSchema(config *config.AmbientLocalExporterConfig) {
|
||||
bytes, err := app.CustomSchema(config)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
fmt.Println(string(bytes))
|
||||
}
|
||||
|
@ -20,35 +20,85 @@ import (
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/provider/awn"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/provider/wunderground"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders/memory"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders/noop"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders/redis"
|
||||
)
|
||||
|
||||
const defUpdatesToKeep = 120
|
||||
|
||||
type AmbientWeather struct {
|
||||
// These providers implement support for the update sent
|
||||
// when either "AmbientWeather" or "Wunderground" are selected
|
||||
// in the "Custom" section of the AWNet app, or the web UI
|
||||
// of an Ambient WeatherHub
|
||||
config *config.AmbientLocalExporterConfig
|
||||
awnProvider provider.AmbientProvider
|
||||
wuProvider provider.AmbientProvider
|
||||
appCtx context.Context
|
||||
metrics *weather.WeatherMetrics
|
||||
l *zerolog.Logger
|
||||
Config *config.AmbientLocalExporterConfig
|
||||
awnProvider provider.AmbientProvider
|
||||
wuProvider provider.AmbientProvider
|
||||
weatherRecorder *recorder.WeatherRecorder
|
||||
appCtx context.Context
|
||||
metrics *weather.WeatherMetrics
|
||||
l *zerolog.Logger
|
||||
*sync.RWMutex
|
||||
}
|
||||
|
||||
func New(appCtx context.Context, awConfig *config.AmbientLocalExporterConfig) *AmbientWeather {
|
||||
return &AmbientWeather{
|
||||
config: awConfig,
|
||||
appCtx: appCtx,
|
||||
Config: awConfig,
|
||||
appCtx: appCtx,
|
||||
RWMutex: &sync.RWMutex{},
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize with defaults, set logger from context
|
||||
func (aw *AmbientWeather) Init() *AmbientWeather {
|
||||
tracer := otel.GetTracer(aw.appCtx, "ambientWeather")
|
||||
_, span := tracer.Start(aw.appCtx, "ambientWeather.init",
|
||||
trace.WithAttributes(
|
||||
attribute.String("name", aw.Config.Name),
|
||||
attribute.Bool("grpcEnabled", aw.Config.GRPCEnabled()),
|
||||
attribute.Bool("httpEnabled", aw.Config.HTTPEnabled()),
|
||||
attribute.Int("weatherStations", len(aw.Config.WeatherStations)),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
aw.awnProvider = &awn.AWNProvider{}
|
||||
aw.wuProvider = &wunderground.WUProvider{}
|
||||
aw.l = zerolog.Ctx(aw.appCtx)
|
||||
|
||||
aw.l.Trace().Any("awConfig", aw.config).Send()
|
||||
updatesToKeep := defUpdatesToKeep
|
||||
if aw.Config.UpdatesToKeep != nil && *aw.Config.UpdatesToKeep > 0 {
|
||||
updatesToKeep = *aw.Config.UpdatesToKeep
|
||||
}
|
||||
span.SetAttributes(attribute.Int("updatesToKeep", updatesToKeep))
|
||||
|
||||
// Choose weather recorder for grpc / api requests,
|
||||
// default is memory recorder
|
||||
var r recorders.Recorder
|
||||
if aw.Config == nil || aw.Config.RecorderConfig == nil {
|
||||
r = &memory.MemoryRecorder{}
|
||||
} else {
|
||||
switch aw.Config.RecorderConfig.Type {
|
||||
case config.TypeMemory:
|
||||
r = &memory.MemoryRecorder{}
|
||||
case config.TypeRedis:
|
||||
r = &redis.RedisRecorder{}
|
||||
case config.TypeNoop:
|
||||
r = &noop.NoopRecorder{}
|
||||
}
|
||||
}
|
||||
|
||||
aw.weatherRecorder = recorder.MustNewWeatherRecorder(&recorder.Opts{
|
||||
AppConfig: aw.Config,
|
||||
Ctx: aw.appCtx,
|
||||
KeepLast: updatesToKeep,
|
||||
Recorder: r,
|
||||
})
|
||||
|
||||
aw.l.Trace().Any("awConfig", aw.Config).Send()
|
||||
span.SetStatus(codes.Ok, "")
|
||||
return aw
|
||||
}
|
||||
|
||||
@ -78,6 +128,9 @@ func (aw *AmbientWeather) handleProviderRequest(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
) {
|
||||
aw.Lock()
|
||||
defer aw.Unlock()
|
||||
|
||||
l := zerolog.Ctx(aw.appCtx)
|
||||
tracer := otel.GetTracer(aw.appCtx, p.Name()+".http.handler")
|
||||
|
||||
@ -110,21 +163,43 @@ func (aw *AmbientWeather) handleProviderRequest(
|
||||
updateSpan.SetAttributes(attribute.String("stationName", update.StationConfig.Name))
|
||||
}
|
||||
|
||||
// Concurrently record the now enriched update
|
||||
// to the configured recorder and to otel, and proxy
|
||||
// to enabled downstream providers
|
||||
var updateWg sync.WaitGroup
|
||||
|
||||
// Record state
|
||||
updateWg.Add(1)
|
||||
go func() {
|
||||
defer updateWg.Done()
|
||||
aw.weatherRecorder.Set(ctx, update)
|
||||
}()
|
||||
|
||||
// Update metrics
|
||||
aw.metricsUpdate(ctx, p, update)
|
||||
updateWg.Add(1)
|
||||
go func() {
|
||||
defer updateWg.Done()
|
||||
aw.metricsUpdate(ctx, p, update)
|
||||
}()
|
||||
|
||||
// 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 update.StationConfig != nil {
|
||||
updateWg.Add(1)
|
||||
go func() {
|
||||
defer updateWg.Done()
|
||||
aw.proxyUpdate(ctx, p, update)
|
||||
}()
|
||||
}
|
||||
|
||||
updateWg.Wait()
|
||||
|
||||
l.Debug().
|
||||
Str("provider", p.Name()).
|
||||
Any("update", update).
|
||||
Msg("successfully handled update")
|
||||
w.Write([]byte("ok"))
|
||||
|
||||
// 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 update.StationConfig != nil {
|
||||
aw.proxyUpdate(ctx, p, update)
|
||||
}
|
||||
}
|
||||
|
||||
func (aw *AmbientWeather) enrichUpdate(
|
||||
@ -227,18 +302,25 @@ func (aw *AmbientWeather) proxyUpdate(
|
||||
}
|
||||
|
||||
func (aw *AmbientWeather) InitMetrics() {
|
||||
if aw.config.MetricPrefix != "" {
|
||||
weather.MetricPrefix = aw.config.MetricPrefix
|
||||
if aw.Config.MetricPrefix != "" {
|
||||
weather.MetricPrefix = aw.Config.MetricPrefix
|
||||
}
|
||||
aw.metrics = weather.MustInitMetrics(aw.appCtx)
|
||||
}
|
||||
|
||||
func (aw *AmbientWeather) enrichStation(update *weather.WeatherUpdate) {
|
||||
if update != nil && update.StationID != nil && *update.StationID != "" {
|
||||
for _, station := range aw.config.WeatherStations {
|
||||
for _, station := range aw.Config.WeatherStations {
|
||||
if *update.StationID == station.AWNPassKey || *update.StationID == station.WundergroundID {
|
||||
update.StationConfig = &station
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (aw *AmbientWeather) GetRecorder() *recorder.WeatherRecorder {
|
||||
aw.RLock()
|
||||
defer aw.RUnlock()
|
||||
|
||||
return aw.weatherRecorder
|
||||
}
|
||||
|
@ -6,23 +6,25 @@ import (
|
||||
|
||||
// This configuration includes all config from go-app/config.AppConfig
|
||||
type AmbientLocalExporterConfig struct {
|
||||
MetricPrefix string `yaml:"metricPrefix" default:"weather" env:"AMBIENT_METRIC_PREFIX"`
|
||||
WeatherStations []WeatherStation `yaml:"weatherStations"` // No env, too complex, not worth the time
|
||||
MetricPrefix string `yaml:"metricPrefix" default:"weather" env:"AMBIENT_METRIC_PREFIX" json:"metricPrefix,omitempty"`
|
||||
UpdatesToKeep *int `yaml:"updatesToKeep" default:"1" env:"AMBIENT_UPDATES_TO_KEEP" json:"updatesToKeep,omitempty"`
|
||||
WeatherStations []WeatherStation `yaml:"weatherStations" json:"weatherStations,omitempty"` // No env, too complex, not worth the time
|
||||
RecorderConfig *RecorderConfig `yaml:"recorderConfig" json:"recorderConfig,omitempty"`
|
||||
*config.AppConfig // Extends app config
|
||||
}
|
||||
|
||||
type WeatherStation struct {
|
||||
Name string `yaml:"name"` // Human Friendly Name (e.g. Back Yard Weather)
|
||||
Equipment string `yaml:"equipment"` // Equipment Type (e.g. WS-5000)
|
||||
Name string `yaml:"name" json:"name,omitempty"` // Human Friendly Name (e.g. Back Yard Weather)
|
||||
Equipment string `yaml:"equipment" json:"equipment,omitempty"` // Equipment Type (e.g. WS-5000)
|
||||
|
||||
// Required if proxying to awn/wu is enabled
|
||||
WundergroundID string `yaml:"wundergroundID"`
|
||||
WundergroundPassword string `yaml:"wundergroundPassword"`
|
||||
AWNPassKey string `yaml:"awnPassKey"`
|
||||
WundergroundID string `yaml:"wundergroundID" json:"wundergroundID,omitempty"`
|
||||
WundergroundPassword string `yaml:"wundergroundPassword" json:"wundergroundPassword,omitempty"`
|
||||
AWNPassKey string `yaml:"awnPassKey" json:"awnPassKey,omitempty"`
|
||||
|
||||
// Proxy updates to AWN or Wunderground
|
||||
ProxyToAWN bool `yaml:"proxyToAWN"`
|
||||
ProxyToWunderground bool `yaml:"proxyToWunderground"`
|
||||
ProxyToAWN bool `yaml:"proxyToAWN" json:"proxyToAWN,omitempty"`
|
||||
ProxyToWunderground bool `yaml:"proxyToWunderground" json:"proxyToWunderground,omitempty"`
|
||||
|
||||
// Unreliable / unwanted metrics by name of WeatherUpdate Field
|
||||
// will be excluded if present in discardMetrics
|
||||
@ -31,8 +33,8 @@ type WeatherStation struct {
|
||||
// ignoring discardMetrics.
|
||||
//
|
||||
// Check weather.WeatherUpdateField for options
|
||||
KeepMetrics []string `yaml:"keepMetrics"`
|
||||
DropMetrics []string `yaml:"dropMetrics"`
|
||||
KeepMetrics []string `yaml:"keepMetrics" json:"keepMetrics,omitempty"`
|
||||
DropMetrics []string `yaml:"dropMetrics" json:"dropMetrics,omitempty"`
|
||||
|
||||
// Relabels battery and sensor names
|
||||
// Temp+Humidity Sensors:
|
||||
@ -42,5 +44,5 @@ type WeatherStation struct {
|
||||
// - OutdoorSensor
|
||||
// - RainSensor
|
||||
// - CO2Sensor
|
||||
SensorMappings map[string]string `yaml:"sensorMappings"`
|
||||
SensorMappings map[string]string `yaml:"sensorMappings" json:"sensorMappings,omitempty"`
|
||||
}
|
||||
|
25
pkg/ambient/config/config_recorder.go
Normal file
25
pkg/ambient/config/config_recorder.go
Normal file
@ -0,0 +1,25 @@
|
||||
package config
|
||||
|
||||
type RecorderType string
|
||||
|
||||
const (
|
||||
TypeMemory RecorderType = "memory" // Stores weather updates in memory
|
||||
TypeRedis RecorderType = "redis" // Required for replicas > 1
|
||||
TypeNoop RecorderType = "noop" // No-op implementation
|
||||
)
|
||||
|
||||
type RecorderConfig struct {
|
||||
Type RecorderType `yaml:"type" env:"RECORDER_TYPE" json:"type,omitempty" enum:"memory,redis,noop"`
|
||||
KeepLast int `yaml:"keepLast" env:"RECORDER_KEEP_LAST" json:"keepLast,omitempty" default:"120"`
|
||||
RedisConfig *RedisConfig `yaml:"redisConfig,omitempty" json:"redisConfig,omitempty"`
|
||||
}
|
||||
|
||||
type RedisConfig struct {
|
||||
RedisHost string `yaml:"redisHost" env:"REDIS_HOST" default:"127.0.0.1" json:"redisHost,omitempty"`
|
||||
RedisPort int `yaml:"redisPort" env:"REDIS_PORT" default:"6379" json:"redisPort,omitempty"`
|
||||
RedisUser string `yaml:"redisUser" env:"REDIS_USER" json:"redisUser,omitempty"`
|
||||
RedisPassword string `yaml:"redisPassword" env:"REDIS_PASSWORD" json:"redisPassword,omitempty"`
|
||||
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"`
|
||||
}
|
104
pkg/util/util.go
Normal file
104
pkg/util/util.go
Normal file
@ -0,0 +1,104 @@
|
||||
package util
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"slices"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
|
||||
"k8s.io/utils/ptr"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
const defaultLimit = -1
|
||||
|
||||
func DerefStr(s *string) string {
|
||||
if s == nil {
|
||||
return ""
|
||||
}
|
||||
return *s
|
||||
}
|
||||
|
||||
func Int32ptr(i *int) *int32 {
|
||||
if i == nil {
|
||||
return nil
|
||||
}
|
||||
return ptr.To(int32(*i))
|
||||
}
|
||||
|
||||
// Generates a hash that will be consistent
|
||||
// across all running replicas
|
||||
func GetAppHash(conf *config.AppConfig) string {
|
||||
hashName := fmt.Sprintf("%s-%s-%s",
|
||||
conf.Name,
|
||||
conf.Environment,
|
||||
conf.Version,
|
||||
)
|
||||
|
||||
hash := md5.Sum([]byte(hashName))
|
||||
return hex.EncodeToString(hash[:])
|
||||
}
|
||||
|
||||
// Get a limit from req, applying a default if unset or not sane
|
||||
func GetLimitFromReq(req *pb.GetWeatherRequest) int {
|
||||
if req == nil || req.Limit == nil {
|
||||
return defaultLimit
|
||||
}
|
||||
|
||||
if req.GetLimit() == 0 {
|
||||
return defaultLimit
|
||||
}
|
||||
|
||||
return int(req.GetLimit())
|
||||
}
|
||||
|
||||
// Simple helper to trim a list of updates
|
||||
func LimitUpdates(updates []*weather.WeatherUpdate, limit int) []*weather.WeatherUpdate {
|
||||
if limit < 0 {
|
||||
return updates // No limit
|
||||
}
|
||||
|
||||
if len(updates) > limit {
|
||||
return updates[len(updates)-limit:] // Trim to limit
|
||||
}
|
||||
|
||||
return updates // Within limit
|
||||
}
|
||||
|
||||
func ApplyOptsToUpdates(updates []*weather.WeatherUpdate, limit int, opts *pb.GetWeatherOpts) []*weather.WeatherUpdate {
|
||||
if opts == nil {
|
||||
return updates
|
||||
} else if opts.StationName == nil && opts.StationType == nil {
|
||||
return updates
|
||||
}
|
||||
|
||||
filtered := make([]*weather.WeatherUpdate, 0, limit)
|
||||
|
||||
for i := len(updates) - 1; i >= 0; i-- {
|
||||
update := updates[i]
|
||||
match := true
|
||||
|
||||
if opts.GetStationName() != "" {
|
||||
if update.GetStationName() != opts.GetStationName() {
|
||||
match = false
|
||||
}
|
||||
}
|
||||
if opts.GetStationType() != "" {
|
||||
if DerefStr(update.StationType) != opts.GetStationType() {
|
||||
match = false
|
||||
}
|
||||
}
|
||||
|
||||
if match {
|
||||
filtered = append(filtered, update)
|
||||
if limit > 0 && len(filtered) >= limit {
|
||||
return slices.Clip(filtered)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return slices.Clip(filtered)
|
||||
}
|
90
pkg/weather/grpc/mapupdate.go
Normal file
90
pkg/weather/grpc/mapupdate.go
Normal file
@ -0,0 +1,90 @@
|
||||
package grpc
|
||||
|
||||
import (
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"google.golang.org/protobuf/types/known/timestamppb"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
// Converts a slice of weather.WeatherUpdate to proto structs
|
||||
func UpdatesToPbUpdates(u []*weather.WeatherUpdate) []*pb.WeatherUpdate {
|
||||
updates := make([]*pb.WeatherUpdate, len(u))
|
||||
for i, update := range u {
|
||||
updates[i] = UpdateToPbUpdate(update)
|
||||
}
|
||||
return updates
|
||||
}
|
||||
|
||||
// Maps a weather.WeatherUpdate to the proto version.
|
||||
//
|
||||
// This should be auto-generated code, but as the proto should be
|
||||
// stable, it is probably not worth the effort.
|
||||
func UpdateToPbUpdate(u *weather.WeatherUpdate) *pb.WeatherUpdate {
|
||||
if u.DateUTC == nil {
|
||||
now := time.Now()
|
||||
u.DateUTC = &now
|
||||
}
|
||||
|
||||
return &pb.WeatherUpdate{
|
||||
StationName: u.StationConfig.Name,
|
||||
StationType: util.DerefStr(u.StationType),
|
||||
StationId: util.DerefStr(u.StationID),
|
||||
TempOutdoorF: u.TempOutdoorF,
|
||||
TempIndoorF: u.TempIndoorF,
|
||||
HumidityOutdoor: util.Int32ptr(u.HumidityOudoor),
|
||||
HumidityIndoor: util.Int32ptr(u.HumidityIndoor),
|
||||
WindSpeedMph: u.WindSpeedMPH,
|
||||
WindGustMph: u.WindGustMPH,
|
||||
MaxDailyGust: u.MaxDailyGust,
|
||||
WindDir: util.Int32ptr(u.WindDir),
|
||||
WindDirAvg_10M: util.Int32ptr(u.WindDirAvg10m),
|
||||
Uv: util.Int32ptr(u.UV),
|
||||
SolarRadiation: u.SolarRadiation,
|
||||
HourlyRainIn: u.HourlyRainIn,
|
||||
EventRainIn: u.EventRainIn,
|
||||
DailyRainIn: u.DailyRainIn,
|
||||
WeeklyRainIn: u.WeeklyRainIn,
|
||||
MonthlyRainIn: u.MonthlyRainIn,
|
||||
YearlyRainIn: u.YearlyRainIn,
|
||||
TotalRainIn: u.TotalRainIn,
|
||||
Batteries: batteriesToPbBatteries(u.Batteries),
|
||||
BaromRelativeIn: u.BaromRelativeIn,
|
||||
BaromAbsoluteIn: u.BaromAbsoluteIn,
|
||||
DewPointF: u.DewPointF,
|
||||
WindChillF: u.WindChillF,
|
||||
TempHumiditySensors: thSensorsToPbSensors(u.TempHumiditySensors),
|
||||
UpdateTimestamp: timestamppb.New(*u.DateUTC),
|
||||
}
|
||||
}
|
||||
|
||||
func batteriesToPbBatteries(batteries []weather.BatteryStatus) []*pb.BatteryStatus {
|
||||
pbBatteries := make([]*pb.BatteryStatus, 0, len(batteries))
|
||||
for _, b := range batteries {
|
||||
if b.Status != nil {
|
||||
pbBatteries = append(pbBatteries, &pb.BatteryStatus{
|
||||
Component: b.Component,
|
||||
Status: util.Int32ptr(b.Status),
|
||||
})
|
||||
}
|
||||
}
|
||||
return slices.Clip(pbBatteries)
|
||||
}
|
||||
|
||||
func thSensorsToPbSensors(sensors []*weather.TempHumiditySensor) []*pb.TempHumiditySensor {
|
||||
pbSensors := make([]*pb.TempHumiditySensor, 0, len(sensors))
|
||||
for _, s := range sensors {
|
||||
if s.TempF != nil || s.Humidity != nil {
|
||||
pbSensors = append(pbSensors, &pb.TempHumiditySensor{
|
||||
Name: s.Name,
|
||||
TempF: s.TempF,
|
||||
Humidity: util.Int32ptr(s.Humidity),
|
||||
})
|
||||
}
|
||||
}
|
||||
return slices.Clip(pbSensors)
|
||||
}
|
117
pkg/weather/grpc/mapupdate_test.go
Normal file
117
pkg/weather/grpc/mapupdate_test.go
Normal file
@ -0,0 +1,117 @@
|
||||
package grpc
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"google.golang.org/protobuf/types/known/timestamppb"
|
||||
"k8s.io/utils/ptr"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
var now = time.Now()
|
||||
|
||||
var mockUpdate = &weather.WeatherUpdate{
|
||||
DateUTC: &now,
|
||||
StationConfig: &config.WeatherStation{
|
||||
Name: "50W",
|
||||
Equipment: "WS-5000",
|
||||
},
|
||||
StationID: ptr.To("50W"),
|
||||
StationType: ptr.To("WS-5000"),
|
||||
TempOutdoorF: ptr.To(97.6),
|
||||
TempIndoorF: ptr.To(77.6),
|
||||
HumidityOudoor: ptr.To(50),
|
||||
HumidityIndoor: ptr.To(50),
|
||||
WindSpeedMPH: ptr.To(20.5),
|
||||
WindGustMPH: ptr.To(30.5),
|
||||
MaxDailyGust: ptr.To(40.0),
|
||||
WindDir: ptr.To(180),
|
||||
WindDirAvg10m: ptr.To(180),
|
||||
UV: nil,
|
||||
SolarRadiation: ptr.To(9.999),
|
||||
HourlyRainIn: ptr.To(9.999),
|
||||
EventRainIn: ptr.To(9.999),
|
||||
DailyRainIn: ptr.To(9.999),
|
||||
WeeklyRainIn: ptr.To(9.999),
|
||||
MonthlyRainIn: ptr.To(9.999),
|
||||
YearlyRainIn: ptr.To(9.999),
|
||||
TotalRainIn: ptr.To(9.999),
|
||||
Batteries: []weather.BatteryStatus{
|
||||
{Component: "battery1", Status: ptr.To(1)},
|
||||
{Component: "battery2", Status: ptr.To(1)},
|
||||
},
|
||||
BaromRelativeIn: ptr.To(9.999),
|
||||
BaromAbsoluteIn: ptr.To(9.999),
|
||||
DewPointF: ptr.To(9.999),
|
||||
WindChillF: ptr.To(9.999),
|
||||
TempHumiditySensors: []*weather.TempHumiditySensor{
|
||||
{Name: "sensor1", TempF: ptr.To(99.999), Humidity: nil},
|
||||
},
|
||||
}
|
||||
|
||||
func TestUpdateToPbUpdate(t *testing.T) {
|
||||
type args struct {
|
||||
u *weather.WeatherUpdate
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want *pb.WeatherUpdate
|
||||
}{
|
||||
{
|
||||
name: "Map Update to PB",
|
||||
args: args{u: mockUpdate},
|
||||
want: &pb.WeatherUpdate{
|
||||
StationName: mockUpdate.StationConfig.Name,
|
||||
StationType: *mockUpdate.StationType,
|
||||
StationId: *mockUpdate.StationID,
|
||||
TempOutdoorF: mockUpdate.TempOutdoorF,
|
||||
TempIndoorF: mockUpdate.TempIndoorF,
|
||||
HumidityOutdoor: ptr.To(int32(*mockUpdate.HumidityOudoor)),
|
||||
HumidityIndoor: ptr.To(int32(*mockUpdate.HumidityIndoor)),
|
||||
WindSpeedMph: mockUpdate.WindSpeedMPH,
|
||||
WindGustMph: mockUpdate.WindGustMPH,
|
||||
MaxDailyGust: mockUpdate.MaxDailyGust,
|
||||
WindDir: ptr.To(int32(*mockUpdate.WindDir)),
|
||||
WindDirAvg_10M: ptr.To(int32(*mockUpdate.WindDirAvg10m)),
|
||||
Uv: nil,
|
||||
SolarRadiation: mockUpdate.SolarRadiation,
|
||||
HourlyRainIn: mockUpdate.HourlyRainIn,
|
||||
EventRainIn: mockUpdate.EventRainIn,
|
||||
DailyRainIn: mockUpdate.DailyRainIn,
|
||||
WeeklyRainIn: mockUpdate.WeeklyRainIn,
|
||||
MonthlyRainIn: mockUpdate.MonthlyRainIn,
|
||||
YearlyRainIn: mockUpdate.YearlyRainIn,
|
||||
TotalRainIn: mockUpdate.TotalRainIn,
|
||||
Batteries: []*pb.BatteryStatus{
|
||||
{Component: mockUpdate.Batteries[0].Component, Status: ptr.To(int32(*mockUpdate.Batteries[0].Status))},
|
||||
{Component: mockUpdate.Batteries[1].Component, Status: ptr.To(int32(*mockUpdate.Batteries[1].Status))},
|
||||
},
|
||||
BaromRelativeIn: mockUpdate.BaromRelativeIn,
|
||||
BaromAbsoluteIn: mockUpdate.BaromAbsoluteIn,
|
||||
DewPointF: mockUpdate.DewPointF,
|
||||
WindChillF: mockUpdate.WindChillF,
|
||||
TempHumiditySensors: []*pb.TempHumiditySensor{
|
||||
{
|
||||
Name: mockUpdate.TempHumiditySensors[0].Name,
|
||||
TempF: mockUpdate.TempHumiditySensors[0].TempF,
|
||||
Humidity: nil,
|
||||
},
|
||||
},
|
||||
UpdateTimestamp: timestamppb.New(now),
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := UpdateToPbUpdate(tt.args.u); !reflect.DeepEqual(got, tt.want) {
|
||||
t.Errorf("UpdateToPbUpdate() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
@ -3,11 +3,64 @@ package grpc
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
otelcodes "go.opentelemetry.io/otel/codes"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
"google.golang.org/protobuf/types/known/timestamppb"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder"
|
||||
)
|
||||
|
||||
// TODO: Implement
|
||||
type GRPCWeather struct {
|
||||
ctx context.Context
|
||||
ctx context.Context
|
||||
recorder *recorder.WeatherRecorder
|
||||
tracer trace.Tracer
|
||||
*pb.UnimplementedAmbientLocalWeatherServiceServer
|
||||
}
|
||||
|
||||
func NewGRPCWeather(ctx context.Context, recorder *recorder.WeatherRecorder) *GRPCWeather {
|
||||
return &GRPCWeather{
|
||||
ctx: ctx,
|
||||
recorder: recorder,
|
||||
tracer: otel.GetTracer(ctx, "grpcWeather"),
|
||||
}
|
||||
}
|
||||
|
||||
func (w *GRPCWeather) GetWeather(ctx context.Context, req *pb.GetWeatherRequest) (
|
||||
*pb.GetWeatherResponse, error,
|
||||
) {
|
||||
ctx, span := w.tracer.Start(ctx, "getWeather")
|
||||
defer span.End()
|
||||
|
||||
limit := 1
|
||||
if req.Limit != nil {
|
||||
if *req.Limit > 1 {
|
||||
limit = int(*req.Limit)
|
||||
}
|
||||
}
|
||||
|
||||
span.SetAttributes(attribute.Int("limit", limit))
|
||||
|
||||
updates, err := w.recorder.Get(ctx, req)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
span.SetStatus(otelcodes.Error, err.Error())
|
||||
return nil, status.Errorf(codes.Internal, err.Error())
|
||||
} else if len(updates) < 1 {
|
||||
return nil, status.Errorf(codes.OutOfRange, "no weather available")
|
||||
}
|
||||
|
||||
span.SetStatus(otelcodes.Ok, "")
|
||||
|
||||
return &pb.GetWeatherResponse{
|
||||
LastUpdated: ×tamppb.Timestamp{
|
||||
Seconds: updates[0].DateUTC.Unix(),
|
||||
},
|
||||
WeatherUpdates: UpdatesToPbUpdates(updates),
|
||||
}, nil
|
||||
}
|
||||
|
57
pkg/weather/recorder/recorder.go
Normal file
57
pkg/weather/recorder/recorder.go
Normal file
@ -0,0 +1,57 @@
|
||||
package recorder
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"go.opentelemetry.io/otel/metric"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders"
|
||||
)
|
||||
|
||||
type WeatherRecorder struct {
|
||||
recorder recorders.Recorder
|
||||
ctx context.Context
|
||||
tracer trace.Tracer
|
||||
meter metric.Meter
|
||||
*sync.RWMutex
|
||||
}
|
||||
|
||||
type Opts struct {
|
||||
AppConfig *config.AmbientLocalExporterConfig
|
||||
Ctx context.Context
|
||||
Recorder recorders.Recorder // If nil, will use memory recorder
|
||||
KeepLast int
|
||||
}
|
||||
|
||||
func MustNewWeatherRecorder(opts *Opts) *WeatherRecorder {
|
||||
if opts.KeepLast < 1 {
|
||||
opts.KeepLast = 1
|
||||
}
|
||||
|
||||
if opts.Recorder == nil {
|
||||
panic("no recorder provided")
|
||||
}
|
||||
|
||||
opts.Recorder.Init(opts.Ctx, &recorders.RecorderOpts{
|
||||
AppConfig: opts.AppConfig,
|
||||
RetainLast: opts.KeepLast,
|
||||
BaseCtx: opts.Ctx,
|
||||
})
|
||||
|
||||
zerolog.Ctx(opts.Ctx).Info().Str("recorderType", opts.Recorder.Name()).
|
||||
Msg("weather update recorder ready")
|
||||
|
||||
return &WeatherRecorder{
|
||||
ctx: opts.Ctx,
|
||||
recorder: opts.Recorder,
|
||||
tracer: otel.GetTracer(opts.Ctx, "weatherRecorder"),
|
||||
meter: otel.GetMeter(opts.Ctx, "weatherRecorder"),
|
||||
RWMutex: &sync.RWMutex{},
|
||||
}
|
||||
}
|
65
pkg/weather/recorder/recorder_get.go
Normal file
65
pkg/weather/recorder/recorder_get.go
Normal file
@ -0,0 +1,65 @@
|
||||
package recorder
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
"k8s.io/utils/ptr"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
// Returns last requested number of weather updates
|
||||
// If negative number given, will return all weather observations
|
||||
func (w *WeatherRecorder) Get(ctx context.Context, req *pb.GetWeatherRequest) (
|
||||
[]*weather.WeatherUpdate, error,
|
||||
) {
|
||||
if req == nil {
|
||||
req = &pb.GetWeatherRequest{Limit: ptr.To(int32(-1))}
|
||||
}
|
||||
|
||||
if req.Limit == nil || *req.Limit < 0 {
|
||||
req.Limit = ptr.To(int32(-1))
|
||||
} else if *req.Limit == 0 {
|
||||
req.Limit = ptr.To(int32(1))
|
||||
}
|
||||
|
||||
var filterSN, filterST string
|
||||
if req.Opts != nil {
|
||||
filterSN = req.Opts.GetStationName()
|
||||
filterST = req.Opts.GetStationType()
|
||||
}
|
||||
|
||||
ctx, span := w.tracer.Start(ctx, "getWeatherRecorder")
|
||||
span.SetAttributes(
|
||||
attribute.String("stationNameFilter", filterSN),
|
||||
attribute.String("stationTypeFilter", filterST),
|
||||
attribute.Int("last", int(*req.Limit)),
|
||||
attribute.Int("currentSize", w.Count(ctx)),
|
||||
)
|
||||
defer span.End()
|
||||
|
||||
updates, err := w.recorder.Get(ctx, req)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
} else {
|
||||
span.SetStatus(codes.Ok, "")
|
||||
}
|
||||
|
||||
return updates, err
|
||||
}
|
||||
|
||||
// Returns count of retained weather updates
|
||||
func (w *WeatherRecorder) Count(ctx context.Context) int {
|
||||
ctx, span := w.tracer.Start(ctx, "countWeatherRecorder")
|
||||
defer span.End()
|
||||
|
||||
count := w.recorder.Count(ctx)
|
||||
span.SetAttributes(attribute.Int("count", count))
|
||||
|
||||
span.SetStatus(codes.Ok, "")
|
||||
return count
|
||||
}
|
33
pkg/weather/recorder/recorder_set.go
Normal file
33
pkg/weather/recorder/recorder_set.go
Normal file
@ -0,0 +1,33 @@
|
||||
package recorder
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
func (w *WeatherRecorder) Set(ctx context.Context, u *weather.WeatherUpdate) error {
|
||||
if u.StationConfig == nil {
|
||||
u.StationConfig = &config.WeatherStation{
|
||||
Name: "unregistered",
|
||||
Equipment: "unknown",
|
||||
ProxyToAWN: false,
|
||||
ProxyToWunderground: false,
|
||||
KeepMetrics: []string{},
|
||||
}
|
||||
}
|
||||
|
||||
ctx, span := w.tracer.Start(ctx, "setRecorderUpdate", trace.WithAttributes(
|
||||
attribute.String("stationName", u.StationConfig.Name),
|
||||
attribute.String("stationType", util.DerefStr(u.StationType)),
|
||||
attribute.String("stationEquipment", u.StationConfig.Equipment),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
return w.recorder.Set(ctx, u)
|
||||
}
|
24
pkg/weather/recorder/recorders/memory/count.go
Normal file
24
pkg/weather/recorder/recorders/memory/count.go
Normal file
@ -0,0 +1,24 @@
|
||||
package memory
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
)
|
||||
|
||||
func (r *MemoryRecorder) Count(ctx context.Context) int {
|
||||
_, span := r.tracer.Start(ctx, "countWeatherRecorder")
|
||||
defer span.End()
|
||||
|
||||
count := r.count()
|
||||
|
||||
span.SetAttributes(attribute.Int("count", count))
|
||||
span.SetStatus(codes.Ok, "")
|
||||
|
||||
return count
|
||||
}
|
||||
|
||||
func (r *MemoryRecorder) count() int {
|
||||
return len(r.updates)
|
||||
}
|
50
pkg/weather/recorder/recorders/memory/get.go
Normal file
50
pkg/weather/recorder/recorders/memory/get.go
Normal file
@ -0,0 +1,50 @@
|
||||
package memory
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
func (r *MemoryRecorder) Get(ctx context.Context, req *pb.GetWeatherRequest) (
|
||||
[]*weather.WeatherUpdate, error,
|
||||
) {
|
||||
_, span := r.tracer.Start(ctx, "memoryRecorder.Get")
|
||||
defer span.End()
|
||||
|
||||
r.RLock()
|
||||
defer r.RUnlock()
|
||||
|
||||
span.AddEvent("acquired lock on recorder cache")
|
||||
|
||||
limit := util.GetLimitFromReq(req)
|
||||
if r.count() == 0 {
|
||||
err := errors.New("no recorded updates to get")
|
||||
span.RecordError(err)
|
||||
return nil, err
|
||||
} else if limit > 0 && r.count() <= limit {
|
||||
span.RecordError(errors.New("requested more updates than recorded"))
|
||||
}
|
||||
|
||||
updates := r.getUpdatesFromReq(req)
|
||||
span.AddEvent("request limit/opts applied to updates")
|
||||
|
||||
span.SetAttributes(attribute.Int("retrieved", len(updates)))
|
||||
span.SetStatus(codes.Ok, "")
|
||||
|
||||
return updates, nil
|
||||
}
|
||||
|
||||
func (r *MemoryRecorder) getUpdatesFromReq(req *pb.GetWeatherRequest) []*weather.WeatherUpdate {
|
||||
if req.Opts == nil {
|
||||
return util.LimitUpdates(r.updates, util.GetLimitFromReq(req))
|
||||
}
|
||||
|
||||
return util.ApplyOptsToUpdates(r.updates, util.GetLimitFromReq(req), req.Opts)
|
||||
}
|
40
pkg/weather/recorder/recorders/memory/memory.go
Normal file
40
pkg/weather/recorder/recorders/memory/memory.go
Normal file
@ -0,0 +1,40 @@
|
||||
package memory
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders"
|
||||
)
|
||||
|
||||
const (
|
||||
DEF_RETAIN_LAST = 120
|
||||
NAME = "memory recorder"
|
||||
)
|
||||
|
||||
type MemoryRecorder struct {
|
||||
baseCtx context.Context
|
||||
updates []*weather.WeatherUpdate
|
||||
tracer trace.Tracer
|
||||
keep int
|
||||
*sync.RWMutex
|
||||
}
|
||||
|
||||
func (r *MemoryRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts) {
|
||||
if opts.RetainLast < 1 {
|
||||
opts.RetainLast = DEF_RETAIN_LAST
|
||||
}
|
||||
|
||||
r.updates = make([]*weather.WeatherUpdate, 0, opts.RetainLast)
|
||||
r.keep = opts.RetainLast
|
||||
r.baseCtx = opts.BaseCtx
|
||||
r.RWMutex = &sync.RWMutex{}
|
||||
r.tracer = otel.GetTracer(r.baseCtx, "memoryRecorder")
|
||||
}
|
||||
|
||||
func (r *MemoryRecorder) Name() string { return NAME }
|
38
pkg/weather/recorder/recorders/memory/set.go
Normal file
38
pkg/weather/recorder/recorders/memory/set.go
Normal file
@ -0,0 +1,38 @@
|
||||
package memory
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
func (r *MemoryRecorder) Set(ctx context.Context, u *weather.WeatherUpdate) error {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
|
||||
ctx, span := r.tracer.Start(ctx, "memoryRecorder.Set")
|
||||
span.SetAttributes(
|
||||
attribute.Int("countWeatherUpdates", r.Count(ctx)),
|
||||
attribute.Int("keepUpdates", r.keep),
|
||||
)
|
||||
defer span.End()
|
||||
|
||||
return r.set(ctx, u)
|
||||
}
|
||||
|
||||
func (r *MemoryRecorder) set(ctx context.Context, u *weather.WeatherUpdate) error {
|
||||
span := trace.SpanFromContext(ctx)
|
||||
|
||||
if len(r.updates) > r.keep {
|
||||
r.updates = r.updates[1:]
|
||||
span.AddEvent("trimmed recorded updates by 1")
|
||||
}
|
||||
|
||||
r.updates = append(r.updates, u)
|
||||
span.AddEvent("recorded weather update")
|
||||
|
||||
return nil
|
||||
}
|
23
pkg/weather/recorder/recorders/noop/noop.go
Normal file
23
pkg/weather/recorder/recorders/noop/noop.go
Normal file
@ -0,0 +1,23 @@
|
||||
package noop
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders"
|
||||
)
|
||||
|
||||
type NoopRecorder struct{}
|
||||
|
||||
func (n *NoopRecorder) Init(context.Context, *recorders.RecorderOpts) {}
|
||||
|
||||
func (n *NoopRecorder) Set(context.Context, *weather.WeatherUpdate) error { return nil }
|
||||
|
||||
func (n *NoopRecorder) Get(context.Context, *pb.GetWeatherRequest) ([]*weather.WeatherUpdate, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (n *NoopRecorder) Count(context.Context) int { return 0 }
|
||||
|
||||
func (r *NoopRecorder) Name() string { return "no-op recorder" }
|
23
pkg/weather/recorder/recorders/recorders.go
Normal file
23
pkg/weather/recorder/recorders/recorders.go
Normal file
@ -0,0 +1,23 @@
|
||||
package recorders
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
type RecorderOpts struct {
|
||||
RetainLast int
|
||||
BaseCtx context.Context
|
||||
AppConfig *config.AmbientLocalExporterConfig
|
||||
}
|
||||
|
||||
type Recorder interface {
|
||||
Init(context.Context, *RecorderOpts)
|
||||
Set(context.Context, *weather.WeatherUpdate) error
|
||||
Get(context.Context, *pb.GetWeatherRequest) ([]*weather.WeatherUpdate, error)
|
||||
Count(context.Context) int // Best Effort
|
||||
Name() string
|
||||
}
|
38
pkg/weather/recorder/recorders/redis/count.go
Normal file
38
pkg/weather/recorder/recorders/redis/count.go
Normal file
@ -0,0 +1,38 @@
|
||||
package redis
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
)
|
||||
|
||||
func (r *RedisRecorder) Count(ctx context.Context) int {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.count")
|
||||
defer span.End()
|
||||
|
||||
r.RLock()
|
||||
defer r.RUnlock()
|
||||
|
||||
return r.count(ctx)
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) count(ctx context.Context) int {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.count.redis", trace.WithAttributes(
|
||||
attribute.String("updatesKey", r.Key())))
|
||||
defer span.End()
|
||||
|
||||
count, err := r.redis.LLen(ctx, r.Key()).Result()
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
r.log.Err(err).Send()
|
||||
return int(count)
|
||||
}
|
||||
|
||||
span.SetAttributes(attribute.Int64("updatesCount", count))
|
||||
span.SetStatus(codes.Ok, "")
|
||||
|
||||
return int(count)
|
||||
}
|
98
pkg/weather/recorder/recorders/redis/get.go
Normal file
98
pkg/weather/recorder/recorders/redis/get.go
Normal file
@ -0,0 +1,98 @@
|
||||
package redis
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"slices"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
func (r *RedisRecorder) Get(ctx context.Context, req *pb.GetWeatherRequest) (
|
||||
[]*weather.WeatherUpdate, error,
|
||||
) {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.get", trace.WithAttributes(
|
||||
attribute.Int("limit", util.GetLimitFromReq(req)),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
return r.get(ctx, req)
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) get(ctx context.Context, req *pb.GetWeatherRequest) (
|
||||
[]*weather.WeatherUpdate, error,
|
||||
) {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.get.redis")
|
||||
defer span.End()
|
||||
|
||||
limit := util.GetLimitFromReq(req)
|
||||
if limit < 1 {
|
||||
limit = r.keep
|
||||
}
|
||||
|
||||
span.SetAttributes(attribute.Int("limit", limit))
|
||||
r.log.Debug().Int("limit", limit).Msg("getting updates from redis")
|
||||
|
||||
datas, err := r.redis.LRange(ctx, r.Key(), 0, int64(limit)-1).Result()
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
r.log.Err(err).Send()
|
||||
return nil, err
|
||||
}
|
||||
|
||||
span.AddEvent("redis queried")
|
||||
r.log.Debug().Int("results", len(datas)).Msg("redis queried")
|
||||
|
||||
updates, err := jsonDatasToUpdates(datas)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
r.log.Err(err).Send()
|
||||
} else {
|
||||
span.SetStatus(codes.Ok, "")
|
||||
}
|
||||
|
||||
span.AddEvent("results unmarshalled")
|
||||
span.SetAttributes(attribute.Int("results", len(updates)))
|
||||
|
||||
filtered := util.ApplyOptsToUpdates(updates, limit, req.Opts)
|
||||
|
||||
span.AddEvent("results filtered")
|
||||
span.SetAttributes(
|
||||
attribute.Int("filteredResults", len(filtered)),
|
||||
attribute.Int("resultsFiltered", len(updates)-len(filtered)),
|
||||
)
|
||||
|
||||
r.log.Debug().
|
||||
Int("updatesRetrieved", len(updates)).
|
||||
Int("updatesAfterFiltering", len(filtered)).
|
||||
Int("updatesFiltered", len(updates)-len(filtered)).
|
||||
Msg("updates retrieved from redis")
|
||||
|
||||
return filtered, err
|
||||
}
|
||||
|
||||
func jsonDatasToUpdates(datas []string) ([]*weather.WeatherUpdate, error) {
|
||||
var errs error
|
||||
updates := make([]*weather.WeatherUpdate, 0, len(datas))
|
||||
|
||||
for _, data := range datas {
|
||||
update := new(weather.WeatherUpdate)
|
||||
err := json.Unmarshal([]byte(data), update)
|
||||
errs = errors.Join(errs, err)
|
||||
|
||||
if err == nil {
|
||||
updates = append(updates, update)
|
||||
}
|
||||
}
|
||||
|
||||
return slices.Clip(updates), errs
|
||||
}
|
114
pkg/weather/recorder/recorders/redis/redis.go
Normal file
114
pkg/weather/recorder/recorders/redis/redis.go
Normal file
@ -0,0 +1,114 @@
|
||||
package redis
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"sync"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
redis "github.com/redis/go-redis/v9"
|
||||
"github.com/rs/zerolog"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/ambient/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather/recorder/recorders"
|
||||
)
|
||||
|
||||
const (
|
||||
DEF_RETAIN = 120
|
||||
UPDATES_KEY = "weatherUpdates"
|
||||
NAME = "redis recorder"
|
||||
)
|
||||
|
||||
type RedisRecorder struct {
|
||||
baseCtx context.Context
|
||||
tracer trace.Tracer
|
||||
redis *redis.Client
|
||||
config *config.AmbientLocalExporterConfig
|
||||
log *zerolog.Logger
|
||||
appKey string // prefix for redis keys, uses app name, environment, and version
|
||||
keep int
|
||||
*sync.RWMutex
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts) {
|
||||
if opts.AppConfig.RecorderConfig.RedisConfig == nil {
|
||||
panic("refusing to init redis recorder with no redisConfig")
|
||||
}
|
||||
|
||||
if opts.RetainLast < 1 {
|
||||
opts.RetainLast = DEF_RETAIN
|
||||
}
|
||||
|
||||
r.config = opts.AppConfig
|
||||
r.keep = opts.RetainLast
|
||||
r.RWMutex = &sync.RWMutex{}
|
||||
r.baseCtx = opts.BaseCtx
|
||||
r.log = zerolog.Ctx(r.baseCtx)
|
||||
|
||||
r.tracer = otel.GetTracer(r.baseCtx, "redisRecorder")
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.init", trace.WithAttributes(
|
||||
attribute.String("redisHost", opts.AppConfig.RecorderConfig.RedisConfig.RedisHost),
|
||||
attribute.Int("retainLast", opts.RetainLast),
|
||||
attribute.Int("redisPort", opts.AppConfig.RecorderConfig.RedisConfig.RedisPort),
|
||||
attribute.Bool("tls", opts.AppConfig.RecorderConfig.RedisConfig.RedisTLS),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
// Unique key prefix for this version/env/name of exporter
|
||||
// will be consistent across replicas, but resets on upgrade
|
||||
// as it is using version
|
||||
r.appKey = util.GetAppHash(r.config.AppConfig)
|
||||
|
||||
r.MustInitRedis(ctx)
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) MustInitRedis(ctx context.Context) {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.init.redis")
|
||||
defer span.End()
|
||||
|
||||
rc := r.config.RecorderConfig.RedisConfig
|
||||
|
||||
var tlsConfig *tls.Config
|
||||
if rc.RedisTLS {
|
||||
tlsConfig = &tls.Config{
|
||||
ServerName: rc.RedisHost,
|
||||
InsecureSkipVerify: rc.RedisTLSInsecure,
|
||||
}
|
||||
}
|
||||
|
||||
r.redis = redis.NewClient(&redis.Options{
|
||||
Addr: fmt.Sprintf("%s:%d", rc.RedisHost, rc.RedisPort),
|
||||
ClientName: fmt.Sprintf("%s-%s", r.config.Name, r.config.Environment),
|
||||
Username: rc.RedisUser,
|
||||
Password: rc.RedisPassword,
|
||||
DB: rc.RedisDB,
|
||||
TLSConfig: tlsConfig,
|
||||
})
|
||||
|
||||
span.AddEvent("redis client ready")
|
||||
|
||||
resp := r.redis.Ping(ctx)
|
||||
if resp.Err() != nil {
|
||||
span.RecordError(resp.Err())
|
||||
span.SetStatus(codes.Error, resp.Err().Error())
|
||||
r.log.Fatal().Err(resp.Err()).Msg("failed to ping redis")
|
||||
}
|
||||
|
||||
span.AddEvent("redis client ping ok")
|
||||
span.SetStatus(codes.Ok, "")
|
||||
|
||||
r.log.Info().Str("appKey", r.appKey).
|
||||
Msg("redis ping ok, client ready")
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) Key() string {
|
||||
return fmt.Sprintf("%s:%s", r.appKey, UPDATES_KEY)
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) Name() string { return NAME }
|
74
pkg/weather/recorder/recorders/redis/set.go
Normal file
74
pkg/weather/recorder/recorders/redis/set.go
Normal file
@ -0,0 +1,74 @@
|
||||
package redis
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
|
||||
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
|
||||
)
|
||||
|
||||
func (r *RedisRecorder) Set(ctx context.Context, u *weather.WeatherUpdate) error {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.set", trace.WithAttributes(
|
||||
attribute.String("stationName", u.GetStationName()),
|
||||
attribute.String("stationType", util.DerefStr(u.StationType)),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
|
||||
// First ensure we can prepare our payload
|
||||
data, err := json.Marshal(u)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
|
||||
r.log.Err(err).Send()
|
||||
return err
|
||||
}
|
||||
|
||||
return r.set(ctx, data)
|
||||
}
|
||||
|
||||
func (r *RedisRecorder) set(ctx context.Context, data []byte) error {
|
||||
ctx, span := r.tracer.Start(ctx, "redisRecorder.set.push", trace.WithAttributes(
|
||||
attribute.Int("updateBytes", len(data)),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
// Atomic, push and trim
|
||||
var count *redis.IntCmd
|
||||
rErr, err := r.redis.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
|
||||
pipe.LPush(ctx, r.Key(), data)
|
||||
pipe.LTrim(ctx, r.Key(), 0, int64(r.keep)-1)
|
||||
count = pipe.LLen(ctx, r.Key())
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
for _, cmd := range rErr {
|
||||
span.RecordError(cmd.Err())
|
||||
}
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
r.log.Err(err).Send()
|
||||
return err
|
||||
}
|
||||
|
||||
// Get new update count
|
||||
|
||||
r.log.Debug().
|
||||
Int("updateBytes", len(data)).
|
||||
Int64("updateCount", count.Val()).
|
||||
Str("redis", r.redis.String()).
|
||||
Str("key", r.Key()).
|
||||
Msg("pushed update to redis")
|
||||
|
||||
span.SetAttributes(attribute.Int64("updateCount", count.Val()))
|
||||
span.SetStatus(codes.Ok, "")
|
||||
return nil
|
||||
}
|
@ -7,6 +7,7 @@ option go_package = "gitea.libretechconsulting.com/rmcguire/ambient-local-export
|
||||
|
||||
message GetWeatherRequest {
|
||||
GetWeatherOpts opts = 1;
|
||||
optional int32 limit = 2;
|
||||
}
|
||||
|
||||
message GetWeatherResponse{
|
||||
@ -23,41 +24,42 @@ message WeatherUpdate {
|
||||
string station_name = 1;
|
||||
string station_type = 2;
|
||||
string station_id = 3;
|
||||
optional double temp_outdoor_f = 4;
|
||||
optional double temp_indoor_f = 5;
|
||||
optional int32 humidity_outdoor = 6;
|
||||
optional int32 humidity_indoor = 7;
|
||||
optional double wind_speed_mph = 8;
|
||||
optional double wind_gust_mph = 9;
|
||||
optional double max_daily_gust = 10;
|
||||
optional int32 wind_dir = 11;
|
||||
optional int32 wind_dir_avg_10m = 12;
|
||||
optional int32 uv = 13;
|
||||
optional double solar_radiation = 14;
|
||||
optional double hourly_rain_in = 15;
|
||||
optional double event_rain_in = 16;
|
||||
optional double daily_rain_in = 17;
|
||||
optional double weekly_rain_in = 18;
|
||||
optional double monthly_rain_in = 19;
|
||||
optional double yearly_rain_in = 20;
|
||||
optional double total_rain_in = 21;
|
||||
repeated BatteryStatus batteries = 22;
|
||||
optional double barom_relative_in = 23;
|
||||
optional double barom_absolute_in = 24;
|
||||
optional double dew_point_f = 25;
|
||||
optional double wind_chill_f = 26;
|
||||
repeated TempHumiditySensor temp_humidity_sensors = 27;
|
||||
optional double temp_outdoor_f = 4;
|
||||
optional double temp_indoor_f = 5;
|
||||
optional int32 humidity_outdoor = 6;
|
||||
optional int32 humidity_indoor = 7;
|
||||
optional double wind_speed_mph = 8;
|
||||
optional double wind_gust_mph = 9;
|
||||
optional double max_daily_gust = 10;
|
||||
optional int32 wind_dir = 11;
|
||||
optional int32 wind_dir_avg_10m = 12;
|
||||
optional int32 uv = 13;
|
||||
optional double solar_radiation = 14;
|
||||
optional double hourly_rain_in = 15;
|
||||
optional double event_rain_in = 16;
|
||||
optional double daily_rain_in = 17;
|
||||
optional double weekly_rain_in = 18;
|
||||
optional double monthly_rain_in = 19;
|
||||
optional double yearly_rain_in = 20;
|
||||
optional double total_rain_in = 21;
|
||||
repeated BatteryStatus batteries = 22;
|
||||
optional double barom_relative_in = 23;
|
||||
optional double barom_absolute_in = 24;
|
||||
optional double dew_point_f = 25;
|
||||
optional double wind_chill_f = 26;
|
||||
repeated TempHumiditySensor temp_humidity_sensors = 27;
|
||||
google.protobuf.Timestamp update_timestamp = 28;
|
||||
}
|
||||
|
||||
// Represents a temperature and humidity sensor
|
||||
message TempHumiditySensor {
|
||||
string name = 1;
|
||||
optional double temp_f = 2;
|
||||
optional int32 humidity = 3;
|
||||
string name = 1;
|
||||
optional double temp_f = 2;
|
||||
optional int32 humidity = 3;
|
||||
}
|
||||
|
||||
// Represents battery status for different components
|
||||
message BatteryStatus {
|
||||
string component = 1;
|
||||
optional int32 status = 2;
|
||||
string component = 1;
|
||||
optional int32 status = 2;
|
||||
}
|
||||
|
Reference in New Issue
Block a user