github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,450 Commits
1,701 Branches
460 Tags
694 MiB
Commit Graph

354 Commits (6790930c4e7345f0f021e188558854d43e37b3f0)

Author SHA1 Message Date
Johannes 'fish' Ziemke f935a8a506 Add -domain command line flag to agent 
This makes it possible to configure the domain on the command line
additionally to the config file.
 2015-03-20 16:05:41 +01:00
tummychow 81545e9499 Add doc notes for HTTPS API 
- the HTTPS API address can be configured just like any other address
- the verify_incoming setting also applies to the HTTPS API
 2015-03-18 16:08:41 -07:00
Ryan Breen 8920da59ee Website: cleanup for intro/getting-started/checks.html. 2015-03-17 17:50:28 -04:00
Bob Potter 7386c49fd6 website: default health check is 'serfHealth' 2015-03-05 17:38:28 -08:00
Ryan Breen 57a9928d48 Website: GH-751 Link to anti-entropy doc everywhere that the term is used. 2015-03-04 10:22:53 -05:00
Ryan Breen 30b7cf7f1f Website: GH-747 change acl_master token to acl_master_token 2015-03-03 11:46:57 -05:00
Ryan Breen caf1783366 Website: GH-747 Add docs on acl_master_token installation. 2015-03-03 11:33:49 -05:00
Seth Vargo a022dfcb32 Be consistent in docs about Consul Replicate vs consul-replicate 2015-02-24 20:29:41 -05:00
Ryan Breen b9e72887e9 Website: Add links to options and commands referenced in docs/agent/basics.html and docs/guide/bootstrapping.html. 2015-02-24 14:11:11 -05:00
Ryan Breen f41dce97fd Manually specify anchors for each LI in options.html. This is necessary because the middleman-hashicorp logic only inserts anchors if the body of the LI contains no links. For consistent presentation, we need to specify all anchors rather than relying on middleman. 2015-02-24 12:30:17 -05:00
Ryan Breen 26ec7ca600 Website: /docs/agent/options Fix internal links in options.html to match the anchors created by middleman-hashicorp. 2015-02-23 15:34:46 -05:00
Ryan Breen a5b5eff31c Merge branch 'master' of github.com:hashicorp/consul 2015-02-23 14:45:00 -05:00
Ryan Breen 16600d498e Website: docs/agent/options.html Fix config-file reference. 2015-02-23 14:44:31 -05:00
Ryan Uber 2c3995b8c5 website: document -recursor arg for agent cli 2015-02-23 10:43:15 -08:00
Ryan Breen b78eb40ef4 s/data center/datacenter/g 2015-02-19 17:45:47 -05:00
Armon Dadgar 05ac51ca26 website: Adding Atlas docs 2015-02-18 15:15:01 -08:00
Armon Dadgar c650deb076 website: Document new options 2015-02-18 15:15:01 -08:00
Ryan Breen 802804a6cf Website: add some missing intra-page links in docs/agent/options 2015-02-16 20:51:04 -05:00
Ryan Breen abfe4061a8 Website: clean up a few intra-page links in docs/agent/options 2015-02-16 20:42:21 -05:00
Ryan Breen bfcdd210b7 Website: add intra-page links in docs/agent/options 2015-02-16 19:48:49 -05:00
Ryan Breen 3f23ac2fc7 Website: finalize edits for configuration file options in docs/agent/options. 2015-02-15 00:47:52 -05:00
Ryan Breen 0c22eb0039 Website: edits for configuration file options in docs/agent/options. 2015-02-15 00:43:01 -05:00
Armon Dadgar 9791cb1298 Merge pull request #695 from ryanbreen/session 
Website: cleanup for docs/agent/http/session
 2015-02-13 17:21:24 -08:00
Ryan Breen 75335db84f Website: tweak cleanup for the docs/agent/options Command-line options section. 2015-02-13 15:19:17 -05:00
Ryan Breen 96c4aecc17 Website: cleanup for the docs/agent/options Command-line options section. 2015-02-13 14:58:05 -05:00
Ryan Breen 679c5ddc50 Remove language about LockDelay parsing. 2015-02-12 20:34:40 -05:00
Armon Dadgar 20e936ead7 Merge pull request #692 from ryanbreen/kv 
Website: cleanup of docs/agent/http/kv
 2015-02-12 16:53:49 -08:00
