mirror of https://github.com/docker/docs.git
Add deep-2.0 tab; start template port (#374)
* Recreate test.md * Add deep-2.0 tab; start template port
This commit is contained in:
Jim Galasyn
parent
30e0fd3f18
commit
c1ba017b02
|
|
@ -54,6 +54,7 @@ dtr_versions:
|
|||
path: /datacenter/dtr/2.0/
|
||||
|
||||
tablabels:
|
||||
deep-2.0: Docker Enterprise Edition Platform 2.0
|
||||
ucp-3.0: Universal Control Plane 3.0
|
||||
ucp-2.2: Universal Control Plane 2.2
|
||||
dtr-2.5: Docker Trusted Registry 2.5
|
||||
|
|
|
|||
|
|
@ -1,11 +1,22 @@
|
|||
---
|
||||
title: Universal Control Plane overview
|
||||
description: Learn about Docker Universal Control Plane, the enterprise-grade cluster
|
||||
management solution from Docker.
|
||||
keywords: ucp, overview, orchestration, clustering
|
||||
description: |
|
||||
Learn about Docker Universal Control Plane, the enterprise-grade cluster management solution from Docker.
|
||||
ui_tabs:
|
||||
- version: ucp-3.0
|
||||
orhigher: true
|
||||
next_steps:
|
||||
- path: admin/install/
|
||||
title: Install UCP
|
||||
- path: /enterprise/docker-ee-architecture/
|
||||
title: Docker EE Platform 2.0 architecture
|
||||
keywords: ucp, overview, orchestration, cluster
|
||||
redirect_from:
|
||||
- /ucp/
|
||||
---
|
||||
{% if include.ui %}
|
||||
|
||||
{% if include.version=="ucp-3.0" %}
|
||||
|
||||
Docker Universal Control Plane (UCP) is the enterprise-grade cluster management
|
||||
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.
|
|||
|
||||
{: .with-border}
|
||||
|
||||
Since UCP exposes the standard Docker API, you can continue using the tools
|
||||
you already know, including the Docker CLI client, to deploy and manage your
|
||||
applications.
|
||||
|
||||
As an example, you can use the `docker info` command to check the
|
||||
status of a cluster managed by UCP:
|
||||
|
||||
```none
|
||||
$ docker info
|
||||
|
||||
Containers: 38
|
||||
Running: 23
|
||||
Paused: 0
|
||||
Stopped: 15
|
||||
Images: 17
|
||||
Server Version: 17.06
|
||||
...
|
||||
Swarm: active
|
||||
NodeID: ocpv7el0uz8g9q7dmw8ay4yps
|
||||
Is Manager: true
|
||||
ClusterID: tylpv1kxjtgoik2jnrg8pvkg6
|
||||
Managers: 1
|
||||
…
|
||||
```
|
||||
|
||||
## Deploy, manage, and monitor
|
||||
|
||||
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.
|
|||
You can also enforce security policies and only allow running applications
|
||||
that use Docker images you know and trust.
|
||||
|
||||
## Where to go next
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
* [Docker EE Platform 2.0 architecture](/enterprise/docker-ee-architecture.md)
|
||||
* [Install UCP](admin/install/index.md)
|
||||
{% if include.cli %}
|
||||
|
||||
{% if include.version=="docker-cli-linux" %}
|
||||
|
||||
Because UCP exposes the standard Docker API, you can continue using the tools
|
||||
you already know, including the Docker CLI client, to deploy and manage your
|
||||
applications.
|
||||
|
||||
For example, you can use the `docker info` command to check the status of a
|
||||
cluster that's managed by UCP:
|
||||
|
||||
```bash
|
||||
docker info
|
||||
```
|
||||
|
||||
This command produces the output that you expect from the Docker EE Engine:
|
||||
|
||||
```bash
|
||||
Containers: 38
|
||||
Running: 23
|
||||
Paused: 0
|
||||
Stopped: 15
|
||||
Images: 17
|
||||
Server Version: 17.06
|
||||
...
|
||||
Swarm: active
|
||||
NodeID: ocpv7el0uz8g9q7dmw8ay4yps
|
||||
Is Manager: true
|
||||
ClusterID: tylpv1kxjtgoik2jnrg8pvkg6
|
||||
Managers: 1
|
||||
…
|
||||
```
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
---
|
||||
title: Manage logs
|
||||
description: |
|
||||
The reason you would do this is X, Y, and Z.
|
||||
|
||||
This can be a multiline description but should probably `be brief`.
|
||||
ui_tabs:
|
||||
- version: ucp-3.0
|
||||
orhigher: true
|
||||
- version: ucp-2.2
|
||||
orlower: true
|
||||
cli_tabs:
|
||||
- version: docker-cli-linux
|
||||
- version: docker-cli-win
|
||||
- version: kubectl
|
||||
next_steps:
|
||||
- path: /engine/install
|
||||
title: Install Docker
|
||||
- path: /get-started/
|
||||
title: Get Started with Docker
|
||||
---
|
||||
{% if include.ui %}
|
||||
To do this foobar task, you'll want to flip the switch under **Tasks > Foobar**,
|
||||
enter your Lorem Ipsum value for {{ site.tablabels[tab.version] }}, then
|
||||
click **Save**.
|
||||
|
||||
{% if include.version=="ucp-3.0" %}
|
||||
|
||||
{% elsif include.version=="ucp-2.2" %}
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if include.cli %}
|
||||
The command line workflow is essentially the same across the various CLIs.
|
||||
First you enumerate the services on the node of choice, then you run the
|
||||
`foobar` command.
|
||||
|
||||
{% if include.version=="docker-cli-linux" %}
|
||||
```bash
|
||||
$ docker stack deploy -c test.yml smokestack
|
||||
```
|
||||
{% elsif include.version=="docker-cli-win" %}
|
||||
```powershell
|
||||
PS> docker stack deploy -c test.yml smokestack
|
||||
```
|
||||
{% elsif include.version=="kubectl" %}
|
||||
```bash
|
||||
$ kubectl get pod -f ./pod.yaml
|
||||
```
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
@ -1,8 +1,20 @@
|
|||
---
|
||||
title: About Docker EE
|
||||
description: Information about Docker Enterprise Edition
|
||||
description: |
|
||||
Information about Docker Enterprise Edition Platform 2.0
|
||||
ui_tabs:
|
||||
- version: deep-2.0
|
||||
orhigher: true
|
||||
next_steps:
|
||||
- path: /engine/install
|
||||
title: Install Docker
|
||||
- path: /get-started/
|
||||
title: Get Started with Docker
|
||||
keywords: enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine
|
||||
---
|
||||
{% if include.ui %}
|
||||
|
||||
{% if include.version=="deep-2.0" %}
|
||||
|
||||
Docker Enterprise Edition (*Docker EE*) is designed for enterprise
|
||||
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
|
|||
deployed version, or you can upgrade to the latest Docker EE version. For
|
||||
more info, see [Scope of Coverage and Maintenance
|
||||
Lifecycle](https://success.docker.com/Policies/Scope_of_Support).
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
@ -1,26 +1,71 @@
|
|||
---
|
||||
name: Manage usage data collection
|
||||
title: Manage usage data collection
|
||||
description: Understand and manage usage data collected by Docker EE and sent to Docker.
|
||||
description: |
|
||||
Understand and manage usage data collected by Docker EE and sent to Docker.
|
||||
ui_tabs:
|
||||
- version: ucp-3.0
|
||||
orhigher: true
|
||||
cli_tabs:
|
||||
- version: docker-cli-linux
|
||||
keywords: enterprise, telemetry, data collection
|
||||
---
|
||||
{% if include.ui %}
|
||||
|
||||
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.
|
||||
{% if include.version=="ucp-3.0" %}
|
||||
|
||||
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
|
||||
Docker EE Engine 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.
|
||||
|
||||
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
|
||||
[`telemetry` plugin documentation](https://store.docker.com/community/images/docker/telemetry).
|
||||
|
||||
If your Docker instance runs in an environment with no internet connectivity,
|
||||
the telemetry plugin does not collect or attempt to send any information to Docker Inc.
|
||||
the telemetry plugin does not collect or attempt to send any information to
|
||||
Docker Inc.
|
||||
|
||||
## Manage data collection
|
||||
|
||||
If you do not wish to send any usage data to Docker Inc., you can disable the plugin,
|
||||
either using the Docker CLI or using Universal Control Plane.
|
||||
If you don't wish to send any usage data to Docker Inc., you can disable the
|
||||
plugin, either using the Docker CLI or using Universal Control Plane.
|
||||
|
||||
> **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.
|
||||
> UCP and CLI
|
||||
>
|
||||
> If you're using Docker EE Standard or Advanced with Universal Control Plane
|
||||
> (UCP), use UCP to enable and disable metrics. Use the CLI only if you don't
|
||||
> have UCP. UCP re-enables the telemetry plugin for hosts where it was
|
||||
> disabled with the CLI.
|
||||
{: .warning}
|
||||
|
||||
### Use the Docker CLI
|
||||
### Use Universal Control Plane
|
||||
|
||||
If you use Universal Control Plane with Docker EE, do not use the Docker CLI to
|
||||
disable the telemetry plugin. Instead, you can manage the information sent to
|
||||
Docker by going to **Admin Settings** and choosing **Usage**.
|
||||
|
||||
{: .with-border}
|
||||
|
||||
To disable the telemetry plugin, disable all three options and click **Save**.
|
||||
Enabling either or both of the top two options will enable the telemetry plugin.
|
||||
You can find out more about an individual option by clicking the **?** icon.
|
||||
|
||||
> API usage metrics
|
||||
>
|
||||
> If API usage statistics are enabled, Docker gathers only aggregate stats
|
||||
> about what API endpoints are used. API payload contents aren't collected.
|
||||
{: .important}
|
||||
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if include.cli %}
|
||||
|
||||
{% if include.version=="docker-cli-linux" %}
|
||||
|
||||
To disable the telemetry plugin, use the `docker plugin disable` with either the plugin NAME or ID:
|
||||
|
||||
|
|
@ -56,5 +101,8 @@ To disable the telemetry plugin, disable all three options and click **Save**.
|
|||
Enabling either or both of the top two options enable the telemetry plugin.
|
||||
You can find out more about an individual option by clicking the **?** icon.
|
||||
|
||||
> **Note**: If API usage statistics are enabled, Docker only gathers aggregate stats about what API endpoints are used. API payload contents are not collected.
|
||||
> **Note**: If API usage statistics are enabled, Docker only gathers aggregate
|
||||
stats about what API endpoints are used. API payload contents are not collected.
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ if (window.navigator.onLine) {
|
|||
isArchive = false;
|
||||
/* This is only relevant to /enterprise/index.md */
|
||||
if (document.getElementById('ee-version-div')) {
|
||||
document.getElementById('ee-version-div').textContent += "The latest version of Docker EE is {{ site.docker_ee_version }}.";
|
||||
document.getElementById('ee-version-div').textContent += "The latest version of Docker EE Engine is {{ site.docker_ee_version }}.";
|
||||
}
|
||||
} });
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue