diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml index 73114a581f..f9eeb13b05 100644 --- a/services/chat/docker-compose.ci.yml +++ b/services/chat/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index d04d2acb50..39ebfe1c5e 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -30,6 +30,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/clsi/docker-compose.ci.yml b/services/clsi/docker-compose.ci.yml index d70197f669..f1371362b4 100644 --- a/services/clsi/docker-compose.ci.yml +++ b/services/clsi/docker-compose.ci.yml @@ -23,6 +23,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/clsi/docker-compose.yml b/services/clsi/docker-compose.yml index 0c301f46c5..388f2d839f 100644 --- a/services/clsi/docker-compose.yml +++ b/services/clsi/docker-compose.yml @@ -38,6 +38,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml index 73114a581f..f9eeb13b05 100644 --- a/services/contacts/docker-compose.ci.yml +++ b/services/contacts/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index e895d9e93e..adb4968ba5 100644 --- a/services/contacts/docker-compose.yml +++ b/services/contacts/docker-compose.yml @@ -30,6 +30,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml index f0733448cc..8163d53b7b 100644 --- a/services/docstore/docker-compose.ci.yml +++ b/services/docstore/docker-compose.ci.yml @@ -24,6 +24,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres GCS_API_ENDPOINT: gcs:9090 diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index 55400d9417..0d8493ab3a 100644 --- a/services/docstore/docker-compose.yml +++ b/services/docstore/docker-compose.yml @@ -33,6 +33,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres GCS_API_ENDPOINT: gcs:9090 diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml index 9acaacf369..20555a8e54 100644 --- a/services/document-updater/docker-compose.ci.yml +++ b/services/document-updater/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index 955e2f6f6d..b8aca3cdee 100644 --- a/services/document-updater/docker-compose.yml +++ b/services/document-updater/docker-compose.yml @@ -30,6 +30,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml index 2a90f26046..a8cbd5faf8 100644 --- a/services/filestore/docker-compose.ci.yml +++ b/services/filestore/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres AWS_S3_ENDPOINT: http://s3:9090 diff --git a/services/filestore/docker-compose.yml b/services/filestore/docker-compose.yml index 628a368049..6f4cdb4168 100644 --- a/services/filestore/docker-compose.yml +++ b/services/filestore/docker-compose.yml @@ -36,6 +36,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres AWS_S3_ENDPOINT: http://s3:9090 diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 73114a581f..f9eeb13b05 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index a203cc28a6..d815de7211 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -30,6 +30,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml index 4e90129f69..a55b372369 100644 --- a/services/real-time/docker-compose.ci.yml +++ b/services/real-time/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index bd9138548c..1e3f7c7e0d 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -30,6 +30,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/spelling/docker-compose.ci.yml b/services/spelling/docker-compose.ci.yml index 73114a581f..f9eeb13b05 100644 --- a/services/spelling/docker-compose.ci.yml +++ b/services/spelling/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/spelling/docker-compose.yml b/services/spelling/docker-compose.yml index 23886c4409..b41743ab7c 100644 --- a/services/spelling/docker-compose.yml +++ b/services/spelling/docker-compose.yml @@ -36,6 +36,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} diff --git a/services/track-changes/docker-compose.ci.yml b/services/track-changes/docker-compose.ci.yml index bc6172b2cb..5eca22fb3b 100644 --- a/services/track-changes/docker-compose.ci.yml +++ b/services/track-changes/docker-compose.ci.yml @@ -21,6 +21,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres AWS_S3_ENDPOINT: http://s3:9090 diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 8957e0dbab..90cd52ac6e 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -30,6 +30,7 @@ services: ELASTIC_SEARCH_DSN: es:9200 REDIS_HOST: redis QUEUES_REDIS_HOST: redis + ANALYTICS_QUEUES_REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres AWS_S3_ENDPOINT: http://s3:9090 diff --git a/services/web/app/src/infrastructure/Queues.js b/services/web/app/src/infrastructure/Queues.js index 6e0303f676..8b20940fa2 100644 --- a/services/web/app/src/infrastructure/Queues.js +++ b/services/web/app/src/infrastructure/Queues.js @@ -21,15 +21,25 @@ const QUEUES_JOB_OPTIONS = { }, } +const ANALYTICS_QUEUES = [ + 'analytics-events', + 'analytics-editing-sessions', + 'analytics-user-properties', + 'post-registration-analytics', +] + const queues = {} function getQueue(queueName) { if (!queues[queueName]) { + const redisOptions = ANALYTICS_QUEUES.includes(queueName) + ? Settings.redis.analyticsQueues + : Settings.redis.queues const jobOptions = QUEUES_JOB_OPTIONS[queueName] || {} queues[queueName] = new Queue(queueName, { // this configuration is duplicated in /services/analytics/app/js/Queues.js // and needs to be manually kept in sync whenever modified - redis: Settings.redis.queues, + redis: redisOptions, defaultJobOptions: { removeOnComplete: MAX_COMPLETED_JOBS_RETAINED, removeOnFail: MAX_FAILED_JOBS_RETAINED, diff --git a/services/web/docker-compose.common.env b/services/web/docker-compose.common.env index 7190a8e525..5b46673eeb 100644 --- a/services/web/docker-compose.common.env +++ b/services/web/docker-compose.common.env @@ -2,6 +2,7 @@ ADMIN_PRIVILEGE_AVAILABLE=true BCRYPT_ROUNDS=1 REDIS_HOST=redis QUEUES_REDIS_HOST=redis +ANALYTICS_QUEUES_REDIS_HOST=redis MONGO_URL=mongodb://mongo/sharelatex SHARELATEX_ALLOW_PUBLIC_ACCESS=true LINKED_URL_PROXY=http://localhost:6543