Ryan Breen f325791590 More cleanup for docs/agent/http/session. 2015-02-12 15:15:53 -05:00
Ryan Breen d2bc6f156d Website: cleanup for docs/agent/http/session. 2015-02-12 14:50:54 -05:00
Ryan Breen 22162efccf Website: finalize cleanup of docs/agent/http/kv 2015-02-11 23:44:10 -05:00
Ryan Breen 1b6b1e09bd Website: cleanup of docs/agent/http/kv 2015-02-11 21:54:03 -05:00
Ryan Breen 03fad82b09 Website: finalize cleanup for docs/agent/http/health. 2015-02-10 15:52:22 -05:00
Ryan Breen 01c74378a5 Website: cleanup for docs/agent/http/health. 2015-02-10 15:49:21 -05:00
Armon Dadgar c6ec9dd844 Merge pull request #678 from ryanbreen/agent 
Cleanup for docs/agent/http/agent.
 2015-02-09 09:54:53 -08:00
Armon Dadgar d3df3673fa Merge pull request #681 from ryanbreen/catalog 
Website: cleanup of docs/agent/http/catalog
 2015-02-09 09:53:57 -08:00
Ryan Breen 6c9edb4eba Website: cleanup for docs/agent/http/event. 2015-02-09 11:24:23 -05:00
Ryan Breen b8beec0311 Website: finalize cleanup of docs/agent/http/catalog. 2015-02-08 12:49:02 -05:00
Ryan Breen 3df08cb7ab Website: edits for docs/agent/http/catalog. 2015-02-08 12:44:36 -05:00
Ryan Breen 75f9327fe4 Finalize cleanup of docs/agent/http/agent. 2015-02-07 17:43:43 -05:00
Ryan Breen b90fa33929 Cleanup for docs/agent/http/agent. 2015-02-07 17:36:10 -05:00
Ryan Breen 9e54778fbe Fixes for docs/agent/http/status 2015-02-06 13:47:32 -05:00
Ryan Uber 6cc9478c38 website: document http check timeout configuration 2015-02-05 23:30:08 -08:00
Armon Dadgar 7724fd8774 Merge pull request #673 from ryanbreen/watches 
Very minor tweaks to docs/agent/watches
 2015-02-05 09:43:54 -08:00
