status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,668 Commits 445 Branches 179 Tags 481 MiB
Commit Graph

2668 Commits

Author SHA1 Message Date
Armon Dadgar 6b4af3056c Merge pull request #1145 from jrgarcia/trim-trailing-slash-lock 
Remove trailing slash from lock
 2015-07-30 10:20:31 -07:00
J.R. Garcia 4cb6f3e943 Remove trailing slash from lock 
Lock command will remove trailing slash from path (as it is invalid).
Fixes #1136.
 2015-07-30 12:14:17 -05:00
Ryan Breen 018fd69aa2 Merge pull request #1143 from hashicorp/GH-1142 
Check NXDOMAIN after filtering nodes
 2015-07-29 18:56:08 -04:00
Ryan Breen 0a7dc85076 Test for GH-1142. 2015-07-29 18:21:16 -04:00
Armon Dadgar 0363d4b54b Merge pull request #1137 from 42wim/fix-1124 
Recurse when PTR answer is empty
 2015-07-29 14:39:04 -07:00
Ryan Breen 42648438a0 Check NXDOMAIN after filtering nodes 
Move the check for NXDOMAIN below the service health filter.
 2015-07-29 17:16:48 -04:00
Kevin Fishner 8ec5a0b5ba update analytics 2015-07-28 15:59:05 -07:00
Ryan Uber 93c9c87f7a Merge pull request #1141 from hashicorp/f-travis 
Try moving to newer Travis-CI infrastructure
 2015-07-28 10:42:56 -07:00
Ryan Uber 40f3e3fae7 travis-ci: skip syslog tests for container-based travis infra 2015-07-28 09:58:43 -07:00
Ryan Uber 6cc2d21241 Merge pull request #1140 from hashicorp/h-acl 
Filter services when using ChecksInState.
 2015-07-28 09:34:40 -07:00
Ryan Uber 3ad7a53095 travis-ci: use newer build infra 2015-07-28 09:13:25 -07:00
Ryan Uber f2b71940f5 consul: filter services by ACL when using ChecksInState. 2015-07-27 16:57:56 -07:00
Wim 5647a37ffe Recurse when PTR answer is empty 2015-07-27 23:22:36 +02:00
Armon Dadgar 4a9b91f2a2 Merge pull request #1130 from pdf/check_socket 
Add Socket check type
 2015-07-27 14:21:24 -07:00
Peter Fern 916ff7e5fa Document `TCP` check type 2015-07-27 10:53:52 +10:00
Ryan Uber a6317f2fb2 Merge pull request #1090 from hashicorp/f-keyring-acl 
Keyring ACLs
 2015-07-24 10:23:18 -07:00
Peter Fern b023904298 Add TCP check type 
Adds the ability to simply check whether a TCP socket accepts
connections to determine if it is healthy.  This is a light-weight -
though less comprehensive than scripting - method of checking network
service health.

The check parameter `tcp` should be set to the `address:port`
combination for the service to be tested.  Supports both IPv6 and IPv4,
in the case of a hostname that resolves to both, connections will be
attempted via both protocol versions, with the first successful
connection returning a successful check result.

Example check:

```json
{
  "check": {
    "id": "ssh",
    "name": "SSH (TCP)",
    "tcp": "example.com:22",
    "interval": "10s"
  }
}
```
 2015-07-24 14:06:05 +10:00
Ryan Uber 7aa8539c10 agent: disable ACLs for RPC client tests 2015-07-23 17:09:33 -07:00
Armon Dadgar eb92961387 Merge pull request #1128 from kongchen/master 
Fix the display issue in consul ui
 2015-07-23 11:08:32 -07:00
孔晨 6b4cdc3c4d fix base64 issue 2015-07-23 15:56:23 +08:00
孔晨 9e1106dda2 fix 中文乱码问题 2015-07-23 14:47:32 +08:00
Armon Dadgar dcb5ae783b Merge pull request #1119 from trumant/multiple_private_IPs 
Fixes #1099 by raising an error when we multiple private IPs are found
 2015-07-22 17:32:00 -07:00
Armon Dadgar 981c62ccba command/lock: Check for shutdown during lock acquisition. Fixes #800 2015-07-22 16:07:44 -07:00
Armon Dadgar cfa7ed71a7 Merge pull request #1080 from zendesk/master 
Return every time lock acquisition fails
 2015-07-22 15:30:46 -07:00
