Skip to content

Commit c1ba017

Browse files
author
Jim Galasyn
committed
Add deep-2.0 tab; start template port (#374)
* Recreate test.md * Add deep-2.0 tab; start template port
1 parent 30e0fd3 commit c1ba017

File tree

6 files changed

+178
-42
lines changed

6 files changed

+178
-42
lines changed

‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ dtr_versions:
5454
path: /datacenter/dtr/2.0/
5555

5656
tablabels:
57+
deep-2.0: Docker Enterprise Edition Platform 2.0
5758
ucp-3.0: Universal Control Plane 3.0
5859
ucp-2.2: Universal Control Plane 2.2
5960
dtr-2.5: Docker Trusted Registry 2.5

‎datacenter/ucp/3.0/guides/index.md

+51-31
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
---
22
title: Universal Control Plane overview
3-
description: Learn about Docker Universal Control Plane, the enterprise-grade cluster
4-
management solution from Docker.
5-
keywords: ucp, overview, orchestration, clustering
3+
description: |
4+
Learn about Docker Universal Control Plane, the enterprise-grade cluster management solution from Docker.
5+
ui_tabs:
6+
- version: ucp-3.0
7+
orhigher: true
8+
next_steps:
9+
- path: admin/install/
10+
title: Install UCP
11+
- path: /enterprise/docker-ee-architecture/
12+
title: Docker EE Platform 2.0 architecture
13+
keywords: ucp, overview, orchestration, cluster
614
redirect_from:
715
- /ucp/
816
---
17+
{% if include.ui %}
18+
19+
{% if include.version=="ucp-3.0" %}
920

1021
Docker Universal Control Plane (UCP) is the enterprise-grade cluster management
1122
solution from Docker. You install it on-premises or in your virtual private
@@ -26,31 +37,6 @@ You can manage and monitor your container cluster using a graphical UI.
2637

2738
![](../../../images/try-ddc-2.png){: .with-border}
2839

29-
Since UCP exposes the standard Docker API, you can continue using the tools
30-
you already know, including the Docker CLI client, to deploy and manage your
31-
applications.
32-
33-
As an example, you can use the `docker info` command to check the
34-
status of a cluster managed by UCP:
35-
36-
```none
37-
$ docker info
38-
39-
Containers: 38
40-
Running: 23
41-
Paused: 0
42-
Stopped: 15
43-
Images: 17
44-
Server Version: 17.06
45-
...
46-
Swarm: active
47-
NodeID: ocpv7el0uz8g9q7dmw8ay4yps
48-
Is Manager: true
49-
ClusterID: tylpv1kxjtgoik2jnrg8pvkg6
50-
Managers: 1
51-
…
52-
```
53-
5440
## Deploy, manage, and monitor
5541

5642
With Docker UCP, you can manage from a centralized place all of the computing
@@ -74,7 +60,41 @@ are safe and can't be tampered with.
7460
You can also enforce security policies and only allow running applications
7561
that use Docker images you know and trust.
7662

77-
## Where to go next
63+
{% endif %}
64+
{% endif %}
65+
66+
{% if include.cli %}
67+
68+
{% if include.version=="docker-cli-linux" %}
69+
70+
Because UCP exposes the standard Docker API, you can continue using the tools
71+
you already know, including the Docker CLI client, to deploy and manage your
72+
applications.
73+
74+
For example, you can use the `docker info` command to check the status of a
75+
cluster that's managed by UCP:
76+
77+
```bash
78+
docker info
79+
```
80+
81+
This command produces the output that you expect from the Docker EE Engine:
82+
83+
```bash
84+
Containers: 38
85+
Running: 23
86+
Paused: 0
87+
Stopped: 15
88+
Images: 17
89+
Server Version: 17.06
90+
...
91+
Swarm: active
92+
NodeID: ocpv7el0uz8g9q7dmw8ay4yps
93+
Is Manager: true
94+
ClusterID: tylpv1kxjtgoik2jnrg8pvkg6
95+
Managers: 1
96+
…
97+
```
7898

79-
* [Docker EE Platform 2.0 architecture](/enterprise/docker-ee-architecture.md)
80-
* [Install UCP](admin/install/index.md)
99+
{% endif %}
100+
{% endif %}

‎datacenter/ucp/3.0/guides/test.md

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
title: Manage logs
3+
description: |
4+
The reason you would do this is X, Y, and Z.
5+
6+
This can be a multiline description but should probably `be brief`.
7+
ui_tabs:
8+
- version: ucp-3.0
9+
orhigher: true
10+
- version: ucp-2.2
11+
orlower: true
12+
cli_tabs:
13+
- version: docker-cli-linux
14+
- version: docker-cli-win
15+
- version: kubectl
16+
next_steps:
17+
- path: /engine/install
18+
title: Install Docker
19+
- path: /get-started/
20+
title: Get Started with Docker
21+
---
22+
{% if include.ui %}
23+
To do this foobar task, you'll want to flip the switch under **Tasks > Foobar**,
24+
enter your Lorem Ipsum value for {{ site.tablabels[tab.version] }}, then
25+
click **Save**.
26+
27+
{% if include.version=="ucp-3.0" %}
28+
![Image number 1](https://docs.docker.com/datacenter/ucp/2.2/guides/images/monitor-ucp-0.png)
29+
{% elsif include.version=="ucp-2.2" %}
30+
![Image number 2](https://docs.docker.com/datacenter/ucp/2.2/guides/images/monitor-ucp-1.png)
31+
{% endif %}
32+
{% endif %}
33+
34+
{% if include.cli %}
35+
The command line workflow is essentially the same across the various CLIs.
36+
First you enumerate the services on the node of choice, then you run the
37+
`foobar` command.
38+
39+
{% if include.version=="docker-cli-linux" %}
40+
```bash
41+
$ docker stack deploy -c test.yml smokestack
42+
```
43+
{% elsif include.version=="docker-cli-win" %}
44+
```powershell
45+
PS> docker stack deploy -c test.yml smokestack
46+
```
47+
{% elsif include.version=="kubectl" %}
48+
```bash
49+
$ kubectl get pod -f ./pod.yaml
50+
```
51+
{% endif %}
52+
{% endif %}

‎enterprise/supported-platforms.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
---
22
title: About Docker EE
3-
description: Information about Docker Enterprise Edition
3+
description: |
4+
Information about Docker Enterprise Edition Platform 2.0
5+
ui_tabs:
6+
- version: deep-2.0
7+
orhigher: true
8+
next_steps:
9+
- path: /engine/install
10+
title: Install Docker
11+
- path: /get-started/
12+
title: Get Started with Docker
413
keywords: enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine
514
---
15+
{% if include.ui %}
16+
17+
{% if include.version=="deep-2.0" %}
618

719
Docker Enterprise Edition (*Docker EE*) is designed for enterprise
820
development and IT teams who build, ship, and run business-critical
@@ -67,3 +79,6 @@ Commercially Supported Docker. You can choose to stay with your current
6779
deployed version, or you can upgrade to the latest Docker EE version. For
6880
more info, see [Scope of Coverage and Maintenance
6981
Lifecycle](https://success.docker.com/Policies/Scope_of_Support).
82+
83+
{% endif %}
84+
{% endif %}

‎enterprise/telemetry.md

+57-9
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,71 @@
11
---
22
name: Manage usage data collection
33
title: Manage usage data collection
4-
description: Understand and manage usage data collected by Docker EE and sent to Docker.
4+
description: |
5+
Understand and manage usage data collected by Docker EE and sent to Docker.
6+
ui_tabs:
7+
- version: ucp-3.0
8+
orhigher: true
9+
cli_tabs:
10+
- version: docker-cli-linux
511
keywords: enterprise, telemetry, data collection
612
---
13+
{% if include.ui %}
714

8-
Docker EE version 17.06 and later includes a telemetry plugin. The plugin is enabled by default on Ubuntu starting with Docker EE 17.06.0 and on the rest of the EE-supported Linux distributions starting with version 17.06.2-ee-5. The telemetry plugin is not part of Docker EE for Windows Server.
15+
{% if include.version=="ucp-3.0" %}
916

10-
The telemetry plugin sends system information to Docker Inc. Docker uses this information to improve Docker EE. For details about the telemetry plugin and the types of data it collects, see the
17+
Docker EE Engine version 17.06 and later includes a telemetry plugin.
18+
The plugin is enabled by default on Ubuntu starting with Docker EE 17.06.0
19+
and on the rest of the EE-supported Linux distributions starting with version
20+
17.06.2-ee-5. The telemetry plugin is not part of Docker EE for Windows Server.
21+
22+
The telemetry plugin sends system information to Docker Inc. Docker uses this
23+
information to improve Docker EE. For details about the telemetry plugin and
24+
the types of data it collects, see the
1125
[`telemetry` plugin documentation](https://store.docker.com/community/images/docker/telemetry).
1226

1327
If your Docker instance runs in an environment with no internet connectivity,
14-
the telemetry plugin does not collect or attempt to send any information to Docker Inc.
28+
the telemetry plugin does not collect or attempt to send any information to
29+
Docker Inc.
1530

1631
## Manage data collection
1732

18-
If you do not wish to send any usage data to Docker Inc., you can disable the plugin,
19-
either using the Docker CLI or using Universal Control Plane.
33+
If you don't wish to send any usage data to Docker Inc., you can disable the
34+
plugin, either using the Docker CLI or using Universal Control Plane.
35+
36+
> UCP and CLI
37+
>
38+
> If you're using Docker EE Standard or Advanced with Universal Control Plane
39+
> (UCP), use UCP to enable and disable metrics. Use the CLI only if you don't
40+
> have UCP. UCP re-enables the telemetry plugin for hosts where it was
41+
> disabled with the CLI.
42+
{: .warning}
43+
44+
### Use Universal Control Plane
45+
46+
If you use Universal Control Plane with Docker EE, do not use the Docker CLI to
47+
disable the telemetry plugin. Instead, you can manage the information sent to
48+
Docker by going to **Admin Settings** and choosing **Usage**.
49+
50+
![UCP admin settings Usage defaults](images/usage-defaults.png){: .with-border}
51+
52+
To disable the telemetry plugin, disable all three options and click **Save**.
53+
Enabling either or both of the top two options will enable the telemetry plugin.
54+
You can find out more about an individual option by clicking the **?** icon.
55+
56+
> API usage metrics
57+
>
58+
> If API usage statistics are enabled, Docker gathers only aggregate stats
59+
> about what API endpoints are used. API payload contents aren't collected.
60+
{: .important}
61+
62+
63+
{% endif %}
64+
{% endif %}
2065

21-
> **Note**: If you're using Docker EE Standard or Advanced with Universal Control Plane, use Universal Control Plane (UCP) to enable and disable metrics. Only use the CLI if you do not have UCP. UCP re-enables the telemetry plugin for hosts where it was disabled with the CLI.
66+
{% if include.cli %}
2267

23-
### Use the Docker CLI
68+
{% if include.version=="docker-cli-linux" %}
2469

2570
To disable the telemetry plugin, use the `docker plugin disable` with either the plugin NAME or ID:
2671

@@ -56,5 +101,8 @@ To disable the telemetry plugin, disable all three options and click **Save**.
56101
Enabling either or both of the top two options enable the telemetry plugin.
57102
You can find out more about an individual option by clicking the **?** icon.
58103

59-
> **Note**: If API usage statistics are enabled, Docker only gathers aggregate stats about what API endpoints are used. API payload contents are not collected.
104+
> **Note**: If API usage statistics are enabled, Docker only gathers aggregate
105+
stats about what API endpoints are used. API payload contents are not collected.
60106

107+
{% endif %}
108+
{% endif %}

‎js/archive.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if (window.navigator.onLine) {
5252
isArchive = false;
5353
/* This is only relevant to /enterprise/index.md */
5454
if (document.getElementById('ee-version-div')) {
55-
document.getElementById('ee-version-div').textContent += "The latest version of Docker EE is {{ site.docker_ee_version }}.";
55+
document.getElementById('ee-version-div').textContent += "The latest version of Docker EE Engine is {{ site.docker_ee_version }}.";
5656
}
5757
} });
5858
}

0 commit comments

Comments
 (0)