From bb016b514f283346f4de7da4af1e69b710f2e2bd Mon Sep 17 00:00:00 2001 From: Marco Pfatschbacher Date: Mon, 23 Oct 2023 13:36:51 +0100 Subject: [PATCH 1/3] update golang to 1.21 --- jenkins.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins.groovy b/jenkins.groovy index ce6d3d0..d5a5e90 100644 --- a/jenkins.groovy +++ b/jenkins.groovy @@ -11,7 +11,7 @@ pipeline tools { - go 'Go 1.19' + go 'Go 1.21' } environment From acb65402cf22fb059b695664ee246a7e1014e96f Mon Sep 17 00:00:00 2001 From: Marco Pfatschbacher Date: Mon, 23 Oct 2023 13:37:07 +0100 Subject: [PATCH 2/3] bump dependencies go: upgraded github.com/google/uuid v1.3.0 => v1.3.1 go: upgraded github.com/sirupsen/logrus v1.9.0 => v1.9.3 go: upgraded golang.org/x/sys v0.4.0 => v0.13.0 --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index cfc96bc..ebdff65 100644 --- a/go.mod +++ b/go.mod @@ -12,13 +12,13 @@ require ( github.com/natefinch/lumberjack v2.0.0+incompatible github.com/pborman/uuid v1.2.1 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 - github.com/sirupsen/logrus v1.9.0 - golang.org/x/sys v0.4.0 + github.com/sirupsen/logrus v1.9.3 + golang.org/x/sys v0.13.0 ) require ( github.com/BurntSushi/toml v0.3.1 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect diff --git a/go.sum b/go.sum index 479cb26..064f1ec 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWTLOJKlh+lOBt6nUQgXAfB7oVIQt5cNreqSLI= github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60= @@ -35,8 +35,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= @@ -44,8 +44,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= From d33261db75f1a6fe1a09509eb6e30e9404c17420 Mon Sep 17 00:00:00 2001 From: Bernd Ahlers Date: Thu, 26 Oct 2023 12:50:33 +0200 Subject: [PATCH 3/3] Use correct filebeat version for arm64 --- dist/fetch_collectors.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/fetch_collectors.sh b/dist/fetch_collectors.sh index f6b0a97..55da8df 100755 --- a/dist/fetch_collectors.sh +++ b/dist/fetch_collectors.sh @@ -45,11 +45,11 @@ download_beat() download_beat "filebeat" "linux" ${FILEBEAT_VERSION} x86_64 download_beat "filebeat" "linux" ${FILEBEAT_VERSION_32} x86 -download_beat "filebeat" "linux" ${FILEBEAT_VERSION_32} arm64 +download_beat "filebeat" "linux" ${FILEBEAT_VERSION} arm64 download_beat "auditbeat" "linux" ${FILEBEAT_VERSION} x86_64 download_beat "auditbeat" "linux" ${AUDITBEAT_VERSION_32} x86 -download_beat "auditbeat" "linux" ${AUDITBEAT_VERSION_32} arm64 +download_beat "auditbeat" "linux" ${AUDITBEAT_VERSION} arm64 download_beat "filebeat" "windows" ${FILEBEAT_VERSION} x86_64 download_beat "filebeat" "windows" ${FILEBEAT_VERSION_32} x86