Skip to content

Commit bcc7563

Browse files
committed
Update chirpstack-api to 4.0.0-rc.1.
1 parent c6340e3 commit bcc7563

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
.PHONY: build dev-requirements devshell
2-
VERSION := $(shell git describe --always |sed -e "s/^v//")
2+
BUILD_VERSION := $(shell git describe --always |sed -e "s/^v//")
33

44
GW_GEN := protoc -I=/googleapis -I=chirpstack/api/proto --grpc-gateway_out=paths=source_relative,logtostderr=true:.
55
API_GEN := protoc -I=/googleapis -I=chirpstack/api/proto --openapiv2_out ./openapiv2 --openapiv2_opt logtostderr=true
66
GRPC_GEN := protoc -I=/googleapis -I=chirpstack/api/proto --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative
77

88
build:
99
mkdir -p build
10-
go build $(GO_EXTRA_BUILD_ARGS) -ldflags "-s -w -X main.version=$(VERSION)" -o build/chirpstack-rest-api main.go
10+
go build $(GO_EXTRA_BUILD_ARGS) -ldflags "-s -w -X main.version=$(BUILD_VERSION)" -o build/chirpstack-rest-api main.go
1111

1212
dist:
1313
goreleaser

chirpstack

Submodule chirpstack updated 263 files

openapiv2/api/device.swagger.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,6 +1341,10 @@
13411341
"$ref": "#/definitions/commonMetricDataset"
13421342
},
13431343
"description": "Datasets."
1344+
},
1345+
"kind": {
1346+
"$ref": "#/definitions/commonMetricKind",
1347+
"description": "Kind."
13441348
}
13451349
}
13461350
},
@@ -1361,6 +1365,16 @@
13611365
}
13621366
}
13631367
},
1368+
"commonMetricKind": {
1369+
"type": "string",
1370+
"enum": [
1371+
"COUNTER",
1372+
"ABSOLUTE",
1373+
"GAUGE"
1374+
],
1375+
"default": "COUNTER",
1376+
"description": " - COUNTER: Incrementing counters that never decrease (these are not reset on each reading).\n - ABSOLUTE: Counters that do get reset upon reading.\n - GAUGE: E.g. a temperature value."
1377+
},
13641378
"protobufAny": {
13651379
"type": "object",
13661380
"properties": {

openapiv2/api/gateway.swagger.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,10 @@
606606
"$ref": "#/definitions/commonMetricDataset"
607607
},
608608
"description": "Datasets."
609+
},
610+
"kind": {
611+
"$ref": "#/definitions/commonMetricKind",
612+
"description": "Kind."
609613
}
610614
}
611615
},
@@ -626,6 +630,16 @@
626630
}
627631
}
628632
},
633+
"commonMetricKind": {
634+
"type": "string",
635+
"enum": [
636+
"COUNTER",
637+
"ABSOLUTE",
638+
"GAUGE"
639+
],
640+
"default": "COUNTER",
641+
"description": " - COUNTER: Incrementing counters that never decrease (these are not reset on each reading).\n - ABSOLUTE: Counters that do get reset upon reading.\n - GAUGE: E.g. a temperature value."
642+
},
629643
"protobufAny": {
630644
"type": "object",
631645
"properties": {

ui/api.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)