github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,045 Commits
1,699 Branches
460 Tags
692 MiB
Commit Graph

827 Commits (ad7451d7cf648ce61024970d244acc266fe0a62b)

Author SHA1 Message Date
Kyle Havlovitz e119240fdf Merge pull request #2788 from hashicorp/f-autopilot-2 
Autopilot server health monitoring
 2017-03-10 12:29:45 -08:00
Kyle Havlovitz 9b4497de09
Cleaned up and reorganized some autopilot-related code 2017-03-09 18:21:40 -08:00
James Phillips 22986fbfe8
Adds back the RPC page with a deprecation notice. 
Fixes #2794.
 2017-03-09 11:09:11 -08:00
James Phillips bdffcbfbe8 Fixes a typo in the snapshot docs. 2017-03-08 19:49:07 -08:00
Kyle Havlovitz fb259e3d04
Merge branch 'master' into f-autopilot-2 2017-03-06 16:02:19 -08:00
Kyle Havlovitz 2eefe3ca5b
Add autopilot server health tracking 
This adds two goroutines to perform autopilot tasks on the leader - one
to monitor the health of servers and another to periodically clean up
dead servers with a limit on removal count. Also adds a new http endpoint,
`/v1/operator/autopilot/health`, for querying this information through an
operator RPC endpoint.
 2017-03-06 16:00:10 -08:00
Sean Chittenden a791de3ecf Revert "Change `ClientAddr` to default to `BindAddr` when not present." 2017-03-06 13:32:43 -08:00
Sean Chittenden df50950600
Note the default value prior to 0.8 for `-client` was `127.0.0.1`. 2017-03-06 12:26:35 -08:00
Sean Chittenden beae5c6bba
Change `ClientAddr` to default to `BindAddr` when not present. 
With this change, it is now possible to only specify the `-bind` or
`bind_addr` attributes and get a functioning consul agent.
 2017-03-04 20:52:52 -08:00
James Phillips ed2e700ab9 Moves raft_protocol config out into its own top-level item. 2017-03-04 09:20:23 -08:00
James Phillips 3103f7f673 Merge pull request #2690 from zeroae/f-simple-rfc2782 
RFC 2782 support with optional .service tag
 2017-03-02 14:49:36 -08:00
Kyle Havlovitz ab6c49ab4c Merge pull request #2771 from hashicorp/f-autopilot 
Autopilot dead server cleanup, config, and raft version compatibility
 2017-02-28 15:04:16 -08:00
Kyle Havlovitz 92c8b9c3a0
Rename DeadServerCleanup and make wording adjustments 2017-02-28 14:45:21 -08:00
Kyle Havlovitz 9221aed856
Remove the RPC client interface and update docs 2017-02-28 13:41:09 -08:00
Kyle Havlovitz 5429e8ce66
Add cli docs and minor test/comment tweaks 2017-02-24 16:55:44 -08:00
Kyle Havlovitz 1c24c5d8d6
Add docs and api client methods for autopilot config 2017-02-23 21:00:15 -08:00
Kyle Havlovitz 0023454ccc
Add config section to docs for autopilot 2017-02-22 13:11:01 -08:00
Ellery Addington-White 47ee5edefc Adds missing double quote 2017-02-16 13:38:55 -08:00
James Phillips 7e52e95c47 Adds clarifying note about the wakeup jitter. 
Closes #2727.
 2017-02-09 20:28:38 -08:00
James Phillips 242cef5ac8 Removes broken WriteRequest ACL reference for catalog endpoints. 
Fixes #1034.
 2017-02-07 19:02:18 -08:00
Andrey Upadyshev 1ec69ba1d2 Fix `acquire` parameter nesting 2017-02-03 00:20:35 +01:00
Kyle Havlovitz 5d888f5303
Added -relay-factor param to keyring operations 2017-02-01 21:53:29 -05:00
Kyle Havlovitz a533e255ab Merge pull request #2699 from hashicorp/f-tls-min-version 
Add TLSMinVersion to config options
 2017-02-01 16:31:53 -05:00
Kyle Havlovitz 07ba3ddb6e
Add TLSMinVersion to config options 2017-02-01 16:20:33 -05:00
James Phillips 9ef05bd759 Merge pull request #2692 from Toady00/patch-1 
Specify PUT for agent maintenance endpoint
 2017-02-01 06:58:20 -08:00
James Phillips 5f5680cfda Merge pull request #2666 from hashicorp/sethvargo-patch-1 
Say which ec2 perms to use
 2017-02-01 06:57:07 -08:00
Brandon Dennis 7f9649b6af Specify PUT for agent maintenance endpoint 
Through most of the documentation if the method isn't specified it should be a `GET` request, but here it should be a `PUT`.
 2017-01-31 16:00:27 -05:00
Patrick Sodré c135c08fb2 Simple RFC 2782 support with optional .service tag 
Add support for SRV queries of names matching:
_<service>._<protocol>.[.service][.datacenter]<.domain>
 2017-01-30 19:46:02 -05:00
Andrey Upadyshev f6c6a9ff3e Fix missing query parameters formatting in HTTP API documentation 2017-01-25 14:34:56 +01:00
Kyle Havlovitz a55968f009
Merge branch 'master' into f-prepared-query-nodemeta 2017-01-23 20:17:48 -05:00
Kyle Havlovitz 3f3d7f9891
Add tests for node meta in prepared queries and update docs 2017-01-23 19:17:30 -05:00
Seth Vargo 748e308ac4 Say which ec2 perms to use 2017-01-20 17:13:28 -05:00
James Phillips 432540f918 Fixes a paste-o in the docs. 2017-01-18 16:02:04 -08:00
James Phillips 6ca0173907
Adds catalog support for node IDs. 2017-01-18 14:26:42 -08:00
James Phillips bd605e330c
Adds basic support for node IDs. 2017-01-17 22:47:59 -08:00
Mikhail Zholobov 7753627b52
website: Fix nesting for "raft_multiplier" option 2017-01-17 14:59:18 +02:00
Kyle Havlovitz 9e696220a8
Add support for multiple metadata filters to remaining endpoints 
Enabled multiple meta filters for /v1/catalog/nodes and /v1/catalog/services
 2017-01-13 20:49:13 -05:00
