From 5c02e391e39a3990f91e8bb9cbf22b816a40297d Mon Sep 17 00:00:00 2001 From: Andreas Neumann Date: Fri, 9 Aug 2019 15:38:41 +0200 Subject: [PATCH] Update documentation links to D2iQ url and changed pathes (#7018) --- docs/docs/auth-access-ctrl.md | 2 +- docs/docs/fault-domain-awareness.md | 2 +- docs/docs/native-docker-private-registry.md | 2 +- docs/docs/networking.md | 6 +++--- docs/docs/pods.md | 2 +- docs/docs/waiting.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/docs/auth-access-ctrl.md b/docs/docs/auth-access-ctrl.md index 68718c130ea..da91aca2b8f 100644 --- a/docs/docs/auth-access-ctrl.md +++ b/docs/docs/auth-access-ctrl.md @@ -6,4 +6,4 @@ title: Authorization and Access Control If you are using Marathon on DC/OS, you can define fine-grained access to applications by creating advanced ACL groups in your native Marathon instance. Advanced ACL groups provide multi-tenancy by isolating application teams as well as individual users. You can also control customized access to applications, for example, to provide read-only access. -This feature is only available in Marathon deployed with DC/OS. See [the DC/OS docs](https://docs.mesosphere.com/latest/security/ent/iam-api/) for this feature. +This feature is only available in Marathon deployed with DC/OS. See [the DC/OS docs](https://docs.d2iq.com/mesosphere/dcos/latest/security/ent/iam-api/) for this feature. diff --git a/docs/docs/fault-domain-awareness.md b/docs/docs/fault-domain-awareness.md index 5689fb67956..c0314c6ccd1 100644 --- a/docs/docs/fault-domain-awareness.md +++ b/docs/docs/fault-domain-awareness.md @@ -95,6 +95,6 @@ Suppose we have a Mesos cluster that spans 3 regions: `aws-us-east1`, `aws-us-ea ### Increase Cluster Capacity -To increase capacity, [add new agents](https://docs.mesosphere.com/latest/administering-clusters/add-a-node/) to a remote region or regions of your cluster, and then update your services to launch instances in that region or those regions appropriately. +To increase capacity, [add new agents](https://docs.d2iq.com/mesosphere/dcos/latest/administering-clusters/add-a-node/) to a remote region or regions of your cluster, and then update your services to launch instances in that region or those regions appropriately. **Note:** You cannot configure your service to run in more than one region. diff --git a/docs/docs/native-docker-private-registry.md b/docs/docs/native-docker-private-registry.md index a89def1fd54..92f9ca70a53 100644 --- a/docs/docs/native-docker-private-registry.md +++ b/docs/docs/native-docker-private-registry.md @@ -37,7 +37,7 @@ As of Marathon 1.5, you can upload your private Docker registry credentials to a } ``` -1. Add the `config.json` file to a secret store. If you are using Enterprise DC/OS, [follow these instructions to add the file to the DC/OS secret store](https://docs.mesosphere.com/latest/security/ent/secrets/create-secrets/#creating-secrets). +1. Add the `config.json` file to a secret store. If you are using Enterprise DC/OS, [follow these instructions to add the file to the DC/OS secret store](https://docs.d2iq.com/mesosphere/dcos/latest/security/ent/secrets/create-secrets/#creating-secrets). ### Step 2: Add the Secret to your App or Pod Definition diff --git a/docs/docs/networking.md b/docs/docs/networking.md index 50a48555e0d..ff7334f3aa5 100644 --- a/docs/docs/networking.md +++ b/docs/docs/networking.md @@ -12,7 +12,7 @@ See the [Migrating to the 1.5 Networking API](upgrade/network-api-for-apps.html) ### VIPs -If you are running Marathon within a [DC/OS cluster](https://dcos.io/get-started), you can use [virtual addresses (VIPs)](https://docs.mesosphere.com/latest/networking/load-balancing-vips/) to make ports management easier. +If you are running Marathon within a [DC/OS cluster](https://dcos.io/get-started), you can use [virtual addresses (VIPs)](https://docs.d2iq.com/mesosphere/dcos/latest/networking/load-balancing-vips/) to make ports management easier. VIPs simplify inter-app communication and implement a reliable service-oriented architecture. VIPs map traffic from a single virtual address to multiple IP addresses and ports. @@ -122,7 +122,7 @@ In Marathon, this is referred to as the service port. The service port is specif The service port is metadata; Marathon does not do anything with this information except track it and provide it to a load balancer. The DevOps team setting up this service is expected to create a script or provide a means to read the `servicePort` and configure the load balancer to route calls to that port (port `8080` in this case) to each of the instances of the application. All metadata is queryable from Marathon. -The [Marathon-LB service](https://docs.mesosphere.com/latest/networking/marathon-lb/), when configured, does exactly this. Marathon-LB will register all instances of an app and route to its configured `servicePort`. Marathon-LB is an HAProxy service with scripts that will register all instances of an app and route to its configured `servicePort`. In the configuration in this example, a client will connect to a load balancer at port `8080` (`servicePort`), which will route (with an algorithm) to `10.0.0.2:31000` (`hostPort`), which will in turn route to `8080` (`containerPort`) of the internal application. +The [Marathon-LB service](https://docs.d2iq.com/mesosphere/dcos/latest/networking/marathon-lb/), when configured, does exactly this. Marathon-LB will register all instances of an app and route to its configured `servicePort`. Marathon-LB is an HAProxy service with scripts that will register all instances of an app and route to its configured `servicePort`. In the configuration in this example, a client will connect to a load balancer at port `8080` (`servicePort`), which will route (with an algorithm) to `10.0.0.2:31000` (`hostPort`), which will in turn route to `8080` (`containerPort`) of the internal application. #### The `VIP_0` Label Use Case @@ -226,7 +226,7 @@ Additional [per-task enviroment variables](task-environment-vars.html) are also #### Virtual addresses -See the DC/OS documentation for [virtual addresses (VIPs)](https://docs.mesosphere.com/latest/networking/load-balancing-vips/). +See the DC/OS documentation for [virtual addresses (VIPs)](https://docs.d2iq.com/mesosphere/dcos/latest/networking/load-balancing-vips/). ## Examples diff --git a/docs/docs/pods.md b/docs/docs/pods.md index 4fca4502813..d63d589403a 100644 --- a/docs/docs/pods.md +++ b/docs/docs/pods.md @@ -865,7 +865,7 @@ The following pod definition specifies an ephemeral volume called `v1`. +The following pod definition specifies a virtual (user) network named `dcos`. The `networks:mode:container` field creates the virtual network. The `name` field is optional. If you have installed DC/OS using [our AWS templates](https://docs.d2iq.com/mesosphere/dcos/latest/installing/oss/cloud/aws/), the default virtual network name is `dcos`. ```json { diff --git a/docs/docs/waiting.md b/docs/docs/waiting.md index d0241747753..b4a5e17bbdb 100644 --- a/docs/docs/waiting.md +++ b/docs/docs/waiting.md @@ -25,7 +25,7 @@ Apps or pods often fail to deploy because the resource offers from Mesos do not There are several reasons why your app or pod may fail to deploy. Some possibilities include: - Marathon isn't getting the resource offers it needs to launch the app. - If you are using DC/OS, use the [CLI](https://docs.mesosphere.com/latest/monitoring/debugging/cli-debugging/) debug subcommands or the [debugging page in the DC/OS web interface](https://docs.mesosphere.com/latest/monitoring/debugging/gui-debugging/) to troubleshoot unmatched or unaccepted resource offers from Mesos. You can also [consult the service and task logs](https://docs.mesosphere.com/latest/monitoring/logging/). + If you are using DC/OS, use the [CLI](https://docs.d2iq.com/mesosphere/dcos/latest/monitoring/debugging/cli-debugging/) debug subcommands or the [debugging page in the DC/OS web interface](https://docs.d2iq.com/mesosphere/dcos/latest/monitoring/debugging/gui-debugging/) to troubleshoot unmatched or unaccepted resource offers from Mesos. You can also [consult the service and task logs](https://docs.d2iq.com/mesosphere/dcos/latest/monitoring/logging/). Otherwise, consult the Marathon UI and the Mesos UI to see the health and resource use of your app or pod.