Commit Graph

492 Commits

Author SHA1 Message Date
Ryan Uber bc2b2120fa agent: -encrypt appends to keyring if one exists 2014-11-19 16:36:01 -08:00
Ryan Uber 22b2c63304 command/agent: fix up gossip encryption indicator 2014-11-19 16:35:37 -08:00
Ryan Uber 7a74f559b9 command: remove -init argument from keyring, auto-persist keyrings when using agent -encrypt 2014-11-19 16:35:13 -08:00
Ryan Uber 1f9d13dc73 agent: squash some more common keyring semantics 2014-11-19 16:34:18 -08:00
Ryan Uber 59a7938d1f agent: guard against empty keyring files 2014-11-19 16:34:18 -08:00
Ryan Uber 7b4b87ccf1 consul: use keyring operation type to cut out duplicated logic 2014-11-19 16:34:18 -08:00
Ryan Uber c11f6b5152 agent: fix install key test 2014-11-19 16:34:18 -08:00
Ryan Uber 91ad3461f4 command: fix panic when client RPC is asked for a keyring operation 2014-11-19 16:34:17 -08:00
Ryan Uber 9d01174521 consul: kill unused struct fields 2014-11-19 16:34:17 -08:00
Ryan Uber a163db2269 command/keyring: remove unneeded -wan arg, fix tests 2014-11-19 16:34:17 -08:00
Ryan Uber f86904ee59 agent: adjust rpc client tests for keyring 2014-11-19 16:34:17 -08:00
Ryan Uber fcba072246 command: fixing test cases for keyring 2014-11-19 16:34:17 -08:00
Ryan Uber 9056e617cb consul: cross-dc key rotation works 2014-11-19 16:34:17 -08:00
Ryan Uber 2bdeaa0c6a consul: restructuring 2014-11-19 16:34:17 -08:00
Ryan Uber 8dec2744da consul: refactor keyring, repeat RPC calls to all DC's 2014-11-19 16:34:17 -08:00
Ryan Uber cfbf2b4f94 command: allow wan ring to be modified separately from lan pools 2014-11-19 16:33:34 -08:00
Ryan Uber 431b366d4f agent: split keyring functionality out of agent.go 2014-11-19 16:32:32 -08:00
Ryan Uber 5ab4a590d7 command: test generated keyring file content and conflicting args for agent 2014-11-19 16:32:06 -08:00
Ryan Uber 621aafa9b4 agent: test loading keyring files for client and server 2014-11-19 16:31:40 -08:00
Ryan Uber 2220ccdac2 command: various cleanup 2014-11-19 16:31:06 -08:00
Ryan Uber d906d16d15 agent: add tests for keyring presence checks 2014-11-19 16:31:06 -08:00
Ryan Uber 353b67826a command: use separate key files for LAN/WAN 2014-11-19 16:31:06 -08:00
Ryan Uber 530f3ba747 command/keys: refactor, restrict key operations to server nodes 2014-11-19 16:31:06 -08:00
Ryan Uber 8a40f3888c agent: move keyring initialization out of agent, add -init option to keys command 2014-11-19 16:31:06 -08:00
Ryan Uber 0952535e33 agent: fix keyring loading when config is passed off 2014-11-19 16:31:06 -08:00
Ryan Uber b6037ef323 agent: clean up keyring file implementation 2014-11-19 16:31:06 -08:00
Ryan Uber fcb0961436 agent: refactor keyring loader 2014-11-19 16:31:06 -08:00
Ryan Uber df68820645 agent: install/use/remove key tests 2014-11-19 16:30:22 -08:00
Ryan Uber 2280434e16 agent: add rpc tests for listing lan/wan gossip keys 2014-11-19 16:30:22 -08:00
Ryan Uber 90de483871 command/keys: begin tests 2014-11-19 16:30:22 -08:00
Ryan Uber 46ce9e936f command/keys: remove key command implemented 2014-11-19 16:30:22 -08:00
Ryan Uber 1ac6b10aed command/keys: use key command implemented 2014-11-19 16:30:22 -08:00
Ryan Uber 7b6f3d6dcc agent: install key command implemented 2014-11-19 16:30:22 -08:00
Ryan Uber e4251a3372 agent: fix inversed lan/wan key listing 2014-11-19 16:30:21 -08:00
Ryan Uber 9b4707a329 command/keys: list keys working end-to-end 2014-11-19 16:30:21 -08:00
Ryan Uber f771f2ef92 command: add option for -wan to keys command 2014-11-19 16:30:21 -08:00
Ryan Uber 67b179ccc9 command: basic rpc works for keys command 2014-11-19 16:30:21 -08:00
Ryan Uber 4dd1b42477 consul: use rpc layer only for key management functions, add rpc commands 2014-11-19 16:30:21 -08:00
Ryan Uber b1c0bb60ce command: warn when passing -encrypt when keyring already exists 2014-11-19 16:30:21 -08:00
Ryan Uber 471ee9ce8f command: create serf dir if it doesn't exist, document -disable-keyring arg 2014-11-19 16:30:21 -08:00
Ryan Uber 0da6e08d9d consul: fix json marshaling 2014-11-19 16:30:21 -08:00
Ryan Uber e20a724999 consul: first pass at keyring integration 2014-11-19 16:30:20 -08:00
Armon Dadgar 6c83ef119a agent: Fixing wan join tests 2014-11-19 13:53:17 -08:00
Armon Dadgar c449f07b38 agent: Fixing config merge test 2014-11-19 13:38:58 -08:00
Armon Dadgar 666cf3c483 agent: Fixing UiDir in test 2014-11-19 13:29:15 -08:00
Armon Dadgar 485f0a0c93 agent: Fixing port collision in tests 2014-11-19 11:51:25 -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 61f1d24f39 consul.Config() helper to generate the tlsutil.Config{} struct, 30 second keepalive, use keepalive for HTTP and HTTPS 2014-11-18 17:56:48 -05:00
Atin Malaviya f1f8c88228 Moved TLS Config stuff to tlsutil package 2014-11-18 11:03:36 -05: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 1b63cbf21e Merge pull request #458 from hashicorp/h-notes
Pass notes field from service checks through
2014-11-06 21:07:45 -08:00
Ryan Uber df5859580f agent: pass notes field through for checks inside of service definitions. Fixes #449 2014-11-06 18:25:21 -08:00
Armon Dadgar cf7e9e40d5 Fixing unit tests 2014-11-03 11:40:55 -08:00
Armon Dadgar cd936793ad Support old recursor config for backwards compatibility 2014-11-03 11:28:21 -08:00
foostan 35b006d884 Add multiple recursor definition support 2014-11-01 04:26:26 +09:00
Ryan Uber 28f31a8dd8 agent: add support for multiple checks and config mixing 2014-10-26 13:11:25 -07:00
Ryan Uber c1dfa55859 agent: test config as a whole in services test 2014-10-26 12:00:11 -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 541b98a926 Gofmt 2014-10-20 10:21:31 -07:00
Armon Dadgar ce4aa7beb5 Switching to the pinned version of msgpack 2014-10-17 18:26:19 -07:00
Ryan Uber cc613a90fd agent: test services are in sync when added from the API 2014-10-17 17:33:27 -07:00
Ryan Uber 525d74aebc agent: add test for consul service sync state 2014-10-17 14:43:52 -07:00
Ryan Uber 2319460904 agent: initialize local consul service tags to fix service sync 2014-10-17 14:29:12 -07:00
Armon Dadgar e4dc15b9e3 agent: skip syslog test on windows 2014-10-17 11:24:10 -07:00
Ryan Uber b2ae3434b1 agent: optimize rpc monitor test 2014-10-16 10:20:57 -07:00
Ryan Uber 35157659a3 agent: fix failing monitor test 2014-10-15 18:23:21 -07:00
Armon Dadgar 4f1fa3a4ce Merge pull request #401 from hashicorp/f-healthcheck
Default services to "critical" state instead of "unknown"
2014-10-15 16:50:38 -07:00
Armon Dadgar e720a09aa4 Merge pull request #400 from hashicorp/f-service-filter
agent: Register "consul" service in agent layer
2014-10-15 16:48:57 -07:00
Ryan Uber 149656951d agent: fix tests after default status change 2014-10-15 15:43:53 -07:00
Ryan Uber 10610d3d26 agent: fix failing test 2014-10-15 15:03:43 -07:00
Ryan Uber cfca160cd5 formatting 2014-10-15 14:56:15 -07:00
Ryan Uber aa6ffc90f0 agent: remove special case of consul service, adjust tests 2014-10-15 14:52:00 -07:00
Ryan Uber 2f93e13da8 consul: kill remaining use of HealthUnknown 2014-10-15 10:14:46 -07:00
Ryan Uber f311ada60e agent: Default health checks to critical. Fixes #341 2014-10-15 10:09:49 -07:00
Ryan Uber e2246b9f6c agent: account for consul service in anti-entropy tests 2014-10-14 18:06:07 -07:00
Ryan Uber cc999e339b agent: fix node name in cli test 2014-10-14 17:49:17 -07:00
Ryan Uber b1e8d351ab agent: re-use ConsulServiceID from consul package 2014-10-14 15:44:11 -07:00
Ryan Uber 4576b4eb29 agent: auto-register the consul service on server nodes 2014-10-14 15:35:00 -07:00
Ryan Uber b804e1ab52 agent: Allow 'consul' service to be targeted for events. Fixes #344 2014-10-14 12:58:52 -07:00
Armon Dadgar 6ffcdbc183 Merge pull request #397 from hashicorp/f-syslog
Filter messages logged to syslog
2014-10-14 12:02:03 -07:00
Ryan Uber b9977338fd agent: Filter messages logged to syslog. Fixes #272 2014-10-13 22:38:12 -07:00
Armon Dadgar 84649b5423 agent: Fixing multiple headers for /v1/event/list endpoint. Fixes #361 2014-10-13 17:53:54 -07:00
Armon Dadgar 3e32e906d1 agent: Fixing tests 2014-10-13 17:52:51 -07: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
Ryan Uber b35578a917 command: formatting 2014-10-12 12:45:40 -07:00
Ryan Uber 599d0558e7 agent: test max retries in config 2014-10-12 12:40:52 -07:00
Ryan Uber 62b4752804 command/agent: add help for retry join 2014-10-12 12:35:25 -07:00
Ryan Uber 67e1f363e1 agent: add retry join tests 2014-10-12 12:27:03 -07:00
Ryan Uber 4bc4ba2d09 agent: test retry join config 2014-10-12 11:20:33 -07:00
Ryan Uber 6d75fc8fb2 agent: merge RetryInterval in config merger 2014-10-12 10:54:53 -07:00
Ryan Uber 7c91c08457 agent: first pass at join retry 2014-10-12 10:50:15 -07:00
Armon Dadgar 77436a15fd agent: tests for DNS truncate config 2014-09-30 13:04:31 -07:00
Alex Wheeler 6cac440a8d Adding support for enabling the DNS truncate flag for UDP queries. 2014-09-30 15:15:36 -04:00
Anton Lindström b8ae4b7d92 Remove redundant assignment 2014-09-29 14:22:31 +02:00
William Tisäter c061eec101 Go format fix 2014-09-19 10:51:03 +02:00
Soren Hansen caedef5cc1 Also change the call sites. *sigh* 2014-09-18 12:55:09 +02:00
Soren Hansen 8605488598 Fix style issue in remote_exec_test 2014-09-18 11:04:20 +02:00
Soren Hansen 8f5089a661 Remove test code duplication 2014-09-17 21:33:03 +02:00
Soren Hansen 264d619457 Pass exitCode by reference
Arguments to defer statements are evaluated when the defer statement is
evaluated, so pass exitCode by reference instead.

