diff --git a/website/source/intro/getting-started/join.html.markdown b/website/source/intro/getting-started/join.html.markdown index a32e5153f5..f62475de81 100644 --- a/website/source/intro/getting-started/join.html.markdown +++ b/website/source/intro/getting-started/join.html.markdown @@ -141,29 +141,7 @@ learn about one existing member. After joining the cluster, the agents gossip with each other to propagate full membership information. ## Auto-joining a Cluster on Start -Ideally, whenever a new node is brought up in your datacenter, it should -automatically join the Consul cluster without human intervention. To -accomplish this, you can use -[Atlas by HashiCorp](https://atlas.hashicorp.com?utm_source=oss&utm_medium=getting-started-join&utm_campaign=consul) -and the [`-atlas-join` flag](/docs/agent/options.html#_atlas_join). -An example configuration is shown below: - -```text -$ consul agent -atlas-join \ - -atlas=ATLAS_USERNAME/infrastructure \ - -atlas-token="YOUR_ATLAS_TOKEN" -``` -To get an Atlas username and token, -[create an account](https://atlas.hashicorp.com/account/new?utm_source=oss&utm_medium=getting-started-join&utm_campaign=consul) -and replace the respective values in your Consul configuration with your -credentials. Now, whenever a new node comes up with a Consul agent, it -will automatically join your Consul cluster without any hardcoded -configuration. - -Alternatively, you can join a cluster at startup using the -[`-join` flag](https://www.consul.io/docs/agent/options.html#_join) or -[`start_join` setting](https://www.consul.io/docs/agent/options.html#start_join) -with hardcoded addresses of other known Consul agents. +Ideally, whenever a new node is brought up in your datacenter, it should automatically join the Consul cluster without human intervention. Consul facilitates auto-join by enabling the auto-discovery of instances in AWS or Google Cloud with a given tag key/value. To use the integration, add the [`retry_join_ec2`](/docs/agent/options.html?#retry_join_ec2) or the [`retry_join_gce`](/docs/agent/options.html?#retry_join_gce) nested object to your Consul configuration file. This will allow a new node to join the cluster without any hardcoded configuration. Alternatively, you can join a cluster at startup using the [`-join` flag](/docs/agent/options.html#_join) or [`start_join` setting](/docs/agent/options.html#start_join) with hardcoded addresses of other known Consul agents. ## Querying Nodes diff --git a/website/source/intro/getting-started/ui.html.markdown b/website/source/intro/getting-started/ui.html.markdown index 2b8db08955..cceb7255fe 100644 --- a/website/source/intro/getting-started/ui.html.markdown +++ b/website/source/intro/getting-started/ui.html.markdown @@ -13,34 +13,6 @@ box. UIs can be used for viewing all services and nodes, for viewing all health checks and their current status, and for reading and setting key/value data. The UIs automatically support multi-datacenter. -There are two options for running a web UI for Consul: using -[Atlas by HashiCorp](https://atlas.hashicorp.com) to host the -dashboard for you or self-hosting the -[open-source UI](/downloads.html). - -## Atlas-hosted Dashboard - -