diff --git a/.env b/.env index 908aec1cf90a456bb9ebd94a43f7d6208ea357ad..988071e5d9bca06c7cab9099c61d216038486bb2 100644 --- a/.env +++ b/.env @@ -18,4 +18,6 @@ clouditor_host=192.168.33.14 clouditor_port=9090 clouditor_oauth2_port=8080 clouditor_client_id=clouditor -clouditor_client_secret=clouditor \ No newline at end of file +clouditor_client_secret=clouditor + +wazuh_check_interval=300 \ No newline at end of file diff --git a/MANIFEST b/MANIFEST index ab968346af5f42372ec6f43df6fa07085d0bcb87..cfffdeccddecd56ab65f231a90eee39933e933e2 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,2 +1,2 @@ -VERSION=v0.0.13 +VERSION=v0.0.14 SERVICE=evidence-collector diff --git a/Makefile b/Makefile index c4e391d3a2879cfc74e59b0382332b5593f98a54..d9784edd631cdfb3a0b5e918517d246df4492daf 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,6 @@ run: docker run --env-file .env -v ${PWD}/resource_id_map.json:/evidence-collector/resource_id_map.json --name evidence-collector evidence-collector stop-and-clean: - docker stop evidence-collector || \ - docker rm evidence-collector || \ + docker stop evidence-collector + docker container rm evidence-collector docker volume rm resource_id_map.json \ No newline at end of file diff --git a/README.md b/README.md index 4d61a10022150dcbf47393e8e14aa285666d9354..64ca89423c72f9880ade97c564d695e47c713260 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ All of the following environment variables have to be set (or passed to containe | `clouditor_oauth2_port` | Clouditor port used for authentication services. Default value `8080`. | | `clouditor_client_id` | Clouditor OAuth2 default id. Default value `clouditor`. | | `clouditor_client_secret` | Clouditor OAuth2 default secret. Default value `clouditor`. | +| `wazuh_check_interval` | Interval in seconds; how often should evidence be created and forwarded. Should be the same as the check interval set on Wazuh manager. | ### Medina resource ID mapping diff --git a/kubernetes/wazuh-vat-evidence-collector-configmap.yaml b/kubernetes/wazuh-vat-evidence-collector-configmap.yaml index faaf1b712e6319c7696e772e296a439d620832e2..4814a24e472b524628ae6fa8a4298220092ffc7b 100644 --- a/kubernetes/wazuh-vat-evidence-collector-configmap.yaml +++ b/kubernetes/wazuh-vat-evidence-collector-configmap.yaml @@ -20,4 +20,6 @@ data: redis_queue: 'low' clouditor_host: 'security-assessment-svc' - clouditor_port: '9090' \ No newline at end of file + clouditor_port: '9090' + + wazuh_check_interval: '300' \ No newline at end of file diff --git a/scheduler/scheduler.py b/scheduler/scheduler.py index 6d78c89e8f89bcdf17522dab1b5363a41f893739..f05780951fbab9ac3904f277387d9778b1b5b5d0 100644 --- a/scheduler/scheduler.py +++ b/scheduler/scheduler.py @@ -9,6 +9,8 @@ REDIS_HOST = os.environ.get("redis_host") REDIS_PORT = int(os.environ.get("redis_port")) REDIS_QUEUE = os.environ.get("redis_queue") +WAZUH_CHECK_INTERVAL = int(os.environ.get("wazuh_check_interval")) + def remove_jobs(scheduler): jobs = scheduler.get_jobs() for job in jobs: @@ -23,13 +25,10 @@ redis = Redis(REDIS_HOST, REDIS_PORT) q = Queue(REDIS_QUEUE, connection=redis) scheduler = Scheduler(connection=redis) -# TODO: Remove if needed remove_jobs(scheduler) -# TODO: Change cron expression and repeat value for production verion. -# Should probably be "0 0 * * * ". scheduler.cron( - '* * * * * ', + '*/' + str(int(WAZUH_CHECK_INTERVAL / 60)) + ' * * * * ', func=wazuh_evidence_collector.main, args=[], repeat=None, @@ -37,5 +36,4 @@ scheduler.cron( use_local_timezone=False ) -# TODO: Remove if needed -print_jobs(scheduler) +print_jobs(scheduler) \ No newline at end of file