Website: cleanup for docs/faq.html.

This commit is contained in:
Ryan Breen 2015-03-05 17:56:41 -05:00
parent 6dffe22f86
commit e6ee9de61f
2 changed files with 15 additions and 12 deletions

View File

@ -11,8 +11,8 @@ sidebar_current: "docs-faq"
Consul makes use of [LMDB](http://symas.com/mdb/) internally for various data Consul makes use of [LMDB](http://symas.com/mdb/) internally for various data
storage purposes. LMDB relies on using memory-mapping, a technique in which storage purposes. LMDB relies on using memory-mapping, a technique in which
a sparse file is represented as a contiguous range of memory. Consul configures a sparse file is represented as a contiguous range of memory. Consul configures
high limits for these file sizes, and as a result relies on a large chunks of high limits for these file sizes and as a result relies on large chunks of
virtual memory to be allocated. However, in practice the limits are much larger virtual memory to be allocated. However, in practice, the limits are much larger
than any realistic deployment of Consul would ever use, and the resident memory or than any realistic deployment of Consul would ever use, and the resident memory or
physical memory used is much lower. physical memory used is much lower.
@ -20,9 +20,9 @@ physical memory used is much lower.
Consul makes use of a HashiCorp service called [Checkpoint](http://checkpoint.hashicorp.com) Consul makes use of a HashiCorp service called [Checkpoint](http://checkpoint.hashicorp.com)
which is used to check for updates and critical security bulletins. which is used to check for updates and critical security bulletins.
Only anonymous information is sent to Checkpoint, and cannot be used to Only anonymous information, which cannot be used to identify the user or host, is
identify the user or host. An anonymous ID is sent which helps de-duplicate sent to Checkpoint . An anonymous ID is sent which helps de-duplicate warning messages.
warning messages and can be disabled. Using the Checkpoint service is optional This anonymous ID can can be disabled. In fact, using the Checkpoint service is optional
and can be disabled. and can be disabled.
See [`disable_anonymous_signature`](/docs/agent/options.html#disable_anonymous_signature) See [`disable_anonymous_signature`](/docs/agent/options.html#disable_anonymous_signature)
@ -31,11 +31,14 @@ and [`disable_update_check`](/docs/agent/options.html#disable_update_check).
## Q: How does Atlas integration work? ## Q: How does Atlas integration work?
Consul makes use of a HashiCorp service called [SCADA](http://scada.hashicorp.com) Consul makes use of a HashiCorp service called [SCADA](http://scada.hashicorp.com)
which stands for Supervisory Control And Data Acquisition. The SCADA system allows (Supervisory Control And Data Acquisition). The SCADA system allows clients to maintain
clients to maintain a long-running connection to Atlas which is used to make requests long-running connections to Atlas. Atlas can in turn provide auto-join facilities for
to Consul agents for features like the dashboard and auto joining. Standard ACLs can Consul agents (supervisory control) and an integrated dashboard showing the health of
be applied to the SCADA connection, which has no enhanced or elevated privileges. all connected agents (data acquisition).
Using the SCADA service is optional and only enabled by opt-in.
See the [Atlas integration guide](/docs/guides/atlas.html). Standard ACLs can be applied to the SCADA connection, ensuring that Atlas is given only
those privileges that make sense for your deployment.
Using the SCADA service is optional. SCADA is only enabled by opt-in.
See the [Atlas integration guide](/docs/guides/atlas.html) for more details.

View File

@ -9,7 +9,7 @@ description: |-
# Atlas Integration # Atlas Integration
[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. [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 configurations. 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.
Atlas is able to securely retrieve data from nodes as Consul maintains a long-running connection to the Atlas is able to securely retrieve data from nodes as Consul maintains a long-running connection to the
[SCADA](http://scada.hashicorp.com) service. [SCADA](http://scada.hashicorp.com) service.