From 01374c86063d9228a4a0a66c158282591733c031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20B=C3=A9lorgey?= <romain.belorgey@docker.com>
Date: Thu, 27 Jun 2019 11:46:40 +0200
Subject: [PATCH 1/2] Add changes for 18.09 version

The configuration of telemetry changes since 18.09 ee version.

For full information, internal escalation: https://docker.atlassian.net/browse/FIELD-1702
---
 ee/telemetry.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ee/telemetry.md b/ee/telemetry.md
index 81fe6a3cf0..f6e6e00ec7 100644
--- a/ee/telemetry.md
+++ b/ee/telemetry.md
@@ -53,6 +53,8 @@ You can find out more about an individual option by clicking the **?** icon.
 
 ## Use the CLI to control telemetry
 
+### For versions prior to 18.09
+
 To disable the telemetry plugin, use the `docker plugin disable` with either the plugin NAME or ID:
 
 ```bash
@@ -74,3 +76,31 @@ ID                  NAME                                           [..]
 
 $ docker plugin enable docker/telemetry:1.0.0.linux-x86_64-stable
 ```
+
+### Since version 18.09
+
+The telemetry module is activated by default with Docker EE 18.09. No plugin are used since this version.
+
+To disable it, you need to modify your configuration file on `/etc/docker/config.json` and add this param:
+```
+{"features":{"telemetry": false}}
+```
+
+Example:
+```
+{
+    "debug": true,
+    "log-driver": "json-file",
+    "log-opts": {
+        "max-size": "10m"
+    },
+    "features":{"telemetry": false}
+}
+```
+
+You will need to restart the docker daemon to take into account the change.
+
+To enable back the telemetry module, you will need to put `true` instead of `false`:
+```
+{"features":{"telemetry": true}}
+```

From 6f34bb896b5b6ae14577d724fe118c078f76aaa6 Mon Sep 17 00:00:00 2001
From: Olly Pomeroy <oppomeroy@gmail.com>
Date: Tue, 2 Jul 2019 13:28:04 +0100
Subject: [PATCH 2/2] Reorded the text, putting 18.09 instructions first

Signed-off-by: Olly Pomeroy <olly@docker.com>
---
 ee/telemetry.md | 64 ++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/ee/telemetry.md b/ee/telemetry.md
index f6e6e00ec7..a95599244e 100644
--- a/ee/telemetry.md
+++ b/ee/telemetry.md
@@ -53,9 +53,36 @@ You can find out more about an individual option by clicking the **?** icon.
 
 ## Use the CLI to control telemetry
 
-### For versions prior to 18.09
+At the engine level, there is a telemetry module built into the Docker
+Enterprise Engine 18.09 or newer. It can be disabled by modifing the [daemon
+configuration
+file](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file).
+By default this is stored at `/etc/docker/daemon.json`. 
 
-To disable the telemetry plugin, use the `docker plugin disable` with either the plugin NAME or ID:
+```bash
+{
+  "features": {
+    "telemetry": false
+  }
+}
+```
+
+For the Docker daemon to pick up the changes in the configuration file, the
+Docker daemon will need to be restarted.
+
+```bash
+$ sudo systemctl reboot docker
+```
+
+To reenable the telemetry module, swap the value to `"telemetry": true` or
+completely remove the `"telemetry": false` line, as the default value is `true`.
+
+
+### Docker Enterprise Engine 18.03 or older
+
+For Docker Enterprise Engine 18.03 or older, the telemetry module ran as a
+Docker Plugin. To disable the telemetry plugin, use the `docker plugin disable`
+with either the plugin NAME or ID:
 
 ```bash
 $ docker plugin ls
@@ -67,7 +94,8 @@ $ docker plugin disable docker/telemetry:1.0.0.linux-x86_64-stable
 
 This command must be run on each Docker host.
 
-To re-enable the telemetry plugin, you can use `docker plugin enable` with either the plugin NAME or ID:
+To re-enable the telemetry plugin, you can use `docker plugin enable` with
+either the plugin NAME or ID:
 
 ```bash
 $ docker plugin ls
@@ -75,32 +103,4 @@ ID                  NAME                                           [..]
 114dbeaa400c        docker/telemetry:1.0.0.linux-x86_64-stable     [..]
 
 $ docker plugin enable docker/telemetry:1.0.0.linux-x86_64-stable
-```
-
-### Since version 18.09
-
-The telemetry module is activated by default with Docker EE 18.09. No plugin are used since this version.
-
-To disable it, you need to modify your configuration file on `/etc/docker/config.json` and add this param:
-```
-{"features":{"telemetry": false}}
-```
-
-Example:
-```
-{
-    "debug": true,
-    "log-driver": "json-file",
-    "log-opts": {
-        "max-size": "10m"
-    },
-    "features":{"telemetry": false}
-}
-```
-
-You will need to restart the docker daemon to take into account the change.
-
-To enable back the telemetry module, you will need to put `true` instead of `false`:
-```
-{"features":{"telemetry": true}}
-```
+```
\ No newline at end of file