Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update event_bus_kafka and add event_bus_redis #32117

Merged
merged 1 commit into from
May 15, 2023
+46 −11
Merged

feat: update event_bus_kafka and add event_bus_redis #32117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions cms/envs/devstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
# in the LMS and CMS.
# .. toggle_tickets: 'https://github.com/openedx/edx-platform/pull/31813'
FEATURES['ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS'] = True
EVENT_BUS_PRODUCER = 'edx_event_bus_kafka.create_producer'
EVENT_BUS_KAFKA_SCHEMA_REGISTRY_URL = 'http://edx.devstack.schema-registry:8081'
EVENT_BUS_KAFKA_BOOTSTRAP_SERVERS = 'edx.devstack.kafka:29092'
EVENT_BUS_PRODUCER = 'edx_event_bus_redis.create_producer'
EVENT_BUS_REDIS_CONNECTION_URL = 'redis://:password@edx.devstack.redis:6379/'
EVENT_BUS_TOPIC_PREFIX = 'dev'
EVENT_BUS_CONSUMER = 'edx_event_bus_redis.RedisEventConsumer'

################# New settings must go ABOVE this line #################
########################################################################
Expand Down
6 changes: 3 additions & 3 deletions lms/envs/devstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,10 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
CLOSEST_CLIENT_IP_FROM_HEADERS = []

#################### Event bus backend ########################
EVENT_BUS_PRODUCER = 'edx_event_bus_kafka.create_producer'
EVENT_BUS_KAFKA_SCHEMA_REGISTRY_URL = 'http://edx.devstack.schema-registry:8081'
EVENT_BUS_KAFKA_BOOTSTRAP_SERVERS = 'edx.devstack.kafka:29092'
EVENT_BUS_PRODUCER = 'edx_event_bus_redis.create_producer'
EVENT_BUS_REDIS_CONNECTION_URL = 'redis://:password@edx.devstack.redis:6379/'
EVENT_BUS_TOPIC_PREFIX = 'dev'
EVENT_BUS_CONSUMER = 'edx_event_bus_redis.RedisEventConsumer'

