Fix helm support (#114)

- Update helm chart template for WS API v2 and OTLP exporter.
- Add README.md
- wavinsentio scraper: use in-memory identity manager

Relates:

- #112

---------

Co-authored-by: Copilot <[email protected]>

Author: zmoog

go.work.sum

@@ -0,0 +1,26 @@
+# Helm
+
+```sh
+# deploy using the Elasticsearch exporter
+helm template collector helm/collector \
+  --set elasticsearch.endpoints="${ELASTICSEARCH_ENDPOINTS}" \
+  --set elasticsearch.username="${ELASTICSEARCH_USERNAME}" \
+  --set elasticsearch.password="${ELASTICSEARCH_PASSWORD}" \
+  --set wavinsentio.username="${WS_USERNAME}" \
+  --set wavinsentio.password="${WS_PASSWORD}" \
+  --set zcsazzurro.client_id="${ZCS_CLIENT_ID}" \
+  --set zcsazzurro.auth_key="${ZCS_AUTH_KEY}" \
+  --set zcsazzurro.thing_key="${ZCS_THING_KEY}" \
+  --set toggl.api_token="${TOGGL_API_TOKEN}" | k apply -f -
+
+# deploy using the OTLP exporter
+helm template collector helm/collector \
+  --set elasticsearch.endpoints="${ELASTICSEARCH_ENDPOINTS}" \
+  --set elasticsearch.api_key="${ELASTICSEARCH_API_KEY}" \
+  --set wavinsentio.username="${WS_USERNAME}" \
+  --set wavinsentio.password="${WS_PASSWORD}" \
+  --set zcsazzurro.client_id="${ZCS_CLIENT_ID}" \
+  --set zcsazzurro.auth_key="${ZCS_AUTH_KEY}" \
+  --set zcsazzurro.thing_key="${ZCS_THING_KEY}" \
+  --set toggl.api_token="${TOGGL_API_TOKEN}" | k apply -f -
+```

helm/collector/README.md

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{.Release.Name}}-collector-config
+  name: "{{.Release.Name}}-collector-config"
   namespace: {{ .Release.Namespace }}
 data:
   collector-config.yaml: |
@@ -15,10 +15,11 @@ data:
         lookback: {{ .Values.toggl.lookback }}
         api_token: {{ .Values.toggl.api_token }}
       wavinsentio:
-        interval: {{ .Values.wavinsentio.interval }}
-        # interval: ${env:WS_INTERVAL:-30s}
+        collection_interval: {{ .Values.wavinsentio.collection_interval }}
+        endpoint: {{ .Values.wavinsentio.endpoint }}
         username: {{ .Values.wavinsentio.username }}
         password: {{ .Values.wavinsentio.password }}
+        web_api_key: {{ .Values.wavinsentio.web_api_key }}
       zcsazzurro:
         interval: {{ .Values.zcsazzurro.interval }}
         client_id: {{ .Values.zcsazzurro.client_id }}
@@ -34,11 +35,15 @@ data:
 
       # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/elasticsearchexporter
       elasticsearch:
-        endpoints: {{ .Values.elasticsearch.endpoints }}
-        logs_index: logs-toggl.track-default
+        endpoints: "{{ .Values.elasticsearch.endpoints }}"
         auth:
           authenticator: basicauth
 
+      otlp/elastic:
+        endpoint: "{{ .Values.elasticsearch.endpoints }}"
+        headers:
+          Authorization: "ApiKey {{ .Values.elasticsearch.api_key }}"
+
     extensions:
       basicauth:
         client_auth:
@@ -56,14 +61,12 @@ data:
         #   receivers: [toggltrack]
         #   exporters: [elasticsearch]
         metrics:
-          # receivers: [wavinsentio, zcsazzurro]
-          receivers: [zcsazzurro]
-          # exporters: [elasticsearch]
-          exporters: [debug, elasticsearch]
+          receivers: [wavinsentio, zcsazzurro]
+          exporters: [otlp/elastic]
       telemetry:
         resource:
-          service.name: {{ .Release.Name }}
-          service.version: {{ .Chart.AppVersion }}
+          service.name: "{{ .Release.Name }}"
+          service.version: "{{ .Chart.AppVersion }}"
         logs:
           level: debug
           # encoding: json

helm/collector/templates/configmap.yaml

