From 20a574566302dc9e257e188a1841b46341d1a60a Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:58:36 +0530 Subject: [PATCH 1/8] Update elasticsearch-exporter.yaml --- .../sunbird-monitoring/templates/elasticsearch-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml index e3a60ff61c..99817b9fba 100644 --- a/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml +++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml @@ -1,5 +1,5 @@ es: - uri: "http://{{ groups['es-1'][0] }}:9200" + uri: "http://{{ groups['es-2'][0] }}:9200" serviceMonitor: enabled: true # namespace: monitoring From 9234fd90e1ec1e79fa294455a51506520c3978a5 Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:30:59 +0530 Subject: [PATCH 2/8] Update service.yaml --- .../helm_charts/core/hawkeyesuperset/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/hawkeyesuperset/templates/service.yaml b/kubernetes/helm_charts/core/hawkeyesuperset/templates/service.yaml index 5921bf6a1d..7621962310 100644 --- a/kubernetes/helm_charts/core/hawkeyesuperset/templates/service.yaml +++ b/kubernetes/helm_charts/core/hawkeyesuperset/templates/service.yaml @@ -16,7 +16,7 @@ spec: ports: - port: {{ .Values.service.port }} targetPort: http - nodePort: 31566 + nodePort: 31966 protocol: TCP name: http selector: From 6a2e4d61e87a320ee0a7f4e48366eaa68a520a57 Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:04:42 +0530 Subject: [PATCH 3/8] Update taxonomy-service_application.conf --- .../templates/taxonomy-service_application.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf b/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf index 332206c502..9ad06d30f8 100644 --- a/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf @@ -406,3 +406,13 @@ cloudstorage { read_base_path="{{ cloudstorage_base_path }}" write_base_path={{ valid_cloudstorage_base_urls }} } + +framework { + keyspace: "{{ lp_cassandra_keyspace_prefix }}_hierarchy_store" + cache { + ttl: 86400 + enable: true + } + categories_cached: ["subject", "medium", "gradeLevel", "board"] + max_term_creation_limit: 200 +} From 0df5d5d5f112174d9e02b91da693730e556df82b Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:05:48 +0530 Subject: [PATCH 4/8] Update sunbird_knowledge-mw-service.env --- .../templates/sunbird_knowledge-mw-service.env | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env index fae25933e4..63c4c55c9e 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env @@ -58,3 +58,9 @@ sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} sunbird_health_check_enable={{sunbird_health_check_enable}} # Release-3.0.0 sunbird_keycloak_public_key={{core_vault_sunbird_sso_publickey}} + +#Release-5.0.0 +enable_user_token_validation={{knowledge_mw_enable_user_token_validation | default('false')}} + +#Release-5.6.0 +sunbird_taxonomy_service_api_base_url={{sunbird_taxonomy_service_api_base_url | default('http://taxonomy-service:9000')}} From e5448f077be125ee28346d4c3bc84a682bbd4a75 Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:35:35 +0530 Subject: [PATCH 5/8] Update content-service_application.conf --- .../stack-sunbird/templates/content-service_application.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf index 8e8fa56f35..138bdebb2c 100644 --- a/ansible/roles/stack-sunbird/templates/content-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf @@ -505,6 +505,8 @@ kafka { topic.send.enable : true topics.instruction : "{{ env_name }}.learning.job.request" publish.request.topic : "{{ env_name }}.publish.job.request" + kafka.topics.graph.event = "{{ env_name }}.learning.graph.events" + } # DIAL Link Config From 2da06c4fccacdc0370353e736bb6571121ce6af6 Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:44:49 +0530 Subject: [PATCH 6/8] Update elasticsearch-exporter.yaml --- .../sunbird-monitoring/templates/elasticsearch-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml index 99817b9fba..e3a60ff61c 100644 --- a/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml +++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/elasticsearch-exporter.yaml @@ -1,5 +1,5 @@ es: - uri: "http://{{ groups['es-2'][0] }}:9200" + uri: "http://{{ groups['es-1'][0] }}:9200" serviceMonitor: enabled: true # namespace: monitoring From dcf0ee3c94e0c5d8bb538dee37ed5742df392476 Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:51:58 +0530 Subject: [PATCH 7/8] Update content-service_application.conf --- .../stack-sunbird/templates/content-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf index 138bdebb2c..454307d62d 100644 --- a/ansible/roles/stack-sunbird/templates/content-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf @@ -505,7 +505,7 @@ kafka { topic.send.enable : true topics.instruction : "{{ env_name }}.learning.job.request" publish.request.topic : "{{ env_name }}.publish.job.request" - kafka.topics.graph.event = "{{ env_name }}.learning.graph.events" + topics.graph.event = "{{ env_name }}.learning.graph.events" } From 92e2a36f4a118889eb2e5b7f94398b33a4e171ef Mon Sep 17 00:00:00 2001 From: Sanket Nagdive <31030038+sanketnagdive@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:58:17 +0530 Subject: [PATCH 8/8] Update content-service_application.conf --- .../stack-sunbird/templates/content-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf index 454307d62d..288011a889 100644 --- a/ansible/roles/stack-sunbird/templates/content-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf @@ -505,7 +505,7 @@ kafka { topic.send.enable : true topics.instruction : "{{ env_name }}.learning.job.request" publish.request.topic : "{{ env_name }}.publish.job.request" - topics.graph.event = "{{ env_name }}.learning.graph.events" + topics.graph.event : "{{ env_name }}.learning.graph.events" }