Skip to content

Allow specifying multiple states #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiwiz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow specifying multiple states #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions check_docker/check_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,13 +575,15 @@ def check_memory(container, thresholds):


@multithread_execution()
def check_status(container, desired_state):
normized_desired_state = desired_state.lower()
def check_status(container, desired_states):
normalized_desired_states = [desired_state.lower() for desired_state in desired_states]
normalized_state = normalize_state(get_state(container)).lower()
if normized_desired_state != normalized_state:
critical("{} state is not {}".format(container, desired_state))
normalized_desired_state_str = ",".join(normalized_desired_states)

if normalized_state not in normalized_desired_states:
critical("{} state is not {}".format(container, normalized_desired_state_str))
return
ok("{} status is {}".format(container, desired_state))
ok("{} status is {}".format(container, normalized_desired_state_str))


@multithread_execution()
Expand Down Expand Up @@ -837,7 +839,7 @@ def process_args(args):
# State
parser.add_argument('--status',
dest='status',
action='store',
action='append',
type=str,
help='Desired container status (running, exited, etc).')

Expand Down