From 44e0d79836c6b8b03fb2482293a7a0c511e305ad Mon Sep 17 00:00:00 2001 From: James Page Date: Sun, 15 Jul 2018 12:04:47 +0100 Subject: [PATCH] Fix NRPE stats collection Commit c0b936c7392c554bd3b72cc669484ab0b8960b8d broke NRPE stats collection via a cron job due to a misplacement of the conditional for checking for enablement of the management plugin. Restore previous code flow for NRPE stats enable/disable. Change-Id: Ice1058c8f926ff559c0bfac6615315ed6eefb11d Closes-Bug: 1778849 --- hooks/rabbitmq_server_relations.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/rabbitmq_server_relations.py b/hooks/rabbitmq_server_relations.py index ce8cf72f..50132cab 100755 --- a/hooks/rabbitmq_server_relations.py +++ b/hooks/rabbitmq_server_relations.py @@ -613,12 +613,13 @@ def update_nrpe_checks(): rsync(os.path.join(charm_dir(), 'scripts', 'collect_rabbitmq_stats.sh'), script) write_file(STATS_CRONFILE, cronjob) + elif os.path.isfile(STATS_CRONFILE): + os.remove(STATS_CRONFILE) + if config('management_plugin'): rsync(os.path.join(charm_dir(), 'scripts', 'check_rabbitmq_cluster.py'), os.path.join(NAGIOS_PLUGINS, 'check_rabbitmq_cluster.py')) - elif os.path.isfile(STATS_CRONFILE): - os.remove(STATS_CRONFILE) # Find out if nrpe set nagios_hostname hostname = nrpe.get_nagios_hostname()