Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 42 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,6 @@ services:
FIDES__CONFIG_PATH: ${FIDES__CONFIG_PATH:-/fides/.fides/fides.toml}
FIDES__LOGGING__COLORIZE: "True"
FIDES__USER__ANALYTICS_OPT_OUT: "True"
FIDES__CELERY__HEALTHCHECK_PORT: "9001"
expose:
- 9001
volumes:
- type: bind
source: ./
Expand All @@ -146,16 +143,52 @@ services:
- /fides/src/fides.egg-info

worker-privacy-preferences:
extends:
service: worker-other
image: ethyca/fides:local
command: fides worker --queues=fides.privacy_preferences,fides.privacy_request_exports,fides.privacy_request_ingestion
depends_on:
redis:
condition: service_started
restart: always
healthcheck:
test: ["CMD", "celery", "-A", "fides.api.tasks", "inspect", "ping"]
start_period: 60s
interval: 20s
timeout: 5s
retries: 10
environment:
FIDES__CONFIG_PATH: ${FIDES__CONFIG_PATH:-/fides/.fides/fides.toml}
FIDES__LOGGING__COLORIZE: "True"
FIDES__USER__ANALYTICS_OPT_OUT: "True"
volumes:
- type: bind
source: ./
target: /fides
read_only: False
- /fides/src/fides.egg-info

worker-dsr:
extends:
service: worker-other
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:9001/"]
image: ethyca/fides:local
command: fides worker --queues=fides.dsr
depends_on:
redis:
condition: service_started
restart: always
healthcheck:
test: ["CMD", "celery", "-A", "fides.api.tasks", "inspect", "ping"]
start_period: 60s
interval: 20s
timeout: 5s
retries: 10
environment:
FIDES__CONFIG_PATH: ${FIDES__CONFIG_PATH:-/fides/.fides/fides.toml}
FIDES__LOGGING__COLORIZE: "True"
FIDES__USER__ANALYTICS_OPT_OUT: "True"
volumes:
- type: bind
source: ./
target: /fides
read_only: False
- /fides/src/fides.egg-info

redis:
image: "redis:8.0-alpine"
Expand Down
4 changes: 0 additions & 4 deletions src/fides/api/tasks/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
)

from fides.api.db.session import get_db_engine, get_db_session
from fides.api.tasks import celery_healthcheck
from fides.api.util.logger import setup as setup_logging
from fides.config import CONFIG, FidesConfig

Expand Down Expand Up @@ -103,7 +102,6 @@ def _create_celery(config: FidesConfig = CONFIG) -> Celery:
)

app = Celery(__name__)
celery_healthcheck.register(app) # type: ignore

celery_config: Dict[str, Any] = {
# Defaults for the celery config
Expand All @@ -114,8 +112,6 @@ def _create_celery(config: FidesConfig = CONFIG) -> Celery:
# Ops requires this to route emails to separate queues
"task_create_missing_queues": True,
"task_default_queue": "fides",
"healthcheck_port": config.celery.healthcheck_port,
"healthcheck_ping_timeout": config.celery.healthcheck_ping_timeout,
}

celery_config.update(config.celery)
Expand Down
4 changes: 0 additions & 4 deletions src/fides/api/tasks/celery_healthcheck/README.md

This file was deleted.

11 changes: 0 additions & 11 deletions src/fides/api/tasks/celery_healthcheck/__init__.py

This file was deleted.

73 changes: 0 additions & 73 deletions src/fides/api/tasks/celery_healthcheck/server.py

This file was deleted.

6 changes: 0 additions & 6 deletions src/fides/config/celery_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ class CelerySettings(FidesSettings):
description="If true, tasks are executed locally instead of being sent to the queue. "
"If False, tasks are sent to the queue.",
)
healthcheck_port: int = Field(
default=9000, description="The port to use for the health check endpoint"
)
healthcheck_ping_timeout: float = Field(
default=2.0, description="The timeout in seconds for the health check ping"
)
model_config = SettingsConfigDict(env_prefix=ENV_PREFIX)


Expand Down
Loading