diff --git a/api/tacticalrmm/checks/models.py b/api/tacticalrmm/checks/models.py index 82966c59..fe1dab6e 100644 --- a/api/tacticalrmm/checks/models.py +++ b/api/tacticalrmm/checks/models.py @@ -424,6 +424,7 @@ class Check(models.Model): disk=self.disk, ip=self.ip, script=self.script, + script_args=self.script_args, timeout=self.timeout, svc_name=self.svc_name, svc_display_name=self.svc_display_name, @@ -434,6 +435,7 @@ class Check(models.Model): log_name=self.log_name, event_id=self.event_id, event_type=self.event_type, + event_id_is_wildcard=self.event_id_is_wildcard, fail_when=self.fail_when, search_last_days=self.search_last_days, ) diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml index 7d33fcd2..fc3b4f78 100644 --- a/docker/docker-compose.override.yml +++ b/docker/docker-compose.override.yml @@ -1,6 +1,9 @@ # FOR PROD version: "3.7" +volumes: + # Gives access to the debug log for celery tasks + debug_log: services: # Container that hosts Vue frontend app: @@ -40,6 +43,7 @@ services: volumes: - scripts:/srv - mesh_token:/token + - debug_log:/app/tacticalrmm/private/log depends_on: - db - meshcentral @@ -69,6 +73,8 @@ services: - redis - proxy - database + volumes: + - debug_log:/app/tacticalrmm/private/log depends_on: - db - redis @@ -98,6 +104,8 @@ services: - redis - proxy - database + volumes: + - debug_log:/app/tacticalrmm/private/log depends_on: - db - redis @@ -127,6 +135,8 @@ services: - redis - proxy - database + volumes: + - debug_log:/app/tacticalrmm/private/log depends_on: - db - redis diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 15d63827..c1282097 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,6 +18,8 @@ volumes: scripts: # Volume for mesh token initial setup mesh_token: + # Useds to make the salt data persistent + salt_data: services: # Postgres Database for API service @@ -49,6 +51,7 @@ services: - "4506:4506" volumes: - scripts:/srv + - salt_data:/etc/salt/pki networks: - proxy