From d17e69b0de43d0cb5c57c0680e3b463534801423 Mon Sep 17 00:00:00 2001 From: Gustavo Silva Date: Thu, 27 Jul 2023 12:03:20 +0100 Subject: [PATCH 1/2] Prepare for new release (#14) * misc: tweak workflows (#7) Migrating conditions over as https://github.com/surface-security/surface/issues/86 * feature: support lifecycle policies on index creation (#8) * feature: support lifecycle policies on index creation ElasticSearch supports multiple lifecycle policies but when instances have many daily indexes, updating all existing indexes lifecycle policies can be cumbersome. Hence, to facilitate its management, collectors can specify lifecycle policies instead of attaching the default one (if your ElasticSearch has one, otherwise it's simply empty) which can be useful if you have different types of collectors and wish to apply different policies to them. * fixup: add testapp to installed apps This ensures collectors are loaded every time. Since `testapp` serves for testing, as well as to demonstrate how to use these packages, we should ensure we have a working example in this app. * misc: Update README Add install instructions, as well as a how-to to implement new collectors. * misc: bump version to new release * Update the version on Django in setup.cfg install_requirements (#13) Signed-off-by: pacuraro <122358966+pacuraro@users.noreply.github.com> * misc: version bump for new release --------- Signed-off-by: pacuraro <122358966+pacuraro@users.noreply.github.com> Signed-off-by: Gustavo Silva Co-authored-by: Duarte Duarte Co-authored-by: pacuraro <122358966+pacuraro@users.noreply.github.com> --- olympus/__init__.py | 3 ++- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/olympus/__init__.py b/olympus/__init__.py index 64895d1..9d5810e 100644 --- a/olympus/__init__.py +++ b/olympus/__init__.py @@ -1,4 +1,5 @@ -__version__ = '0.0.4' +__version__ = '0.0.5' + # set default_app_config when using django earlier than 3.2 try: diff --git a/setup.cfg b/setup.cfg index 5527afa..b932168 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ zip_safe = False include_package_data = True packages = find: install_requires = - Django >= 3.0, < 4 + Django >= 3.0, < 5 elasticsearch >= 6.8, < 7 # TODO: make tqdm optional tqdm >= 4, < 5 From 4dfd726f79c1195377f7794681aa3d14c5cd77cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Pinto?= Date: Wed, 22 Oct 2025 14:27:09 +0100 Subject: [PATCH 2/2] Elasticsearch 7 support --- olympus/__init__.py | 2 +- setup.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/olympus/__init__.py b/olympus/__init__.py index 9d5810e..20b9d87 100644 --- a/olympus/__init__.py +++ b/olympus/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.0.5' +__version__ = '0.0.7' # set default_app_config when using django earlier than 3.2 diff --git a/setup.cfg b/setup.cfg index b932168..3a64d7d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,8 +24,8 @@ zip_safe = False include_package_data = True packages = find: install_requires = - Django >= 3.0, < 5 - elasticsearch >= 6.8, < 7 + Django >= 3.0, < 6 + elasticsearch >= 6.8, <= 7 # TODO: make tqdm optional tqdm >= 4, < 5 django-logbasecommand < 1