Skip to content
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

fix ignore_paused #74

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix ignore_paused #74

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64d5785
fix ignore_paused
ezkrg Sep 29, 2020
6768fd1
fix error count
ezkrg Sep 29, 2020
323e6cb
Merge branch 'master' into master
timdaman Oct 3, 2020
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
21 changes: 10 additions & 11 deletions check_docker/check_swarm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def check_swarm():
def process_global_service(name, ignore_paused=False):
bad_node_states = {'drain'}
if ignore_paused:
bad_node_states.add('paused')
bad_node_states.add('pause')

# Get all the nodes we care about based on their state
node_list, status = get_nodes()
Expand All @@ -193,13 +193,12 @@ def process_global_service(name, ignore_paused=False):
# Also note, this ignores conditions where services state they are running on a node not in the index.
service_tasks = get_service_tasks(name)
for task in service_tasks:
if task['Status']['State'] != 'running':
critical('Global service {service} has one or more tasks not running'.format(service=name))
return
node_index.discard(task['NodeID'])
if task['Status']['State'] == 'running' and task['NodeID'] in node_index:
node_index.discard(task['NodeID'])

if len(node_index) > 0:
critical('Global service {service} has {count} tasks not running'.format(service=name, count=len(node_list)))
critical('Global service {service} has {count} tasks not running'.format(service=name, count=len(node_index)))
return

ok('Global service {service} OK'.format(service=name))

Expand Down Expand Up @@ -266,6 +265,11 @@ def process_args(args):
default=DEFAULT_TIMEOUT,
help='Connection timeout in seconds. (default: %(default)s)')

parser.add_argument('--ignore_paused',
dest='ignore_paused',
action='store_true',
help="Don't require global services to be running on paused nodes")

swarm_group = parser.add_mutually_exclusive_group(required=True)

# Swarm
Expand All @@ -284,11 +288,6 @@ def process_args(args):
default=[],
help='One or more RegEx that match the names of the services(s) to check.')

swarm_group.add_argument('--ignore_paused',
dest='ignore_paused',
action='store_true',
help="Don't require global services to be running on paused nodes")

parser.add_argument('-V', action='version', version='%(prog)s {}'.format(__version__))

if len(args) == 0:
Expand Down