From a1202255922f3057d78a5fac499f238ba94aa9ab Mon Sep 17 00:00:00 2001
From: Ales Pour <ales.pour@bonitoo.io>
Date: Tue, 23 Jan 2024 11:35:41 +0100
Subject: [PATCH 1/4] chore(build): upgrade Go to 1.20.13

---
 .github/workflows/chronograf-cypress-tests.yaml | 2 +-
 etc/Dockerfile_build                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml
index 99a1b3185c..72689d36c9 100644
--- a/.github/workflows/chronograf-cypress-tests.yaml
+++ b/.github/workflows/chronograf-cypress-tests.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.20.10'
+          go-version: '1.20.13'
 
       - uses: actions/setup-node@v2
         with:
diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
index 3a71d82e45..981ff451b9 100644
--- a/etc/Dockerfile_build
+++ b/etc/Dockerfile_build
@@ -33,7 +33,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.20.10
+ENV GO_VERSION 1.20.13
 ENV GO_ARCH amd64
 ENV GO111MODULES ON
 RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \

From d1bbd7d2425b5184f813f4bc411d2cb0c7883f78 Mon Sep 17 00:00:00 2001
From: Ales Pour <ales.pour@bonitoo.io>
Date: Tue, 23 Jan 2024 12:35:00 +0100
Subject: [PATCH 2/4] chore(build): bump builder image

---
 .circleci/config.yml      | 8 ++++----
 etc/scripts/docker/run.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a94f7d321..3b3ef37e99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20231013
+      DOCKER_TAG: chronograf-20240123
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -96,7 +96,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20231013
+      DOCKER_TAG: chronograf-20240123
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -125,7 +125,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20231013
+      DOCKER_TAG: chronograf-20240123
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -160,7 +160,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20231013
+      DOCKER_TAG: chronograf-20240123
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
diff --git a/etc/scripts/docker/run.sh b/etc/scripts/docker/run.sh
index dc038dcc1f..de657582f3 100755
--- a/etc/scripts/docker/run.sh
+++ b/etc/scripts/docker/run.sh
@@ -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-20231013"
+test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240123"
 
 docker run \
        -e AWS_ACCESS_KEY_ID \

From 76d568c5cb2ec8f7fcf45e4a83bbf9b63d6d48e6 Mon Sep 17 00:00:00 2001
From: Ales Pour <ales.pour@bonitoo.io>
Date: Tue, 23 Jan 2024 13:10:47 +0100
Subject: [PATCH 3/4] chore: trigger CI


From ce663c3a7292298b08bdf1ede240d24fa3874d3f Mon Sep 17 00:00:00 2001
From: Ales Pour <ales.pour@bonitoo.io>
Date: Tue, 23 Jan 2024 13:30:22 +0100
Subject: [PATCH 4/4] docs: update CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47c6515311..21a8414adb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## unreleased
+
+### Other
+
+1. [#6074](https://github.com/influxdata/chronograf/pull/6074): Upgrade golang to 1.20.13.
+
 ## v1.10.2 [2023-10-20]
 
 ### Bug Fixes