######################## Subscriptions API SETTINGS ########################
SUBSCRIPTIONS_ROOT_URL = "http://host.docker.internal:18750"
Expand Down
5 changes: 3 additions & 2 deletions requirements/edx/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ edx-codejail
edx-django-utils>=5.4.0 # Utilities for cache, monitoring, and plugins
edx-drf-extensions
edx-enterprise
# edx-event-bus-kafka 2.0.0 adds support for configurable producer API
edx-event-bus-kafka>=2.0.0 # Kafka implementation of event bus
timmc-edx marked this conversation as resolved.
Show resolved Hide resolved
# edx-event-bus-kafka 4.0.0 adds support for configurable consumer API
edx-event-bus-kafka>=4.0.1 # Kafka implementation of event bus
edx-event-bus-redis
edx-milestones
edx-name-affirmation
edx-opaque-keys
Expand Down
12 changes: 11 additions & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ django==3.2.19
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-i18n-tools
# edx-milestones
# edx-name-affirmation
Expand Down Expand Up @@ -459,6 +460,7 @@ edx-django-utils==5.4.0
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-name-affirmation
# edx-rest-api-client
# edx-toggles
Expand Down Expand Up @@ -488,6 +490,8 @@ edx-enterprise==3.62.7
# learner-pathway-progress
edx-event-bus-kafka==4.0.1
# via -r requirements/edx/base.in
edx-event-bus-redis==0.1.1
# via -r requirements/edx/base.in
edx-i18n-tools==0.9.2
# via ora2
edx-milestones==0.4.0
Expand Down Expand Up @@ -543,6 +547,7 @@ edx-toggles==5.0.0
# -r requirements/edx/base.in
# edx-completion
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-name-affirmation
# edx-search
# edxval
Expand Down Expand Up @@ -775,6 +780,7 @@ openedx-events==7.2.0
# via
# -r requirements/edx/base.in
# edx-event-bus-kafka
# edx-event-bus-redis
openedx-filters==1.2.0
# via
# -r requirements/edx/base.in
Expand Down Expand Up @@ -969,7 +975,9 @@ rapidfuzz==3.0.0
recommender-xblock==2.0.1
# via -r requirements/edx/base.in
redis==4.5.5
# via -r requirements/edx/base.in
# via
# -r requirements/edx/base.in
# walrus
regex==2023.5.5
# via nltk
requests==2.30.0
Expand Down Expand Up @@ -1146,6 +1154,8 @@ vine==5.0.0
# kombu
voluptuous==0.13.1
# via ora2
walrus==0.9.2
# via edx-event-bus-redis
watchdog==3.0.0
# via -r requirements/edx/paver.txt
wcwidth==0.2.6
Expand Down
14 changes: 13 additions & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ django==3.2.19
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-i18n-tools
# edx-milestones
# edx-name-affirmation
Expand Down Expand Up @@ -583,6 +584,7 @@ edx-django-utils==5.4.0
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-name-affirmation
# edx-rest-api-client
# edx-toggles
Expand Down Expand Up @@ -612,6 +614,8 @@ edx-enterprise==3.62.7
# learner-pathway-progress
edx-event-bus-kafka==4.0.1
# via -r requirements/edx/testing.txt
edx-event-bus-redis==0.1.1
# via -r requirements/edx/testing.txt
edx-i18n-tools==0.9.2
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -676,6 +680,7 @@ edx-toggles==5.0.0
# -r requirements/edx/testing.txt
# edx-completion
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-name-affirmation
# edx-search
# edxval
Expand Down Expand Up @@ -1033,6 +1038,7 @@ openedx-events==7.2.0
# via
# -r requirements/edx/testing.txt
# edx-event-bus-kafka
# edx-event-bus-redis
openedx-filters==1.2.0
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1357,7 +1363,9 @@ rapidfuzz==3.0.0
recommender-xblock==2.0.1
# via -r requirements/edx/testing.txt
redis==4.5.5
# via -r requirements/edx/testing.txt
# via
# -r requirements/edx/testing.txt
# walrus
regex==2023.5.5
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1665,6 +1673,10 @@ voluptuous==0.13.1
# ora2
vulture==2.7
# via -r requirements/edx/development.in
walrus==0.9.2
# via
# -r requirements/edx/testing.txt
# edx-event-bus-redis
watchdog==3.0.0
# via -r requirements/edx/testing.txt
wcwidth==0.2.6
Expand Down
14 changes: 13 additions & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ django==3.2.19
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-i18n-tools
# edx-milestones
# edx-name-affirmation
Expand Down Expand Up @@ -561,6 +562,7 @@ edx-django-utils==5.4.0
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-name-affirmation
# edx-rest-api-client
# edx-toggles
Expand Down Expand Up @@ -590,6 +592,8 @@ edx-enterprise==3.62.7
# learner-pathway-progress
edx-event-bus-kafka==4.0.1
# via -r requirements/edx/base.txt
edx-event-bus-redis==0.1.1
# via -r requirements/edx/base.txt
edx-i18n-tools==0.9.2
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -653,6 +657,7 @@ edx-toggles==5.0.0
# -r requirements/edx/base.txt
# edx-completion
# edx-event-bus-kafka
# edx-event-bus-redis
# edx-name-affirmation
# edx-search
# edxval
Expand Down Expand Up @@ -980,6 +985,7 @@ openedx-events==7.2.0
# via
# -r requirements/edx/base.txt
# edx-event-bus-kafka
# edx-event-bus-redis
openedx-filters==1.2.0
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -1279,7 +1285,9 @@ rapidfuzz==3.0.0
recommender-xblock==2.0.1
# via -r requirements/edx/base.txt
redis==4.5.5
# via -r requirements/edx/base.txt
# via
# -r requirements/edx/base.txt
# walrus
regex==2023.5.5
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -1537,6 +1545,10 @@ voluptuous==0.13.1
# via
# -r requirements/edx/base.txt
# ora2
walrus==0.9.2
# via
# -r requirements/edx/base.txt
# edx-event-bus-redis
watchdog==3.0.0
# via -r requirements/edx/base.txt
wcwidth==0.2.6
Expand Down