diff --git a/brian_polling_manager/interfaces.py b/brian_polling_manager/interfaces.py index 655127078061e6aa9112d70dfd813c3934488024..666c64c22f3275b04e55636fa97927ac22919d93 100644 --- a/brian_polling_manager/interfaces.py +++ b/brian_polling_manager/interfaces.py @@ -9,7 +9,9 @@ logger = logging.getLogger(__name__) def load_ifc_checks(sensu_params): def _is_ifc_check(check): name = check['metadata']['name'] - return re.match(r'^check-([^-]+\.geant\.net)-(.+)$', name) + # check-* is the old-style name (add to the returned + # data so it can be deleted) + return re.match(r'^(check|ifc)-([^-]+\.geant\.net)-(.+)$', name) ifc_checks = filter(_is_ifc_check, sensu.load_all_checks(sensu_params)) return {c['metadata']['name']: c for c in ifc_checks} @@ -100,3 +102,4 @@ def refresh(sensu_params, state, statsd=None): statsd.gauge('interfaces', interfaces) statsd.gauge('checks_created', created) statsd.gauge('checks_updated', updated) + statsd.gauge('checks_deleted', len(extra_checks))