From 70e7a4405dde0f06b0b9583ec779c2c976779bac Mon Sep 17 00:00:00 2001 From: Josh Powers Date: Wed, 5 Jan 2022 08:38:03 -0700 Subject: [PATCH] fix: update docker client API version Telegraf manually sets the API version in the docker client. We are using the 20.10 version of docker, which cooresponds to a newer API version that we can bump up to. Fixes: #4666 Fixes: #10380 --- go.mod | 2 +- go.sum | 4 ++-- plugins/inputs/docker/client.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 26d3be2717f70..1defa9d1e0999 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/denisenkom/go-mssqldb v0.10.0 github.com/dimchansky/utfbom v1.1.1 github.com/djherbis/times v1.5.0 - github.com/docker/docker v20.10.9+incompatible + github.com/docker/docker v20.10.11+incompatible github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60 github.com/dynatrace-oss/dynatrace-metric-utils-go v0.3.0 github.com/eclipse/paho.mqtt.golang v1.3.5 diff --git a/go.sum b/go.sum index a1031a0f01b80..81e1477d48c09 100644 --- a/go.sum +++ b/go.sum @@ -670,8 +670,8 @@ github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BU github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.9+incompatible h1:JlsVnETOjM2RLQa0Cc1XCIspUdXW3Zenq9P54uXBm6k= -github.com/docker/docker v20.10.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.11+incompatible h1:OqzI/g/W54LczvhnccGqniFoQghHx3pklbLuhfXpqGo= +github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= diff --git a/plugins/inputs/docker/client.go b/plugins/inputs/docker/client.go index 6abba44c549d6..14a075accbf08 100644 --- a/plugins/inputs/docker/client.go +++ b/plugins/inputs/docker/client.go @@ -11,7 +11,7 @@ import ( ) var ( - version = "1.21" // 1.24 is when server first started returning its version + version = "1.41" // https://docs.docker.com/engine/api/ defaultHeaders = map[string]string{"User-Agent": "engine-api-cli-1.0"} )