Kyle Havlovitz 5acd69b4fc
Add node metadata filtering to remaining health/catalog endpoints 2017-01-13 20:08:43 -05:00
Kyle Havlovitz 5ddea8a5df
Merge branch 'master' into f-gce-discovery 2017-01-11 22:57:07 -05:00
Kyle Havlovitz dbc72eaac0
Condense gce discovery logging a bit 2017-01-11 22:37:22 -05:00
Kyle Havlovitz 23ce10f889 Merge pull request #2643 from hashicorp/f-node-metadata 
Node metadata
 2017-01-11 20:29:24 -05:00
Kyle Havlovitz 87c0283bb1
Update client api and docs for node metadata 2017-01-11 19:28:58 -05:00
Kyle Havlovitz d44f3ea5d4
Update website docs for node metadata 2017-01-11 17:52:31 -05:00
Brian Shumate 1eaeb13a9c
DOCS: update environment variables 
- Move environment variables to section of CLI page
- Remove environment variables page
- Remove environment variables nagivation menu entry
 2017-01-09 12:02:06 -05:00
Brian Shumate f5e76a7125
DOCS: update environment variables page 
- Relocate Environment Variables page to Agent section
- Correct front matter newlines issue
 2017-01-06 09:42:49 -05:00
James Phillips 6c2462e309 Merge pull request #2611 from amiryal/patch-1 
Correct heading level in encryption documentation
 2017-01-05 12:13:13 -08:00
Ruslan Sennov 8e86ebd9db update `/v1/agent/service/register` endpoint doc 2016-12-26 23:32:20 +03:00
Amir Yalon 2932648c05 Correct heading level in encryption documentation 
The ‘RPC Encryption’ heading is semantically at the same level as ‘Gossip Encryption’.
 2016-12-22 10:51:20 +02:00
James Phillips 03a4b09c1d
Fixes a typo in the agent options docs. 2016-12-14 21:03:16 -08:00
James Phillips a67d308175 Merge pull request #2594 from hashicorp/acl-complete 
Adds complete ACL support for /v1/agent endpoints.
 2016-12-14 20:49:00 -08:00
Kyle Havlovitz 7f5f1fed81
Add a notice about deprecation of atlas features 2016-12-14 15:13:51 -05:00
James Phillips ca7a243b70
Adds ACL management support to the agent. 2016-12-14 07:07:41 -08:00
James Phillips 0139bbb963
Adds support for a new "acl_agent_token" which is used for internal 
catalog operations.
 2016-12-12 14:52:27 -08:00
Chris Marchesi 6500d1afaa command/agent: Google Compute Engine host discovery 
This commit adds several command-line and config options that facilitate
host discovery through Google Compute Engine (GCE), much like the
recently added EC2 host discovery options. This should assist with
bootstrapping and joining servers within GCE when non-static addresses
are used, such as when using managed instance groups.

Documentation has also been added. It should be noted that if running
from within a GCE instance, the only option that should be necessary is
-retry-join-gce-tag-value.
 2016-12-06 17:46:40 -08:00
James Phillips 8ae9e17dff
Adds an opt-in for new ACL policies and features coming in Consul 0.8. 2016-12-06 11:06:14 -08:00
James Phillips fba22f997e
Fixes broken link in options doc. 2016-12-05 18:53:51 -08:00
Mike Zupan fc352d7a62 Needs to be moved 
This took 2 hours from my life. The near has to be inside a service and not in the main block.
 2016-12-01 22:47:02 -08:00
William Lord 4d1f56a287 Update snapshot.html.markdown 2016-12-01 10:11:35 +00:00
James Phillips c07bdb173b Merge pull request #2555 from hashicorp/pr-2497-slackpad 
Updates Circonus library and adds support for custom display name and tags.
 2016-11-30 21:42:01 -08:00
