-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #119 from hashicorp/ossmerge_20190906
Ossmerge 20190906
- Loading branch information
Showing
7 changed files
with
529 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
job "group_check" { | ||
datacenters = ["dc1"] | ||
type = "service" | ||
|
||
group "group_check" { | ||
network { | ||
mode = "bridge" | ||
} | ||
|
||
service { | ||
name = "group-service-1" | ||
port = "9001" | ||
|
||
check { | ||
name = "alive-1" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-1"] | ||
} | ||
} | ||
|
||
service { | ||
name = "group-service-2" | ||
port = "9002" | ||
|
||
check { | ||
name = "alive-2a" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-2a"] | ||
} | ||
|
||
# the file expected by this check will not exist when started, | ||
# so the check will error-out and be in a warning state until | ||
# it's been created | ||
check { | ||
name = "alive-2b" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "cat" | ||
args = ["${NOMAD_TASK_DIR}/alive-2b"] | ||
} | ||
} | ||
|
||
service { | ||
name = "group-service-3" | ||
port = "9003" | ||
|
||
# this check should always time out and so the service | ||
# should not be marked healthy | ||
check { | ||
name = "always-dead" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "1s" | ||
command = "sleep" | ||
args = ["10"] | ||
} | ||
} | ||
|
||
count = 1 | ||
|
||
task "test" { | ||
driver = "raw_exec" | ||
|
||
config { | ||
command = "bash" | ||
args = ["-c", "sleep 15000"] | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
job "group_check" { | ||
datacenters = ["dc1"] | ||
type = "service" | ||
|
||
group "group_check" { | ||
network { | ||
mode = "bridge" | ||
} | ||
|
||
service { | ||
name = "group-service-1" | ||
port = "9001" | ||
|
||
# after update, check name has changed | ||
check { | ||
name = "alive-1a" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-1a"] | ||
} | ||
} | ||
|
||
service { | ||
name = "group-service-2" | ||
port = "9002" | ||
|
||
check { | ||
name = "alive-2a" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-2a"] | ||
} | ||
|
||
# after updating, this check will always pass | ||
check { | ||
name = "alive-2b" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-2b"] | ||
} | ||
} | ||
|
||
service { | ||
name = "group-service-3" | ||
port = "9003" | ||
|
||
# this check should always time out and so the service | ||
# should not be marked healthy | ||
check { | ||
name = "always-dead" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "1s" | ||
command = "sleep" | ||
args = ["10"] | ||
} | ||
} | ||
|
||
count = 1 | ||
|
||
task "test" { | ||
driver = "raw_exec" | ||
|
||
config { | ||
command = "bash" | ||
args = ["-c", "sleep 15000"] | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
job "task_check" { | ||
datacenters = ["dc1"] | ||
type = "service" | ||
|
||
group "task_check" { | ||
count = 1 | ||
|
||
task "test" { | ||
service { | ||
name = "task-service-1" | ||
|
||
check { | ||
name = "alive-1" | ||
type = "script" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-1"] | ||
} | ||
} | ||
|
||
service { | ||
name = "task-service-2" | ||
|
||
check { | ||
name = "alive-2a" | ||
type = "script" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-2a"] | ||
} | ||
|
||
# the file expected by this check will not exist when started, | ||
# so the check will error-out and be in a warning state until | ||
# it's been created | ||
check { | ||
name = "alive-2b" | ||
type = "script" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "cat" | ||
args = ["${NOMAD_TASK_DIR}/alive-2b"] | ||
} | ||
} | ||
|
||
service { | ||
name = "task-service-3" | ||
|
||
# this check should always time out and so the service | ||
# should not be marked healthy | ||
check { | ||
name = "always-dead" | ||
type = "script" | ||
interval = "2s" | ||
timeout = "1s" | ||
command = "sleep" | ||
args = ["10"] | ||
} | ||
} | ||
|
||
driver = "raw_exec" | ||
|
||
config { | ||
command = "bash" | ||
args = ["-c", "sleep 15000"] | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
job "task_check" { | ||
datacenters = ["dc1"] | ||
type = "service" | ||
|
||
group "task_check" { | ||
count = 1 | ||
|
||
task "test" { | ||
service { | ||
name = "task-service-1" | ||
|
||
# after update, check name has changed | ||
check { | ||
name = "alive-1a" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-1a"] | ||
} | ||
} | ||
|
||
service { | ||
name = "task-service-2" | ||
|
||
check { | ||
name = "alive-2a" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-2a"] | ||
} | ||
|
||
# after updating, this check will always pass | ||
check { | ||
name = "alive-2b" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "2s" | ||
command = "echo" | ||
args = ["alive-2b"] | ||
} | ||
} | ||
|
||
service { | ||
name = "task-service-3" | ||
|
||
# this check should always time out and so the service | ||
# should not be marked healthy | ||
check { | ||
name = "always-dead" | ||
type = "script" | ||
task = "test" | ||
interval = "2s" | ||
timeout = "1s" | ||
command = "sleep" | ||
args = ["10"] | ||
} | ||
} | ||
|
||
driver = "raw_exec" | ||
|
||
config { | ||
command = "bash" | ||
args = ["-c", "sleep 15000"] | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.