Armon Dadgar 3e9e575dee Merge pull request #1127 from carlpett/master 
Fix missing config-dir in getting started guide
 2015-07-22 12:34:35 -07:00
Benjamin Abbott-Scott f877b9ecc4 Return every time lock acquisition fails 2015-07-22 10:44:47 -07:00
Calle Pettersson 73086996cf Fix missing config-dir in getting started guide 2015-07-22 13:33:15 +02:00
Travis Truman 182f881d82 Fixes #1099 by raising an error when we multiple private IPs are found 2015-07-16 22:25:02 -04:00
Ryan Uber c34bcb45c6 Merge pull request #1093 from buddhamagnet/master 
Switch to more idiomatic var syntax
 2015-07-14 12:53:58 -07:00
Ryan Uber 5339ee6cd9 Merge pull request #1112 from drawks/iss-1111 
Fix issue #1111 - vagrant cluster demo doesn't work
 2015-07-14 12:01:58 -07:00
Dave Rawks 5fbda6e4a4 Fix issue #1111 - vagrant cluster demo doesn't work 
Switch demo Vagrantfile to use official debian 7 base box
and reflect change in the README
 2015-07-14 11:43:18 -07:00
Ryan Uber 1bbdf3b03b agent: vet fixes 2015-07-14 11:42:51 -07:00
Ryan Uber 5d73afc13f consul: fixes for events and related tests 2015-07-14 11:38:26 -07:00
Seth Vargo 4a7f9dd9d4 Merge pull request #1109 from hashicorp/sethvargo/rack_protection 
Use Rack::Protection
 2015-07-13 12:59:20 -04:00
Seth Vargo d473fe5693 Use Rack::Protection 2015-07-13 12:56:46 -04:00
Seth Vargo 32906a9d3e Update middleman-hashicorp 2015-07-13 12:56:40 -04:00
Ryan Uber 5682b715c4 Merge pull request #995 from 42wim/rfc2308-soa-ttl 
Send SOA with negative responses (RFC2308)
 2015-07-13 08:49:25 -07:00
Ryan Breen cd41daba31 Merge pull request #1094 from BrianHicks/website/ciscocloud-consul-tools 
website: add marathon-consul and mesos-consul
 2015-07-08 20:01:31 -04:00
Brian Hicks 0f491d92f1 website: add marathon-consul and mesos-consul 2015-07-08 17:47:49 -06:00
buddhamagnet 462a03c1ab switch to more idiomatic var syntax 2015-07-08 23:22:12 +01:00
Ryan Uber 79ac4f3512 agent: testing keyring ACLs 2015-07-07 15:14:06 -06:00
Ryan Uber 58c26497a9 acl: adding negative tests for bad policy 2015-07-07 14:46:41 -06:00
Ryan Uber 38175f450b website: docs for keyring ACLs 2015-07-07 11:45:49 -06:00
Ryan Uber 02b49058a2 acl: more keyring tests 2015-07-07 11:21:27 -06:00
Ryan Uber 7e50a457d9 acl: allow omitting keyring policy, add tests 2015-07-07 11:07:37 -06:00
Ryan Uber 47a33e3f1a acl: keyring policy uses a flat string 2015-07-07 10:45:38 -06:00
Ryan Uber 5c65bc7df2 agent: write-level keyring ACLs work 2015-07-07 10:36:51 -06:00
Ryan Uber bffc0861cc agent: read-level keyring ACLs work 2015-07-07 10:30:34 -06:00
Ryan Breen 7cba295eb9 Merge pull request #1087 from edwardbadboy/master 
Website: Delete the unnecessary backslash at the end shell command line
 2015-07-06 23:40:09 -04:00
Zhou Zheng Sheng 85f7064fe0 Website: Delete the unnecessary backslash at the end shell command line 
Shell thinks '\<newline>' as line continuation only when it's unquoted
or in double quotes. It's not necessary to manually mark '\<newline>'
in single quotes, because when shell sees the a single quote starts, it
continues the line automatically until it sees the matching single quote
ends.

Thus,
echo 'a\
  b'
would give the following output
a\
  b

And
echo 'a
  b'
gives the following output
a
  b

Since we don't want to leave backslashes in the resulting json files, we
should remove the line continuation backslashes inside single quotes.
 2015-07-07 11:27:47 +08:00