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.

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

[ED-3649] merge release-6.0.0 changes to 7.0.0 #3998

Merged
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
408c8c4
Fix syntax (#3894)
santhosh-tg Sep 14, 2023
d6c6875
Updated vars for cron schedule (#3895)
raghupathiguduri Sep 19, 2023
8dc81f6
[ED-2793] Fix: release-6.0.0 installation issues (#3900)
santhosh-tg Sep 25, 2023
6320664
Update main.yml with cassandra (#3845) (#3901)
santhosh-tg Sep 25, 2023
6ce00cf
ED-2838: ##Release-6.0.0 new variables (#3899)
tsprasath Sep 26, 2023
3924727
[ED-2793] Fix installation issues (#3905)
santhosh-tg Sep 29, 2023
bf876cc
[ED-2793] Add OCI specific vars (#3912)
santhosh-tg Oct 27, 2023
d8d4479
Add ml_core_internal_access_token for private repo template
aks30 Nov 3, 2023
2101224
Merge pull request #3918 from aks30/patch-9
santhosh-tg Nov 3, 2023
22eaac2
Update cassandra jenkins job config (#3927)
santhosh-tg Nov 30, 2023
b8d7b88
saving changes (#3935)
ankit1shahu Dec 11, 2023
7c59bce
#OB-553 fix: Analytics service issue fixes for OCI
sowmya-dixit Feb 14, 2024
5af4495
#OB-553 fix: Analytics service issue fixes for OCI
sowmya-dixit Feb 15, 2024
3fb0c3e
ED-3534:- Adoption Changes in ML service (#3963)
ankit1shahu Feb 20, 2024
0d2daa4
ED-3079: deploy nginx to support cors for s3 compatible object storag…
ddevadat Feb 28, 2024
eb6d21a
Added new kafka topics in main.yml and config.j2 (#3970)
prashanthShiksha Feb 28, 2024
463de74
Issue #CO-824: dynamic redirect URL
Mar 13, 2024
856963b
Issue #CO-824: dynamic redirect URL
Mar 14, 2024
cc13e08
Issue #CO-824: SSO Isse condition update
Mar 15, 2024
6c55e1a
Merge pull request #3972 from shubhambansaltarento/bug/CO-CO-824
santhosh-tg Mar 15, 2024
e647be6
Merge pull request #3961 from sowmya-dixit/release-6.0.0
santhosh-tg Mar 28, 2024
bd77480
Issue ED-0000 report service env update
rajeevsathish Apr 2, 2024
c474dce
Issue ED-0000 report service env update (#3977)
rajeevsathish Apr 2, 2024
1e2d9ed
Issue ED-0000 report service env update
rajeevsathish Apr 3, 2024
d4b852e
Issue ED-0000 report service env update
rajeevsathish Apr 3, 2024
bdccf0e
Merge pull request #3979 from rajeevsathish/6.0.0
santhosh-tg Apr 3, 2024
ac243f7
Issue ED-0000 report service env update (#3981)
rajeevsathish Apr 4, 2024
7183cce
ED-3534:- Adoption Changes in ML service (#3983)
Vivek-M-08 Apr 15, 2024
d14902b
Issue #IQ-750 fix: added script for inquiry schema upload
krgauraw Apr 15, 2024
e0169de
Merge pull request #3985 from krgauraw/release-6.0.0
santhosh-tg Apr 15, 2024
890d5a8
Issue #IQ-750 fix: updated jenkins file
krgauraw Apr 15, 2024
ce7f1e7
Merge pull request #3986 from krgauraw/release-6.0.0
santhosh-tg Apr 15, 2024
9d27bff
added the faust related changes
Apr 16, 2024
17fcae4
Issue #IQ-750 fix: updated jenkins script
krgauraw Apr 16, 2024
669e9b5
Merge pull request #3987 from krgauraw/release-6.0.0
santhosh-tg Apr 16, 2024
4a20409
added the value to ml_analytics_faust_applications_list
Apr 16, 2024
b65d398
Update secrets.yml
ankit1shahu Apr 17, 2024
70c69d1
Merge pull request #3988 from Vivek-M-08/release-6.0.0
santhosh-tg Apr 17, 2024
b4a3248
Merge pull request #3990 from ankitpws/patch-1
santhosh-tg Apr 17, 2024
06cc35a
ED-3534:- Adoption Changes in ML service (#3993)
Vivek-M-08 Apr 19, 2024
f48b749
Add release-6.0.0 missing vars
santhosh-tg Apr 30, 2024
7e703a9
Add release-6.0.0 missing vars (#3995)
santhosh-tg May 6, 2024
966e885
Merge branch 'project-sunbird:release-6.0.0' into release-6.0.0
santhosh-tg May 6, 2024
aa80d59
Add inquiry-schema-upload Jenkinsfile
santhosh-tg Apr 12, 2024
8ce8d17
Merge branch 'release-6.0.0' into release-7.0.0
santhosh-tg May 6, 2024
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
Prev Previous commit
Next Next commit
added the faust related changes
  • Loading branch information
vivek authored and vivek committed Apr 16, 2024
commit 9d27bffe96c005fd9fd199f2fccbabf6f7316273
5 changes: 1 addition & 4 deletions ansible/roles/ml-analytics-service/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -138,7 +138,4 @@ ml_analytics_batch_cron_hour: "{{ ml_batch_cron_hour | default('18') }}"
ml_analytics_nvsk_cron_minute: "{{ ml_nvsk_cron_minute | default('30') }}"
ml_analytics_nvsk_cron_hour: "{{ ml_nvsk_cron_hour | default('7') }}"
ml_analytics_nvsk_cron_weekday: "{{ ml_nvsk_cron_weekday | default('4') }}"
ml_analytics_survey_meta_druid_topic_name : "{{ env_name }}.ml.survey.meta"
ml_analytics_survey_completed_druid_topic_name : "{{ env_name }}.ml.survey.status.completed"
ml_analytics_survey_started_druid_topic_name : "{{ env_name }}.ml.survey.status.started"
ml_analytics_survey_inprogress_druid_topic_name : "{{ env_name }}.ml.survey.status.inprogress"
ml_analytics_faust_applications_list: "{{ ml_analytics_faust_applications_list }}"
12 changes: 5 additions & 7 deletions ansible/roles/ml-analytics-service/templates/config.j2
Original file line number Diff line number Diff line change
@@ -130,13 +130,6 @@ survey_raw_topic = {{ ml_analytics_kafka_survey_topic_name }}

survey_druid_topic = {{ ml_analytics_kafka_survey_druid_topic_name }}

survey_meta_druid_topic = {{ ml_analytics_survey_meta_druid_topic_name }}

survey_completed_druid_topic = {{ ml_analytics_survey_completed_druid_topic_name }}

survey_started_druid_topic = {{ ml_analytics_survey_started_druid_topic_name }}

survey_inprogress_druid_topic = {{ ml_analytics_survey_inprogress_druid_topic_name }}

[LOGS]

@@ -270,3 +263,8 @@ store = {{ ml_analytics_reports_store }}
[ML_CORE_SERVICE_URL]

url = {{ ml_analytics_core_service }}


[SERVICES]

faust_applications_list = {{ ml_analytics_faust_applications_list }}
14 changes: 12 additions & 2 deletions ansible/roles/stack-sunbird/templates/ml-analytics-service.conf
Original file line number Diff line number Diff line change
@@ -71,8 +71,6 @@ survey_collection = surveys

metadata_url = http://{{groups['druid'][0]}}:8081/druid/coordinator/v1/datasources/

datasource_url = http://{{groups['ml-raw-broker'][0]}}:8082/druid/v2/datasources

batch_url = http://{{groups['druid'][0]}}:8081/druid/indexer/v1/task

metadata_rollup_url = http://{{groups['druid'][0]}}:8081/druid/coordinator/v1/datasources/
@@ -81,8 +79,16 @@ batch_rollup_url = http://{{groups['druid'][0]}}:8081/druid/indexer/v1/task

urlQuery = http://{{groups['druid'][0]}}:8082/druid/v2?pretty

datasource_url = http://{{groups['ml-raw-broker'][0]}}:8082/druid/v2/datasources

sql_url = http://{{groups['ml-raw-broker'][0]}}:8082/druid/v2/sql/

coordinator_url = http://{{groups['ml-raw-coordinator'][0]}}:8081/status/health

overload_url = http://{{groups['ml-raw-overload'][0]}}:8081/status/health

historical_url = http://{{groups['ml-raw-historical'][0]}}:8081/status/health

observation_status_injestion_spec = '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type": "CloudType","uris": ["CloudURI"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"sl-observation-status","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"updatedAt","format":"auto"},"dimensionsSpec":{"dimensions":["status","entity_externalId","entity_id","entity_type","solution_id","solution_externalId","submission_id","entity_name","solution_name","role_title","school_name","school_code","school_externalId","state_name","state_code","state_externalId","district_name","district_code","district_externalId","block_name","block_code","block_externalId","cluster_name","cluster_code","cluster_externalId","completedDate","channel","parent_channel","program_id","program_externalId","program_name","app_name","user_id","private_program","solution_type","organisation_name","ecm_marked_na","board_name","updatedAt","organisation_id","user_type","observed_school_name","observed_school_id","observed_school_code","observed_state_name","observed_state_id","observed_state_code","observed_district_name","observed_district_id","observed_district_code","observed_block_name","observed_block_id","observed_block_code","observed_cluster_name","observed_cluster_id","observed_cluster_code","isRubricDriven","criteriaLevelReport"]},"metricsSpec":[]}}}'

project_injestion_spec = '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type": "CloudType","uris": ["CloudURI"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"sl-project","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"project_updated_date","format":"auto"},"dimensionsSpec":{"dimensions":[]},"metricsSpec":[]}}}'
@@ -282,3 +288,7 @@ store = {{ ml_analytics_reports_store }}
[ML_CORE_SERVICE_URL]

url = http://{{private_ingressgateway_ip}}/ml-core

[SERVICES]

faust_applications_list = {{ faust_applications_list }}