diff --git a/docker/conf/counters_journal_client.yml b/docker/conf/counters_journal_client_keys.yml rename from docker/conf/counters_journal_client.yml rename to docker/conf/counters_journal_client_keys.yml --- a/docker/conf/counters_journal_client.yml +++ b/docker/conf/counters_journal_client_keys.yml @@ -10,3 +10,4 @@ - content - origin - revision + - release diff --git a/docker/conf/counters_journal_client.yml b/docker/conf/counters_journal_client_messages.yml rename from docker/conf/counters_journal_client.yml rename to docker/conf/counters_journal_client_messages.yml --- a/docker/conf/counters_journal_client.yml +++ b/docker/conf/counters_journal_client_messages.yml @@ -7,6 +7,5 @@ prefix: swh.journal.objects group_id: swh.counters.journal_client object_types: - - content - - origin + - release - revision diff --git a/docker/docker-compose-counters.yml b/docker/docker-compose-counters.yml --- a/docker/docker-compose-counters.yml +++ b/docker/docker-compose-counters.yml @@ -23,12 +23,33 @@ timeout: 5s retries: 10 - swh-counters-journal-client: + swh-counters-journal-client-keys: image: swh/stack build: ./ entrypoint: /entrypoint.sh env_file: - ./env/common_python.env + environment: + JOURNAL_TYPE: keys + depends_on: + kafka: + condition: service_healthy + redis: + condition: service_healthy + swh-counters: + condition: service_healthy + volumes: + - "./conf/counters_journal_client_keys.yml:/etc/softwareheritage/counters/journal_client.yml:ro" + - "./services/swh-counters-journal-client/entrypoint.sh:/entrypoint.sh:ro" + + swh-counters-journal-client-messages: + image: swh/stack + build: ./ + entrypoint: /entrypoint.sh + env_file: + - ./env/common_python.env + environment: + JOURNAL_TYPE: messages depends_on: kafka: condition: service_healthy @@ -37,7 +58,7 @@ swh-counters: condition: service_healthy volumes: - - "./conf/counters_journal_client.yml:/etc/softwareheritage/counters/journal_client.yml:ro" + - "./conf/counters_journal_client_messages.yml:/etc/softwareheritage/counters/journal_client.yml:ro" - "./services/swh-counters-journal-client/entrypoint.sh:/entrypoint.sh:ro" redis: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -21,6 +21,7 @@ swh.journal.objects.origin_visit:1:1, swh.journal.objects.origin_visit_status:1:1, swh.journal.objects.revision:1:1, + swh.journal.objects.release:1:1, swh.journal.indexed.origin_intrinsic_metadata:1:1 depends_on: - zookeeper diff --git a/docker/services/swh-counters-journal-client/entrypoint.sh b/docker/services/swh-counters-journal-client/entrypoint.sh --- a/docker/services/swh-counters-journal-client/entrypoint.sh +++ b/docker/services/swh-counters-journal-client/entrypoint.sh @@ -12,6 +12,6 @@ *) echo "Starting swh-counters-journal client" exec wait-for-it kafka:9092 -s --timeout=0 -- \ - swh --log-level DEBUG counters --config-file /etc/softwareheritage/counters/journal_client.yml journal-client + swh --log-level DEBUG counters --config-file /etc/softwareheritage/counters/journal_client.yml journal-client ${JOURNAL_TYPE} ;; esac