Skip to content

Make py3.6 compat, handle post_results when nagios endpoint is down. #1

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

Merged
brd merged 2 commits into from
Jun 27, 2022
Merged

Make py3.6 compat, handle post_results when nagios endpoint is down. #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f0ca7
Fixes for running under python 3.6 on centos 7.
care2DavidDPD Jun 27, 2022
86865f6
when the nagios end point is down a fatal expection happens, handle t…
care2DavidDPD Jun 27, 2022
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
10 changes: 9 additions & 1 deletion libpassiveagent/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ def run_check(c, pc, reschedule_and_post=True):
if reschedule_and_post:
schedule.reschedule(c, pc)
logging.info('run_check(): %s', c['passive checks'][pc]['command'].split())
res = subprocess.run(c['passive checks'][pc]['command'].split(), capture_output=True, text=True)
if sys.version_info[:3] > (3,7):
res = subprocess.run(c['passive checks'][pc]['command'].split(), capture_output=True, text=True)
else:
from subprocess import PIPE
res = subprocess.run(c['passive checks'][pc]['command'].split(), stdout=PIPE, stderr=PIPE)
stdout_str = res.stdout
res.stdout = stdout_str.decode("utf-8")
logging.info('run_check(): returncode: %s; stdout: %s', res.returncode, res.stdout.rstrip())
if reschedule_and_post:
post_results(c, pc, { "code": res.returncode, "stdout": res.stdout.rstrip() })
Expand Down Expand Up @@ -57,6 +63,8 @@ def post_results(c, pc, res):
r = requests.post(u, data=postdata, timeout=10)
except requests.Timeout:
logging.warning('Timeout posting results to %s', u)
except requests.exceptions.ConnectionError:
logging.warning('Connection Error posting results to %s', u)
else:
if r.status_code == requests.codes.ok:
logging.info('Submitted successfully to NRDP: %s', u)
Expand Down