From e9c213470842200ea6f97b9b4689e274e7a159e0 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 1 Nov 2023 16:04:50 +0000
Subject: T5701: Bump telegraf to version v1.28.3

---
 docker/Dockerfile             | 4 ++--
 packages/telegraf/Jenkinsfile | 2 +-
 packages/telegraf/build.sh    | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 178c46ba..dc298ec8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 VyOS maintainers and contributors
+# Copyright (C) 2018-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # in order to easy exprort images built to "external" world
@@ -244,7 +244,7 @@ RUN pip install --break-system-packages \
       whois
 
 # Go required for validators and vyos-xe-guest-utilities
-RUN GO_VERSION_INSTALL="1.18.3" ; \
+RUN GO_VERSION_INSTALL="1.21.3" ; \
     wget -O /tmp/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-$(dpkg-architecture -qDEB_HOST_ARCH).tar.gz ; \
     tar -C /opt -xzf /tmp/go*.tar.gz && \
     rm /tmp/go*.tar.gz
diff --git a/packages/telegraf/Jenkinsfile b/packages/telegraf/Jenkinsfile
index 95781923..08ef10c2 100644
--- a/packages/telegraf/Jenkinsfile
+++ b/packages/telegraf/Jenkinsfile
@@ -23,7 +23,7 @@
 // and not via a DEB package
 def pkgList = [
     ['name': 'telegraf',
-     'scmCommit': 'v1.23.1',
+     'scmCommit': 'v1.28.3',
      'scmUrl': 'https://github.com/influxdata/telegraf.git',
      'buildCmd': 'cd ..; ./build.sh'],
 ]
diff --git a/packages/telegraf/build.sh b/packages/telegraf/build.sh
index 46dfc88a..2ba511d0 100755
--- a/packages/telegraf/build.sh
+++ b/packages/telegraf/build.sh
@@ -21,4 +21,7 @@ cp ${PLUGIN_DIR}/outputs/all/all.go ${SRC}/plugins/outputs/all/all.go
 echo "I: Build Debian ${BUILD_ARCH} package"
 cd ${SRC}
 export PATH=/opt/go/bin:$PATH
+
+# Generate default telegraf config
+go run ./cmd/telegraf config > etc/telegraf.conf
 LDFLAGS=-w make "${BUILD_ARCH}.deb"
-- 
cgit v1.2.3