@@ -1,6 +1,6 @@
 image:
   registry: ghcr.io/zmoog/collector
-  tag: latest@sha256:4bd9c370e698f6dc5a44dd9a6f9a3d7f52ed207bc060c54aa774e39cb99992e7
+  tag: latest@sha256:a07c861961e2e5a97c154757fda22b901850e5f4a66734d4d6b0c511225f4edb
 
 labels:
   hardware_profile: general-purpose
@@ -17,11 +17,17 @@ elasticsearch:
   endpoints: ""
   username: ""
   password: ""
+  api_key: ""
 
 wavinsentio:
-  interval: "1m"
+  collection_interval: "1m"
+  # Production endpoint.
+  endpoint: "https://blaze.wavinsentio.com/wavin.blaze.v1.BlazeDeviceService"
   username: ""
   password: ""
+  # This is not a secret, it is the app in Firebase that is used
+  # to authenticate with the Wavin Sentio API.
+  web_api_key: "AIzaSyBlAtNI7-2jitPul9I-O4EZcT-n0sIay-g"
 
 zcsazzurro:
   interval: "5m"

helm/collector/values.yaml

@@ -4,7 +4,7 @@ go 1.25.1
 
 require (
 	github.com/stretchr/testify v1.11.1
-	github.com/zmoog/ws/v2 v2.0.0
+	github.com/zmoog/ws/v2 v2.1.0
 	go.opentelemetry.io/collector/component v1.42.0
 	go.opentelemetry.io/collector/component/componenttest v0.136.0
 	go.opentelemetry.io/collector/confmap v1.42.0
@@ -56,8 +56,8 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
 	google.golang.org/grpc v1.75.1 // indirect
 	google.golang.org/protobuf v1.36.9 // indirect

receiver/wavinsentioreceiver/go.mod

@@ -57,8 +57,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zmoog/ws/v2 v2.0.0 h1:4he/jrfv2mevKW/6KzCgzSXta2A3yozsYaI+uAyYNj4=
-github.com/zmoog/ws/v2 v2.0.0/go.mod h1:Jl8cLao3qZL+tDGXDDVQIzRl3gbcUIHM6hCMvOzA7aA=
+github.com/zmoog/ws/v2 v2.1.0 h1:dSiEDiDJ7Ye/EewoOfN2wgHvxvNvJfohPeeWqvNkoA8=
+github.com/zmoog/ws/v2 v2.1.0/go.mod h1:Jl8cLao3qZL+tDGXDDVQIzRl3gbcUIHM6hCMvOzA7aA=
 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/collector/component v1.42.0 h1:on4XJ/NT1oPnuCVKDEtlpcr3GGPAS9taWBe8woHSTmY=
@@ -146,12 +146,12 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=

receiver/wavinsentioreceiver/go.sum

@@ -38,7 +38,7 @@ func (s *wavinsentioScraper) scrape(_ context.Context) (pmetric.Metrics, error)
 }
 
 func (s *wavinsentioScraper) start(_ context.Context, host component.Host) (err error) {
-	identityManager := identity.NewManager(
+	identityManager := identity.NewInMemoryManager(
 		s.cfg.Username,
 		s.cfg.Password,
 		s.cfg.WebApiKey,

receiver/wavinsentioreceiver/scraper.go

@@ -50,9 +50,9 @@ require (
 	github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/cli v28.0.4+incompatible // indirect
+	github.com/docker/cli v28.2.2+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v28.1.1+incompatible // indirect
+	github.com/docker/docker v28.2.2+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.3 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@@ -81,7 +81,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/google/certificate-transparency-go v1.3.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
+	github.com/google/go-containerregistry v0.20.6 // indirect
 	github.com/google/ko v0.18.0 // indirect
 	github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -154,7 +154,7 @@ require (
 	go.opentelemetry.io/collector/internal/telemetry v0.136.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.42.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/log v0.14.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect

tools/go.mod

@@ -143,10 +143,12 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1ef64XEu4A=
 github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
 github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
 github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -238,6 +240,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f h1:q+kbH7LI4wK3gNCxyvy2rFldJqAAB+Gch79/xj9/+GU=
 github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f/go.mod h1:UnXV0UkKqoHbzwn49vfozmwMcLMS8XLLsVKVuhv3cGc=
+github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
+github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -538,6 +542,7 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
 go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
 go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=