Ryan Breen a02bd2f586 Finalize cleanups for docs/agent/http/acl. 2015-02-05 12:02:03 -05:00
Ryan Breen 1fcded43af Cleanups for docs/agent/http/acl. 2015-02-05 11:52:29 -05:00
Ryan Breen f381aa554a Pare off unnecessary space. 2015-02-04 22:28:10 -05:00
Ryan Breen 6c30b2f39a Minor fixes for docs/agent/watches. 2015-02-04 22:25:29 -05:00
Ryan Breen b51730ddd7 Finalize telemetry docs edits. 2015-02-04 14:07:33 -05:00
Ryan Breen c9a23fca9d Cleanup docs/agent/telemetry 2015-02-04 00:10:25 -05:00
Ryan Breen 8975c49c96 Cleanup docs/agent/rpc 2015-02-03 17:20:50 -05:00
Ryan Breen 4c1cd629ae Cleanup docs/agent/rpc 2015-02-03 17:07:03 -05:00
Ryan Breen 0d8ec87456 Some further cleanups to the root http doc. 2015-02-02 00:14:16 -05:00
Ryan Breen 27c145e2f8 Begin editing the docs/agent/http. 2015-02-01 17:42:02 -05:00
Ryan Breen 3a184a06f7 Final edits to encryption doc. 2015-01-31 22:05:00 -05:00
Ryan Breen 02c7ed0e94 Final edits to encryption doc. 2015-01-31 22:01:33 -05:00
Ryan Breen b18b6491ff Final edits to encryption doc. 2015-01-31 21:59:59 -05:00
Ryan Breen 0cd1739ebc Tighten up TLS setting language a bit. 2015-01-31 18:59:11 -05:00
Ryan Breen 26bbda57d0 Tighten up TLS mode language a bit. 2015-01-31 18:55:58 -05:00
Ryan Breen edeab6a0d2 Substantial and potentially inaccurate rewrite to docs/agent/encryption. 2015-01-31 18:33:29 -05:00
Ryan Breen 499d3b26ff Clean up double 'is'. 2015-01-31 13:36:31 -05:00
Ryan Breen 18602f0db8 Final tweaks to DNS doc. 2015-01-31 13:17:43 -05:00
Ryan Breen fbbb765bf9 More heavy-handed reorg of content for flow. 2015-01-31 13:07:21 -05:00
Ryan Breen 7a0515817a Restructure opening paragraphs to have better flow. 2015-01-31 13:01:00 -05:00
Ryan Breen a7357aae65 Finish first pass of DNS updates. 2015-01-31 12:59:03 -05:00
Ryan Breen b56720d41a Update docs for standard DNS queries. 2015-01-31 12:51:28 -05:00
Ryan Breen e0d139c6b9 Minor cleanups to docs/agent/dns. 2015-01-30 23:32:57 -05:00
Ryan Breen 9a597d2351 Make capitalization of agent more consistent. 2015-01-30 14:49:58 -05:00
Ryan Breen 4a8305e022 Minor cleanups to docs/agent/basics. 2015-01-30 14:48:20 -05:00
Ryan Breen 7fd0b148ac A bit more language cleanup to checks. 2015-01-29 17:17:02 -05:00
Ryan Breen cf033f448d No need to confine the example to a web app. 2015-01-29 17:14:19 -05:00
Ryan Breen a8470991cd Some reorg of the TTL description. 2015-01-29 17:12:20 -05:00
Ryan Breen cef8305bd0 Make it clear that checks persist with the node, period, not just across runs of the agent but across reboots as well. 2015-01-29 17:10:15 -05:00
Ryan Breen eea0029f2d Add a bit more detail around checks and clarify some language. 2015-01-29 17:08:56 -05:00
Ryan Breen 8afcf9f152 Language touch-ups for the checks docs. 2015-01-29 16:45:19 -05:00
Ryan Breen 1346cf1a00 Move the note about checks to its own line. 2015-01-28 19:46:28 -05:00
Ryan Breen 917b10417d Grammatical cleanup in services.html. 2015-01-28 19:43:52 -05:00
Emil Hessman 6f3215f0a8 website: fix minor typos in docs 2015-01-23 22:11:15 +01:00
Armon Dadgar e1a5d537d4 Merge pull request #625 from hashicorp/f-maintcmd 
New "maint" command
 2015-01-22 11:56:49 -08:00
Armon Dadgar cf04d6ae31 Merge pull request #622 from hashicorp/f-sockets 
Unix domain sockets
 2015-01-21 16:30:03 -08:00
Ryan Uber 52ff08b6c0 website: document reason flag for http api 2015-01-21 14:33:01 -08:00
Ryan Uber f4f9b5c94b website: update maintenance mode endpoint 2015-01-21 11:15:15 -08:00
Ryan Uber a975903b63 website: fix health endpoint page 2015-01-20 22:50:33 -08:00
Ryan Uber 90ee967bc4 website: move content from monolithic http page 2015-01-20 22:50:30 -08:00
Ryan Uber 2968a20cb5 website: separate pages for top-level endpoints 2015-01-20 22:49:41 -08:00
Ryan Uber 99b92a6fb0 website: beginning http docs update 2015-01-20 22:49:41 -08:00
Ryan Uber 674be58e55 agent: support multiple checks per service 2015-01-20 21:48:42 -08:00
Ryan Uber 5a8703bb00 website: add notice about socket permission portability 2015-01-20 19:16:17 -08:00
Ryan Uber bae6334c60 website: document unix_sockets config 2015-01-20 16:29:22 -08:00
Ryan Uber 853cb504d6 website: document node maintenance mode 2015-01-16 15:38:13 -08:00
Ryan Uber 9ee1e6e858 agent: maintenance mode api's are idempotent 2015-01-16 15:37:52 -08:00
Ryan Uber 1f749ce3f2 website: document service maintenance endpoint 2015-01-16 15:37:52 -08:00
Ryan Uber 7a585d7a9b website: update docs for agent socket options 2015-01-16 13:06:49 -08:00
Ryan Uber bf48651c58 agent: only ignore errors on IsNotExist() 2015-01-16 09:14:52 -08:00
Jeff Mitchell 5a9bcd36ef Update option text to describe how to use Unix listening sockets. 2015-01-14 20:22:59 +00:00
Armon Dadgar 713d30c73e Merge pull request #592 from nicholascapo/check-http 
command/agent: Add simple HTTP check type
 2015-01-13 12:11:50 -08:00
