Merge pull request #2597 from hashicorp/atlas-deprecation-notice

Add a notice about deprecation of atlas features

command/agent/command.go

@@ -1125,6 +1125,10 @@ func (c *Command) setupScadaConn(config *Config) error {
 		return nil
 	}
 
+	c.Ui.Error("WARNING: The hosted version of Consul Enterprise will be deprecated " +
+		"on March 7th, 2017. For details, see " +
+		"https://atlas.hashicorp.com/help/consul/alternatives")
+
 	scadaConfig := &scada.Config{
 		Service:      "consul",
 		Version:      fmt.Sprintf("%s%s", config.Version, config.VersionPrerelease),

website/source/docs/agent/options.html.markdown

@@ -53,6 +53,9 @@ The options below are all specified on the command-line.
   address when being accessed from a remote datacenter if the remote datacenter is configured
   with <a href="#translate_wan_addrs">`translate_wan_addrs`</a>.
 
+~> **Notice:** The hosted version of Consul Enterprise will be deprecated on
+  March 7th, 2017. For details, see https://atlas.hashicorp.com/help/consul/alternatives
+
 * <a name="_atlas"></a><a href="#_atlas">`-atlas`</a> - This flag
   enables [Atlas](https://atlas.hashicorp.com) integration.
   It is used to provide the Atlas infrastructure name and the SCADA connection. The format of

website/source/docs/guides/atlas.html.markdown

@@ -8,6 +8,9 @@ description: |-
 
 # Atlas Integration
 
+~> **Notice:** The hosted version of Consul Enterprise will be deprecated on
+March 7th, 2017. For details, see https://atlas.hashicorp.com/help/consul/alternatives
+
 [Atlas](https://atlas.hashicorp.com?utm_source=oss&utm_medium=guide-atlas&utm_campaign=consul) is a service provided by HashiCorp to deploy applications and manage infrastructure.
 Starting with Consul 0.5, it is possible to integrate Consul with Atlas. Atlas is able to display the state of the Consul cluster in its dashboard and set up alerts based on health checks. Additionally, nodes can use Atlas to auto-join a Consul cluster without hardcoding any configuration.
 
@@ -18,7 +21,7 @@ Atlas is able to securely retrieve data from nodes as Consul maintains a long-ru
 
 To enable Atlas integration, you must specify the name of the Atlas infrastructure and the Atlas authentication
 token in your Consul configuration. The Atlas infrastructure name can be set either with the [`-atlas` CLI flag](/docs/agent/options.html#_atlas) or with the [`atlas_infrastructure` configuration option](/docs/agent/options.html#atlas_infrastructure). The Atlas token is set with the [`-atlas-token` CLI flag](/docs/agent/options.html#_atlas_token),
-[`atlas_token` configuration option](/docs/agent/options.html#atlas_token), or `ATLAS_TOKEN` environment variable. 
+[`atlas_token` configuration option](/docs/agent/options.html#atlas_token), or `ATLAS_TOKEN` environment variable.
 
 To get an Atlas username and token, [create an account here](https://atlas.hashicorp.com/account/new?utm_source=oss&utm_medium=guide-atlas&utm_campaign=consul) and replace the respective values in your Consul configuration with your credentials.