Commit graph

4397 commits

Author SHA1 Message Date
James Phillips 0c65b1e813 Merge pull request #2195 from hashicorp/b-fix-version
Adds version info back into the config.
2016-07-19 18:41:42 -07:00
James Phillips 9816c995bd Adds version info back into the config.
In #2191 I accedentally broke SCADA by not populating the agent's version
information into the config structure. This adds it back, and makes the
distinction between the raw parts we send to APIs and the human form of
the version that we display.
2016-07-19 18:38:15 -07:00
James Phillips 33e9f42329 Update CHANGELOG.md 2016-07-19 17:17:11 -07:00
James Phillips 51fbad91fd 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 d1e711a4a5 Adds a vendoring cheat sheet. 2016-07-19 17:14:25 -07:00
James Phillips 044512c6de Updates armon/go-metrics and adds Circonus vendored libraries. 2016-07-19 16:54:21 -07:00
James Phillips ca5f42d61d Tweaks the docs a bit. 2016-07-19 15:54:52 -07:00
James Phillips 9b36671fd6 Removes top-level key support for Circonus configs.
This was a feature to help migrate to the new telemetry sub-structure,
but since this is all new we don't need it.
2016-07-19 15:46:57 -07:00
James Phillips 79726d35e4 Merge pull request #2192 from hashicorp/f-short-sha
Switches to the short form of the SHA for the build info.
2016-07-19 15:20:12 -07:00
James Phillips a50d07ef82 Switches to the short form of the SHA for the build info. 2016-07-19 15:19:32 -07:00
James Phillips a56032bc83 Simplifies the version formatter. 2016-07-19 15:15:26 -07:00
James Phillips 5dd3542028 Update CHANGELOG.md 2016-07-19 15:11:07 -07:00
James Phillips ba264f2015 Merge pull request #2191 from hashicorp/f-version-tweak
Makes sure version is always displayed consistently.
2016-07-19 15:08:23 -07:00
James Phillips 53877aa260 Makes sure version is always displayed consistently. 2016-07-19 15:06:32 -07:00
James Phillips dab7905cab Merge pull request #2185 from richard-hulm/issue-1404
Add the version (from config) to the Starting Consul Agent printout
2016-07-19 13:56:53 -07:00
James Phillips 7870017b48 Merge pull request #2190 from DynomiteDB/master
Unnest TaggedAddresses in Catalog Register endpoint
2016-07-19 12:08:38 -07:00
akbarahmed 99c1e0051d Merge remote-tracking branch 'upstream/master' 2016-07-19 11:01:55 -07:00
akbarahmed 25f6bc9d56 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
richard.hulm f11a0145ab RH: Add revision (if it exists) 2016-07-19 10:04:56 +01:00
matt maier 53936f336d Documentation for Circonus Telemetry integration 2016-07-18 16:24:49 -04:00
matt maier 87e29fd709 fix: typo coupled, default token app to "consul", switch submit_interval/SubmitInterval to submission_interval/SubmissionInterval 2016-07-18 15:46:11 -04:00
matt maier c5a6cb8b4c Add Circonus support for Telemetry metrics 2016-07-18 09:34:43 -04:00
richard.hulm c2b78eac7d Add the version (from config) to the Starting Consul Agent printout 2016-07-18 10:01:16 +01:00
James Phillips 2820882cc8 Merge pull request #2183 from stusmall/master
Fixing minor punctuation mistake.
2016-07-14 00:22:25 -06:00
Stu Small 6a664a4669 Fixing minor punctuation mistake. 2016-07-13 16:50:19 -06:00
Evan Gilman c5b30cba6f
Merge branch 'master' into let-watches-be-stale
Attempt to let the tests pass
2016-07-13 11:20:44 -07:00
James Phillips 7d0ce117cb Merge pull request #2182 from dcarbone/dcarbone-lib-addition
Adding my lib to list of downloads
2016-07-13 10:31:35 -06:00
Daniel Carbone 076292ba0a Adding my lib to list of downloads 2016-07-13 08:28:44 -05:00
James Phillips 9bd508abde Update CHANGELOG.md 2016-07-11 17:37:57 -06:00
James Phillips 2187be8294 Merge pull request #2178 from hashicorp/f-rpc-test
Adds some supplemental tests for RPC "no leader" retries.
2016-07-11 17:34:48 -06:00
James Phillips a1266e4164 Adds some supplemental tests for RPC "no leader" retries.
This adds some extra tests for #2175.
2016-07-11 17:32:26 -06:00
James Phillips 842d81b694 Merge pull request #2175 from hashicorp/f-hold-rpc
Gracefully handle short lived outages by holding RPC calls
2016-07-11 16:43:11 -06:00
Armon Dadgar 2d8cf9ef4a consul: change tests to not expect ErrNoLeader 2016-07-10 13:24:18 -04:00
Armon Dadgar 5d0a977bdf consul: Refactor forward to hold RPC when no leader is known 2016-07-10 13:24:06 -04:00
Armon Dadgar 191876f87e consul: Add RPCHoldTimeout as tunable hold period 2016-07-10 13:23:43 -04:00
James Phillips 76afbf5c96 Merge pull request #2144 from janisz/add_marathon-consul
Added allegor/marathon-consul in community tools
2016-07-06 10:54:05 -07:00
James Phillips 920a638599 Merge pull request #2159 from myENA/website/consul-backinator
Add link to consul-backinator utility
2016-07-06 10:50:49 -07:00
Ryan Uber d8fd470f4f Merge pull request #1837 from cleung2010/obfuscate-acl-token
Obfuscate token for lookupACL error
2016-07-05 13:56:49 -07:00
Ryan Uber 05736df9e0 Merge pull request #1836 from shaneog/terraform-google
Add Terraform config for Google Cloud Platform
2016-07-05 13:55:16 -07:00
Shane O'Grady bc85603f0e Add Terraform config for Google Cloud Platform
Supports:
- Ubuntu 14.04 LTS
- RHEL 6
- RHEL 7
- CentOS 6
- CentOS 7
2016-07-05 17:11:52 -03:00
Shane O'Grady 3fe7162d12 Add RPC port to iptables config
From https://www.consul.io/docs/agent/options.html#ports
2016-07-05 17:11:52 -03:00
Shane O'Grady 297e4f02c5 Move scripts to a shared directory 2016-07-05 17:11:52 -03:00
Ryan Uber 62d0edbdd4 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
Ryan Uber ad46a724e0 Merge pull request #1971 from iadknet/feature/terraform-centos7
terraform: added support for centos7 to aws
2016-07-05 12:56:10 -07:00
Calvin Leung Huang 38134f1b8c Fix substring length on obfuscated token 2016-07-05 15:53:30 -04:00
Ryan Uber 855374077b Merge pull request #1863 from mssola/bash-completion
contrib: added bash completion
2016-07-05 12:52:58 -07:00
James Phillips 95d9a67b29 Merge pull request #2160 from hashicorp/f-api-pq-template
Adds query templates to the api package
2016-07-02 19:45:54 -07:00
Ryan Uber 6deb17d069 api: add query templates 2016-07-02 16:05:41 -07:00
Aaron Hurt 4c5686cdf7 Alter instructions for adding tools to the list 2016-07-02 15:37:43 -05:00
Aaron Hurt 89d26df41a Add link to consul-backinator utility 2016-07-02 15:33:47 -05:00