From 401122e131a3ea81d2d5d2f57d877c2c489b7ff5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 13 Dec 2023 10:48:00 +0100 Subject: [PATCH 1/2] engine: update vendored docs Signed-off-by: Sebastiaan van Stijn --- _vendor/github.com/docker/cli/docs/deprecated.md | 11 ++++++++++- _vendor/modules.txt | 2 +- go.mod | 2 +- go.sum | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/_vendor/github.com/docker/cli/docs/deprecated.md b/_vendor/github.com/docker/cli/docs/deprecated.md index bf653dec3d..4a9cd2376f 100644 --- a/_vendor/github.com/docker/cli/docs/deprecated.md +++ b/_vendor/github.com/docker/cli/docs/deprecated.md @@ -50,6 +50,7 @@ The table below provides an overview of the current status of deprecated feature | Status | Feature | Deprecated | Remove | |------------|------------------------------------------------------------------------------------------------------------------------------------|------------|--------| +| Deprecated | [logentries logging driver](#logentries-logging-driver) | v24.0 | v25.0 | | Deprecated | [OOM-score adjust for the daemon](#oom-score-adjust-for-the-daemon) | v24.0 | v25.0 | | Removed | [Buildkit build information](#buildkit-build-information) | v23.0 | v24.0 | | Deprecated | [Legacy builder for Linux images](#legacy-builder-for-linux-images) | v23.0 | - | @@ -80,7 +81,7 @@ The table below provides an overview of the current status of deprecated feature | Removed | [`--disable-legacy-registry` override daemon option](#--disable-legacy-registry-override-daemon-option) | v17.12 | v19.03 | | Removed | [Interacting with V1 registries](#interacting-with-v1-registries) | v17.06 | v17.12 | | Removed | [Asynchronous `service create` and `service update` as default](#asynchronous-service-create-and-service-update-as-default) | v17.05 | v17.10 | -| Removed | [`-g` and `--graph` flags on `dockerd`](#-g-and---graph-flags-on-dockerd) | v17.05 | - | +| Removed | [`-g` and `--graph` flags on `dockerd`](#-g-and---graph-flags-on-dockerd) | v17.05 | v23.0 | | Deprecated | [Top-level network properties in NetworkSettings](#top-level-network-properties-in-networksettings) | v1.13 | v17.12 | | Removed | [`filter` param for `/images/json` endpoint](#filter-param-for-imagesjson-endpoint) | v1.13 | v20.10 | | Removed | [`repository:shortid` image references](#repositoryshortid-image-references) | v1.13 | v17.12 | @@ -106,6 +107,14 @@ The table below provides an overview of the current status of deprecated feature | Removed | [`--run` flag on `docker commit`](#--run-flag-on-docker-commit) | v0.10 | v1.13 | | Removed | [Three arguments form in `docker import`](#three-arguments-form-in-docker-import) | v0.6.7 | v1.12 | +### Logentries logging driver + +**Target For Removal In Release: v25.0** + +The logentries service SaaS was shut down on November 15, 2022, rendering +this logging driver non-functional. Users should no longer use this logging +driver, and the driver will be removed in Docker 25.0. + ### OOM-score adjust for the daemon **Deprecated in Release: v24.0** diff --git a/_vendor/modules.txt b/_vendor/modules.txt index d36ff2fd99..919841cd6d 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,6 +2,6 @@ # github.com/moby/buildkit v0.13.0-beta1.0.20231113205014-1efcd30d9dd6 # github.com/docker/buildx v0.12.0 # github.com/docker/scout-cli v1.2.0 -# github.com/docker/cli v24.0.8-0.20231211210310-fb2f337bc1b1+incompatible +# github.com/docker/cli v24.0.8-0.20231213094340-0f82fd88610a+incompatible # github.com/compose-spec/compose-spec v0.0.0-20231121152139-478928e7c9f8 # github.com/docker/compose/v2 v2.23.3 diff --git a/go.mod b/go.mod index c7bd5a621c..67f96a98b4 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.1 require ( github.com/compose-spec/compose-spec v0.0.0-20231121152139-478928e7c9f8 // indirect github.com/docker/buildx v0.12.0 // indirect - github.com/docker/cli v24.0.8-0.20231211210310-fb2f337bc1b1+incompatible // indirect + github.com/docker/cli v24.0.8-0.20231213094340-0f82fd88610a+incompatible // indirect github.com/docker/compose/v2 v2.23.3 // indirect github.com/docker/scout-cli v1.2.0 // indirect github.com/moby/buildkit v0.13.0-beta1.0.20231113205014-1efcd30d9dd6 // indirect diff --git a/go.sum b/go.sum index 3331d5e85d..4c294c5257 100644 --- a/go.sum +++ b/go.sum @@ -64,6 +64,8 @@ github.com/docker/cli v24.0.8-0.20231106123152-48ec4f339e2b+incompatible h1:tXZk github.com/docker/cli v24.0.8-0.20231106123152-48ec4f339e2b+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.8-0.20231211210310-fb2f337bc1b1+incompatible h1:3hcKPFXxdqoVzoIrjNF1NNb36kzFiEimwUegOhw0pC0= github.com/docker/cli v24.0.8-0.20231211210310-fb2f337bc1b1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v24.0.8-0.20231213094340-0f82fd88610a+incompatible h1:OSAexdrbbGYSMOdaskqxEQR9N3CNv59ypbhD032P1TI= +github.com/docker/cli v24.0.8-0.20231213094340-0f82fd88610a+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v25.0.0-beta.1+incompatible h1:bJzIgR4mKNpceAwwi19SqZK0AbztMc3nQTgnvxxyY/A= github.com/docker/cli v25.0.0-beta.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose-cli v1.0.35 h1:uZyEHLalfqBS2PiTpA1LAULyJmuQ+YtZg7nG4Xl3/Cc= From 9fca00261d72cbd5cf00765ee551fbfa3c052b11 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 13 Dec 2023 10:26:27 +0100 Subject: [PATCH 2/2] logging: add deprecation message for logentries logging driver Signed-off-by: Sebastiaan van Stijn --- content/config/containers/logging/configure.md | 2 +- content/config/containers/logging/logentries.md | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/content/config/containers/logging/configure.md b/content/config/containers/logging/configure.md index ce037643d8..3373078498 100644 --- a/content/config/containers/logging/configure.md +++ b/content/config/containers/logging/configure.md @@ -196,7 +196,7 @@ see more options. | [`splunk`](splunk.md) | Writes log messages to `splunk` using the HTTP Event Collector. | | [`etwlogs`](etwlogs.md) | Writes log messages as Event Tracing for Windows (ETW) events. Only available on Windows platforms. | | [`gcplogs`](gcplogs.md) | Writes log messages to Google Cloud Platform (GCP) Logging. | -| [`logentries`](logentries.md) | Writes log messages to Rapid7 Logentries. | +| [`logentries`](logentries.md) ([deprecated](../../../../engine/deprecated.md#logentries-logging-driver)) | Writes log messages to Rapid7 Logentries. | ## Limitations of logging drivers diff --git a/content/config/containers/logging/logentries.md b/content/config/containers/logging/logentries.md index 1d100598c0..48b329753d 100644 --- a/content/config/containers/logging/logentries.md +++ b/content/config/containers/logging/logentries.md @@ -1,11 +1,23 @@ --- -title: Logentries logging driver +title: Logentries logging driver (deprecated) description: Learn how to use the logentries logging driver with Docker Engine keywords: logentries, docker, logging, driver aliases: - /engine/admin/logging/logentries/ --- +> **Deprecated** +> +> The logentries service is no longer in operation since November 15, 2022, +> and the logentries driver [has been deprecated](../../../engine/deprecated.md#logentries-logging-driver). +> +> This driver will be removed in Docker Engine v25.0, and you must migrate to +> a supported logging driver before upgrading to Docker Engine v25.0. Read the +> [Configure logging drivers](configure.md) page for an overview of supported +> logging drivers. +{ .warning } + + The `logentries` logging driver sends container logs to the [Logentries](https://logentries.com/) server.