From 3da6578e9b2d8c2babd181733b1579aef1896047 Mon Sep 17 00:00:00 2001 From: Andy Shultz Date: Thu, 16 Nov 2023 08:48:11 -0500 Subject: [PATCH 1/3] feat: add settings for detailed search logging (default off) devstack on, production load from environment --- lms/envs/common.py | 3 +++ lms/envs/devstack.py | 1 + lms/envs/production.py | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/lms/envs/common.py b/lms/envs/common.py index 2841563260..a2f1c57599 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1415,6 +1415,9 @@ ELASTIC_SEARCH_CONFIG = [ } ] +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 index 5c5aa74e39..44b5446f4c 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -168,6 +168,7 @@ FEATURES['LICENSING'] = True 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 index c846c6d377..a50dedf906 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -771,6 +771,11 @@ SEARCH_SKIP_SHOW_IN_CATALOG_FILTERING = ENV_TOKENS.get( 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', [{}]) From 8526601466be27647b0849acb70acf6ee53098f5 Mon Sep 17 00:00:00 2001 From: Andy Shultz Date: Thu, 16 Nov 2023 09:01:53 -0500 Subject: [PATCH 2/3] fix: fix upgrade-package usage string --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f8a9f22ede..55252bf2af 100644 --- 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 From 3fba263fea8b458c04d809281f10211779c59dd4 Mon Sep 17 00:00:00 2001 From: Andy Shultz Date: Thu, 16 Nov 2023 09:01:30 -0500 Subject: [PATCH 3/3] feat: bump edx-search to 3.7.1 --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 714952a1b5..7186cb2041 100644 --- 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 index f94fd4b028..a6d52626c4 100644 --- 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 index 7006772a93..c57460c62a 100644 --- 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 index 9d9a2ea89f..cf2c368ee2 100644 --- 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