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

Devops changes for Program join stories (ED-599) && Block Level Filters (ED-94) #3737

Merged
merged 4 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 25 additions & 2 deletions ansible/roles/kong-api/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ uci_admin_prefix: /uci
notification_service_prefix: /notification
registry_service_prefix: /rc
assessment_prefix: /assessment
programs_service_prefix: /programs
resource_prefix: /resource

# Service URLs
knowledge_mw_service_url: "http://knowledge-mw-service:5000"
Expand Down Expand Up @@ -7522,8 +7524,8 @@ kong_apis:
config.enabled: false

- name: getSolutionReportInformation
uris: "{{ solutions_service_prefix }}/mlcore/v1/read"
upstream_url: "{{ ml_core_service_url }}/v1/solutions/read"
uris: "{{ resource_prefix }}/mlreports/v1/filtervalues"
upstream_url: "{{{ ml_reports_service_url }}/v1/resource/filtervalues"
strip_uri: true
plugins:
- name: jwt
Expand Down Expand Up @@ -10001,3 +10003,24 @@ kong_apis:
- name: opa-checks
config.required: true
config.enabled: true

- name: joinProgramByUser
uris: "{{ programs_service_prefix }}/mlcore/v1/join"
upstream_url: "{{ ml_core_service_url }}/v1/programs/join"
strip_uri: true
plugins:
- name: jwt
- name: cors
- "{{ statsd_pulgin }}"
- name: acl
config.whitelist:
- programAccess
- name: rate-limiting
config.policy: local
config.hour: "{{ medium_rate_limit_per_hour }}"
config.limit_by: credential
- name: request-size-limiting
config.allowed_payload_size: "{{ small_request_size_limit }}"
- name: opa-checks
config.required: false
config.enabled: false
14 changes: 13 additions & 1 deletion ansible/roles/stack-sunbird/templates/ml-core-service.env
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,16 @@ ELASTICSEARCH_ENTITIES_INDEX={{ml_core_elasticsearch_user_extension_index_type |
USER_SERVICE_URL={{ml_core_user_service_URL | default("http://learner-service:9000")}}

## portal url of env
APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }}
APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }}

# Kafka enable or disable communication flag
KAFKA_COMMUNICATIONS_ON_OFF={{ml_core_kafka_communications_on_off | default("ON")}}

# IP address of kafka server with port without HTTP
KAFKA_URL={{ml_core_kafka_url | default(groups['processing-cluster-kafka'][0]+':9092')}}

# Kafka consumer group for ML Core Service
KAFKA_GROUP_ID={{ml_core_kafka_group_id | default("ml-core-service")}}

#Kafka topic name for pushing programUsers
PROGRAM_USERS_JOINED_TOPIC={{ml_core_program_users_joined_topic | default (env_name+".programuser.info")}}
13 changes: 13 additions & 0 deletions ansible/roles/stack-sunbird/templates/ml-reports-service.env
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@ SURVEY_DATASOURCE_NAME={{ml_report_survey_datasource_name | default("sl-survey")
# Survey evidence data source name
SURVEY_EVIDENCE_DATASOURCE_NAME={{ml_report_survey_evidence_datasource_name | default("sl-survey-evidence")}}

# Project Solution Resource data source name
PROJECT_RESOURCE_DATASOURCE_NAME = {{ml_project_resource_datasource_name | default("ml-project-status")}}

# Observation Solution Resource data source name
OBSERVATION_RESOURCE_DATASOURCE_NAME = {{ml_observation_resource_datasource_name | default("ml-obs-status")}}

# Survey Solution Resource data source name
SURVEY_RESOURCE_DATASOURCE_NAME = {{ml_survey_resource_datasource_name | default("ml-survey-status")}}


# Program Resource data source name
PROGRAM_RESOURCE_DATASOURCE_NAME = {{ml_program_resource_datasource_name | default("ml-user-program")}}

# Dhiti Thresold Values
#Restrict number of records to be shown for container reports
CONTENT_REPORT_THRESHOLD={{ml_report_content_report_threshold | default("5")}}
Expand Down