Nicholas Capo e0c3c22748 Update HTTP Check documentation: 503 -> 429 2015-01-13 00:10:05 +00:00
Evan Broder ee6d59d4dd Add "only_passing" option to DNS config 
This excludes nodes from DNS results if their healthchecks are in any
non-passing state, not just if they're critical.
 2015-01-10 13:17:11 +01:00
Nicholas Capo fb5ba8d97d command/agent: Add simple HTTP check type 
These checks make an `HTTP GET` request every Interval to the specified URL.
The status of the service depends on the HTTP Response Code.
`200` is passing, `503` is warning and anything else is failing.
 2015-01-09 16:43:24 -06:00
Emil Hessman 880e21837c website: omit excessive use of the word lastly 
Simplify wording by removing various uses of the word lastly.
 2015-01-09 06:37:26 +01:00
Emil Hessman 91c2939294 website: fix typo 
s/patameters/parameters/
 2015-01-09 05:59:06 +01:00
Armon Dadgar a4db77df11 website: Documenting ?cas with KV DELETE 2015-01-08 17:34:41 -08:00
Armon Dadgar 1abce8cddf website: Updating the documentation 2015-01-08 12:08:29 -08:00
Armon Dadgar 401437ca1f website: Update session API documentation 2015-01-07 15:19:27 -08:00
Armon Dadgar b3f974dee0 website: Link to consul-replicate. Fixes #439 2015-01-07 13:30:30 -08:00
Armon Dadgar f86d7c3a09 Merge pull request #558 from ceh/http-api-response-headers 
add ability to specify response headers on the HTTP API
 2015-01-05 11:36:08 -08:00
Emil Hessman bf0e284756 website: fix typo, casing and links 
Fix typo in Leader Election guide: s/blog/blob/

Also fix various casing issues and prefer HTTPS links
for HashiCorp projects.
 2015-01-04 12:58:58 +01:00
Armon Dadgar 73eeb2566e Merge pull request #556 from darron/master 
Docs: It's not key - it's service.
 2015-01-02 21:54:53 +05:30
Thordur Bjornsson 5ef79e747e Revert "correct the doc for obtaining formatted json" 
This reverts commit cf3b9ec4fe.
 2015-01-02 08:00:09 +01:00
Emil Hessman cb764c35e5 add ability to specify response headers on the HTTP API 
Add an config object that allows adding HTTP header response fields to every
HTTP API response.

Each specified header is added to every response from all HTTP API endpoints.
Each individual endpoint may overwrite the specified header, which makes sure
that Consul headers such as 'X-Consul-Index' is enforced by the API.
 2014-12-28 19:17:08 +01:00
darron froese a5ba33ae06 It's not key - it's service. 
It's right in the description, but the example seems to be wrong.
 2014-12-26 21:51:48 -08:00
Michael H. Oshita a03436e4b2 minor grammer fix 2014-12-11 19:02:29 +09:00
Dan Frost 284814a515 docs: agent/watches: minor fixes 2014-11-26 13:48:33 +00:00
Dan Frost 1b94c804f3 docs: agent/checks: minor fixes 2014-11-26 13:42:53 +00:00
Dan Frost 65ffbed02e docs: agent/dns: minor fixes 2014-11-26 13:33:55 +00:00
Dan Frost 3bbb226e2b docs: agent/basics: minor fixes 2014-11-26 13:15:41 +00:00
Ryan Uber f126bb7381 website: Improve docs for reloading config. Fixes #407 2014-11-25 19:03:14 -08:00
Brandon Wilson cf3b9ec4fe correct the doc for obtaining formatted json 
was "?pretty" should be "?pretty=1"
 2014-11-21 12:27:48 -08:00
Ryan Uber ab5fbe4094 agent: ignore -encrypt if provided when keyring exists 2014-11-19 16:37:40 -08:00
Ryan Uber 80c25e3320 website: document new behavior of the -encrypt option 2014-11-19 16:36:01 -08:00
Ryan Uber 026ebcef58 website: remove keyring persistence options from agent page 2014-11-19 16:31:06 -08:00
Ryan Uber cea2b49c15 website: update consul keys documentation 2014-11-19 16:30:22 -08:00
Armon Dadgar 6be29e17c2 Merge pull request #478 from amalaviy/https 
Added HTTPS support via a new HTTPS Port configuration option
 2014-11-19 11:17:10 -08:00