Fixes issue #346
2014-09-17 21:17:51 +02:00
Armon Dadgar 36fd5f76c2 agent: Fixing issue with multiple watches. Fixes #337 2014-09-15 10:56:04 -07:00
Armon Dadgar a8b66666f5 agent: Fixing config merge issue 2014-09-02 14:49:31 -07:00
Armon Dadgar d04880cc60 agent: Support for checkpoint 2014-09-02 14:23:43 -07:00
Armon Dadgar e86c5b2627 agent: Address overrides. Fixes #301 and #253 2014-09-02 12:47:40 -07:00
Armon Dadgar cc728a1345 agent: Adding address configurations 2014-09-02 12:42:14 -07:00
Armon Dadgar 98acc0a908 agent: statsd support. Fixes #247 2014-09-02 11:26:17 -07:00
Armon Dadgar 3286074758 agent: Handle cancel for idle wait 2014-09-01 14:46:22 -07:00
Armon Dadgar 9b74b86709 agent: Testing remote exec 2014-09-01 14:46:22 -07:00
Armon Dadgar 9ba4f31fde agent: Refactor remote exec write code 2014-09-01 14:46:22 -07:00
Armon Dadgar a0c6dbfe2a agent: testing remote exec writer 2014-09-01 14:46:21 -07:00
Armon Dadgar 53777527e0 agent: First pass at remote exec support 2014-09-01 14:46:21 -07:00
Armon Dadgar 6a6885ec18 agent: Refactor msgpack serialization into util 2014-09-01 14:46:21 -07:00
Armon Dadgar 89f258ca2e agent: Adding remote exec configuration 2014-09-01 14:46:21 -07:00
Armon Dadgar dc883d151e website: typo fixes 2014-08-30 17:22:23 -07:00
Armon Dadgar 6c30ccd3f7 agent: Prevent hot spin on event list 2014-08-28 15:55:36 -07:00
Armon Dadgar c3bb7de75d agent: Support event filtering on name 2014-08-28 15:25:53 -07:00
Armon Dadgar 602828472d agent: First pass at multi-DC support 2014-08-28 15:00:49 -07:00
Armon Dadgar 337fe4085a agent: Testing event endpoints 2014-08-28 14:38:00 -07:00
Armon Dadgar 77e94cfd38 agent: First pass at event endpoints 2014-08-28 13:42:07 -07:00
Armon Dadgar 0ec5e5ab5f agent: Testing user events 2014-08-28 12:42:24 -07:00
Armon Dadgar aad57e952e agent: Methods to get the user events 2014-08-28 11:15:55 -07:00
Armon Dadgar 93c17db1b2 agent: remove userEventEnc type 2014-08-28 10:56:30 -07:00
Armon Dadgar 2d03146d3b agent: Adding event ingestion 2014-08-27 17:01:10 -07:00
Armon Dadgar 314743c111 agent: working on user events 2014-08-27 16:49:12 -07:00
Armon Dadgar 1c341e6766 consul: expose UserEvent from Serf 2014-08-26 18:50:03 -07:00
Armon Dadgar e0a815772a agent: Support encrypt CLI flag. Fixes #245. 2014-08-22 15:08:15 -07:00
Armon Dadgar 3e4bd6a2ec agent: ACL violation returns 403 code 2014-08-22 12:59:47 -07:00
Armon Dadgar 70eb59c63e agent: Use SHELL if provided. Fixes #237. 2014-08-22 12:47:58 -07:00
Armon Dadgar 46a96d9c42 agent: Refactor script invoke 2014-08-21 14:28:16 -07:00
Armon Dadgar 4b547a43d0 agent: First pass at agent-based watches 2014-08-21 13:09:13 -07:00
Armon Dadgar e877753162 agent: Changing to use nested JSON for watches 2014-08-21 11:52:36 -07:00
Armon Dadgar 5ee737b8d4 agent: Adding watches config 2014-08-19 14:29:01 -07:00
Armon Dadgar 4d66b11c91 agent: Fixing ACL tests with token param 2014-08-19 14:28:49 -07:00
Armon Dadgar b952506c10 agent: Strict PUT for modifying ACLs 2014-08-19 14:28:34 -07:00
Armon Dadgar 96648dd495 agent: Enforce PUT for session destroy. Fixes #285. 2014-08-19 10:53:25 -07:00
Armon Dadgar ca1aeb8fa8 Merge pull request #288 from gmr/rfc-2782-srv-lookups
Add RFC-2782 style SRV lookups
2014-08-18 16:01:18 -07:00
Armon Dadgar 343f69504b agent: Rename acl delete to destroy 2014-08-18 15:46:58 -07:00
Armon Dadgar 0ff28a12fa agent: Copy token in KV PUT/DELETE 2014-08-18 15:46:24 -07:00
Armon Dadgar 7c5a39717e agent: Fixing the ACL tests 2014-08-18 15:46:23 -07:00
Armon Dadgar 88c2a9c947 agent: Adding token parsing 2014-08-18 15:46:23 -07:00
Armon Dadgar fee3524dea agent: Special handler if ACL support is disabled 2014-08-18 15:46:23 -07:00
Armon Dadgar 78049ad240 agent: ACL endpoint tests 2014-08-18 15:46:21 -07:00
Armon Dadgar 22658aa781 agent: ACL endpoint 2014-08-18 15:46:21 -07:00
Armon Dadgar cae4b421a3 agent: Adding ACL master token 2014-08-18 15:46:20 -07:00
Armon Dadgar a8063457f8 consul: ACL setting passthrough 2014-08-18 15:46:20 -07:00
Armon Dadgar 9cd9a6bcc4 agent: Changing ACL config names 2014-08-18 15:46:20 -07:00
Armon Dadgar 7e5fdeb64b agent: Adding new ACL flags 2014-08-18 15:46:20 -07:00
Gavin M. Roy b030991c8b Fix the over-indent 2014-08-18 15:50:36 -04:00
Gavin M. Roy 6000f6977d Add RFC-2782 style SRV lookups 2014-08-18 15:45:56 -04:00