Merge pull request #267 from thingspect/bconway_update_chirpstack_4_8_1

Update Chirpstack dependency to v4.8.1

build/deploy/atlas-deps/docker-compose.yml

@@ -46,7 +46,7 @@ services:
  - ./volume/redis:/data
 
  chirpstack:
- image: chirpstack/chirpstack:4.7
+ image: chirpstack/chirpstack:4.8
  command: -c /etc/chirpstack
  depends_on:
  - postgres

build/deploy/atlas/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
  atlas-api:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-api
  restart: on-failure
  ports:
@@ -22,7 +22,7 @@ services:
  - API_LORA_DEV_PROF_ID=00000000-0000-0000-0000-000000000000
 
  atlas-mqtt-ingestor:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-mqtt-ingestor
  restart: on-failure
  depends_on:
@@ -34,7 +34,7 @@ services:
  - MQTT_INGEST_NSQ_PUB_ADDR=nsqd:4150
 
  atlas-lora-ingestor:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-lora-ingestor
  restart: on-failure
  depends_on:
@@ -47,7 +47,7 @@ services:
  - LORA_INGEST_NSQ_PUB_ADDR=nsqd:4150
 
  atlas-decoder:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-decoder
  restart: on-failure
  depends_on:
@@ -61,7 +61,7 @@ services:
  - DECODER_NSQ_LOOKUP_ADDRS=nsqlookupd:4161
 
  atlas-validator:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-validator
  restart: on-failure
  depends_on:
@@ -76,7 +76,7 @@ services:
  - VALIDATOR_NSQ_LOOKUP_ADDRS=nsqlookupd:4161
 
  atlas-accumulator:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-accumulator
  restart: on-failure
  environment:
@@ -87,7 +87,7 @@ services:
  - ACCUMULATOR_NSQ_LOOKUP_ADDRS=nsqlookupd:4161
 
  atlas-eventer:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-eventer
  restart: on-failure
  depends_on:
@@ -100,7 +100,7 @@ services:
  - EVENTER_NSQ_LOOKUP_ADDRS=nsqlookupd:4161
 
  atlas-alerter:
- image: ghcr.io/thingspect/atlas:f72e6477
+ image: ghcr.io/thingspect/atlas:2507371a
  command: atlas-alerter
  restart: on-failure
  environment:

go.mod

@@ -1,14 +1,12 @@
 module github.com/thingspect/atlas
 
-go 1.22.2
-
-toolchain go1.22.3
+go 1.22.3
 
 require (
  github.com/NYTimes/gziphandler v1.1.1
- github.com/chirpstack/chirpstack/api/go/v4 v4.7.0
+ github.com/chirpstack/chirpstack/api/go/v4 v4.8.1
  github.com/eclipse/paho.mqtt.golang v1.4.3
- github.com/expr-lang/expr v1.16.6
+ github.com/expr-lang/expr v1.16.7
  github.com/google/uuid v1.6.0
  github.com/gregdel/pushover v1.3.1
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
@@ -42,8 +40,7 @@ require (
  golang.org/x/sync v0.7.0 // indirect
  golang.org/x/sys v0.20.0 // indirect
  golang.org/x/text v0.15.0 // indirect
- google.golang.org/genproto v0.0.0-20240228224816-df926f6c8641 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -393,8 +393,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chirpstack/chirpstack/api/go/v4 v4.7.0 h1:LgtwvUm/pDvmBYgVc62khybuFdXnx0Hyj9MfKGkXufI=
-github.com/chirpstack/chirpstack/api/go/v4 v4.7.0/go.mod h1:6+68s1PGHq2QWZ216RTwXhp7h1vCiMc6kX3f4s74ZzQ=
+github.com/chirpstack/chirpstack/api/go/v4 v4.8.1 h1:SqbHUYtSMAhIKOb+yYlOrjB0NvEOy2sg4PvuisRa91g=
+github.com/chirpstack/chirpstack/api/go/v4 v4.8.1/go.mod h1:NNVeEib9I7GGomK2bPiP5c5UstkoMfxYiJ1Z5wrYCh4=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -427,8 +427,8 @@ github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
 github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
-github.com/expr-lang/expr v1.16.6 h1:u1mrPXbwHtWAih5ZP24ZDG+ht8CB5xB0aBvagkAWPY0=
-github.com/expr-lang/expr v1.16.6/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
+github.com/expr-lang/expr v1.16.7 h1:gCIiHt5ODA0xIaDbD0DPKyZpM9Drph3b3lolYAYq2Kw=
+github.com/expr-lang/expr v1.16.7/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -1049,12 +1049,12 @@ google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZV
 google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
 google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
 google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20240228224816-df926f6c8641 h1:GihpvzHjeZHw+/mzsWpdxwr1LaG6E3ff/gyeZlVHbyc=
-google.golang.org/genproto v0.0.0-20240228224816-df926f6c8641/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
-google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae h1:AH34z6WAGVNkllnKs5raNq3yRq93VnjBG6rpfub/jYk=
-google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae/go.mod h1:FfiGhwUm6CJviekPrc0oJ+7h29e+DmWU6UtjX0ZvI7Y=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae h1:c55+MER4zkBS14uJhSZMGGmya0yJx5iHV4x/fpOSNRk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM=
+google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
+google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
+google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 h1:W5Xj/70xIA4x60O/IFyXivR5MGqblAb8R3w26pnD6No=
+google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.mod h1:vPrPUTsDCYxXWjP7clS81mZ6/803D8K4iM9Ma27VKas=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 h1:mxSlqyb8ZAHsYDCfiXN1EDdNTdvjUJSLY+OnAUtYNYA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=