Atin Malaviya 0904c651a8 Change names to StartJoinWan, RetryJoinWan etc 2014-11-17 17:14:59 -05:00
Atin Malaviya f4fd8453ed Added HTTPS support via a new HTTPS Port configuration option similar to the HTTP Port. 2014-11-17 14:29:35 -05:00
Atin Malaviya 5b41170f47 Add start-wan-join, retry-wan-join and related configuration options and commandline options 2014-11-14 10:56:39 -05:00
Ryan Uber 3facf1bdf4 website: better description of config merging in agent options. Closes #470 2014-11-13 12:04:09 -08:00
Danny Berger 3da9291ae1 Fix some typos in website docs 2014-11-04 21:33:42 -07:00
Armon Dadgar cd936793ad Support old recursor config for backwards compatibility 2014-11-03 11:28:21 -08:00
Armon Dadgar 632bbcdd54 Merge pull request #448 from foostan/multiple_recursor 
Add multiple recursor definition support
 2014-11-03 11:18:37 -08:00
foostan 35b006d884 Add multiple recursor definition support 2014-11-01 04:26:26 +09:00
Laurent Raufaste 26916b03e6 Rephrase 2014-10-30 21:46:19 -04:00
Laurent Raufaste 33c0de708d ACL doc clarification 
Fixes #443
 2014-10-30 21:44:23 -04:00
Ryan Uber d472825181 website: fix JSON in multiple checks documentation 2014-10-27 11:58:01 -07:00
Ryan Uber f03bbb8daa website: update docs for multiple checks in config 2014-10-26 13:25:48 -07:00
Alexander Simmerl 461c1e18a5 Add multiple service definition support 
This change-set adds another key to the configuration decoding called
`services`, which is expected to be a list of service definitions. It
follows the established convention of only allowing one of the keys:
`service`, `check`, `services`. For every entry in the list it calls
the corresponding decode method and appends it to the Servics of the
resulting Config.

While a similar result could be achieved with changing the Services
member of the Config struct to have named mapstruct tag it lacks the
proper time conversions provided by DecodeServiceDefinition.
 2014-10-23 22:50:40 -04:00
Armon Dadgar 21c3e606a2 website: Fixing formatting 2014-10-23 17:14:40 -07:00
Armon Dadgar c7d5330471 Merge pull request #427 from blalor/agent_http_links 
website: Improve navigability of agent HTTP API categories
 2014-10-23 16:46:58 -07:00
Ryan Uber 805a9f7ec2 website: document retry_join and retry_interval flags for config file 2014-10-23 16:40:49 -07:00
Brian Lalor 914db50a52 Add links for status endpoints 2014-10-23 07:59:58 -04:00
Brian Lalor dd251dd323 Add links for event endpoints 2014-10-23 07:59:05 -04:00
Brian Lalor f09d1b32c9 Add links for ACL endpoints 2014-10-23 07:57:55 -04:00
Brian Lalor 8d6b8f4309 Add links for session endpoints 2014-10-23 07:56:28 -04:00
Brian Lalor 03be420bce Add links for health endpoints 2014-10-23 07:54:46 -04:00
Brian Lalor c7125bad12 Add links for catalog endpoints 2014-10-23 07:53:11 -04:00
Brian Lalor 98ebb94afa Add links for agent endpoints 2014-10-23 07:50:54 -04:00
Brian Lalor 351d722a15 Improve navigability of agent HTTP API categories 2014-10-23 07:44:20 -04:00
Leo Cassarani 64f710518f Fix spelling of "separator" in the HTTP API docs 2014-10-23 12:31:41 +01:00
Seth Vargo 869b194127 Use new Markdown syntaxes and add SEO descriptions 2014-10-19 19:42:13 -04:00
Seth Vargo 302789bf76 Use codeblocks for code 2014-10-19 19:41:11 -04:00
Armon Dadgar bee5fe280c Merge pull request #396 from ryanuber/f-retry-join 
agent: Retry failed joins on agent start
 2014-10-13 10:46:10 -07:00