diff --git a/css/documentation.css b/css/documentation.css index feecd68d56..9def81ba63 100644 --- a/css/documentation.css +++ b/css/documentation.css @@ -418,3 +418,7 @@ span.reading-time { span.reading-time-label { } + +img.with-border { + border: 1px solid #eaeaea; +} diff --git a/datacenter/images/try-ddc-1.png b/datacenter/images/try-ddc-1.png index 945ecff1e3..f2e44097c4 100644 Binary files a/datacenter/images/try-ddc-1.png and b/datacenter/images/try-ddc-1.png differ diff --git a/datacenter/images/try-ddc-2.png b/datacenter/images/try-ddc-2.png index 9048af8f59..6b6a345688 100644 Binary files a/datacenter/images/try-ddc-2.png and b/datacenter/images/try-ddc-2.png differ diff --git a/datacenter/images/try-ddc-3.png b/datacenter/images/try-ddc-3.png index 364777e84e..a2aeb13e1c 100644 Binary files a/datacenter/images/try-ddc-3.png and b/datacenter/images/try-ddc-3.png differ diff --git a/datacenter/install/linux.md b/datacenter/install/linux.md index 278da26974..f645473185 100644 --- a/datacenter/install/linux.md +++ b/datacenter/install/linux.md @@ -64,9 +64,10 @@ for any necessary configuration values. ### Step 4: License your installation Now that UCP is installed, you need to license it. In your browser, navigate -to the UCP web UI and upload your license. +to the UCP web UI, login with your administrator credentials and upload your +license. -![](../images/try-ddc-1.png) +![](../images/try-ddc-1.png){: .with-border} [Get a free trial license if you don't have one](https://store.docker.com/bundles/docker-datacenter). @@ -76,11 +77,11 @@ Join more nodes so that you can manage them from UCP. Go to the **UCP web UI**, navigate to the **Resources** page, and go to the **Nodes** section. -![](../images/try-ddc-2.png) +![](../images/try-ddc-2.png){: .with-border} Click the **Add Node button** to add a new node. -![](../images/try-ddc-3.png) +![](../images/try-ddc-3.png){: .with-border} Check the 'Add node as a manager' option to join the node as a manager diff --git a/datacenter/ucp/2.0/guides/access-ucp/cli-based-access.md b/datacenter/ucp/2.0/guides/access-ucp/cli-based-access.md index c7b6f8103e..bad6dcc8dc 100644 --- a/datacenter/ucp/2.0/guides/access-ucp/cli-based-access.md +++ b/datacenter/ucp/2.0/guides/access-ucp/cli-based-access.md @@ -29,7 +29,7 @@ controller node. To download a client certificate bundle, log into the **UCP web UI**, and navigate to your user **profile page**. -![](../images/cli-based-access-1.png) +![](../images/cli-based-access-1.png){: .with-border} Click the **Create a Client Bundle** button, to download the certificate bundle. diff --git a/datacenter/ucp/2.0/guides/access-ucp/index.md b/datacenter/ucp/2.0/guides/access-ucp/index.md index 3a71166a4a..b72559a5f5 100644 --- a/datacenter/ucp/2.0/guides/access-ucp/index.md +++ b/datacenter/ucp/2.0/guides/access-ucp/index.md @@ -7,7 +7,7 @@ title: Web-based access Docker Universal Control Plane allows you to manage your cluster in a visual way, from your browser. -![](../images/overview-1.png) +![](../images/web-based-access-1.png){: .with-border} Docker UCP secures your cluster with role-based access control. From the @@ -17,7 +17,7 @@ browser, Administrators can: * Manage the permissions of users and teams, * See all images, networks, volumes, and containers. -![](../images/overview-3.png) +![](../images/web-based-access-2.png){: .with-border} Non-admin users can only see and change the images, networks, volumes, and containers, they are granted access. diff --git a/datacenter/ucp/2.0/guides/applications/deploy-app-cli.md b/datacenter/ucp/2.0/guides/applications/deploy-app-cli.md index f4aadcb07e..ef410df1e9 100644 --- a/datacenter/ucp/2.0/guides/applications/deploy-app-cli.md +++ b/datacenter/ucp/2.0/guides/applications/deploy-app-cli.md @@ -80,7 +80,7 @@ In this example, WordPress was deployed to 172.31.18.153:8000. Navigate to this address in your browser, to start using the WordPress app you just deployed. -![](../images/deploy-app-cli-1.png) +![](../images/deploy-app-cli-1.png){: .with-border} ## Where to go next diff --git a/datacenter/ucp/2.0/guides/applications/index.md b/datacenter/ucp/2.0/guides/applications/index.md index ac8d1433ed..dd6767e9b2 100644 --- a/datacenter/ucp/2.0/guides/applications/index.md +++ b/datacenter/ucp/2.0/guides/applications/index.md @@ -14,7 +14,7 @@ WordPress application. In your browser, **log in** to UCP, and navigate to the **Applications** page. There, click the **Deploy compose.yml** button, to deploy a new application. -![](../images/deploy-app-ui-1.png) +![](../images/deploy-app-ui-1.png){: .with-border} The WordPress application we're going to deploy is composed of two services: @@ -54,25 +54,25 @@ Name the application 'wordpress', and paste the docker-compose.yml definition. You can also upload a docker-compose.yml file from your machine, by clicking on the 'Upload an existing docker-compose.yml' link. -![](../images/deploy-app-ui-2.png) +![](../images/deploy-app-ui-2.png){: .with-border} Click the **Create** button, to create the WordPress application. Once UCP deploys the WordPress application, you can **click on the wordpress_wordpress_1** container, to see its details. -![](../images/deploy-app-ui-3.png) +![](../images/deploy-app-ui-3.png){: .with-border} In the container details page, search for the **Ports** the container is exposing. -![](../images/deploy-app-ui-4.png) +![](../images/deploy-app-ui-4.png){: .with-border} In this example, WordPress can be accessed at `172.31.18.152:8000`. Navigate to this address in your browser, to start using the WordPress app you just deployed. -![](../images/deploy-app-ui-5.png) +![](../images/deploy-app-ui-5.png){: .with-border} ## Limitations @@ -85,7 +85,7 @@ Compose keywords are not supported: * dockerfile * env_file -![](../images/deploy-app-ui-6.png) +![](../images/deploy-app-ui-6.png){: .with-border} To overcome these limitations, you can [deploy your apps from the CLI](deploy-app-cli.md). diff --git a/datacenter/ucp/2.0/guides/configuration/configure-logs.md b/datacenter/ucp/2.0/guides/configuration/configure-logs.md index ed4cadcb65..061776d4e6 100644 --- a/datacenter/ucp/2.0/guides/configuration/configure-logs.md +++ b/datacenter/ucp/2.0/guides/configuration/configure-logs.md @@ -14,7 +14,7 @@ You can configure UCP for sending logs to a remote logging service: 3. Set the information about your logging server, and click **Enable Remote Logging** -![](../images/settings-log.png) +![](../images/configure-logs-1.png){: .with-border} ## Example: Setting up an ELK stack diff --git a/datacenter/ucp/2.0/guides/configuration/integrate-with-ldap.md b/datacenter/ucp/2.0/guides/configuration/integrate-with-ldap.md index dd7cb4440d..85ced42440 100644 --- a/datacenter/ucp/2.0/guides/configuration/integrate-with-ldap.md +++ b/datacenter/ucp/2.0/guides/configuration/integrate-with-ldap.md @@ -14,7 +14,7 @@ To configure UCP to authenticate users using an LDAP service, go to the **UCP web UI**, navigate to the **Settings** page, and click the **Auth** tab. -![](../images/ldap-integration-1.png) +![](../images/ldap-integration-1.png){: .with-border} Then configure your LDAP integration. @@ -82,7 +82,6 @@ Once you've configure the LDAP integration, UCP synchronizes users based on the interval you've defined. When the synchronization runs, UCP stores logs that can help you troubleshoot when something goes wrong. -![](../images/ldap-integration-2.png) You can also manually synchronize users by clicking the **Sync Now** button. diff --git a/datacenter/ucp/2.0/guides/images/add-pk.png b/datacenter/ucp/2.0/guides/images/add-pk.png deleted file mode 100644 index 4ad76ca176..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/add-pk.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/browser_cert_open.png b/datacenter/ucp/2.0/guides/images/browser_cert_open.png deleted file mode 100644 index eb35e781ed..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/browser_cert_open.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/browser_cert_san.png b/datacenter/ucp/2.0/guides/images/browser_cert_san.png deleted file mode 100644 index 72d2d3a920..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/browser_cert_san.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/cli-based-access-1.png b/datacenter/ucp/2.0/guides/images/cli-based-access-1.png index b307c0579d..1845e2981a 100644 Binary files a/datacenter/ucp/2.0/guides/images/cli-based-access-1.png and b/datacenter/ucp/2.0/guides/images/cli-based-access-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/cluster-nodes.png b/datacenter/ucp/2.0/guides/images/cluster-nodes.png deleted file mode 100644 index bdaa48b509..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/cluster-nodes.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/configure-logs-1.png b/datacenter/ucp/2.0/guides/images/configure-logs-1.png new file mode 100644 index 0000000000..d43372e145 Binary files /dev/null and b/datacenter/ucp/2.0/guides/images/configure-logs-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/container-list.png b/datacenter/ucp/2.0/guides/images/container-list.png deleted file mode 100644 index 0d56946720..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/container-list.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-1.png b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-1.png index 2f0e49f9ad..52722b3a19 100644 Binary files a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-1.png and b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-2.png b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-2.png index 6038e42ac4..f4455859db 100644 Binary files a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-2.png and b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-3.png b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-3.png index 9dd0749d47..7c9609c7ff 100644 Binary files a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-3.png and b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-3.png differ diff --git a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-4.png b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-4.png index 3072aa964d..86b42efa5f 100644 Binary files a/datacenter/ucp/2.0/guides/images/create-and-manage-teams-4.png and b/datacenter/ucp/2.0/guides/images/create-and-manage-teams-4.png differ diff --git a/datacenter/ucp/2.0/guides/images/create-users-1.png b/datacenter/ucp/2.0/guides/images/create-users-1.png index 72a69f43eb..a0315e2f91 100644 Binary files a/datacenter/ucp/2.0/guides/images/create-users-1.png and b/datacenter/ucp/2.0/guides/images/create-users-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/create-users-2.png b/datacenter/ucp/2.0/guides/images/create-users-2.png index 047b481144..c04f0f01ab 100644 Binary files a/datacenter/ucp/2.0/guides/images/create-users-2.png and b/datacenter/ucp/2.0/guides/images/create-users-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/create_network.png b/datacenter/ucp/2.0/guides/images/create_network.png deleted file mode 100644 index d383367be0..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/create_network.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-cli-1.png b/datacenter/ucp/2.0/guides/images/deploy-app-cli-1.png index 9ccf43e4d4..0a9c1fcdc1 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-cli-1.png and b/datacenter/ucp/2.0/guides/images/deploy-app-cli-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-ui-1.png b/datacenter/ucp/2.0/guides/images/deploy-app-ui-1.png index 261b23b1e6..c2face85ed 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-ui-1.png and b/datacenter/ucp/2.0/guides/images/deploy-app-ui-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-ui-2.png b/datacenter/ucp/2.0/guides/images/deploy-app-ui-2.png index 05e1564ed3..dc2b9bb80a 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-ui-2.png and b/datacenter/ucp/2.0/guides/images/deploy-app-ui-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-ui-3.png b/datacenter/ucp/2.0/guides/images/deploy-app-ui-3.png index c81e945fce..eab6df78db 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-ui-3.png and b/datacenter/ucp/2.0/guides/images/deploy-app-ui-3.png differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-ui-4.png b/datacenter/ucp/2.0/guides/images/deploy-app-ui-4.png index 67e4daaab8..a96ac1da04 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-ui-4.png and b/datacenter/ucp/2.0/guides/images/deploy-app-ui-4.png differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-ui-5.png b/datacenter/ucp/2.0/guides/images/deploy-app-ui-5.png index 318db9d1ca..0a9c1fcdc1 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-ui-5.png and b/datacenter/ucp/2.0/guides/images/deploy-app-ui-5.png differ diff --git a/datacenter/ucp/2.0/guides/images/deploy-app-ui-6.png b/datacenter/ucp/2.0/guides/images/deploy-app-ui-6.png index 274918c787..506ca800c5 100644 Binary files a/datacenter/ucp/2.0/guides/images/deploy-app-ui-6.png and b/datacenter/ucp/2.0/guides/images/deploy-app-ui-6.png differ diff --git a/datacenter/ucp/2.0/guides/images/explain.gliffy b/datacenter/ucp/2.0/guides/images/explain.gliffy deleted file mode 100644 index 08a9639688..0000000000 --- a/datacenter/ucp/2.0/guides/images/explain.gliffy +++ /dev/null @@ -1 +0,0 @@ -{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#ffffff","width":280,"height":274,"nodeIndex":512,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":300,"maxHeight":300,"themeData":null,"viewportType":"default","fitBB":{"min":{"x":19,"y":8},"max":{"x":280,"y":274}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":17.0,"y":13.5,"rotation":0.0,"id":507,"width":150.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":223,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":5,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

Mac or Windows System

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":23.0,"y":35.0,"rotation":0.0,"id":209,"width":60.0,"height":97.0,"uid":"com.gliffy.shape.network.network_v4.business.server","order":26,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.server","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":208.0,"y":8.0,"rotation":0.0,"id":278,"width":72.0,"height":114.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":35,"lockAspectRatio":false,"lockShape":false,"children":[{"x":36.0,"y":0.0,"rotation":0.0,"id":275,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":31,"lockAspectRatio":true,"lockShape":false,"children":[{"x":7.370770543164145,"y":7.753846153846151,"rotation":0.0,"id":276,"width":25.68922814444095,"height":18.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":34,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":277,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.circle","order":29,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.ellipse.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":17.0,"rotation":0.0,"id":163,"width":61.0,"height":97.0,"uid":"com.gliffy.shape.network.network_v4.business.virtual_server","order":17,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.virtual_server","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.0,"y":0.0,"rotation":0.0,"id":382,"width":67.0,"height":14.0,"uid":null,"order":"auto","lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"both","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

Virtual Host

","tid":null,"valign":"middle","vposition":"below","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":48.0,"y":97.0,"rotation":0.0,"id":177,"width":126.0,"height":75.0,"uid":"com.gliffy.shape.network.network_v4.business.laptop","order":194,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.laptop","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.0,"y":0.0,"rotation":0.0,"id":178,"width":77.0,"height":12.0,"uid":null,"order":196,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"both","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

Docker CLI

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":208.0,"y":144.0,"rotation":0.0,"id":487,"width":72.0,"height":114.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":202,"lockAspectRatio":false,"lockShape":false,"children":[{"x":36.0,"y":0.0,"rotation":0.0,"id":488,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":209,"lockAspectRatio":true,"lockShape":false,"children":[{"x":7.370770543164145,"y":7.753846153846151,"rotation":0.0,"id":489,"width":25.68922814444095,"height":18.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":212,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":490,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.circle","order":207,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.ellipse.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":17.0,"rotation":0.0,"id":491,"width":61.0,"height":97.0,"uid":"com.gliffy.shape.network.network_v4.business.virtual_server","order":201,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.virtual_server","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.0,"y":0.0,"rotation":0.0,"id":492,"width":67.0,"height":14.0,"uid":null,"order":204,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"both","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

Virtual Host

","tid":null,"valign":"middle","vposition":"below","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":128.0,"y":224.0,"rotation":0.0,"id":501,"width":268.0,"height":34.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":219,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":177,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#1c4587","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":1,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[-17.0,-52.0],[-17.0,-3.0],[76.0,-3.0]],"lockSegments":{},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":99.0,"y":85.0,"rotation":0.0,"id":503,"width":98.0,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":221,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":177,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":163,"py":0.2928932188134525,"px":1.1102230246251563E-16}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#1c4587","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":1,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[12.0,12.0],[12.0,-31.58935777509511],[109.0,-31.58935777509511]],"lockSegments":{},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":228}],"shapeStyles":{},"lineStyles":{"global":{"stroke":"#1c4587","strokeWidth":2,"endArrow":1}},"textStyles":{"global":{"face":"Courier","size":"14px","color":"#1c4587","bold":true}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.basic.basic_v1.default"],"lastSerialized":1454999651555,"analyticsProduct":"Confluence"},"embeddedResources":{"index":3,"resources":[{"id":0,"mimeType":"image/svg+xml","data":"\n\n \n logo copy\n Created with Sketch.\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n","width":59.29392246992643,"height":42.185403696,"x":0.4429050300735753,"y":0.7077644040000006},{"id":1,"mimeType":"image/svg+xml","data":"\r\n\r\n\r\n\r\nlogo copy\r\nCreated with Sketch.\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n","width":59.29454583951309,"height":42.2999999999999,"x":0.5054541604868632,"y":0.671429000000046},{"id":2,"mimeType":"image/svg+xml","data":"\r\n\r\n\r\n\r\nlogo copy\r\nCreated with Sketch.\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n","width":59.29454583951309,"height":42.2999999999999,"x":0.5054541604868632,"y":0.671429000000046}]}} \ No newline at end of file diff --git a/datacenter/ucp/2.0/guides/images/explain.png b/datacenter/ucp/2.0/guides/images/explain.png deleted file mode 100644 index 90e8266447..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/explain.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/go_networks.png b/datacenter/ucp/2.0/guides/images/go_networks.png deleted file mode 100644 index 07c266a560..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/go_networks.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/install-production-1.png b/datacenter/ucp/2.0/guides/images/install-production-1.png index 945ecff1e3..f2e44097c4 100644 Binary files a/datacenter/ucp/2.0/guides/images/install-production-1.png and b/datacenter/ucp/2.0/guides/images/install-production-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/install-production-2.png b/datacenter/ucp/2.0/guides/images/install-production-2.png index 9048af8f59..6b6a345688 100644 Binary files a/datacenter/ucp/2.0/guides/images/install-production-2.png and b/datacenter/ucp/2.0/guides/images/install-production-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/install-production-3.png b/datacenter/ucp/2.0/guides/images/install-production-3.png index 364777e84e..a2aeb13e1c 100644 Binary files a/datacenter/ucp/2.0/guides/images/install-production-3.png and b/datacenter/ucp/2.0/guides/images/install-production-3.png differ diff --git a/datacenter/ucp/2.0/guides/images/install-production-4.png b/datacenter/ucp/2.0/guides/images/install-production-4.png index 58ff7dab70..73931dbfa1 100644 Binary files a/datacenter/ucp/2.0/guides/images/install-production-4.png and b/datacenter/ucp/2.0/guides/images/install-production-4.png differ diff --git a/datacenter/ucp/2.0/guides/images/ip_cloud_provider.png b/datacenter/ucp/2.0/guides/images/ip_cloud_provider.png deleted file mode 100644 index 832867380b..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/ip_cloud_provider.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/ldap-integration-1.png b/datacenter/ucp/2.0/guides/images/ldap-integration-1.png index 6e95cbe9e5..f90ffa4e03 100644 Binary files a/datacenter/ucp/2.0/guides/images/ldap-integration-1.png and b/datacenter/ucp/2.0/guides/images/ldap-integration-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/ldap-integration-2.png b/datacenter/ucp/2.0/guides/images/ldap-integration-2.png deleted file mode 100644 index f35fc2b7b1..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/ldap-integration-2.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/license-title.png b/datacenter/ucp/2.0/guides/images/license-title.png deleted file mode 100644 index 9a3958f736..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/license-title.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/license-ucp-1.png b/datacenter/ucp/2.0/guides/images/license-ucp-1.png index 58539aa40d..7d2e114a74 100644 Binary files a/datacenter/ucp/2.0/guides/images/license-ucp-1.png and b/datacenter/ucp/2.0/guides/images/license-ucp-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/license-ucp-2.png b/datacenter/ucp/2.0/guides/images/license-ucp-2.png index 98e21e7a48..6be87ff956 100644 Binary files a/datacenter/ucp/2.0/guides/images/license-ucp-2.png and b/datacenter/ucp/2.0/guides/images/license-ucp-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/login-ani.gif b/datacenter/ucp/2.0/guides/images/login-ani.gif deleted file mode 100644 index 7816b8c8af..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/login-ani.gif and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/login.png b/datacenter/ucp/2.0/guides/images/login.png deleted file mode 100644 index a4deeb34bd..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/login.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/monitor-ucp-1.png b/datacenter/ucp/2.0/guides/images/monitor-ucp-1.png index 1b0ec8bcd0..2af858a661 100644 Binary files a/datacenter/ucp/2.0/guides/images/monitor-ucp-1.png and b/datacenter/ucp/2.0/guides/images/monitor-ucp-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/monitor-ucp-2.png b/datacenter/ucp/2.0/guides/images/monitor-ucp-2.png index 2172b94c00..21d63ee0b6 100644 Binary files a/datacenter/ucp/2.0/guides/images/monitor-ucp-2.png and b/datacenter/ucp/2.0/guides/images/monitor-ucp-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/monitor-ucp-3.png b/datacenter/ucp/2.0/guides/images/monitor-ucp-3.png new file mode 100644 index 0000000000..ff8cfc9d81 Binary files /dev/null and b/datacenter/ucp/2.0/guides/images/monitor-ucp-3.png differ diff --git a/datacenter/ucp/2.0/guides/images/my_new_site.png b/datacenter/ucp/2.0/guides/images/my_new_site.png deleted file mode 100644 index 2c75c16cf9..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/my_new_site.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/nodes-3.png b/datacenter/ucp/2.0/guides/images/nodes-3.png deleted file mode 100644 index da1c42f593..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/nodes-3.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/nodes-page.png b/datacenter/ucp/2.0/guides/images/nodes-page.png deleted file mode 100644 index e02c645ebb..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/nodes-page.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/nodes.png b/datacenter/ucp/2.0/guides/images/nodes.png deleted file mode 100644 index 2e2e5e7932..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/nodes.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/orca_components.png b/datacenter/ucp/2.0/guides/images/orca_components.png deleted file mode 100644 index 75cf37ce04..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/orca_components.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/overview-1.png b/datacenter/ucp/2.0/guides/images/overview-1.png index 0fec27c5b1..6b9a5f5969 100644 Binary files a/datacenter/ucp/2.0/guides/images/overview-1.png and b/datacenter/ucp/2.0/guides/images/overview-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/overview-2.png b/datacenter/ucp/2.0/guides/images/overview-2.png index 6deb52fc7a..e32675bb09 100644 Binary files a/datacenter/ucp/2.0/guides/images/overview-2.png and b/datacenter/ucp/2.0/guides/images/overview-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/overview-3.png b/datacenter/ucp/2.0/guides/images/overview-3.png index df672e6698..6a6cd5c91a 100644 Binary files a/datacenter/ucp/2.0/guides/images/overview-3.png and b/datacenter/ucp/2.0/guides/images/overview-3.png differ diff --git a/datacenter/ucp/2.0/guides/images/port_80.png b/datacenter/ucp/2.0/guides/images/port_80.png deleted file mode 100644 index 6417f295c6..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/port_80.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/replica-nodes.png b/datacenter/ucp/2.0/guides/images/replica-nodes.png deleted file mode 100644 index da1def421d..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/replica-nodes.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/sandbox.gliffy b/datacenter/ucp/2.0/guides/images/sandbox.gliffy deleted file mode 100644 index 9108c1a1ff..0000000000 --- a/datacenter/ucp/2.0/guides/images/sandbox.gliffy +++ /dev/null @@ -1 +0,0 @@ -{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#ffffff","width":404,"height":285,"nodeIndex":502,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":450,"maxHeight":300,"themeData":null,"viewportType":"default","fitBB":{"min":{"x":12,"y":31},"max":{"x":404,"y":285}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":16.0,"y":31.0,"rotation":0.0,"id":475,"width":388.0,"height":254.00000000000003,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":0,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#073763","fillColor":"#cfe2f3","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":22.030093613322748,"y":82.5,"rotation":0.0,"id":403,"width":170.96990638667722,"height":87.37831421221244,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":122,"lockAspectRatio":false,"lockShape":false,"children":[{"x":134.96990638667722,"y":0.0,"rotation":0.0,"id":341,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":118,"lockAspectRatio":true,"lockShape":false,"children":[{"x":7.370770543164145,"y":7.753846153846153,"rotation":0.0,"id":342,"width":25.689228144440957,"height":18.27692307692307,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":121,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":343,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.circle","order":116,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.ellipse.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":40.60940328141335,"y":41.729352796725266,"rotation":45.30544957003446,"id":329,"width":21.83070923529454,"height":20.99791864506468,"uid":"com.gliffy.shape.basic.basic_v1.default.octagon","order":113,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.octagon.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#FFFFFF","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":40.969906386677266,"y":21.0,"rotation":0.0,"id":180,"width":120.0,"height":28.000000000000014,"uid":"com.gliffy.shape.network.network_v4.business.rack_server_1u","order":66,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.rack_server_1u","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.0,"y":0.0,"rotation":0.0,"id":380,"width":38.0,"height":14.0,"uid":null,"order":"auto","lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"both","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

node1

","tid":null,"valign":"middle","vposition":"below","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":2.670491791855227,"y":21.714959313579925,"rotation":119.99999999999999,"id":332,"width":70.48052766952839,"height":44.549787165455825,"uid":"com.gliffy.shape.basic.basic_v1.default.chevron_tail_left","order":8,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.no_fill_no_line_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":333,"width":26.0,"height":12.531462554331648,"uid":null,"order":3,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"ConstWidthConstraint","ConstWidthConstraint":{"width":26}},{"type":"PositionConstraint","PositionConstraint":{"nodeId":332,"px":0.0,"py":0.0,"xOffset":0.0,"yOffset":0.0}}]},"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.partial_shapes.chevron_v1.chevron.chevron_nose_left","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":26.0,"y":0.0,"rotation":0.0,"id":334,"width":19.480527669528385,"height":12.531462554331648,"uid":null,"order":6,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"WidthConstraint","WidthConstraint":{"isMin":false,"widthInfo":[{"magnitude":1,"id":332}],"minWidth":0.0,"growParent":false,"padding":-51.0}}]},"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.partial_shapes.chevron_v1.chevron.chevron_body","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":335,"width":19.480527669528385,"height":20.0,"uid":null,"order":12,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"WidthConstraint","WidthConstraint":{"isMin":false,"widthInfo":[{"magnitude":1,"id":334}],"minWidth":0.0,"growParent":false,"padding":0.0}}]},"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":3,"paddingRight":2,"paddingBottom":3,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

 

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":45.480527669528385,"y":0.0,"rotation":0.0,"id":336,"width":27.0,"height":12.531462554331648,"uid":null,"order":15,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"ConstWidthConstraint","ConstWidthConstraint":{"width":27}},{"type":"PositionConstraint","PositionConstraint":{"nodeId":332,"px":1.0,"py":0.0,"xOffset":-25.0,"yOffset":0.0}}]},"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.partial_shapes.chevron_v1.chevron.chevron_tail_right","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":187.0300936133228,"y":83.5,"rotation":0.0,"id":420,"width":170.96990638667722,"height":87.37831421221244,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":131,"lockAspectRatio":false,"lockShape":false,"children":[{"x":134.96990638667722,"y":0.0,"rotation":0.0,"id":421,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":150,"lockAspectRatio":true,"lockShape":false,"children":[{"x":7.370770543164145,"y":7.753846153846153,"rotation":0.0,"id":422,"width":25.689228144440957,"height":18.27692307692307,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":153,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":423,"width":36.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.circle","order":148,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.ellipse.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":40.60940328141335,"y":41.729352796725266,"rotation":45.30544957003446,"id":424,"width":21.83070923529454,"height":20.99791864506468,"uid":"com.gliffy.shape.basic.basic_v1.default.octagon","order":145,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.octagon.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#FFFFFF","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":40.969906386677266,"y":21.0,"rotation":0.0,"id":425,"width":120.0,"height":28.000000000000014,"uid":"com.gliffy.shape.network.network_v4.business.rack_server_1u","order":140,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.rack_server_1u","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.0,"y":0.0,"rotation":0.0,"id":426,"width":38.0,"height":14.0,"uid":null,"order":143,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"both","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

node2

","tid":null,"valign":"middle","vposition":"below","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":2.670491791855227,"y":21.714959313579925,"rotation":119.99999999999999,"id":427,"width":70.48052766952839,"height":44.549787165455825,"uid":"com.gliffy.shape.basic.basic_v1.default.chevron_tail_left","order":130,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.no_fill_no_line_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.1316282072803006E-14,"y":0.0,"rotation":0.0,"id":428,"width":26.0,"height":12.531462554331648,"uid":null,"order":125,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"ConstWidthConstraint","ConstWidthConstraint":{"width":26}},{"type":"PositionConstraint","PositionConstraint":{"nodeId":427,"px":0.0,"py":0.0,"xOffset":0.0,"yOffset":0.0}}]},"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.partial_shapes.chevron_v1.chevron.chevron_nose_left","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":26.0,"y":0.0,"rotation":0.0,"id":429,"width":19.480527669528385,"height":12.531462554331648,"uid":null,"order":128,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"WidthConstraint","WidthConstraint":{"isMin":false,"widthInfo":[{"magnitude":1,"id":427}],"minWidth":0.0,"growParent":false,"padding":-51.0}}]},"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.partial_shapes.chevron_v1.chevron.chevron_body","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":430,"width":19.480527669528385,"height":20.0,"uid":null,"order":135,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"WidthConstraint","WidthConstraint":{"isMin":false,"widthInfo":[{"magnitude":1,"id":429}],"minWidth":0.0,"growParent":false,"padding":0.0}}]},"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":3,"paddingRight":2,"paddingBottom":3,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

 

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":45.480527669528385,"y":0.0,"rotation":0.0,"id":431,"width":27.0,"height":12.531462554331648,"uid":null,"order":138,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[{"type":"ConstWidthConstraint","ConstWidthConstraint":{"width":27}},{"type":"PositionConstraint","PositionConstraint":{"nodeId":427,"px":1.0,"py":0.0,"xOffset":-25.0,"yOffset":0.0}}]},"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.partial_shapes.chevron_v1.chevron.chevron_tail_right","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":41.0,"y":52.0,"rotation":0.0,"id":445,"width":343.0,"height":135.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":154,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","gradient":false,"dashStyle":"8,8","dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":142.0,"y":171.0,"rotation":0.0,"id":379,"width":150.0,"height":81.5,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":191,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":67.5,"rotation":0.0,"id":374,"width":150.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":193,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

Swarm Cluster

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":34.0,"y":0.0,"rotation":0.0,"id":373,"width":83.0,"height":64.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":190,"lockAspectRatio":false,"lockShape":false,"children":[{"x":13.370770543164099,"y":10.253846153846155,"rotation":0.0,"id":372,"width":56.689228144440946,"height":41.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":188,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":23.0,"rotation":0.0,"id":355,"width":56.689228144440904,"height":18.276923076923055,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":180,"lockAspectRatio":false,"lockShape":false,"children":[{"x":31.0,"y":0.0,"rotation":0.0,"id":356,"width":25.68922814444095,"height":18.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":185,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":357,"width":25.68922814444095,"height":18.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":176,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":354,"width":56.689228144440904,"height":18.276923076923055,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":171,"lockAspectRatio":false,"lockShape":false,"children":[{"x":31.0,"y":0.0,"rotation":0.0,"id":352,"width":25.68922814444095,"height":18.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":167,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":347,"width":25.68922814444095,"height":18.27692307692306,"uid":"com.gliffy.shape.basic.basic_v1.default.svg","order":162,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Svg","Svg":{"embeddedResourceId":0,"strokeWidth":2.0,"strokeColor":"#000000","dropShadow":true,"shadowX":5.0,"shadowY":5.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":350,"width":83.0,"height":64.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":157,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"#0b5394","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":26.0,"y":258.5,"rotation":0.0,"id":477,"width":150.0,"height":16.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":197,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

UCP Installation

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":10.0,"y":81.5,"rotation":0.0,"id":486,"width":150.0,"height":16.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":198,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"

controller

","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":219}],"shapeStyles":{},"lineStyles":{"global":{"stroke":"#999999","strokeWidth":6}},"textStyles":{"global":{"face":"Courier","size":"14px","color":"#1c4587"}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.basic.basic_v1.default"],"lastSerialized":1454999446656,"analyticsProduct":"Confluence"},"embeddedResources":{"index":3,"resources":[{"id":0,"mimeType":"image/svg+xml","data":"\n\n \n logo copy\n Created with Sketch.\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n","width":59.29392246992643,"height":42.185403696,"x":0.4429050300735753,"y":0.7077644040000006},{"id":1,"mimeType":"image/svg+xml","data":"\r\n\r\n\r\n\r\nlogo copy\r\nCreated with Sketch.\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n","width":59.29454583951309,"height":42.2999999999999,"x":0.5054541604868632,"y":0.671429000000046},{"id":2,"mimeType":"image/svg+xml","data":"\r\n\r\n\r\n\r\nlogo copy\r\nCreated with Sketch.\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n","width":59.29454583951309,"height":42.2999999999999,"x":0.5054541604868632,"y":0.671429000000046}]}} \ No newline at end of file diff --git a/datacenter/ucp/2.0/guides/images/sandbox.png b/datacenter/ucp/2.0/guides/images/sandbox.png deleted file mode 100644 index 13321bb8b4..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/sandbox.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/scale-your-cluster-1.png b/datacenter/ucp/2.0/guides/images/scale-your-cluster-1.png index 9048af8f59..864aa80f62 100644 Binary files a/datacenter/ucp/2.0/guides/images/scale-your-cluster-1.png and b/datacenter/ucp/2.0/guides/images/scale-your-cluster-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/scale-your-cluster-2.png b/datacenter/ucp/2.0/guides/images/scale-your-cluster-2.png index 364777e84e..fa2ebba2f6 100644 Binary files a/datacenter/ucp/2.0/guides/images/scale-your-cluster-2.png and b/datacenter/ucp/2.0/guides/images/scale-your-cluster-2.png differ diff --git a/datacenter/ucp/2.0/guides/images/scale-your-cluster-3.png b/datacenter/ucp/2.0/guides/images/scale-your-cluster-3.png index 58ff7dab70..e32675bb09 100644 Binary files a/datacenter/ucp/2.0/guides/images/scale-your-cluster-3.png and b/datacenter/ucp/2.0/guides/images/scale-your-cluster-3.png differ diff --git a/datacenter/ucp/2.0/guides/images/scale-your-cluster-4.png b/datacenter/ucp/2.0/guides/images/scale-your-cluster-4.png index dccf955ebc..542dd82a60 100644 Binary files a/datacenter/ucp/2.0/guides/images/scale-your-cluster-4.png and b/datacenter/ucp/2.0/guides/images/scale-your-cluster-4.png differ diff --git a/datacenter/ucp/2.0/guides/images/settings-log.png b/datacenter/ucp/2.0/guides/images/settings-log.png deleted file mode 100644 index 05d1411d9b..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/settings-log.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/troubleshoot-ucp-1.png b/datacenter/ucp/2.0/guides/images/troubleshoot-ucp-1.png index 2172b94c00..ff8cfc9d81 100644 Binary files a/datacenter/ucp/2.0/guides/images/troubleshoot-ucp-1.png and b/datacenter/ucp/2.0/guides/images/troubleshoot-ucp-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/votingapp-net.png b/datacenter/ucp/2.0/guides/images/votingapp-net.png deleted file mode 100644 index 7064d5f7d2..0000000000 Binary files a/datacenter/ucp/2.0/guides/images/votingapp-net.png and /dev/null differ diff --git a/datacenter/ucp/2.0/guides/images/web-based-access-1.png b/datacenter/ucp/2.0/guides/images/web-based-access-1.png new file mode 100644 index 0000000000..6b9a5f5969 Binary files /dev/null and b/datacenter/ucp/2.0/guides/images/web-based-access-1.png differ diff --git a/datacenter/ucp/2.0/guides/images/web-based-access-2.png b/datacenter/ucp/2.0/guides/images/web-based-access-2.png new file mode 100644 index 0000000000..6a6cd5c91a Binary files /dev/null and b/datacenter/ucp/2.0/guides/images/web-based-access-2.png differ diff --git a/datacenter/ucp/2.0/guides/index.md b/datacenter/ucp/2.0/guides/index.md index 0ce86293d0..4b5ab9d26e 100644 --- a/datacenter/ucp/2.0/guides/index.md +++ b/datacenter/ucp/2.0/guides/index.md @@ -10,7 +10,7 @@ solution from Docker. You install it on-premises or in your virtual private cloud, and it helps you manage your Docker cluster and applications from a single place. -![](images/overview-1.png) +![](images/overview-1.png){: .with-border} ## Centralized cluster management @@ -21,7 +21,7 @@ by Docker to make it easier to manage your cluster from a centralized place. You can manage and monitor your container cluster using a graphical UI. -![](images/overview-2.png) +![](images/overview-2.png){: .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 @@ -61,7 +61,7 @@ Docker UCP has its own built-in authentication mechanism and integrates with LDAP services. It also has Role Based Access Control (RBAC), so that you can control who can access and make changes to your cluster and applications. -![](images/overview-3.png) +![](images/overview-3.png){: .with-border} Docker UCP integrates with Docker Trusted Registry so that you can keep the Docker images you use for your applications behind your firewall, where they diff --git a/datacenter/ucp/2.0/guides/installation/index.md b/datacenter/ucp/2.0/guides/installation/index.md index 6ed654a45d..5e645c40c3 100644 --- a/datacenter/ucp/2.0/guides/installation/index.md +++ b/datacenter/ucp/2.0/guides/installation/index.md @@ -59,7 +59,7 @@ To install UCP: 2. Run the following command: - ```bash + ```none # Pull the latest version of UCP $ docker pull docker/ucp:latest @@ -79,9 +79,10 @@ To install UCP: ## Step 5: License your installation Now that UCP is installed, you need to license it. In your browser, navigate -to the UCP web UI and upload your license. +to the UCP web UI, login with your administrator credentials and upload your +license. -![](../images/install-production-1.png) +![](../images/install-production-1.png){: .with-border} If you don't have a license yet, [learn how to get a free trial license](license.md). @@ -98,11 +99,11 @@ for worker nodes to execute. To join manager nodes to the swarm, go to the **UCP web UI**, navigate to the **Resources** page, and go to the **Nodes** section. -![](../images/install-production-2.png) +![](../images/install-production-2.png){: .with-border} Click the **Add Node button** to add a new node. -![](../images/install-production-3.png) +![](../images/install-production-3.png){: .with-border} Check the 'Add node as a manager' to turn this node into a manager and replicate UCP for high-availability. @@ -116,7 +117,7 @@ can reach it. For each manager node that you want to join to UCP, login into that node using ssh, and run the join command that is displayed on UCP. -![](../images/install-production-4.png) +![](../images/install-production-4.png){: .with-border} After you run the join command in the node, the node starts being displayed in UCP. diff --git a/datacenter/ucp/2.0/guides/installation/license.md b/datacenter/ucp/2.0/guides/installation/license.md index da5cb23785..f726b30b12 100644 --- a/datacenter/ucp/2.0/guides/installation/license.md +++ b/datacenter/ucp/2.0/guides/installation/license.md @@ -12,7 +12,7 @@ installation. Here's how to do it. Go to [Docker Store](https://store.docker.com/bundles/docker-datacenter) and download your UCP license or get a free trial license. -![](../images/license-ucp-1.png) +![](../images/license-ucp-1.png){: .with-border} ## License your installation @@ -23,7 +23,7 @@ page**. On the **License** page you can upload the new license. -![](../images/license-ucp-2.png) +![](../images/license-ucp-2.png){: .with-border} Click **Upload License** for the changes to take effect. diff --git a/datacenter/ucp/2.0/guides/installation/scale-your-cluster.md b/datacenter/ucp/2.0/guides/installation/scale-your-cluster.md index 4e5171c80d..5e030a86ae 100644 --- a/datacenter/ucp/2.0/guides/installation/scale-your-cluster.md +++ b/datacenter/ucp/2.0/guides/installation/scale-your-cluster.md @@ -33,11 +33,11 @@ manager or worker: To add join nodes to the cluster, go to the **UCP web UI**, navigate to the **Resources** page, and go to the **Nodes** section. -![](../images/scale-your-cluster-1.png) +![](../images/scale-your-cluster-1.png){: .with-border} Click the **Add Node button** to add a new node. -![](../images/scale-your-cluster-2.png) +![](../images/scale-your-cluster-2.png){: .with-border} Check the 'Add node as a manager' option if you want to add the node as manager. Also, set the 'Use a custom listen address' option to specify the IP of the @@ -46,7 +46,7 @@ host that you'll be joining to the cluster. Then you can copy the command displayed, use ssh to **log into the host** that you want to join to the cluster, and **run the command** on that host. -![](../images/scale-your-cluster-3.png) +![](../images/scale-your-cluster-3.png){: .with-border} After you run the join command in the node, the node starts being displayed in UCP. @@ -62,6 +62,8 @@ so that it is: * Drained: the node won't receive new tasks. Existing tasks are stopped and replica tasks are launched in active nodes. +![](../images/scale-your-cluster-4.png){: .with-border} + If you're load-balancing user requests to UCP across multiple manager nodes, when demoting those nodes into workers, don't forget to remove them from your load-balancing pool. diff --git a/datacenter/ucp/2.0/guides/monitor/index.md b/datacenter/ucp/2.0/guides/monitor/index.md index ab4be03cf2..50bc30edd9 100644 --- a/datacenter/ucp/2.0/guides/monitor/index.md +++ b/datacenter/ucp/2.0/guides/monitor/index.md @@ -5,78 +5,65 @@ keywords: Docker, UCP, troubleshoot title: Monitor your cluster --- -This article gives you an overview of how to monitor your Docker UCP -cluster. Here you'll also find the information you need to troubleshoot -if something goes wrong. - +This article gives you an overview of how to monitor your Docker UCP. ## Check the cluster status from the UI To monitor your UCP cluster, the first thing to check is the **Nodes** screen on the UCP web app. -![UCP dashboard](../images/monitor-ucp-1.png) +![UCP dashboard](../images/monitor-ucp-1.png){: .with-border} In the nodes screen you can see if all the nodes in the cluster are healthy, or if there is any problem. -You can also check the state of individual UCP containers by navigating to the -**Containers** page. By default the Containers screen doesn't display system -containers. On the filter dropdown choose **Show all containers** to see all -the UCP components. +If you're an administrator you can also check the state and logs of the +UCP internal services. -![UCP dashboard](../images/monitor-ucp-2.png) +To check the state of the `ucp-agent` service, navigate to the **Services** page +and toggle the **Show system services** option. -You can click on a container to see more details like configurations and logs. +![](../images/monitor-ucp-2.png){: .with-border} +The `ucp-agent` service monitors the node where it is running, deploys other +UCP internal components, and ensures they keep running. The UCP components that +are deployed on a node, depend on whether the node is a manager or worker. +[Learn more about the UCP architecture](../architecture.md) + +To check the state and logs of other UCP internal components, go to the +**Containers** page, and appply the **System containers** filter. +This can help validate that all UCP internal components are up and running. + +![](../images/monitor-ucp-3.png){: .with-border} + +It's normal for the `ucp-reconcile` to be stopped. This container only runs when +the `ucp-agent` detects that a UCP internal component should be running but for +some reason it's not. In this case the `ucp-agent` starts the `ucp-reconcile` +service to start all UCP services that need to be running. Once that is done, +the `ucp-agent` stops. ## Check the cluster status from the CLI -You can also monitor the status of a UCP cluster, using the Docker CLI client. +You can also monitor the status of a UCP cluster using the Docker CLI client. +There are two ways to do this, using a +[client certificate bundle](../access-ucp/cli-based-access.md), or logging into +one of the manager nodes using ssh. -1. Get a client certificate bundle. +Then you can use regular Docker CLI commands to check the status and logs +of the [UCP internal services and containers](../architecture.md). - When using the Docker CLI client you need to authenticate using client - certificates. - [Learn how to use client certificates](../access-ucp/cli-based-access.md). +## Automated status checking - If your client certificate bundle is for a non-admin user, you won't have - permissions to execute all docker commands, or see all information about - the cluster. +You can use the `https:///_ping` endpoint to perform automated +monitoring tasks. When you access this endpoint, UCP validates that all its +internal components are working, and returns the following HTTP error codes: -2. Use the `docker info` command to check the cluster status. - - ```bash - $ docker info - - Containers: 11 - Nodes: 2 - ucp: 192.168.99.100:12376 - └ Status: Healthy - ucp-node: 192.168.99.101:12376 - └ Status: Healthy - Cluster Managers: 1 - 192.168.99.104: Healthy - └ Orca Controller: https://192.168.99.100:443 - └ Swarm Manager: tcp://192.168.99.100:3376 - └ KV: etcd://192.168.99.100:12379 - ``` - -3. Check the container logs - - With an admin user certificate bundle, you can run docker commands directly - on the Docker Engine or Swarm Manager of a node. In this example, we are - connecting directly to the Docker Engine running on the UCP controller, and - requesting the logs of the ucp-kv container. - - ```bash - $ docker -H tcp://192.168.99.101:12376 logs ucp-kv - - 2016-04-18 22:40:51.553912 I | etcdserver: start to snapshot (applied: 40004, lastsnap: 30003) - 2016-04-18 22:40:51.561682 I | etcdserver: saved snapshot at index 40004 - 2016-04-18 22:40:51.561927 I | etcdserver: compacted raft log at 35004 - ``` +* 200, if all components are healthy +* 500, if one or more components are not healthy +If you're accessing this endpoint through a load balancer, you'll have no way to +know which UCP manager node is not healthy. So make sure you make a request +directly to each manager node. ## Where to go next diff --git a/datacenter/ucp/2.0/guides/monitor/troubleshoot.md b/datacenter/ucp/2.0/guides/monitor/troubleshoot.md index cac26b6a88..2cf6b35118 100644 --- a/datacenter/ucp/2.0/guides/monitor/troubleshoot.md +++ b/datacenter/ucp/2.0/guides/monitor/troubleshoot.md @@ -16,7 +16,7 @@ page of UCP. By default the UCP system containers are hidden. Click the **Show all containers** option for the UCP system containers to be listed as well. -![](../images/troubleshoot-ucp-1.png) +![](../images/troubleshoot-ucp-1.png){: .with-border} You can click on a container to see more details like its configurations and logs. diff --git a/datacenter/ucp/2.0/guides/user-management/create-and-manage-teams.md b/datacenter/ucp/2.0/guides/user-management/create-and-manage-teams.md index 438823aac5..152a8c04fa 100644 --- a/datacenter/ucp/2.0/guides/user-management/create-and-manage-teams.md +++ b/datacenter/ucp/2.0/guides/user-management/create-and-manage-teams.md @@ -13,32 +13,20 @@ A team defines the permissions users have for resources that have the label To create a new team, go to the **UCP web UI**, and navigate to the **Users & Teams** page. -![](../images/create-and-manage-teams-1.png) +![](../images/create-and-manage-teams-1.png){: .with-border} -Click the **Create** button to create a new team. +Click the **Create** button to create a new team, and assign it a name. -![](../images/create-and-manage-teams-2.png) - -Give a name to the team, and choose if the team is managed by UCP, or -discovered from an LDAP service: - -* Managed: You'll manage the team and manually define the users that are part -of the team. -* Discovered: When integrating with an LDAP service, you can map a team to -an LDAP group. When a user is added to the LDAP group, it is automatically added -to the UCP team. +![](../images/create-and-manage-teams-2.png){: .with-border} ## Add users to a team -If you've created a managed team, you can now add and remove users from the -team. +You can now add and remove users from the team. Navigate to the **Members** tab, and click the **Add User to Team** button. Then choose the list of users that you want to add to the team. -![](../images/create-and-manage-teams-3.png) +![](../images/create-and-manage-teams-3.png){: .with-border} -If you've created a discovered team, users are automatically added and removed -from the team the next time UCP synchronizes with the LDAP server. ## Manage team permissions @@ -46,11 +34,12 @@ To manage the permissions of the team, click the **Permissions** tab. Here you can specify a list of labels and the permission level users will have for resources with those labels. -![](../images/create-and-manage-teams-4.png) +![](../images/create-and-manage-teams-4.png){: .with-border} In the example above, members of the 'Operations' team have permissions to create and edit resources that have the labels -`com.docker.ucp.access.label=crm` or `com.docker.ucp.access.label=billing`. +`com.docker.ucp.access.label=operations` applied, but can only view resources +that have the `com.docker.ucp.access.label=blog` label. There are four permission levels available: diff --git a/datacenter/ucp/2.0/guides/user-management/create-and-manage-users.md b/datacenter/ucp/2.0/guides/user-management/create-and-manage-users.md index 8af945bf18..635838a240 100644 --- a/datacenter/ucp/2.0/guides/user-management/create-and-manage-users.md +++ b/datacenter/ucp/2.0/guides/user-management/create-and-manage-users.md @@ -12,11 +12,11 @@ cluster. To create a new user, go to the **UCP web UI**, and navigate to the **Users & Teams** page. -![](../images/create-users-1.png) +![](../images/create-users-1.png){: .with-border} Click the **Create User** button, and fill-in the user information. -![](../images/create-users-2.png) +![](../images/create-users-2.png){: .with-border} Check the 'Is a UCP admin' option, if you want to grant permissions for the user to change cluster configurations. Also, assign the user with a default