diff --git a/Changelog.md b/Changelog.md
index 951b8a0207c914d9619533925095834b13569438..4d21100a47fd4d27e6da4e04eb85794038dac1b0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
+## [0.8] - 2023-08-23
+- Added cleanup of events for deleted checks so the GUI is usable
+
## [0.7] - 2022-10-19
- POL1-624: Allow supporting GTT as a GWS Direct ISP
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a047e435811c03a31e4c65c0d7ca9b7ce8d0cb2a
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 GÉANT Vereniging
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/brian_polling_manager/main.py b/brian_polling_manager/main.py
index 90ba9f94c8841906efaa2f50bab5a7f4c518781e..1228b238a0b512b172b8cc631e8e646ca81e4797 100644
--- a/brian_polling_manager/main.py
+++ b/brian_polling_manager/main.py
@@ -100,6 +100,9 @@ def refresh(config, force=False):
}
jsonschema.validate(result, REFRESH_RESULT_SCHEMA) # sanity
+ # remove events for deleted checks, otherwise they stick around forever
+ sensu.clean_events(config['sensu'])
+
statsd_config = config.get('statsd', None)
if statsd_config:
for key, counts in result.items():
diff --git a/brian_polling_manager/sensu.py b/brian_polling_manager/sensu.py
index 1ac0bf705ca11978dabdc480f7959e1591eec132..9252b6a3528838572f664c1a5242845cd4d11630 100644
--- a/brian_polling_manager/sensu.py
+++ b/brian_polling_manager/sensu.py
@@ -5,6 +5,7 @@ import copy
import logging
import random
import requests
+from datetime import datetime
logger = logging.getLogger(__name__)
@@ -100,6 +101,38 @@ def checks_match(a, b) -> bool:
return True
+def clean_events(params, namespace='default'):
+ logger.info('cleaning events for deleted checks')
+ url = random.choice(params['api-base'])
+ r = requests.get(f'{url}/api/core/v2/namespaces/{namespace}/events',
+ headers={'Authorization': f'Key {params["api-key"]}'})
+ r.raise_for_status()
+
+ events = r.json()
+
+ all_checks = load_all_checks(params, namespace)
+ check_names = {c['metadata']['name'] for c in all_checks}
+
+ with requests.Session() as session:
+ session.headers.update({'Authorization': f'Key {params["api-key"]}'})
+ for event in events:
+ if event['check']['metadata']['name'] not in check_names:
+ last_execution = event['check']['executed']
+ days_since_last_execution = (datetime.utcnow() - datetime.fromtimestamp(last_execution)).days
+
+ if days_since_last_execution <