Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ workflows:
jobs:
build:
environment:
DOCKER_TAG: chronograf-20250404
DOCKER_TAG: chronograf-20251013
GO111MODULE: "ON"
machine:
image: ubuntu-2204:current
Expand All @@ -112,7 +112,7 @@ jobs:

deploy-nightly:
environment:
DOCKER_TAG: chronograf-20250404
DOCKER_TAG: chronograf-20251013
GO111MODULE: "ON"
machine:
image: ubuntu-2204:current
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:

build-nightly:
environment:
DOCKER_TAG: chronograf-20250404
DOCKER_TAG: chronograf-20251013
GO111MODULE: "ON"
machine:
image: ubuntu-2204:current
Expand All @@ -162,7 +162,7 @@ jobs:

deploy-pre-release:
environment:
DOCKER_TAG: chronograf-20250404
DOCKER_TAG: chronograf-20251013
GO111MODULE: "ON"
machine:
image: ubuntu-2204:current
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:

deploy-release:
environment:
DOCKER_TAG: chronograf-20250404
DOCKER_TAG: chronograf-20251013
GO111MODULE: "ON"
machine:
image: ubuntu-2204:current
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## [unreleased]

### Other

1. [#6148](https://github.com/influxdata/chronograf/pull/6148): Upgrade golang to 1.25.1

## v1.10.8 [2025-08-15]

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion etc/Dockerfile_build
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.23.8
ENV GO_VERSION 1.25.1
ENV GO_ARCH amd64
ENV GO111MODULES ON
RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
Expand Down
2 changes: 1 addition & 1 deletion etc/scripts/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test -z $SSH_KEY_PATH && SSH_KEY_PATH="$HOME/.ssh/id_rsa"
echo "Using SSH key located at: $SSH_KEY_PATH"

# Default docker tag if not specified
test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20250404"
test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20251013"

docker run \
-e AWS_ACCESS_KEY_ID \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/influxdata/chronograf

go 1.23.0
go 1.25.1

require (
cloud.google.com/go/bigtable v1.10.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion influx/databases.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (c *Client) UpdateRP(ctx context.Context, db string, rp string, upd *chrono
// At last, we can check if there are any error strings
for _, r := range results {
if r.Error != "" {
return nil, fmt.Errorf(r.Error)
return nil, fmt.Errorf("%s", r.Error)
}
}

Expand Down
2 changes: 1 addition & 1 deletion influx/influx.go
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func (c *Client) ping(u *url.URL) (string, string, error) {
}

if resp.StatusCode != http.StatusNoContent {
var err = fmt.Errorf(string(body))
var err = fmt.Errorf("%s", string(body))
return "", "", err
}

Expand Down
4 changes: 2 additions & 2 deletions influx/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (c *Client) Delete(ctx context.Context, u *chronograf.User) error {
// At last, we can check if there are any error strings
for _, r := range results {
if r.Error != "" {
return fmt.Errorf(r.Error)
return fmt.Errorf("%s", r.Error)
}
}
return nil
Expand Down Expand Up @@ -227,7 +227,7 @@ func (c *Client) updatePassword(ctx context.Context, name, passwd string) error
// At last, we can check if there are any error strings
for _, r := range results {
if r.Error != "" {
return fmt.Errorf(r.Error)
return fmt.Errorf("%s", r.Error)
}
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion oauth2/generic.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (g *Generic) PrincipalID(provider *http.Client) (string, error) {
if ok := ofDomain(g.Domains, email); !ok {
msg := "Not a member of required domain"
g.Logger.Error(msg)
return "", fmt.Errorf(msg)
return "", fmt.Errorf("%s", msg)
}
}

Expand Down
2 changes: 1 addition & 1 deletion server/kapacitors.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ func (s *Service) deactivateOtherKapacitors(ctx context.Context, srcID int, ID i
}
}
if len(deactivationErrors) > 1 {
return fmt.Errorf(strings.Join(deactivationErrors, "\n"))
return fmt.Errorf("%s", strings.Join(deactivationErrors, "\n"))
}
return deactivationError
}
Expand Down
2 changes: 1 addition & 1 deletion server/mountable_router_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func Test_MountableRouter_MountsRoutesUnderPrefix(t *testing.T) {

expected := "Hello?! McFly?! Anybody in there?!"
mr.GET("/biff", http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
fmt.Fprintf(rw, expected)
fmt.Fprintf(rw, "%s", expected)
}))

ts := httptest.NewServer(mr)
Expand Down
2 changes: 1 addition & 1 deletion server/url_prefixer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func Test_Server_Prefixer_NoPrefixingWithoutFlusther(t *testing.T) {
func Test_Server_Prefixer_IgnoreJsAndSvg(t *testing.T) {
expected := "Keep it the same please"
backend := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
fmt.Fprintf(rw, expected)
fmt.Fprintf(rw, "%s", expected)
})

tl := &mocks.TestLogger{}
Expand Down
Loading