Merge pull request #33732 from openedx/ashultz0/es-search-log-settings

ES courseware search log settings
openedx · Nov 16, 2023 · 6c6ecab · 6c6ecab
2 parents 942a241 + 3fba263
commit 6c6ecab
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -153,7 +153,7 @@ upgrade:  ## update the pip requirements files to use the latest releases satisf
 	$(MAKE) compile-requirements COMPILE_OPTS="--upgrade"
 
 upgrade-package: ## update just one package to the latest usable release
-	@test -n "$(package)" || { echo "\nUsage: make upgrade_package package=...\n"; exit 1; }
+	@test -n "$(package)" || { echo "\nUsage: make upgrade-package package=...\n"; exit 1; }
 	$(MAKE) compile-requirements COMPILE_OPTS="--upgrade-package $(package)"
 
 check-types: ## run static type-checking tests

diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -1415,6 +1415,9 @@ def _make_mako_template_dirs(settings):
     }
 ]
 
+SEARCH_COURSEWARE_CONTENT_LOG_PARAMS = False
+
+
 # .. setting_name: ELASTIC_SEARCH_INDEX_PREFIX
 # .. setting_default: ''
 # .. setting_description: Specifies the prefix used when namixng elasticsearch indexes related to edx-search.

diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
@@ -168,6 +168,7 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 FEATURES['ENABLE_COURSEWARE_SEARCH'] = True
 FEATURES['ENABLE_COURSEWARE_SEARCH_FOR_COURSE_STAFF'] = True
 SEARCH_ENGINE = 'search.elastic.ElasticSearchEngine'
+SEARCH_COURSEWARE_CONTENT_LOG_PARAMS = True
 
 ELASTIC_SEARCH_CONFIG = [
     {

diff --git a/lms/envs/production.py b/lms/envs/production.py
@@ -771,6 +771,11 @@ def get_env_setting(setting):
     SEARCH_SKIP_SHOW_IN_CATALOG_FILTERING,
 )
 
+SEARCH_COURSEWARE_CONTENT_LOG_PARAMS = ENV_TOKENS.get(
+    'SEARCH_COURSEWARE_CONTENT_LOG_PARAMS',
+    SEARCH_COURSEWARE_CONTENT_LOG_PARAMS,
+)
+
 # TODO: Once we have successfully upgraded to ES7, switch this back to ELASTIC_SEARCH_CONFIG.
 ELASTIC_SEARCH_CONFIG = ENV_TOKENS.get('ELASTIC_SEARCH_CONFIG_ES7', [{}])
 

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -532,7 +532,7 @@ edx-rest-api-client==5.6.1
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.6.0
+edx-search==3.7.1
     # via -r requirements/edx/kernel.in
 edx-sga==0.23.0
     # via -r requirements/edx/bundled.in

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -827,7 +827,7 @@ edx-rest-api-client==5.6.1
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.6.0
+edx-search==3.7.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -621,7 +621,7 @@ edx-rest-api-client==5.6.1
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.6.0
+edx-search==3.7.1
     # via -r requirements/edx/base.txt
 edx-sga==0.23.0
     # via -r requirements/edx/base.txt

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -642,7 +642,7 @@ edx-rest-api-client==5.6.1
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.6.0
+edx-search==3.7.1
     # via -r requirements/edx/base.txt
 edx-sga==0.23.0
     # via -r requirements/edx/base.txt