Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all the packages have been updated #722

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
11d9082
switched default http.client to http client with timeout
fancar Jul 28, 2021
b0e982a
Use time.Duration type.
brocaar Aug 12, 2021
c0d266b
Improve gateway and device metrics in API and web-interface.
brocaar Aug 4, 2021
52a1eed
Implement new wifi payload (0x0e type).
brocaar Aug 4, 2021
ae295e4
Update chirpstack-api and lorawan dependencies.
brocaar Aug 9, 2021
b15cc11
Migrate from dgrijalva/jwt-go to golang-jwt + upgrade to v4.
brocaar Aug 12, 2021
35da9fb
Remove required PostgreSQL / Redis versions from config template.
brocaar Aug 17, 2021
2f14fcf
Add Docker builds for arm/v6, arm/v7 and arm64. (#618)
krasi-georgiev Aug 17, 2021
7c420e1
Get PostgreSQL rxTime from RxInfo if available.
brocaar Aug 23, 2021
a1de773
Bump lib/pq version.
brocaar Sep 2, 2021
03f0939
Fix doughnut chart styling regression after chartjs update.
brocaar Sep 2, 2021
c45e88a
Increase Azure Service-Bus API timeout to 5 secs.
brocaar Sep 20, 2021
5902ee2
Support parsing multiple TLV records.
brocaar Oct 4, 2021
af03d26
Use Redis Stream ID for de-duplication of device events.
brocaar Oct 4, 2021
1e4988b
Do not lookup from errToCode map when error is of type slice.
brocaar Oct 11, 2021
b0a3a40
Bump tmpl from 1.0.4 to 1.0.5 in /ui (#625)
dependabot[bot] Oct 11, 2021
1e0df78
Bump url-parse from 1.5.1 to 1.5.3 in /ui (#629)
dependabot[bot] Oct 11, 2021
7148606
FIX: email_verified is a string on azure instead of bool (#641)
chopmann Dec 3, 2021
802029e
Extendes UplinkEvent with DeviceProfileName, DeviceProfileID and its …
maxreb Dec 3, 2021
586e3ef
Update lorawan dependency.
brocaar Nov 24, 2021
e7baa52
Update Go and Alpine versions.
brocaar Dec 6, 2021
7c90ded
Fix 'misuse of unbuffered os.Signal channel ...' error.
brocaar Dec 6, 2021
c289f4e
Bump color-string from 1.5.3 to 1.8.2 in /ui (#645)
dependabot[bot] Dec 6, 2021
2324993
Bump ws from 5.2.2 to 5.2.3 in /ui (#644)
dependabot[bot] Dec 6, 2021
633046b
Bump path-parse from 1.0.6 to 1.0.7 in /ui (#643)
dependabot[bot] Dec 6, 2021
eab119c
Fix fetching tags.
brocaar Dec 14, 2021
93129ec
Fix fetching tags.
brocaar Dec 14, 2021
9e734c0
Add DevNonce Clear Functionality (#660)
sagar-patel-sls Feb 8, 2022
fe759eb
Update LoRaCloud integration with Modem & Geoloc Services.
brocaar Feb 8, 2022
5941d0e
Bump url-parse from 1.5.3 to 1.5.7 in /ui (#670)
dependabot[bot] Feb 18, 2022
4efc6de
Bump follow-redirects from 1.11.0 to 1.14.8 in /ui (#668)
dependabot[bot] Feb 18, 2022
def7112
Bump ajv from 6.12.0 to 6.12.6 in /ui (#667)
dependabot[bot] Feb 18, 2022
3594cde
Bump merge-deep from 3.0.2 to 3.0.3 in /ui (#648)
dependabot[bot] Feb 18, 2022
c9aef11
Add missing RP002-1.0.3 option.
brocaar Mar 8, 2022
2cba899
Update LoRa Cloud endpoints.
brocaar Mar 11, 2022
ab71676
Update to Go 1.18.
brocaar Jul 27, 2022
4c0ab6e
Update mqtt and lorawan dependencies.
brocaar Jul 27, 2022
d88749d
Bump terser from 4.6.11 to 4.8.1 in /ui (#693)
dependabot[bot] Jul 27, 2022
e09fbba
Bump moment from 2.24.0 to 2.29.4 in /ui (#690)
dependabot[bot] Jul 27, 2022
414f9fd
Bump eventsource from 1.0.7 to 1.1.1 in /ui (#688)
dependabot[bot] Jul 27, 2022
e6c4df5
Bump ejs from 3.0.2 to 3.1.8 in /ui (#684)
dependabot[bot] Jul 27, 2022
70da625
Bump async from 2.6.3 to 2.6.4 in /ui (#682)
dependabot[bot] Jul 27, 2022
5a498cc
Bump url-parse from 1.5.7 to 1.5.10 in /ui (#672)
dependabot[bot] Jul 27, 2022
8f843f2
Fix git error.
brocaar Jul 31, 2022
bb59254
Fix typo.
brocaar Jul 31, 2022
a0b55c5
Revert to older go in go.mod + go mod tidy.
brocaar Aug 2, 2022
872d139
Introduce use_userinfo and assume_email_verified options for OIDC (#695)
gavanfantom Aug 16, 2022
628d357
Update Go to 1.19.1.
brocaar Sep 16, 2022
14de4b1
Update Go version to 1.19.3.
brocaar Nov 29, 2022
4b63feb
Update prometheus/client_golang to v1.14.0.
brocaar Nov 29, 2022
d6e744b
Fix alpine version to prevent nodejs bump (#709)
conny-andersson Jan 10, 2023
b007e8d
Update README.
brocaar Jan 24, 2023
10ea140
Create FUNDING.yml
brocaar Jan 24, 2023
50f2526
go mod packages has been updated
fancar Jun 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: chirpstack
15 changes: 10 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
-
name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
-
name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
Expand All @@ -51,21 +53,23 @@ jobs:
run: |
aws s3 sync dist/upload s3://builds.loraserver.io/chirpstack-application-server

# Runs on pull request to ensure the docker build works,
# but pushes only on commits to master and on PRs.
docker:
needs: test
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/v')
steps:
-
name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
-
name: Docker meta
id: meta
uses: docker/metadata-action@v3
with:
images: |
chirpstack/chirpstack-application-server
images: chirpstack/${{ github.event.repository.name }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}
Expand All @@ -78,6 +82,7 @@ jobs:
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
if: startsWith(github.ref, 'refs/tags/v')
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
Expand All @@ -87,8 +92,8 @@ jobs:
id: docker_build
uses: docker/build-push-action@v2
with:
context: .
push: true
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
-
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16-alpine AS development
FROM golang:1.19.3-alpine3.16 AS development

ENV PROJECT_PATH=/chirpstack-application-server
ENV PATH=$PATH:$PROJECT_PATH/build
Expand All @@ -14,7 +14,7 @@ WORKDIR $PROJECT_PATH
RUN make dev-requirements ui-requirements
RUN make

FROM alpine:3.13.2 AS production
FROM alpine:3.17.0 AS production

RUN apk --no-cache add ca-certificates
COPY --from=development /chirpstack-application-server/build/chirpstack-application-server /usr/bin/chirpstack-application-server
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile-devel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16-alpine
FROM golang:1.19.3-alpine3.16

ENV PROJECT_PATH=/chirpstack-application-server
ENV PATH=$PATH:$PROJECT_PATH/build
Expand All @@ -13,4 +13,5 @@ RUN mkdir -p $PROJECT_PATH
COPY . $PROJECT_PATH
WORKDIR $PROJECT_PATH

RUN git config --global --add safe.directory $PROJECT_PATH
RUN make dev-requirements
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ with a web-interface and API (RESTful JSON and gRPC) and supports authorization
by using JWT tokens (optional). Received payloads are published over MQTT
and payloads can be enqueued by using MQTT or the API.

## !!! ChirpStack v4 note !!!

With the release of ChirpStack v4, the source-code has been migrated to
[https://github.com/chirpstack/chirpstack/](https://github.com/chirpstack/chirpstack/).
Please refer to the [v3 to v4 migration guide](https://www.chirpstack.io/docs/v3-v4-migration.html)
for information on how to migrate your ChirpStack v3 instance.

## Architecture

![architecture](https://www.chirpstack.io/static/img/graphs/architecture.dot.png)
Expand All @@ -31,12 +38,6 @@ and payloads can be enqueued by using MQTT or the API.
* [Support forum](https://forum.chirpstack.io)
* [Bug or feature requests](https://github.com/brocaar/chirpstack-application-server/issues)

## Sponsors

[![CableLabs](https://www.chirpstack.io/img/sponsors/cablelabs.png)](https://www.cablelabs.com/)
[![SIDNFonds](https://www.chirpstack.io/img/sponsors/sidn_fonds.png)](https://www.sidnfonds.nl/)
[![acklio](https://www.chirpstack.io/img/sponsors/acklio.png)](http://www.ackl.io/)

## License

ChirpStack Application Server is distributed under the MIT license. See also
Expand Down
18 changes: 14 additions & 4 deletions cmd/chirpstack-application-server/cmd/configfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ grpc_default_resolver_scheme="{{ .General.GRPCDefaultResolverScheme }}"


# PostgreSQL settings.
#
# Please note that PostgreSQL 9.5+ is required.
[postgresql]
# PostgreSQL dsn (e.g.: postgres://user:password@hostname/database?sslmode=disable).
#
Expand Down Expand Up @@ -86,8 +84,6 @@ max_idle_connections={{ .PostgreSQL.MaxIdleConnections }}


# Redis settings
#
# Please note that Redis 2.6.0+ is required.
[redis]

# Server address or addresses.
Expand Down Expand Up @@ -211,6 +207,20 @@ id="{{ .ApplicationServer.ID }}"
# The login label is used in the web-interface login form.
login_label="{{ .ApplicationServer.UserAuthentication.OpenIDConnect.LoginLabel }}"

# Use UserInfo.
#
# Use a UserInfo call to retrieve the claim rather than extracting the claim from
# the idToken.
use_userinfo={{ .ApplicationServer.UserAuthentication.OpenIDConnect.UseUserInfo }}

# Assume email_verified.
#
# Assume that the email_verified field is always true, regardless of whether it
# is included in the token.
#
# This is required for identity providers that don't supply this claim, such as
# Microsoft Azure AD.
assume_email_verified={{ .ApplicationServer.UserAuthentication.OpenIDConnect.AssumeEmailVerified }}

# JavaScript codec settings.
[application_server.codec.js]
Expand Down
3 changes: 2 additions & 1 deletion cmd/chirpstack-application-server/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,15 @@ func init() {
viper.SetDefault("application_server.integration.amqp.event_routing_key_template", "application.{{ .ApplicationID }}.device.{{ .DevEUI }}.event.{{ .EventType }}")
viper.SetDefault("application_server.integration.enabled", []string{"mqtt"})
viper.SetDefault("application_server.codec.js.max_execution_time", 100*time.Millisecond)
viper.SetDefault("application_server.user_authentication.openid_connect.use_userinfo", true)
viper.SetDefault("application_server.user_authentication.openid_connect.assume_email_verified", false)

viper.SetDefault("metrics.timezone", "Local")
viper.SetDefault("metrics.redis.aggregation_intervals", []string{"MINUTE", "HOUR", "DAY", "MONTH"})
viper.SetDefault("metrics.redis.minute_aggregation_ttl", time.Hour*2)
viper.SetDefault("metrics.redis.hour_aggregation_ttl", time.Hour*48)
viper.SetDefault("metrics.redis.day_aggregation_ttl", time.Hour*24*90)
viper.SetDefault("metrics.redis.month_aggregation_ttl", time.Hour*24*730)

viper.SetDefault("monitoring.per_device_event_log_max_history", 10)

rootCmd.AddCommand(versionCmd)
Expand Down
2 changes: 1 addition & 1 deletion cmd/chirpstack-application-server/cmd/root_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func run(cmd *cobra.Command, args []string) error {
}
}

sigChan := make(chan os.Signal)
sigChan := make(chan os.Signal, 1)
exitChan := make(chan struct{})
signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
log.WithField("signal", <-sigChan).Info("signal received")
Expand Down
Loading