Skip to content

Commit 39f8199

Browse files
vlastahajekbednar
vlastahajek
and
bednar
authored
chore: upgrade InfluxQL parser (#6166)
* chore: Upgrade InfluxQL lib, Kapacitor client and Flux to latest * chore: updating build * fix: failing tests * chore: trying cross-builder * chore: adding dependencies * fix: scripts path * fix: script permissions * fix: trying updating path * fix: trying fix build * fix: script * fix: check go * fix: setting path * fix: GO111MODULE env value * fix: persist path * chore: updating build * chore: use dependencies * chore: increase build timeout * chore: reverting to go 1.24.11 * chore: fixing build. * chore: adjusting also (pre) release steps * chore: removing docker images building * chore: validate Time condition only if InfluxDBv3 is enabled * chore: try darwin arm64 * chore: fixing Cypress scrips * fix: env variable encapsulation in Makefile * chore: remove installing already installed pkg-config * chore: remove darwin arm64 * chore: update changelog * chore: remove obsolete ToDo file * chore: remove obsolete ToDo from PR template * chore: upgrade Flux to the latest: 0.199 * chore: more InfluxDB v3 tests * chore: revert changes in package.json * chore: syncing swagger with the changes in API * fix: add channel URL property migration code * docs: Update CHANGELOG with removal of platform support * fix: formatting in package.json --------- Co-authored-by: Jakub Bednář <jakub.bednar@gmail.com>
1 parent 9afe3c9 commit 39f8199

28 files changed

Lines changed: 1316 additions & 1166 deletions

‎.circleci/config.yml‎

Lines changed: 110 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
version: 2.1
2+
executors:
3+
cross-builder:
4+
docker:
5+
- image: quay.io/influxdb/cross-builder:go1.24.11-latest
6+
resource_class: large
7+
environment:
8+
GOPATH: /root/go
9+
GOROOT: /go
10+
11+
commands:
12+
install_dependencies:
13+
description: >
14+
Install additional dependencies
15+
steps:
16+
- run:
17+
name: Install additional dependencies
18+
command: |
19+
./etc/scripts/install-deps.sh
20+
echo 'export PATH=/usr/local/node/bin:$PATH' >> $BASH_ENV
21+
222
orbs:
323
browser-tools: circleci/browser-tools@1.1.3
424
aws-s3: circleci/aws-s3@2.0.0
@@ -88,106 +108,109 @@ workflows:
88108
jobs:
89109
build:
90110
environment:
91-
DOCKER_TAG: chronograf-20260112
92-
GO111MODULE: "ON"
93-
machine:
94-
image: ubuntu-2204:current
111+
GO111MODULE: "on"
112+
executor: cross-builder
113+
working_directory: ~/chronograf
95114
steps:
96115
- checkout
97116
- run: |
98117
ls -lah
99118
pwd
100-
- run: ./etc/scripts/docker/pull.sh
119+
- install_dependencies
120+
- run:
121+
name: "Show Versions"
122+
command: |
123+
node --version
124+
yarn --version
125+
npm --version
126+
go version
127+
go env
101128
- run:
102129
name: "Run Tests"
130+
no_output_timeout: 30m
103131
command: >
104-
./etc/scripts/docker/run.sh
132+
./etc/build.py
105133
--debug
106134
--test
107135
--no-build
108136
- persist_to_workspace:
109-
root: /home/circleci
137+
root: /root
110138
paths:
111-
- project
139+
- chronograf
112140

113141
deploy-nightly:
114142
environment:
115-
DOCKER_TAG: chronograf-20260112
116-
GO111MODULE: "ON"
117-
machine:
118-
image: ubuntu-2204:current
143+
GO111MODULE: "on"
144+
executor: cross-builder
145+
working_directory: ~/chronograf
119146
steps:
120147
- attach_workspace:
121-
at: /home/circleci
122-
- run: |
123-
./etc/scripts/docker/run.sh \
124-
--debug \
125-
--clean \
126-
--package \
127-
--platform all \
128-
--arch all \
129-
--upload \
130-
--nightly \
131-
--version=nightly \
132-
--bucket=dl.influxdata.com/chronograf/releases
133-
cp build/linux/static_amd64/chronograf .
134-
cp build/linux/static_amd64/chronoctl .
135-
docker build -t chronograf .
136-
docker login -u "$QUAY_USER" -p $QUAY_PASS quay.io
137-
docker tag chronograf quay.io/influxdb/chronograf:nightly
138-
docker push quay.io/influxdb/chronograf:nightly
148+
at: /root
149+
- install_dependencies
150+
- run:
151+
name: "Deploy Nightly Build"
152+
no_output_timeout: 30m
153+
command: |
154+
./etc/build.py \
155+
--debug \
156+
--clean \
157+
--package \
158+
--platform all \
159+
--arch all \
160+
--upload \
161+
--nightly \
162+
--version=nightly \
163+
--bucket=dl.influxdata.com/chronograf/releases
139164
- store_artifacts:
140165
path: ./build/
141166

142167
build-nightly:
143168
environment:
144-
DOCKER_TAG: chronograf-20260112
145-
GO111MODULE: "ON"
146-
machine:
147-
image: ubuntu-2204:current
169+
GO111MODULE: "on"
170+
executor: cross-builder
171+
working_directory: ~/chronograf
148172
steps:
149173
- attach_workspace:
150-
at: /home/circleci
151-
- run: |
152-
./etc/scripts/docker/run.sh \
153-
--debug \
154-
--clean \
155-
--package \
156-
--platform all \
157-
--arch all \
158-
--nightly \
159-
--version=${CIRCLE_SHA1:0:7}
174+
at: /root
175+
- install_dependencies
176+
- run:
177+
name: "Nightly Build"
178+
no_output_timeout: 30m
179+
command: |
180+
./etc/build.py \
181+
--debug \
182+
--clean \
183+
--package \
184+
--platform all \
185+
--arch all \
186+
--nightly \
187+
--version=${CIRCLE_SHA1:0:7}
160188
- store_artifacts:
161189
path: ./build/
162190

163191
deploy-pre-release:
164192
environment:
165-
DOCKER_TAG: chronograf-20260112
166-
GO111MODULE: "ON"
167-
machine:
168-
image: ubuntu-2204:current
193+
GO111MODULE: "on"
194+
executor: cross-builder
195+
working_directory: ~/chronograf
169196
steps:
170197
- attach_workspace:
171-
at: /home/circleci
172-
- run: |
173-
./etc/scripts/docker/run.sh \
174-
--clean \
175-
--debug \
176-
--release \
177-
--package \
178-
--platform all \
179-
--arch all \
180-
--upload-overwrite \
181-
--upload \
182-
--bucket dl.influxdata.com/chronograf/releases
183-
cp build/linux/static_amd64/chronograf .
184-
cp build/linux/static_amd64/chronoctl .
185-
docker build -t chronograf .
186-
docker login -u "$QUAY_USER" -p $QUAY_PASS quay.io
187-
docker tag chronograf quay.io/influxdb/chronograf:${CIRCLE_SHA1:0:7}
188-
docker push quay.io/influxdb/chronograf:${CIRCLE_SHA1:0:7}
189-
docker tag chronograf quay.io/influxdb/chronograf:${CIRCLE_TAG}
190-
docker push quay.io/influxdb/chronograf:${CIRCLE_TAG}
198+
at: /root
199+
- install_dependencies
200+
- run:
201+
name: "Deploy Pre-Release Build"
202+
no_output_timeout: 30m
203+
command: |
204+
./etc/build.py \
205+
--clean \
206+
--debug \
207+
--release \
208+
--package \
209+
--platform all \
210+
--arch all \
211+
--upload-overwrite \
212+
--upload \
213+
--bucket dl.influxdata.com/chronograf/releases
191214
- store_artifacts:
192215
path: ./build/
193216
- persist_to_workspace:
@@ -197,34 +220,27 @@ jobs:
197220

198221
deploy-release:
199222
environment:
200-
DOCKER_TAG: chronograf-20260112
201-
GO111MODULE: "ON"
202-
machine:
203-
image: ubuntu-2204:current
223+
GO111MODULE: "on"
224+
executor: cross-builder
225+
working_directory: ~/chronograf
204226
steps:
205227
- attach_workspace:
206-
at: /home/circleci
207-
- run: |
208-
./etc/scripts/docker/run.sh \
209-
--clean \
210-
--debug \
211-
--release \
212-
--package \
213-
--platform all \
214-
--arch all \
215-
--upload-overwrite \
216-
--upload \
217-
--bucket dl.influxdata.com/chronograf/releases
218-
cp build/linux/static_amd64/chronograf .
219-
cp build/linux/static_amd64/chronoctl .
220-
docker build -t chronograf .
221-
docker login -u "$QUAY_USER" -p $QUAY_PASS quay.io
222-
docker tag chronograf quay.io/influxdb/chronograf:${CIRCLE_SHA1:0:7}
223-
docker push quay.io/influxdb/chronograf:${CIRCLE_SHA1:0:7}
224-
docker tag chronograf quay.io/influxdb/chronograf:${CIRCLE_TAG}
225-
docker push quay.io/influxdb/chronograf:${CIRCLE_TAG}
226-
docker tag chronograf quay.io/influxdb/chronograf:latest
227-
docker push quay.io/influxdb/chronograf:latest
228+
at: /root
229+
- install_dependencies
230+
- run:
231+
name: "Deploy Pre-Release Build"
232+
no_output_timeout: 30m
233+
command: |
234+
./etc/build.py \
235+
--clean \
236+
--debug \
237+
--release \
238+
--package \
239+
--platform all \
240+
--arch all \
241+
--upload-overwrite \
242+
--upload \
243+
--bucket dl.influxdata.com/chronograf/releases
228244
- store_artifacts:
229245
path: ./build/
230246
- persist_to_workspace:

‎.github/PULL_REQUEST_TEMPLATE‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ _What was the solution?_
88
- [ ] [Well-formatted commit messages](https://www.conventionalcommits.org/en/v1.0.0-beta.3/)
99
- [ ] Rebased/mergeable
1010
- [ ] Tests pass
11-
- [ ] Any changes to `etc/Dockerfile_build` have been pushed to DockerHub, and the changes have been added to `.circleci/config.yml`
1211
- [ ] swagger.json updated (if modified Go structs or API)
1312
- [ ] Sign [CLA](https://influxdata.com/community/cla/) (if not already signed)

‎.github/workflows/chronograf-cypress-tests.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,16 @@ jobs:
2727
- name: Setup Go
2828
uses: actions/setup-go@v2
2929
with:
30-
go-version: '1.25.5'
30+
go-version: '1.24.11'
3131

32-
- uses: actions/setup-node@v2
32+
- name: Install pkg-config
33+
run: go install github.com/influxdata/pkg-config@v0.3.0
34+
35+
- name: Install Rust
36+
uses: dtolnay/rust-toolchain@1.72
37+
38+
- name: Setup Node.js
39+
uses: actions/setup-node@v2
3340
with:
3441
node-version: '16.14.2'
3542
- run: if [ ! -x "$(command -v yarn)" ]; then npm install -g yarn; fi

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
## [unreleased]
22

3+
⚠️ Removed support for Linux i386, armhf, armel and static build. Removed support for Darwin arm64.
4+
35
### Other
46

5-
1. [#6165](https://github.com/influxdata/chronograf/pull/6165): Upgrade golang to 1.25.5
7+
1. [#6166](https://github.com/influxdata/chronograf/pull/6166): Upgrade dependencies. Upgrade golang to 1.24.11. Removed support for Linux i386, armhf, armel and static build. Removed support for Darwin arm64
68

79
## v1.10.9 [2026-01-07]
810

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ all: dep build
2929
build: assets ${BINARY}
3030

3131
${BINARY}: $(SOURCES) .bindata .jsdep .godep
32-
go build -o ${BINARY} ${LDFLAGS} ./cmd/chronograf/main.go
32+
. $(HOME)/.cargo/env && CGO_ENABLED=1 go build -o ${BINARY} ${LDFLAGS} ./cmd/chronograf/main.go
3333
go build -o ${CTLBINARY} ${LDFLAGS} ./cmd/chronoctl
3434

3535
define CHRONOGIRAFFE
@@ -47,7 +47,7 @@ chronogiraffe: ${BINARY}
4747
@echo "$$CHRONOGIRAFFE"
4848

4949
docker-${BINARY}: $(SOURCES)
50-
CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o ${BINARY} ${LDFLAGS} \
50+
CGO_ENABLED=1 GOOS=linux go build -o ${BINARY} ${LDFLAGS} \
5151
./cmd/chronograf/main.go
5252

5353
docker: dep assets docker-${BINARY}

‎V3TODO.md‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎chronograf.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strconv"
1010
"time"
1111

12-
"github.com/influxdata/influxdb/influxql"
12+
"github.com/influxdata/influxql"
1313
"github.com/influxdata/kapacitor/client/v1"
1414
)
1515

0 commit comments

Comments
 (0)