Commit graph

5945 commits

Author SHA1 Message Date
Alex Dadgar b63273b81f Merge pull request #1973 from maier/master
vendor circonus
2016-11-09 16:47:38 -08:00
matt maier 276af02188 revert to previous circonusllhist 2016-11-09 19:33:12 -05:00
Michael Schurter 8b0511713f Merge pull request #1955 from hashicorp/b-fix-default-advertise
Choose safer default advertise address
2016-11-09 16:03:17 -08:00
Michael Schurter cb1e2d2194 Fix comment 2016-11-09 15:51:00 -08:00
Alex Dadgar 5fba85c092 get tlsutil tests to compile - need to regenerate the certificates 2016-11-09 14:41:08 -08:00
Alex Dadgar 6c4060c014 Merge pull request #1969 from maier/master
Vendor circonus
2016-11-09 14:29:53 -08:00
Michael Schurter 5b4389be52 Merge pull request #1970 from hashicorp/b-fix-rkt-docs
Remove warning since #1862 added ports support
2016-11-09 14:27:03 -08:00
Michael Schurter 5216e9c395 Remove warning since #1862 added ports support 2016-11-09 13:57:12 -08:00
Michael Schurter c301e696cf Fix typo in test 2016-11-09 13:16:56 -08:00
matt maier c6504f3418 Update Circonus integration expose Check Display Name and Check Tags
configuration options.
2016-11-09 15:12:30 -05:00
matt maier 525c7710a4 Update vendor circonus-labs/circonus-gometrics
Update `vendor circonus-labs/circonus-gometrics/checkmgr`
Update `vendor circonus-labs/circonus-gometrics/api`
Update `vendor circonus-labs/circonusllhist`
2016-11-09 15:10:42 -05:00
Michael Schurter fdc5aa5a50 Add unit test for missing port helper func 2016-11-09 11:55:10 -08:00
Michael Schurter a75e5b5803 Addresses are just addresses - no ports
Store address+port in an unexported field for ease-of-use
2016-11-09 11:49:55 -08:00
Alex Dadgar 96ada5a4fe changelog 2016-11-09 10:32:31 -08:00
Alex Dadgar ee921ccbb2 Merge pull request #1949 from carlpett/blacklist-fingerprints-and-drivers
Support blacklisting fingerprinters
2016-11-09 10:31:17 -08:00
Calle Pettersson 4304755c12 Address comments from PR 2016-11-09 11:50:16 +01:00
Diptanu Choudhury 84a47b1a4c Merge pull request #1967 from hashicorp/ephemeral_migrate
Fixing the upgrade path for ephemeral disk
2016-11-08 17:07:22 -08:00
Diptanu Choudhury 7ea3efbd28 Added a warning message if disk attribute is non zero 2016-11-08 17:06:37 -08:00
Michael Schurter 23de99b1df Enable dev mode to allow using localhost in tests 2016-11-08 16:35:11 -08:00
Michael Schurter f1120e4de0 Fix test that fails now that advertise can't be localhost 2016-11-08 16:22:04 -08:00
Michael Schurter 290f71f62e Restore sync/atomic use for consistency 2016-11-08 16:21:52 -08:00
Michael Schurter 293c596411 Normalize configs for agent tests 2016-11-08 16:13:09 -08:00
Alex Dadgar 6ecc0aab70 Merge branch 'master' of github.com:hashicorp/nomad 2016-11-08 16:07:04 -08:00
Alex Dadgar 4c2748db51 vendor circonus 2016-11-08 16:06:55 -08:00
Michael Schurter 6d83a192cf Fix int pointer formatting and server config test 2016-11-08 16:02:20 -08:00
Diptanu Choudhury e057c39ea1 Fixed a test 2016-11-08 15:48:47 -08:00
Michael Schurter 4235d65011 Move config normalization into config.go to ease testing 2016-11-08 15:44:10 -08:00
Diptanu Choudhury 2af135ce15 Updated Changelog 2016-11-08 15:42:44 -08:00
Alex Dadgar 3039339f21 changelog 2016-11-08 15:41:44 -08:00
Alex Dadgar fe9a200979 Merge pull request #1952 from hashicorp/b-reserved-ports-aws
Run environmental fingerprinters after host fingerprinters and AWS overrides network
2016-11-08 15:35:46 -08:00
Alex Dadgar 20a5b6fa6b Merge pull request #1965 from hashicorp/b-docker-interpolate
Interpolate all docker driver configs that are strings
2016-11-08 15:35:27 -08:00
Alex Dadgar 3b33f49cde Merge pull request #1966 from hashicorp/b-service-interpolate
Interpolate all service/check fields
2016-11-08 15:35:19 -08:00
Michael Schurter 1e3a2ae04d Match old error messages 2016-11-08 15:25:29 -08:00
Diptanu Choudhury 56ed1d3cd8 Fixing the upgrade path for ephemeral disk 2016-11-08 15:24:51 -08:00
Alex Dadgar f1689bc7f9 Rkt env var 2016-11-08 15:14:04 -08:00
Alex Dadgar ddf101d7a2 Interpolate all check related variables 2016-11-08 14:43:46 -08:00
Alex Dadgar 691e09f863 remove debug 2016-11-08 14:21:37 -08:00
Alex Dadgar 9f2c0cb0c2 Interpolate everything that is a string 2016-11-08 14:20:51 -08:00
Michael Schurter ad07eef9ab Handle missing ports in addresses 2016-11-08 13:44:41 -08:00
Michael Schurter 2960380055 Refactor getAdvertise into a func 2016-11-08 13:06:56 -08:00
Diptanu Choudhury 19524f4007 Merge pull request #1963 from hashicorp/fix-test
Fixed a test
2016-11-08 13:02:19 -08:00
Diptanu Choudhury a70fbd7cf1 Fixed a test 2016-11-08 13:01:56 -08:00
Diptanu Choudhury e4fdb849f9 Merge pull request #1960 from hashicorp/fix-perm-issues
Fixed permission issues on client
2016-11-08 12:57:18 -08:00
Diptanu Choudhury d9f8e3a75a Fixed comments 2016-11-08 12:55:15 -08:00
Alex Dadgar 94cb48af08 Merge pull request #1962 from hashicorp/b-env-vars
Fix env vars relating to secretdir
2016-11-08 12:36:16 -08:00
Alex Dadgar 742e11ddb4 Fix env vars relating to secretdir 2016-11-08 12:28:43 -08:00
Michael Schurter fbcc0ddbf5 Failure to resolve advertise address isn't fatal 2016-11-08 11:17:22 -08:00
Michael Schurter c735589f41 Choose safer default advertise address
* -dev mode defaults bind & advertise to localhost
* Normal mode defaults bind to 0.0.0.0 & advertise to the resolved
  hostname. If the hostname resolves to localhost it will refuse to
  start and advertise must be manually set.
2016-11-08 11:17:16 -08:00
Alex Dadgar 29eb3bd1c1 Merge pull request #1961 from hashicorp/b-vault
Fix marking unrecoverable errors as recoverable when deriving Vault token
2016-11-08 11:09:50 -08:00
Alex Dadgar 822e32de6d Fix error checking 2016-11-08 11:04:11 -08:00