James Phillips 859dbfd72a
Changes Consul version number for new Circonus options. 2016-11-30 21:35:54 -08:00
Kyle Havlovitz bd69c6d871 Add reload/leave http endpoints (#2516) 2016-11-30 13:29:42 -05:00
James Phillips 2dea48193c Merge pull request #2532 from jamtur01/docspass 
Documentation pass
 2016-11-29 15:15:04 -08:00
James Phillips 214fbbbad2 Update dns.html.markdown 2016-11-29 15:01:38 -08:00
Kyle Havlovitz 124f907063 Add monitor http endpoint 2016-11-28 18:36:26 -05:00
James Turnbull db13340633 Final dc pass 2016-11-25 13:29:55 -05:00
James Turnbull 8a145d50a3 Removed two space after period exceptions 2016-11-25 13:25:09 -05:00
James Turnbull edeb7e405a Another catch 2016-11-25 13:14:09 -05:00
James Turnbull 90a83d1329 And a handful more 2016-11-25 12:39:08 -05:00
James Turnbull 9e5184fca3 More consistency 2016-11-25 12:34:07 -05:00
James Turnbull 23a4a96ad3 Documentation pass 
I was reviewing some docs and found a few issues.

1. Fixed some spelling mistakes.
2. Re-formatted some paragraphs.
3. Changed some potentially loaded language.
4. Fixed some grammar issues.
5. Tried to consistently use syntax-highlighting.
6. Fixed post-period spacing.
7. Fixed some formatting issues and inconsistency.
8. All "notes" are either proper notes or re-written.
 2016-11-25 12:02:32 -05:00
Kyle Havlovitz dcdadd012f Fix keyring doc method wording 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 6bd65c668b Combine keyring endpoints into one 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 31453c7dbd Add version specific note to keyring http docs 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 345e2366eb Add keyring api website doc sections 2016-11-22 20:10:43 -05:00
James Phillips 4ed6770cfa Makes addresses blank in service definition. 2016-11-22 08:29:29 -08:00
James Phillips ea58d6795d Tweaks title of snapshot link. 2016-11-21 09:02:19 -08:00
Brian Shumate 940232890e
tweaks 2016-11-18 10:53:59 -05:00
Brian Shumate 3871c4810e
Attempt to describe entire response (for #2393) 
Describe fields returned by /v1/catalog/service/<service>
 2016-11-18 10:33:37 -05:00
Cameron Stokes 74cfcd3014 ~ docs: Typo in agent options page. 2016-11-16 07:58:24 -08:00
Benjamin Farley 58fa50e06d Small change to how operator docs read 2016-11-16 09:01:51 +00:00
Brian Shumate df51fde7b0 Docs: Web UI config updates (#2411) 
* Updates around Web UI directory configuration

* consistent terms
 2016-11-12 13:08:15 -08:00
Brian Shumate 486fa06eec Updated broken Extended Key Usage link (#2500) 2016-11-10 08:09:39 -08:00
Sumit Gupta 2f97f65ed9 Remove Extra > (#2499) 2016-11-10 08:09:17 -08:00
James Phillips 16f8e04bfe
Revert "Updates Circonus metrics library and adds support for display name and tags." 
This reverts commit bd490ec937 from #2491.
 2016-11-09 16:21:02 -08:00
matt maier bd490ec937 Updates Circonus metrics library and adds support for display name and tags. 
* Update circonus-gometrics

`vendor circonus-labs/circonus-gometrics`
`vendor circonus-labs/circonus-gometrics/api`
`vendor circonus-labs/circonus-gometrics/checkmgr`
`vendor circonus-labs/circonusllhist`
`vendor hashicorp/go-retryablehttp`

* Update Circonus integration expose Check Display Name and Check Tags configuration options.

* Adds version info to docs for new Circonus options.
 2016-11-09 13:26:43 -08:00
James Phillips 08448015b1 Adds version info to docs for new Circonus options. 2016-11-09 13:26:20 -08:00
matt maier 91a8b43d5a Update Circonus integration expose Check Display Name and Check Tags configuration options. 2016-11-09 15:33:37 -05:00
Kyle Havlovitz 8e621eb9c8 Set MaxStale default to 10 years and add a stale counter (#2481) 
Default MaxStale to 10 years and add a counter at `consul.dns.stale_queries` that tracks when an agent serves a query that's stale by at least 5 seconds. Previously, MaxStale defaulted to 5 seconds and DNS would become unavailable after a short period of time with no leader. This new default allows DNS requests to still be served in the event of a long outage.

Fixes #2460.
 2016-11-08 14:45:12 -05:00
Cameron Stokes e6e35d9013 Clarify -retry-join docs. (#2469) 2016-11-03 14:22:46 -07:00
Kyle McCullough 73b281a27c Add setting to skip ssl certificate verification for HTTP checks (#1984) 
* http check: add setting to skip ssl certificate verification

* update http check documentation

* fix typo in documentation

* Add TLSSkipVerify to agent api
 2016-11-03 13:17:30 -07:00
James Phillips 233a3a101b Supports WAN and LAN Serf Bind Addresses. (#2468) 
* * adding cli config and config file support for specifying the serf wan and lan bind addresses
* updating documentation for serf wan and lan options
Fixes #2007

* Cleans up some small things from #2380.

* Uses the bind default for the agent test for Serf WAN and LAN.
 2016-11-03 12:58:58 -07:00
Kyle Havlovitz 1de39d23d1
Small tweaks to docs and syntax 2016-11-03 13:04:42 -04:00
Kyle Havlovitz f3efab5f84
Add support for ECS task roles as an auth mechanism 2016-11-02 18:48:15 -04:00
Kyle Havlovitz d4d6e2b482
Move EC2 discovery logic into retryJoin for robustness 2016-11-02 14:35:37 -04:00
Kyle Havlovitz 3be132863f Enable snapshots in dev mode (#2453) 2016-10-31 14:39:47 -04:00
James Phillips c01a3871c9 Adds support for snapshots and restores. (#2396) 
* Updates Raft library to get new snapshot/restore API.

* Basic backup and restore working, but need some cleanup.

* Breaks out a snapshot module and adds a SHA256 integrity check.

* Adds snapshot ACL and fills in some missing comments.

* Require a consistent read for snapshots.

* Make sure snapshot works if ACLs aren't enabled.

* Adds a bit of package documentation.

* Returns an empty response from restore to avoid EOF errors.

* Adds API client support for snapshots.

* Makes internal file names match on-disk file snapshots.

* Adds DC and token coverage for snapshot API test.

* Adds missing documentation.

* Adds a unit test for the snapshot client endpoint.

* Moves the connection pool out of the client for easier testing.

* Fixes an incidental issue in the prepared query unit test.

I realized I had two servers in bootstrap mode so this wasn't a good setup.

* Adds a half close to the TCP stream and fixes panic on error.

* Adds client and endpoint tests for snapshots.

* Moves the pool back into the snapshot RPC client.

* Adds a TLS test and fixes half-closes for TLS connections.

* Tweaks some comments.

* Adds a low-level snapshot test.

This is independent of Consul so we can pull this out into a library
later if we want to.

* Cleans up snapshot and archive and completes archive tests.

* Sends a clear error for snapshot operations in dev mode.

Snapshots require the Raft snapshots to be readable, which isn't supported
in dev mode. Send a clear error instead of a deep-down Raft one.

* Adds docs for the snapshot endpoint.

* Adds a stale mode and index feedback for snapshot saves.

This gives folks a way to extract data even if the cluster has no
leader.

* Changes the internal format of a snapshot from zip to tgz.

* Pulls in Raft fix to cancel inflight before a restore.

* Pulls in new Raft restore interface.

* Adds metadata to snapshot saves and a verify function.

* Adds basic save and restore snapshot CLI commands.

* Gets rid of tarball extensions and adds restore message.

* Fixes an incidental bad link in the KV docs.

* Adds documentation for the snapshot CLI commands.

* Scuttle any request body when a snapshot is saved.

* Fixes archive unit test error message check.

* Allows for nil output writers in snapshot RPC handlers.

* Renames hash list Decode to DecodeAndVerify.

* Closes the client connection for snapshot ops.

* Lowers timeout for restore ops.

* Updates Raft vendor to get new Restore signature and integrates with Consul.

* Bounces the leader's internal state when we do a restore.
 2016-10-25 19:20:24 -07:00
James Phillips 104b12040a Merge pull request #2383 from hashicorp/jbs-1462 
Clarify retry_join addresses for #1462
 2016-10-20 11:40:03 -07:00
Brian Shumate 17dfb0b196
Reworded and applied to -retry-join also 2016-10-20 14:14:55 -04:00
James Phillips b073ec72f3 Adds a note about child process reaping going away. 2016-10-06 21:38:29 -07:00
Andreas Böttger cb8deabdc3 json syntax corrected 2016-10-04 15:40:53 +02:00
Brian Shumate 320b07c025
Clarify retry_join addresses for #1462 
- Initial pass at adding note about address formats for retry_join;
  IPv4 is a list of IPs only, whereas IPv6 are bracketed IPs + port
 2016-10-03 12:15:24 -04:00
Brian Shumate ba5bbf8ca2
Update variable value information as port must also be specified, fixes #2210 2016-09-29 12:50:00 -04:00
Brian Shumate 775c32539f
Finalize update for -bind 2016-09-27 18:36:19 -04:00
Brian Shumate 59a90d68a9
Clarification 2016-09-27 12:38:32 -04:00
Brian Shumate 49a410a2da
Correct inaccurate bind reference, closes #2234 2016-09-27 12:05:22 -04:00
McKenna Jones 34043357da cli flag formatting for agent docs and one guide 2016-09-26 21:22:01 -07:00
Seth Vargo e1c8b14a6b
Clarify that hostname defaults to localhost for tcp 2016-09-21 12:20:36 -04:00
Brian Shumate 2c9501a1b0
Remove references to the 'unknown' state. 
- Remove reference to 'unknown' state in catalog endpoint docs
- Remove reference to 'unknown' state in health endpoint docs
 2016-09-21 09:50:12 -04:00
James Phillips 6f0a3b9bf5 Adds Operator endpoint link. 2016-09-15 13:13:09 -07:00
James Phillips 0a34741d72 Adds version note to near parameter. 2016-09-06 07:50:06 -07:00
James Phillips 08d6bfbc9b Tweaks options doc after latest merges. 2016-09-01 22:18:34 -07:00
James Phillips f686d34483 Merge pull request #2263 from sweeneyb/dnsPort 
Add support for dns port as a command line option
 2016-09-01 22:16:15 -07:00
James Phillips d19995c067 Merge pull request #2322 from hashicorp/pr-2321-slackpad 
Adds a configurable timeout for DNS recursor client.
 2016-09-01 22:11:54 -07:00
James Phillips 951f597cde
Tweaks documentation. 2016-09-01 21:50:46 -07:00
Pivotal DX129 fe61650ef0 Merge remote-tracking branch 'upstream/master' 2016-09-01 10:15:32 -04:00
James Phillips 55ef6c54a6
Changes default for `leave_on_terminate` based on server or client mode. 2016-08-31 23:39:11 -07:00
James Phillips ed7356dd5c
Changes default DNS allow_stale to true. 2016-08-30 13:55:19 -07:00
James Phillips 2c9885d10d
Updates documentation with details on the Consul operator actions. 2016-08-30 13:15:37 -07:00
James Phillips e5850d8a26
Adds new consul operator endpoint, CLI, and ACL and some basic Raft commands. 2016-08-30 00:02:50 -07:00
Pierre Delagrave 578602f248 Added website documentation for the new recursor_timeout parameter 2016-08-29 14:41:30 -04:00
James Phillips 17b70c7efd
Adds a max raft multiplier and tweaks documentation. 2016-08-25 15:36:05 -07:00
James Phillips 57db4bcce6
Adds performance tuning capability for Raft, detuned defaults, and supplemental docs. 2016-08-24 21:58:37 -07:00
Brian Shumate 3d71951c97 Fix typo 2016-08-18 09:14:15 -04:00
James Phillips 861efcc8c8 Merge pull request #2235 from robwdux/patch-1 
update ca tutorial to one more recent and relevant
 2016-08-17 18:00:03 -07:00
James Phillips 9d154a55ad Update acl.html.markdown 2016-08-17 10:21:59 -07:00
James Phillips 4c7a0ed3b0
Merge branch 'master' into f-deregister-critical 2016-08-16 12:53:21 -07:00
James Phillips ba60afd5d8
Cleans up based on code review feedback. 2016-08-16 12:52:30 -07:00
James Phillips 9f7a973ace
Adds an `X-Consul-Translate-Addresses` to signal translation is enabled. 2016-08-16 11:31:41 -07:00
James Phillips fbdd021ab9
Adds an "lan" tagged address so we have a way to get them all. 
If we didn't have this, then there would be no way to know the LAN
address if address translation was turned on.
 2016-08-16 10:49:03 -07:00
James Phillips 231f5a957f
Fixes a typo and adds an admonition about only being in Consul 0.7+. 2016-08-16 09:27:20 -07:00
James Phillips 4a3d7db24f
Adds ability to deregister a service based on critical check state longer than a timeout. 2016-08-16 01:00:26 -07:00
James Phillips 315b9d4ea4 Tweaks translate_wan_addr documentation. 
Adds a note about HTTP being 0.7 and later only.
 2016-08-15 16:23:01 -07:00
James Phillips affbb27416 Merge pull request #2275 from hashicorp/pr-2118-slackpad 
Translates node addresses to WAN addresses where appropriate.
 2016-08-15 16:16:56 -07:00
James Phillips b8fa011972
Updates docs for WAN address translation and tweaks some nearby unrelated docs. 2016-08-15 16:12:01 -07:00
Brian Shumate f150a8a7a9 Add anchor 2016-08-15 16:48:54 -04:00
James Phillips bcb0f71759
Finishes up DNS compression by adding opt-out, tests, and documentation. Fixes trim routine. 2016-08-11 16:27:08 -07:00
sweeneyb 14ec3290fa Add support for dns port as a command line option 2016-08-10 04:05:56 +00:00
James Phillips 7b80f5d278 Adds a note about HTTP telemetry. 2016-08-09 16:03:59 -07:00
James Phillips 95930e3cb7 Merge pull request #2237 from hashicorp/f-acl-replication 
Adds ACL replication.
 2016-08-09 11:42:16 -07:00
James Phillips c499c4e7d3
Updates documentation for ACL replication. 2016-08-05 00:23:28 -07:00
rob dux 376a0cbf6f update ca tutorial to one more recent and relevant 2016-08-02 21:24:02 -05:00
Andrei Burd 094d7cb9e0 Added missing comma 2016-08-01 18:46:43 +03:00
James Phillips 85bd2a5459 Adds a cautionary note about the stats in the self API. 2016-07-29 13:45:25 -07:00
James Phillips 4fb97a2ef9 Tweaks the agent docs for `EnableTagOverride`. 2016-07-23 14:48:54 -07:00
shalev67 f66bf3114a Added api agent docs enableTagOverride var 2016-07-22 20:21:07 +03:00
Jason Martin a1b38ececb
Escape verify_server_hostname angle-brackets 2016-07-20 15:57:07 -07:00
matt maier 5d020e72ed Change circonus_broker_search_tag to circonus_broker_select_tag to match same change to command/agent/config.go 2016-07-20 11:44:38 -04:00
James Phillips cfbe8f430e Merge pull request #2193 from hashicorp/pr-2188-slackpad 
Adds Circonus support for telemetry metrics.
 2016-07-19 17:15:29 -07:00
James Phillips 129db848c7 Tweaks the docs a bit. 2016-07-19 15:54:52 -07:00
akbarahmed 79dd717f41 Merge remote-tracking branch 'upstream/master' 2016-07-19 11:01:55 -07:00
akbarahmed 591f6ca3ef Unnest TaggedAddresses. Add sentence to mention that multiple Checks may 
be specified as an array. Closes hashicorp/consul#2176
 2016-07-19 10:55:46 -07:00
matt maier 1b6dd97864 Documentation for Circonus Telemetry integration 2016-07-18 16:24:49 -04:00
Stu Small 450d3dbe91 Fixing minor punctuation mistake. 2016-07-13 16:50:19 -06:00
Ryan Uber 5023c4add1 Merge pull request #1847 from mssola/dc-to-datacenter 
[proposal] command: deprecated the -dc flag in the agent CLI
 2016-07-05 13:01:51 -07:00
Sean Macdonald 525d977bd4 small typo 2016-07-02 01:29:00 -04:00
Ryan Uber 01b28b9581 website: document near parameter of prepared queries 2016-07-01 11:50:09 -07:00
James Phillips af30e17dcd Merge pull request #2123 from hashicorp/f-key-metrics 
Adds a key metrics section to the telemetry guide.
 2016-06-18 04:01:15 +01:00
James Phillips 4c82c45ee9 Adds a key metrics section to the telemetry guide. 2016-06-17 18:57:42 +01:00
Sheldon Kwok 14abdbf5ad Update agent.html.markdown 
The documentation was not clear and I had to try with the cli to figure it out.
 2016-06-09 16:48:18 -07:00
lihz 392c2605f3 add tcp in service/register 
I found consul /service/register interface supprt TCP check as well.
 2016-06-03 19:29:05 +08:00
Michael Barrow 9c3e2f1aef Fix typo 
Simple typo fix.
 2016-05-29 10:24:44 -07:00
Sean Chittenden 446d76b432
Fix the href target for the `/v1/catalog/node/<node>` endpoint. 2016-05-27 00:12:17 -07:00
Sean Kilgore edc31a9391 docs: clarify address specification for telemetry 
Earlier on this page, under `addresses`, we say "For TCP addresses, these should simply be an IP address without the port. For example: 10.0.0.1, not 10.0.0.1:8500." Since we expect the port to be included for `_address` for telemetry, call it out specifically.
 2016-05-24 12:55:23 -07:00
Saif Abid 8211555d0d Fix json for /v1/catalog/node in markdown 
add in a missing comma after the "Address" field
 2016-05-19 14:41:41 -04:00
James Phillips 0f5aabcbbd Merge pull request #2028 from hashicorp/f-atomic-kv 
Adds support for atomic transactions spanning multiple KV entries.
 2016-05-15 13:46:05 -07:00
Sean Chittenden 92298e3d02
Speling police 2016-05-15 09:13:52 -07:00
James Phillips 653387637a Reduces the number of operations in a transaction to 64. 2016-05-14 21:40:46 -07:00
James Phillips 778b975e7a Adds a get-tree verb to KV transaction operations. 2016-05-13 16:57:39 -07:00
James Phillips 570d46aa5f Adds some size limiting features to transactions to help prevent abuse. 2016-05-13 13:39:01 -07:00
James Phillips fbfb90a694 Removes null results for deletes, and preps for more than one result from an operation. 2016-05-13 01:47:55 -07:00
James Phillips a37bf9de56 Adds a read-only optimized path for transactions. 2016-05-13 00:34:05 -07:00
James Phillips 17cd0ac4ec Adds documentation for the transaction endpoint. 2016-05-11 14:18:47 -07:00
James Phillips c6bde826a4 Fixes and clarifies the only_passing docs. 2016-04-27 14:55:38 -07:00
James Phillips ceac68c5eb Merge pull request #1762 from mshean/script-timeout 
Add Timeout field to CheckMonitor
 2016-04-24 23:08:06 -07:00
Sean Chittenden 0c7f697244 Tweak discussion regarding reaping to advise against adjusting these 
values.
 2016-04-21 14:24:41 -07:00
Sean Chittenden bb7c3b75a3 Fix broken markdown 2016-04-20 18:46:01 -04:00
James Phillips c11e1506c5 Merge pull request #1935 from hashicorp/f-reap-time 
Makes reap time configurable for LAN and WAN.
 2016-04-20 13:50:21 -07:00
James Phillips cf00c11221 Sets an anti-footgun floor for the configurable reap time. 2016-04-20 13:49:51 -07:00
Matt Shean fa575db15c Update documentation for CheckMonitor timeout 2016-04-20 11:43:49 -07:00
James Phillips 963916e990 Clarifies default behavior of blank service addresses. 2016-04-20 10:16:06 -07:00
Ryan Uber 8855ec0e2d website: mention 4K output limit for checks 2016-04-14 14:35:35 -07:00
James Phillips 724707649c Merge pull request #1891 from romansky/patch-1 
clerify RPC usage
 2016-04-12 02:10:15 -07:00
James Phillips 7f55f9825f Updates some docs that say reaping is not configurable. 2016-04-11 00:56:03 -07:00
James Phillips eedeba682b Makes reap time configurable for LAN and WAN. 2016-04-11 00:38:25 -07:00
Sean Chittenden bd05093986 Add a note re: pre-0.7 behavior 2016-03-31 18:06:58 -07:00
Sean Chittenden 5994c9efbf skip_leave_on_int's default changes based on agent mode 
`skip_leave_on_int`'s behavior now changes based on whether or not the agent is acting as a client or server.

Fixes: 1687
 2016-03-31 17:45:14 -07:00
Roman Landenband 2a034373ed fix correct RPC entity 2016-03-30 12:21:52 +03:00
Sean Chittenden fe0a7283d3 Reword `udp_answer_limit` for the better. 2016-03-29 23:48:22 -07:00
Sean Chittenden fcee9779ae Use industry jargon re: DNS round-robin 
s/randomized DNS round-robin/round-robin DNS/
 2016-03-29 23:07:42 -07:00
Sean Chittenden d4f7f143f2 Whitespace, indent markdown correctly 2016-03-29 19:27:36 -07:00
Sean Chittenden c5c8daf07a Trim UDP responses per configuration 2016-03-29 19:27:21 -07:00
Sean Chittenden 4b5674bee3 Merge branch 'b-dns-single-record' of ssh://github.com/hashicorp/consul into b-dns-single-record 
# Conflicts:
#	command/agent/dns.go
 2016-03-29 19:24:53 -07:00
Sean Chittenden 9fb64ab114 Allow adjusting the number of DNS records in a response... 
Based on work done by @fusiondog in #1583, extend the concept to use an integer instead of a boolean.

Fixes: #1583 && #1481
 2016-03-29 19:23:56 -07:00
Roman Landenband aebae0349b clerify RPC usage 2016-03-29 15:10:28 +03:00
James Phillips 77ad084229 Fixes JSON in wildcard query example. 2016-03-23 14:33:20 -07:00
James Phillips e60a095207 Merge pull request #1839 from foxel/patch-1 
Clarification for advertise_addrs.rpc
 2016-03-21 16:14:17 -07:00
Sean Chittenden f33b2722d8 Update the docs slightly re: only_passing 
Signed-off by: @slackpad
 2016-03-21 16:07:56 -07:00
Sayalic bb9ddee4a0 add inline code segment to enableTagOverride 2016-03-20 11:09:12 +08:00
Wim b5d45322b4 Allow [::] as a bind address (binds to first public IPv6 address) 2016-03-18 23:59:44 +01:00
Miquel Sabaté Solà 4567963d8e command: deprecated the -dc flag in the agent CLI 
The `-dc` flag from the agent CLI command has been deprecated in favor of
`-datacenter`. This is done this way because:

- Other CLI commands used `-datacenter`. See: event, exec and watch.
- The agent configuration file uses `datacenter`.

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
 2016-03-18 15:44:35 +01:00
James Phillips 6b2ace6f6b Fixes a few bugs in the prepared query doc. 2016-03-17 23:42:27 -07:00
Andrey Kupreychik f4cc8e7620 Clarification for advertise_addrs.rpc 
Clarification for advertise_addrs.rpc as it sets the server RPC port (default 8300)
 2016-03-16 12:10:54 +05:00
James Phillips adea7cda81 Merge pull request #1803 from tylert/doc-enc-update 
Update agent encryption doc example
 2016-03-10 20:06:02 -08:00
James Phillips 01ae1e7dfe Merge pull request #1820 from hashicorp/f-port-docs 
Adds a reference to the network ports from the security guide.
 2016-03-09 21:22:41 -08:00
James Phillips c1de5b7a13 Adds a reference to the network ports from the security page. 2016-03-09 21:21:49 -08:00
Igor Dubinskiy bc7b65452c Fix doc typo 2016-03-09 12:41:49 -08:00
Tyler Tidman 43312b4a69 Update agent encryption doc example 2016-03-09 11:18:48 -05:00
Igor Dubinskiy 3a25860270 Make sure UDP DNS responses aren't larger than allowed 2016-03-07 16:41:17 -08:00
James Phillips aa8cd2619d Fixes broken example JSON. 2016-03-07 10:45:39 -08:00
James Phillips eb7004f2b8 Renames "debug" endpoint and structures to "explain". 2016-03-07 10:45:39 -08:00
James Phillips d7288e3a5e Adds a prepared query debug endpoint. 2016-03-07 10:45:39 -08:00
James Phillips fbd8e40cd5 Adds basic docs for prepared query templates. 2016-03-07 10:45:39 -08:00
James Phillips 7ebad899da Adds a new PUT-based TTL check update endpoint. 2016-03-02 17:54:01 -08:00
James Phillips ef1a588b7a Merge pull request #1777 from hashicorp/b-port-docfix 
TLS example and correcting error
 2016-03-01 13:02:30 -08:00
James Phillips b92243d8d0 Tweaks the address and advertise docs. 2016-03-01 13:01:13 -08:00
James Phillips dca480e284 Cleans up the documents. 2016-02-24 18:05:58 -08:00
James Phillips 7d392118d2 Adds a check for users re-submitting the redacted token. 2016-02-24 17:35:26 -08:00
James Phillips 483898abe5 Renames "prepared_query" ACL policy to "query". 2016-02-24 17:02:06 -08:00
James Phillips 880cd21667 Refactors docs into a more complete state for prepared query ACLs. 2016-02-23 22:27:44 -08:00
James Phillips 67de77482e Creates new "prepared-query" ACL type and new token capture behavior. 
Prior to this change, prepared queries had the following behavior for
ACLs, which will need to change to support templates:

1. A management token, or a token with read access to the service being
   queried needed to be provided in order to create a prepared query.

2. The token used to create the prepared query was stored with the query
   in the state store and used to execute the query.

3. A management token, or the token used to create the query needed to be
   supplied to perform and CRUD operations on an existing prepared query.

This was pretty subtle and complicated behavior, and won't work for
templates since the service name is computed at execution time. To solve
this, we introduce a new "prepared-query" ACL type, where the prefix
applies to the query name for static prepared query types and to the
prefix for template prepared query types.

With this change, the new behavior is:

1. A management token, or a token with "prepared-query" write access to
   the query name or (soon) the given template prefix is required to do
   any CRUD operations on a prepared query, or to list prepared queries
   (the list is filtered by this ACL).

2. You will no longer need a management token to list prepared queries,
   but you will only be able to see prepared queries that you have access
   to (you get an empty list instead of permission denied).

3. When listing or getting a query, because it was easy to capture
   management tokens given the past behavior, this will always blank out
   the "Token" field (replacing the contents as <hidden>) for all tokens
   unless a management token is supplied. Going forward, we should
   discourage people from binding tokens for execution unless strictly
   necessary.

4. No token will be captured by default when a prepared query is created.
   If the user wishes to supply an execution token then can pass it in via
   the "Token" field in the prepared query definition. Otherwise, this
   field will default to empty.

5. At execution time, we will use the captured token if it exists with the
   prepared query definition, otherwise we will use the token that's passed
   in with the request, just like we do for other RPCs (or you can use the
   agent's configured token for DNS).

6. Prepared queries with no name (accessible only by ID) will not require
   ACLs to create or modify (execution time will depend on the service ACL
   configuration). Our argument here is that these are designed to be
   ephemeral and the IDs are as good as an ACL. Management tokens will be
   able to list all of these.

These changes enable templates, but also enable delegation of authority to
manage the prepared query namespace.
 2016-02-23 17:12:43 -08:00
Michael Crilly 4c8725ef63 TLS example and correcting error 
The example configuration file omits TLS support in the HTTP API. This is fine, but a second example demonstrating how to enable TLS over the HTTP API is harmless and, in fact, should be default practice.

Using the format `ip:port` in the "addresses" block will cause Consul to crash on reload/start. See issue (#1727)[https://github.com/hashicorp/consul/issues/1727#issuecomment-184980751]
 2016-02-17 15:24:37 +10:00
Sean Chittenden d2745081f3 Allow adjusting the number of DNS records in a response... 
Based on work done by @fusiondog in #1583, extend the concept to use an integer instead of a boolean.

Fixes: #1583 && #1481
 2016-02-12 12:18:25 -08:00
James Phillips 590ab94d8d Adds documentation for WAN address translation. 2016-02-07 11:12:19 -08:00
James Phillips d2d6b51fe4 Tweaks the telemetry docs. 2016-02-06 22:07:11 -08:00
Nate Brown 43a4f3fe02 Option to disable hostnames from telemetry 2016-01-29 13:44:48 -08:00
Raja Nadar cd17cdc03d fixing small typo in json 2016-01-29 01:25:23 -08:00
Daryl b2f8ef9f32 Correcting count of checks 
I saw there were 5 checks listed - script, tcp, http, ttl, docker.
 2016-01-19 22:50:27 -05:00
Seth Vargo f5ffa8fb79 Fix broken link 2016-01-13 19:32:30 -05:00
Seth Vargo cae0ff354a Use HTTPS + www. where appropriate 2016-01-13 17:44:01 -05:00
James Phillips 203d8101eb Tweaks wording of reap config option section. 2016-01-06 22:29:03 -08:00
James Phillips c1fe9092ed Merge pull request #1550 from hashicorp/f-devmode 
Add a `-dev` mode for easy prototyping
 2016-01-05 10:01:41 -08:00
James Phillips ebad52ffc2 Merge pull request #1549 from kikitux/patch-1 
[doc] fix identation on statsd_addr
 2016-01-02 06:50:56 -08:00
Peter Schaadt b15d02e431 Fixing typos in Coordinate documentation. 2015-12-28 16:34:09 -08:00
Ryan Uber c4e73275b0 website: add docs for dev mode 2015-12-27 09:45:59 -06:00
Alvaro Miranda bbf67d83fb fix identation on statsd_addr 
ditto
 2015-12-27 18:19:31 +13:00
Ryan Uber e040616df1 website: document the static ui flag 2015-12-24 22:21:34 -05:00
James Phillips 0b1c346990 Changes sense of option to "reap" and uses nil for "not set". 2015-12-22 10:28:10 -08:00
James Phillips 2b257c922e Adds child process reaping when Consul is running as PID 1. 2015-12-21 21:47:35 -08:00
James Phillips 63b3e7f16a Clarifies format of stats aggregator configurations as host:port. 2015-12-18 22:53:55 -08:00
William Jimenez 9f0594a9e1 Update options.html.markdown 
clarify that setting `acl_default_policy` won't have any effect unless ACL support is also enabled by setting `acl_datacenter`
 2015-12-18 14:26:35 -08:00
Sep Nasiri 48c2f68edc Change example filename to use .json instead of .js 
Since only .json files are loaded using .js as an example here is confusing.
 2015-12-08 18:42:32 -08:00
James Phillips 4c47f2d57f Adds blank line to fix Docker check formatting. 2015-12-08 00:04:55 -08:00
Ryan Breen 4d42ff66e3 Update health.html.markdown 
Correct json syntax in example.
 2015-11-23 09:39:05 -05:00
Arnout Engelen afc77a4634 Include 'Service'/'Address' field in example 
Add the `Service`/`Address` field to the example output for the `/v1/health/service/\<service\>` endpoint.

Even though it's an optional value, this is probably the one consumers are looking for (rather than the `Node` address)
 2015-11-23 15:01:24 +01:00
James Phillips d861f87851 Fixes a typo in the prepared queries doc. 2015-11-20 21:44:24 -08:00
James Phillips ab63122a32 Removes old logging doc which was empty. 2015-11-18 14:41:50 -08:00
James Phillips 95c708f65e Adds Docker checks support to client API. 
Also changed `DockerContainerId` to `DockerContainerID`, and updated the agent
API docs to reflect their support for Docker checks.
 2015-11-18 07:40:02 -08:00
Sean Chittenden e4d7bfee6a Fix markdown's markup: 2^(64-1) != 2^(64)-1 2015-11-17 15:21:47 -08:00
James Phillips 800e946bf1 Adds and updates docs for prepared queries. 2015-11-15 17:06:00 -08:00
James Phillips f1f9d30ade Extends the session TTL max to 24 hours, and adds a warning to the docs. 2015-11-15 16:51:00 -08:00
talwai 0a5434f2a0 Add DogStatsD configuration options to documentation source 2015-11-11 14:30:37 -05:00
Diptanu Choudhury c25d0f044f Some more grammer corrections and formatting to docker check docs 2015-10-28 14:56:55 -07:00
Diptanu Choudhury 1633cf9d1c Some changes to the docker check docs 2015-10-28 14:24:03 -07:00
Diptanu Choudhury e4f2887ba3 Added some docs for the docker check 2015-10-28 14:19:57 -07:00
Cameron Stokes 442461b030 Clarify format of the -atlas agent option. 2015-10-27 14:21:05 -07:00
Victor Trac 2b00e1cd6a Mote -> Note typo 2015-10-26 15:10:20 -05:00
James Phillips cef9402ab9 Updates docs for network coordinates. 2015-10-23 15:23:01 -07:00
James Phillips f9da231a1c Adds coordinate of agent to self endpoint. 2015-10-23 15:23:01 -07:00
James Phillips 33e3505aea Adds endpoints for raw network coordinates. 2015-10-23 15:23:01 -07:00
James Phillips 9c9195746f Changes ?near=self to a safer ?near=_agent, which is also clearer about what it does. 2015-10-23 15:23:01 -07:00
James Phillips 9caa5b3653 Adds distance sorting to health endpoint. Cleans up unit tests. 2015-10-23 15:23:01 -07:00
James Phillips e47eea3f3a Adds a magic "self" node name to distance queries. 2015-10-23 15:23:01 -07:00
James Phillips 36c78f5042 Adds sort of DCs in catalog queries based on RTT. Cleans up. 
* Makes the catalog endpoint respect disabling coordinates for all
  RTT-sorting query types.
 2015-10-23 15:23:01 -07:00
James Phillips 89c7203f31 Adds coordinate sorting support to catalog queries for nodes and service nodes. 2015-10-23 15:23:01 -07:00
Armon Dadgar 6a350d5d19 Merge pull request #1318 from daveadams/f-http-header-token 
Allow specifying Consul token in an HTTP request header
 2015-10-22 13:33:47 -07:00
David Adams b7bcb2a414 Add HTTP request header X-Consul-Token 
Add support for an X-Consul-Token HTTP request header to specify the
token with which this request should be fulfilled. The header would have
precedence over the responding Agent's default token, but would have
lower precedence than a token specified in the query string.
 2015-10-19 11:26:01 -05:00
James Phillips dc05fb728a Updates docs about new "acquire when you already have it" behavior. 2015-10-15 14:59:09 -07:00
Jeff Wang 0488dfd366 Make service lookup DNS documentation consistent 2015-09-23 23:16:34 -07:00
Jeff Wang ce66db8157 Make node lookup DNS documentation consistent 2015-09-23 23:09:52 -07:00
James Phillips 2f9ebdb135 Merge pull request #1187 from sfncook/enable_tag_drift_03 
Enable tag drift 03
 2015-09-11 15:35:32 -07:00
Shawn Cook 1f330add02 Doc changes in response to review. 2015-09-11 15:26:30 -07:00
Shawn Cook 598526eba2 Docs - add verbage to anti-entropy page. 2015-09-11 14:27:54 -07:00
Anthony Scalisi 10e028d599 remove various typos 2015-09-11 12:29:54 -07:00
Shawn Cook 4caf049c4c Update documentation for service definition 2015-09-11 09:32:54 -07:00
James Phillips 1387aba91b Fixes a typo in the telemetry docs. 2015-09-02 21:37:31 -07:00
Ryan Breen 80d26f9156 Merge pull request #1167 from railsguru/master 
Add -http-port option to change the HTTP API port
 2015-09-02 01:15:55 -04:00
Andy Lo-A-Foe bb5422af14 Position it alphabetically 2015-09-02 06:28:55 +02:00
Andy Lo-A-Foe 00b906774b Update agent options section on the website 2015-09-02 05:36:09 +02:00
Ryan Uber 4adc0b5c66 website: document precedence of Atlas endpoint inputs 2015-08-27 17:54:56 -07:00
Ryan Uber b8e82eee1c website: document atlas endpoint config 2015-08-27 11:31:29 -07:00
Ryan Uber b0fcb6c234 Merge pull request #1199 from hashicorp/f-scada-reload 
SCADA client is reload-able
 2015-08-26 11:46:50 -07:00
Ryan Uber 96e7b1869c website: add atlas token/infra to reloadable config 2015-08-25 17:21:29 -07:00
James Phillips 103fe83b4a Clarifies services docs a bit. 2015-08-25 16:12:19 -07:00
Cameron Stokes 23db28a5db Added detail about left/failed nodes and 72h reaping 
Ref: https://groups.google.com/forum/#!searchin/consul-tool/left/consul-tool/KVl0u91uCdw/bfzrUO4r-1QJ
 2015-08-06 17:37:48 -07:00
Peter Fern 916ff7e5fa Document `TCP` check type 2015-07-27 10:53:52 +10:00
ketzacoatl b63041c3b0 Minor improvement to `acl_master_token` docs 
Confirm the expected format, and what happens if not provided.
 2015-07-01 15:34:35 -04:00
Ryan Uber 6290cb93bd website: adding tag/service name dns compliance docs 2015-06-25 09:08:38 -07:00
Ryan Uber d0348d1291 Merge pull request #1004 from i0rek/advertise_addrs 
Add advertise_addrs.
 2015-06-23 12:32:07 -07:00
Hans Hasselberg 267e0caf81 Implement advertise_addrs for SerfLan, SerfWan and RPC. 
Fixes #550.
This will make it possible to configure the advertised adresses for
SerfLan, SerfWan and RPC. It will enable multiple consul clients on a
single host which is very useful in a container environment.

This option might override advertise_addr and advertise_addr_wan
depending on the configuration.

It will be configureable with advertise_addrs. Example:

{
  "advertise_addrs": {
    "serf_lan": "10.0.120.91:4424",
    "serf_wan": "201.20.10.61:4423",
    "rpc": "10.20.10.61:4424"
  }
}
 2015-06-23 21:23:45 +02:00
Ryan Uber c8b3e48cbf website: link to check pass/fail endpoint docs from checks page 2015-06-22 10:21:50 -07:00
Ryan Uber c8f76b5e2c website: document passing ACL tokens in catalog register/deregister 2015-06-15 11:45:30 -07:00
Christian Theune 74ac30c601 Wording. 2015-06-12 16:09:44 +02:00
Christian Theune 7211876688 Make behaviour of keyprefixes always matching all keys in a prefix more clear. 2015-06-12 16:07:42 +02:00
Ryan Uber e872587e19 website: document TTL check persistence 2015-06-05 17:15:57 -07:00
siddharthist 0dac1ea126 Clarify how intervals are parsed 
Current docs only show second intervals and do not specify
other valid options, this commit specifically outlines how the times are
parsed.
 2015-06-03 12:53:09 -05:00
Ryan Uber 32820fc9d2 website: add status field for check registration in http docs 2015-05-28 13:09:33 -07:00
Ryan Uber 1ae7710024 website: document setting initial status of health checks in config 2015-05-28 13:03:01 -07:00
Armon Dadgar ab3632e409 consul: lower default query time and add small stagger 2015-05-14 17:59:43 -07:00
Armon Dadgar 90d6204a1a website: document the new TLS changes 2015-05-11 16:22:10 -07:00
Cameron Ruatta 587cd35c6c Adding docs about configuration directory sub-directories 2015-05-11 10:36:50 -07:00