Merge branch 'cron-interval' into 'master'

Custom Cron job interval

See merge request medina/evidence-collector!12

.env

@@ -19,3 +19,5 @@ clouditor_port=9090
 clouditor_oauth2_port=8080
 clouditor_client_id=clouditor
 clouditor_client_secret=clouditor
+
+wazuh_check_interval=300
\ No newline at end of file

MANIFEST

-VERSION=v0.0.13
+VERSION=v0.0.14
 SERVICE=evidence-collector

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

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
 

kubernetes/wazuh-vat-evidence-collector-configmap.yaml

@@ -21,3 +21,5 @@ data:
         
     clouditor_host: 'security-assessment-svc'
     clouditor_port: '9090'
+
+    wazuh_check_interval: '300'
\ No newline at end of file

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)
\ No newline at end of file