diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml index 4f782b6e41..59d1e70239 100644 --- a/ansible/inventory/env/group_vars/all.yml +++ b/ansible/inventory/env/group_vars/all.yml @@ -315,7 +315,7 @@ zk_port: 2181 kafka_broker_host: "{{groups['kafka']|join(',')}}" zookeeper_quorum: "{{groups['kafka']|join(':2182,')}}:2181" -sunbird_telemetry_kafka_topic: "{{env}}.telemetry.ingestion" +sunbird_telemetry_kafka_topic: "{{env}}.telemetry.ingest" sunbird_data_pipeline_kafka_topic: "{{env}}.telemetry.ingest" telemetry_proxy_url: "{{sunbird_ekstep_api_base_url}}/data/v3/telemetry" sunbird_telemetry_request_max_count: 100 @@ -564,7 +564,6 @@ player_limit_memory: 512M content_replicas: 1 content_reservation_memory: 1000M content_limit_memory: 1000M -learner_reservation_cpu: 1 badger_replicas: 1 badger_reservation_memory: 500MB badger_limit_memory: 500MB diff --git a/ansible/keycloak.yml b/ansible/keycloak.yml index a54b953dc9..3ec94fd47e 100644 --- a/ansible/keycloak.yml +++ b/ansible/keycloak.yml @@ -29,5 +29,4 @@ - name: After succesful migration and staring of keycloak, start back monit if installed service: name=monit state=started become: yes - when: ansible_facts.services.monit is defined - + when: ansible_facts.services.monit is defined \ No newline at end of file diff --git a/ansible/postgresql-data-update-managed.yml b/ansible/postgresql-data-update-managed.yml new file mode 100644 index 0000000000..145efd0efc --- /dev/null +++ b/ansible/postgresql-data-update-managed.yml @@ -0,0 +1,7 @@ +- hosts: localhost + gather_facts: no + become: yes + vars_files: + - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml'] + roles: + - postgresql-data-update-managed diff --git a/ansible/postgresql-data-update.yml b/ansible/postgresql-data-update.yml index e8cd6b30f4..e8cbfe2828 100644 --- a/ansible/postgresql-data-update.yml +++ b/ansible/postgresql-data-update.yml @@ -1,7 +1,6 @@ -- hosts: localhost - gather_facts: no +- hosts: postgresql-master become: yes vars_files: - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml'] roles: - - postgresql-data-update + - postgresql-data-update \ No newline at end of file diff --git a/ansible/roles/keycloak-deploy/tasks/main.yml b/ansible/roles/keycloak-deploy/tasks/main.yml index 052413c753..e0b3ae6995 100644 --- a/ansible/roles/keycloak-deploy/tasks/main.yml +++ b/ansible/roles/keycloak-deploy/tasks/main.yml @@ -1,12 +1,13 @@ --- +- include: bootstrap.yml + tags: + - bootstrap + - include: deploy.yml tags: - deploy - include: custom.yml tags: - - deploy + - custom -- include: bootstrap.yml - tags: - - bootstrap diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 8395295c9e..4c750937b4 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -89,9 +89,9 @@ premium_consumer_rate_limits: # Example: # kong_apis: # - name: "readContent" -# uris: "/v3/public/content/read" +# request_path: "/v3/public/content/read" # upstream_url: "{{ learning_service_url }}/v3/public/content/read" -# strip_uri: true +# strip_request_path: true # plugins: # - {name: 'jwt'} # - {name: 'cors'} @@ -100,11 +100,10 @@ premium_consumer_rate_limits: # - {name: 'rate-limiting', config.hour: "{{ medium_rate_limit_per_hour }}"} # - {name: 'request-size-limiting', config.allowed_payload_size: "{{ medium_request_size_limit }}" } kong_apis: - - name: PrivateContentAPIs - uris: "{{ private_content_prefix }}/v3" + request_path: "{{ private_content_prefix }}/v3" upstream_url: "{{ vm_learning_service_url }}/content/v3" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -118,9 +117,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createContent - uris: "{{ content_service_prefix }}/v1/create" + request_path: "{{ content_service_prefix }}/v1/create" upstream_url: "{{ content_service_url }}/v1/content/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -134,9 +133,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchContent - uris: "{{ content_service_prefix }}/v1/search" + request_path: "{{ content_service_prefix }}/v1/search" upstream_url: "{{ content_service_url }}/v1/content/search" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -147,9 +146,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateContent - uris: "{{ content_service_prefix }}/v1/update" + request_path: "{{ content_service_prefix }}/v1/update" upstream_url: "{{ content_service_url }}/v1/content/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -163,9 +162,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readContent - uris: "{{ content_service_prefix }}/v1/read" + request_path: "{{ content_service_prefix }}/v1/read" upstream_url: "{{ content_service_url }}/v1/content/read" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -176,9 +175,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: submitContentForReview - uris: "{{ content_service_prefix }}/v1/review" + request_path: "{{ content_service_prefix }}/v1/review" upstream_url: "{{ content_service_url }}/v1/content/review" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -192,9 +191,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: publishContent - uris: "{{ content_service_prefix }}/v1/publish" + request_path: "{{ content_service_prefix }}/v1/publish" upstream_url: "{{ content_service_url }}/v1/content/publish" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -208,9 +207,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: uploadContent - uris: "{{ content_service_prefix }}/v1/upload" + request_path: "{{ content_service_prefix }}/v1/upload" upstream_url: "{{ content_service_url }}/v1/content/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -224,9 +223,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ large_request_size_limit }}" - name: retireContent - uris: "{{ content_service_prefix }}/v1/retire" + request_path: "{{ content_service_prefix }}/v1/retire" upstream_url: "{{ content_service_url }}/v1/content/retire" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -240,9 +239,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createCourse - uris: "{{ course_service_prefix }}/v1/create" + request_path: "{{ course_service_prefix }}/v1/create" upstream_url: "{{ content_service_url }}/v1/course/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -256,9 +255,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchCourse - uris: "{{ course_service_prefix }}/v1/search" + request_path: "{{ course_service_prefix }}/v1/search" upstream_url: "{{ content_service_url }}/v1/course/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -272,9 +271,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateCourse - uris: "{{ course_service_prefix }}/v1/update" + request_path: "{{ course_service_prefix }}/v1/update" upstream_url: "{{ content_service_url }}/v1/course/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -288,9 +287,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readCourse - uris: "{{ course_service_prefix }}/v1/read" + request_path: "{{ course_service_prefix }}/v1/read" upstream_url: "{{ content_service_url }}/v1/course/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -304,9 +303,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: submitCourseForReview - uris: "{{ course_service_prefix }}/v1/review" + request_path: "{{ course_service_prefix }}/v1/review" upstream_url: "{{ content_service_url }}/v1/course/review" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -320,9 +319,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: publishCourse - uris: "{{ course_service_prefix }}/v1/publish" + request_path: "{{ course_service_prefix }}/v1/publish" upstream_url: "{{ content_service_url }}/v1/course/publish" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -336,9 +335,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: retireCourse - uris: "{{ course_service_prefix }}/v1/retire" + request_path: "{{ course_service_prefix }}/v1/retire" upstream_url: "{{ content_service_url }}/v1/course/retire" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -352,9 +351,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getCourseHierarchy - uris: "{{ course_service_prefix }}/v1/hierarchy" + request_path: "{{ course_service_prefix }}/v1/hierarchy" upstream_url: "{{ content_service_url }}/v1/course/hierarchy" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -365,9 +364,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: courseEnrolment - uris: "{{ course_service_prefix }}/v1/enrol" + request_path: "{{ course_service_prefix }}/v1/enrol" upstream_url: "{{ lms_service_url }}/v1/course/enroll" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -381,9 +380,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: courseUnEnrolment - uris: "{{ course_service_prefix }}/v1/unenrol" + request_path: "{{ course_service_prefix }}/v1/unenrol" upstream_url: "{{ lms_service_url }}/v1/course/unenroll" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -397,9 +396,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listCourseEnrollments - uris: "{{ course_service_prefix }}/v1/user/enrollment/list" + request_path: "{{ course_service_prefix }}/v1/user/enrollment/list" upstream_url: "{{ lms_service_url }}/v1/user/courses/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -413,9 +412,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readCourseEnrollment - uris: "{{ course_service_prefix }}/v1/user/enrollment/read" + request_path: "{{ course_service_prefix }}/v1/user/enrollment/read" upstream_url: "{{ lms_service_url }}/v1/user/courses/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -429,9 +428,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readContentState - uris: "{{ course_service_prefix }}/v1/content/state/read" + request_path: "{{ course_service_prefix }}/v1/content/state/read" upstream_url: "{{ lms_service_url }}/v1/content/state/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -445,9 +444,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateContentState - uris: "{{ course_service_prefix }}/v1/content/state/update" + request_path: "{{ course_service_prefix }}/v1/content/state/update" upstream_url: "{{ lms_service_url }}/v1/content/state/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -461,9 +460,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createUser - uris: "{{ user_service_prefix }}/v1/create" + request_path: "{{ user_service_prefix }}/v1/create" upstream_url: "{{ learning_service_url }}/v1/user/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -477,9 +476,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createUserVersion2 - uris: "{{ user_service_prefix }}/v2/create" + request_path: "{{ user_service_prefix }}/v2/create" upstream_url: "{{ learning_service_url }}/v2/user/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -493,9 +492,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateUser - uris: "{{ user_service_prefix }}/v1/update" + request_path: "{{ user_service_prefix }}/v1/update" upstream_url: "{{ learning_service_url }}/v1/user/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -509,9 +508,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserProfile - uris: "{{ user_service_prefix }}/v1/read" + request_path: "{{ user_service_prefix }}/v1/read" upstream_url: "{{ learning_service_url }}/v1/user/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -525,9 +524,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserProfileV2 - uris: "{{ user_service_prefix }}/v2/read" + request_path: "{{ user_service_prefix }}/v2/read" upstream_url: "{{ learning_service_url }}/v2/user/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -541,9 +540,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchUser - uris: "{{ user_service_prefix }}/v1/search" + request_path: "{{ user_service_prefix }}/v1/search" upstream_url: "{{ learning_service_url }}/v1/user/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -557,9 +556,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: retireUser - uris: "{{ user_service_prefix }}/v1/retire" + request_path: "{{ user_service_prefix }}/v1/retire" upstream_url: "{{ learning_service_url }}/v1/user/retire" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -573,9 +572,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createPage - uris: "{{ data_service_prefix }}/v1/page/create" + request_path: "{{ data_service_prefix }}/v1/page/create" upstream_url: "{{ lms_service_url }}/v1/page/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -589,9 +588,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updatePage - uris: "{{ data_service_prefix }}/v1/page/update" + request_path: "{{ data_service_prefix }}/v1/page/update" upstream_url: "{{ lms_service_url }}/v1/page/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -605,9 +604,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getPageSettings - uris: "{{ data_service_prefix }}/v1/page/read" + request_path: "{{ data_service_prefix }}/v1/page/read" upstream_url: "{{ lms_service_url }}/v1/page/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -621,9 +620,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: dialAssemble - uris: "{{ data_service_prefix }}/v1/dial/assemble" + request_path: "{{ data_service_prefix }}/v1/dial/assemble" upstream_url: "{{ lms_service_url }}/v1/page/assemble" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -634,9 +633,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: assemblePage - uris: "{{ data_service_prefix }}/v1/page/assemble" + request_path: "{{ data_service_prefix }}/v1/page/assemble" upstream_url: "{{ lms_service_url }}/v1/page/assemble" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -647,9 +646,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createNote - uris: "{{ notes_service_prefix }}/v1/create" + request_path: "{{ notes_service_prefix }}/v1/create" upstream_url: "{{ learning_service_url }}/v1/note/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -663,9 +662,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateNote - uris: "{{ notes_service_prefix }}/v1/update" + request_path: "{{ notes_service_prefix }}/v1/update" upstream_url: "{{ learning_service_url }}/v1/note/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -679,9 +678,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readNote - uris: "{{ notes_service_prefix }}/v1/read" + request_path: "{{ notes_service_prefix }}/v1/read" upstream_url: "{{ learning_service_url }}/v1/note/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -695,9 +694,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchNotes - uris: "{{ notes_service_prefix }}/v1/search" + request_path: "{{ notes_service_prefix }}/v1/search" upstream_url: "{{ learning_service_url }}/v1/note/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -711,9 +710,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createOrg - uris: "{{ org_service_prefix }}/v1/create" + request_path: "{{ org_service_prefix }}/v1/create" upstream_url: "{{ learning_service_url }}/v1/org/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -727,9 +726,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateOrg - uris: "{{ org_service_prefix }}/v1/update" + request_path: "{{ org_service_prefix }}/v1/update" upstream_url: "{{ learning_service_url }}/v1/org/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -743,9 +742,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readOrg - uris: "{{ org_service_prefix }}/v1/read" + request_path: "{{ org_service_prefix }}/v1/read" upstream_url: "{{ learning_service_url }}/v1/org/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -759,9 +758,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchOrg - uris: "{{ org_service_prefix }}/v1/search" + request_path: "{{ org_service_prefix }}/v1/search" upstream_url: "{{ learning_service_url }}/v1/org/search" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -772,9 +771,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: addMember - uris: "{{ org_service_prefix }}/v1/member/add" + request_path: "{{ org_service_prefix }}/v1/member/add" upstream_url: "{{ learning_service_url }}/v1/org/member/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -788,9 +787,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: removeMember - uris: "{{ org_service_prefix }}/v1/member/remove" + request_path: "{{ org_service_prefix }}/v1/member/remove" upstream_url: "{{ learning_service_url }}/v1/org/member/remove" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -804,9 +803,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: suspendMember - uris: "{{ org_service_prefix }}/v1/member/suspend" + request_path: "{{ org_service_prefix }}/v1/member/suspend" upstream_url: "{{ learning_service_url }}/v1/org/member/suspend" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -820,9 +819,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateMembership - uris: "{{ org_service_prefix }}/v1/member/update" + request_path: "{{ org_service_prefix }}/v1/member/update" upstream_url: "{{ learning_service_url }}/v1/org/member/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -836,9 +835,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: echo - uris: "{{ echo_service_prefix }}" + request_path: "{{ echo_service_prefix }}" upstream_url: "{{ echo_service_url }}" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -852,9 +851,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createPageSection - uris: "{{ data_service_prefix }}/v1/page/section/create" + request_path: "{{ data_service_prefix }}/v1/page/section/create" upstream_url: "{{ lms_service_url }}/v1/page/section/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -868,9 +867,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updatePageSection - uris: "{{ data_service_prefix }}/v1/page/section/update" + request_path: "{{ data_service_prefix }}/v1/page/section/update" upstream_url: "{{ lms_service_url }}/v1/page/section/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -884,9 +883,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listPageSections - uris: "{{ data_service_prefix }}/v1/page/section/list" + request_path: "{{ data_service_prefix }}/v1/page/section/list" upstream_url: "{{ lms_service_url }}/v1/page/section/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -900,9 +899,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readPageSection - uris: "{{ data_service_prefix }}/v1/page/section/read" + request_path: "{{ data_service_prefix }}/v1/page/section/read" upstream_url: "{{ lms_service_url }}/v1/page/section/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -916,9 +915,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readRoleMapping - uris: "{{ data_service_prefix }}/v1/role/read" + request_path: "{{ data_service_prefix }}/v1/role/read" upstream_url: "{{ learning_service_url }}/v1/role/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -932,9 +931,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateAssessment - uris: "{{ course_service_prefix }}/v1/assessment/update" + request_path: "{{ course_service_prefix }}/v1/assessment/update" upstream_url: "{{ learning_service_url }}/v1/assessment/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -948,9 +947,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readAssessmentResult - uris: "{{ course_service_prefix }}/v1/assessment/result/read" + request_path: "{{ course_service_prefix }}/v1/assessment/result/read" upstream_url: "{{ learning_service_url }}/v1/assessment/result/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -964,9 +963,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateOrgStatus - uris: "{{ org_service_prefix }}/v1/status/update" + request_path: "{{ org_service_prefix }}/v1/status/update" upstream_url: "{{ learning_service_url }}/v1/org/status/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -980,9 +979,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readUserProfile - uris: "{{ user_service_prefix }}/v1/profile/read" + request_path: "{{ user_service_prefix }}/v1/profile/read" upstream_url: "{{ learning_service_url }}/v1/user/getuser" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -996,9 +995,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerMobileApp - uris: "{{ api_manager_perfix }}/v1/consumer/mobile_app/credential/register" + request_path: "{{ api_manager_perfix }}/v1/consumer/mobile_app/credential/register" upstream_url: "{{ am_util_url }}/v1/consumer/mobile_app/credential/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1012,9 +1011,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerMobileDevice - uris: "{{ api_manager_perfix }}/v1/consumer/mobile_device/credential/register" + request_path: "{{ api_manager_perfix }}/v1/consumer/mobile_device/credential/register" upstream_url: "{{ am_util_url }}/v1/consumer/mobile_device/credential/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1029,9 +1028,9 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerMobileAppOpenRAP - uris: "{{ api_manager_perfix }}/v1/consumer/mobile_app_openrap/credential/register" + request_path: "{{ api_manager_perfix }}/v1/consumer/mobile_app_openrap/credential/register" upstream_url: "{{ am_util_url }}/v1/consumer/mobile_app_openrap/credential/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1046,9 +1045,9 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerMobileDeviceOpenRAP - uris: "{{ api_manager_perfix }}/v1/consumer/mobile_device_openrap/credential/register" + request_path: "{{ api_manager_perfix }}/v1/consumer/mobile_device_openrap/credential/register" upstream_url: "{{ am_util_url }}/v1/consumer/mobile_device_openrap/credential/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1063,9 +1062,9 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: compositeSearch - uris: "{{ composite_service_prefix }}/v1/search" + request_path: "{{ composite_service_prefix }}/v1/search" upstream_url: "{{ content_service_url }}/v1/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1079,9 +1078,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listTerms - uris: "{{ meta_service_prefix }}/v1/terms/list" + request_path: "{{ meta_service_prefix }}/v1/terms/list" upstream_url: "{{ content_service_url }}/v1/terms/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1095,9 +1094,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listResourceBundles - uris: "{{ meta_service_prefix }}/v1/resourcebundles/list" + request_path: "{{ meta_service_prefix }}/v1/resourcebundles/list" upstream_url: "{{ content_service_url }}/v1/resourcebundles/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1111,9 +1110,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listOrdinals - uris: "{{ meta_service_prefix }}/v1/ordinals/list" + request_path: "{{ meta_service_prefix }}/v1/ordinals/list" upstream_url: "{{ content_service_url }}/v1/ordinals/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1127,9 +1126,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: telemetry - uris: "{{ data_service_prefix }}/v1/telemetry" + request_path: "{{ data_service_prefix }}/v1/telemetry" upstream_url: "{{ telemetry_service_url }}/v1/telemetry" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1143,9 +1142,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: flagContent - uris: "{{ content_service_prefix }}/v1/flag" + request_path: "{{ content_service_prefix }}/v1/flag" upstream_url: "{{ content_service_url }}/v1/content/flag" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1159,9 +1158,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: acceptContentFlag - uris: "{{ content_service_prefix }}/v1/flag/accept" + request_path: "{{ content_service_prefix }}/v1/flag/accept" upstream_url: "{{ content_service_url }}/v1/content/flag/accept" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1175,9 +1174,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: rejectContentFlag - uris: "{{ content_service_prefix }}/v1/flag/reject" + request_path: "{{ content_service_prefix }}/v1/flag/reject" upstream_url: "{{ content_service_url }}/v1/content/flag/reject" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1191,9 +1190,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getOrgCreationDashboard - uris: "{{ dashboard_service_prefix }}/v1/creation/org" + request_path: "{{ dashboard_service_prefix }}/v1/creation/org" upstream_url: "{{ learning_service_url }}/v1/dashboard/creation/org" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1207,9 +1206,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getOrgConsumptionDashboard - uris: "{{ dashboard_service_prefix }}/v1/consumption/org" + request_path: "{{ dashboard_service_prefix }}/v1/consumption/org" upstream_url: "{{ learning_service_url }}/v1/dashboard/consumption/org" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1223,9 +1222,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getCourseProgressDashboard - uris: "{{ dashboard_service_prefix }}/v1/progress/course" + request_path: "{{ dashboard_service_prefix }}/v1/progress/course" upstream_url: "{{ lms_service_url }}/v1/dashboard/progress/course" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1239,9 +1238,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getCourseProgressDashboardV2 - uris: "{{ dashboard_service_prefix }}/v2/progress/course" + request_path: "{{ dashboard_service_prefix }}/v2/progress/course" upstream_url: "{{ lms_service_url }}/v2/dashboard/progress/course" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1255,9 +1254,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getCourseConsumptionDashboard - uris: "{{ dashboard_service_prefix }}/v1/consumption/course" + request_path: "{{ dashboard_service_prefix }}/v1/consumption/course" upstream_url: "{{ lms_service_url }}/v1/dashboard/consumption/course" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1271,9 +1270,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserCreationDashboard - uris: "{{ dashboard_service_prefix }}/v1/creation/user" + request_path: "{{ dashboard_service_prefix }}/v1/creation/user" upstream_url: "{{ learning_service_url }}/v1/dashboard/creation/user" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1287,9 +1286,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserConsumptionDasbhoard - uris: "{{ dashboard_service_prefix }}/v1/consumption/user" + request_path: "{{ dashboard_service_prefix }}/v1/consumption/user" upstream_url: "{{ learning_service_url }}/v1/dashboard/consumption/user" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1303,9 +1302,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: userBulkUpload - uris: "{{ user_service_prefix }}/v1/upload" + request_path: "{{ user_service_prefix }}/v1/upload" upstream_url: "{{ learning_service_url }}/v1/user/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1319,9 +1318,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: orgBulkUpload - uris: "{{ org_service_prefix }}/v1/upload" + request_path: "{{ org_service_prefix }}/v1/upload" upstream_url: "{{ learning_service_url }}/v1/org/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1335,9 +1334,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: checkUploadJobStatus - uris: "{{ data_service_prefix }}/v1/upload/status" + request_path: "{{ data_service_prefix }}/v1/upload/status" upstream_url: "{{ learning_service_url }}/v1/upload/status" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1351,9 +1350,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUploadJobStatusLink - uris: "{{ data_service_prefix }}/v1/upload/statusDownloadLink" + request_path: "{{ data_service_prefix }}/v1/upload/statusDownloadLink" upstream_url: "{{ learning_service_url }}/v1/upload/statusDownloadLink" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1367,9 +1366,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createBatch - uris: "{{ course_service_prefix }}/v1/batch/create" + request_path: "{{ course_service_prefix }}/v1/batch/create" upstream_url: "{{ lms_service_url }}/v1/course/batch/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1383,9 +1382,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateBatch - uris: "{{ course_service_prefix }}/v1/batch/update" + request_path: "{{ course_service_prefix }}/v1/batch/update" upstream_url: "{{ lms_service_url }}/v1/course/batch/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1399,9 +1398,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: addUserToBatch - uris: "{{ course_service_prefix }}/v1/batch/user/add" + request_path: "{{ course_service_prefix }}/v1/batch/user/add" upstream_url: "{{ lms_service_url }}/v1/course/batch/users/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1415,9 +1414,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: removeUserFromBatch - uris: "{{ course_service_prefix }}/v1/batch/user/remove" + request_path: "{{ course_service_prefix }}/v1/batch/user/remove" upstream_url: "{{ lms_service_url }}/v1/course/batch/users/remove" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1431,9 +1430,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getBatch - uris: "{{ course_service_prefix }}/v1/batch/read" + request_path: "{{ course_service_prefix }}/v1/batch/read" upstream_url: "{{ lms_service_url }}/v1/course/batch/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1447,9 +1446,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getParticipants - uris: "{{ course_service_prefix }}/v1/batch/participants/list" + request_path: "{{ course_service_prefix }}/v1/batch/participants/list" upstream_url: "{{ lms_service_url }}/v1/batch/participants/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1463,9 +1462,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: assignRole - uris: "{{ user_service_prefix }}/v1/role/assign" + request_path: "{{ user_service_prefix }}/v1/role/assign" upstream_url: "{{ learning_service_url }}/v1/user/assign/role" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1479,9 +1478,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: indexSync - uris: "{{ data_service_prefix }}/v1/index/sync" + request_path: "{{ data_service_prefix }}/v1/index/sync" upstream_url: "{{ learning_service_url }}/v1/data/sync" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1495,9 +1494,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: blockUser - uris: "{{ user_service_prefix }}/v1/block" + request_path: "{{ user_service_prefix }}/v1/block" upstream_url: "{{ learning_service_url }}/v1/user/block" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1511,9 +1510,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: unblockUser - uris: "{{ user_service_prefix }}/v1/unblock" + request_path: "{{ user_service_prefix }}/v1/unblock" upstream_url: "{{ learning_service_url }}/v1/user/unblock" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1527,9 +1526,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: uploadMedia - uris: "{{ content_service_prefix }}/v1/media/upload" + request_path: "{{ content_service_prefix }}/v1/media/upload" upstream_url: "{{ learning_service_url }}/v1/file/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1543,9 +1542,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: listCourseBatches - uris: "{{ course_service_prefix }}/v1/batch/list" + request_path: "{{ course_service_prefix }}/v1/batch/list" upstream_url: "{{ lms_service_url }}/v1/course/batch/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1559,9 +1558,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: batchBulkEnrolment - uris: "{{ course_service_prefix }}/v1/batch/bulk/enrollment" + request_path: "{{ course_service_prefix }}/v1/batch/bulk/enrollment" upstream_url: "{{ lms_service_url }}/v1/batch/bulk/enrollment" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1575,9 +1574,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: batchBulkUnEnrolment - uris: "{{ course_service_prefix }}/v1/batch/bulk/unenrollment" + request_path: "{{ course_service_prefix }}/v1/batch/bulk/unenrollment" upstream_url: "{{ lms_service_url }}/v1/batch/bulk/unenrollment" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1591,9 +1590,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getTenantInfo - uris: "{{ org_service_prefix }}/v1/tenant/info" + request_path: "{{ org_service_prefix }}/v1/tenant/info" upstream_url: "{{ player_service_url }}/v1/tenant/info" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1607,9 +1606,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getContentUploadUrl - uris: "{{ content_service_prefix }}/v1/upload/url/read" + request_path: "{{ content_service_prefix }}/v1/upload/url/read" upstream_url: "{{ content_service_url }}/v1/content/upload/url" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1623,9 +1622,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: rejectContent - uris: "{{ content_service_prefix }}/v1/reject" + request_path: "{{ content_service_prefix }}/v1/reject" upstream_url: "{{ content_service_url }}/v1/content/reject" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1639,9 +1638,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: deleteNote - uris: "{{ notes_service_prefix }}/v1/delete" + request_path: "{{ notes_service_prefix }}/v1/delete" upstream_url: "{{ learning_service_url }}/v1/note/delete" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1655,9 +1654,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: sendEmailNotification - uris: "{{ user_service_prefix }}/v1/notification/email" + request_path: "{{ user_service_prefix }}/v1/notification/email" upstream_url: "{{ learning_service_url }}/v1/notification/email" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1671,9 +1670,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: listAllBadges - uris: "{{ org_service_prefix }}/v1/badges/list" + request_path: "{{ org_service_prefix }}/v1/badges/list" upstream_url: "{{ learning_service_url }}/v1/badges/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1687,9 +1686,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: addBadgeToUser - uris: "{{ user_service_prefix }}/v1/badges/add" + request_path: "{{ user_service_prefix }}/v1/badges/add" upstream_url: "{{ learning_service_url }}/v1/user/badges/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1703,9 +1702,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: listOrgTypes - uris: "{{ org_service_prefix }}/v1/type/list" + request_path: "{{ org_service_prefix }}/v1/type/list" upstream_url: "{{ learning_service_url }}/v1/org/type/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1719,9 +1718,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createOrgType - uris: "{{ org_service_prefix }}/v1/type/create" + request_path: "{{ org_service_prefix }}/v1/type/create" upstream_url: "{{ learning_service_url }}/v1/org/type/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1735,9 +1734,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: updateOrgType - uris: "{{ org_service_prefix }}/v1/type/update" + request_path: "{{ org_service_prefix }}/v1/type/update" upstream_url: "{{ learning_service_url }}/v1/org/type/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1751,9 +1750,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: updateUserloginTime - uris: "{{ user_service_prefix }}/v1/update/logintime" + request_path: "{{ user_service_prefix }}/v1/update/logintime" upstream_url: "{{ learning_service_url }}/v1/user/update/logintime" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1767,9 +1766,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getMediaTypes - uris: "{{ user_service_prefix }}/v1/mediatype/list" + request_path: "{{ user_service_prefix }}/v1/mediatype/list" upstream_url: "{{ learning_service_url }}/v1/user/mediatype/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1783,9 +1782,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: DecryptData - uris: "{{ data_service_prefix }}/v1/user/decrypt" + request_path: "{{ data_service_prefix }}/v1/user/decrypt" upstream_url: "{{ learning_service_url }}/v1/user/data/decrypt" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1799,9 +1798,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: encryptData - uris: "{{ data_service_prefix }}/v1/user/encrypt" + request_path: "{{ data_service_prefix }}/v1/user/encrypt" upstream_url: "{{ learning_service_url }}/v1/user/data/encrypt" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1815,9 +1814,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: searchAuditHistory - uris: "{{ data_service_prefix }}/v1/audit/history" + request_path: "{{ data_service_prefix }}/v1/audit/history" upstream_url: "{{ learning_service_url }}/v1/audit/history" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1831,9 +1830,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: addUserSkill - uris: "{{ user_service_prefix }}/v1/skill/add" + request_path: "{{ user_service_prefix }}/v1/skill/add" upstream_url: "{{ learning_service_url }}/v1/user/skill/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1847,9 +1846,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getUserSkill - uris: "{{ user_service_prefix }}/v1/skill/read" + request_path: "{{ user_service_prefix }}/v1/skill/read" upstream_url: "{{ learning_service_url }}/v1/user/skill/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1863,9 +1862,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getSkills - uris: "{{ data_service_prefix }}/v1/skills" + request_path: "{{ data_service_prefix }}/v1/skills" upstream_url: "{{ learning_service_url }}/v1/skills" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1879,9 +1878,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: updateUserSkill - uris: "{{ user_service_prefix }}/v1/skill/update" + request_path: "{{ user_service_prefix }}/v1/skill/update" upstream_url: "{{ learning_service_url }}/v1/user/skill/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1895,9 +1894,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: addUserSkillEndorsement - uris: "{{ user_service_prefix }}/v1/skill/endorse/add" + request_path: "{{ user_service_prefix }}/v1/skill/endorse/add" upstream_url: "{{ learning_service_url }}/v1/user/skill/endorse/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1911,9 +1910,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getAllData - uris: "{{ data_service_prefix }}/v1/object/read/list" + request_path: "{{ data_service_prefix }}/v1/object/read/list" upstream_url: "{{ learning_service_url }}/v1/object/read/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1927,9 +1926,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getData - uris: "{{ data_service_prefix }}/v1/object/read" + request_path: "{{ data_service_prefix }}/v1/object/read" upstream_url: "{{ learning_service_url }}/v1/object/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1943,9 +1942,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createData - uris: "{{ data_service_prefix }}/v1/object/create" + request_path: "{{ data_service_prefix }}/v1/object/create" upstream_url: "{{ learning_service_url }}/v1/object/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1959,9 +1958,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ large_request_size_limit }}" - name: updateData - uris: "{{ data_service_prefix }}/v1/object/update" + request_path: "{{ data_service_prefix }}/v1/object/update" upstream_url: "{{ learning_service_url }}/v1/object/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1975,9 +1974,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: deleteData - uris: "{{ data_service_prefix }}/v1/object/delete" + request_path: "{{ data_service_prefix }}/v1/object/delete" upstream_url: "{{ learning_service_url }}/v1/object/delete" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -1991,9 +1990,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: searchData - uris: "{{ data_service_prefix }}/v1/object/search" + request_path: "{{ data_service_prefix }}/v1/object/search" upstream_url: "{{ learning_service_url }}/v1/object/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2007,9 +2006,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getAnnouncementDefinitions - uris: "{{announcement_service_prefix}}/v1/definitions" + request_path: "{{announcement_service_prefix}}/v1/definitions" upstream_url: "{{ player_service_url }}/announcement/v1/definitions" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2023,9 +2022,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createAnnouncement - uris: "{{announcement_service_prefix}}/v1/create" + request_path: "{{announcement_service_prefix}}/v1/create" upstream_url: "{{ player_service_url }}/announcement/v1/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2039,9 +2038,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: cancelAnnouncement - uris: "{{announcement_service_prefix}}/v1/cancel" + request_path: "{{announcement_service_prefix}}/v1/cancel" upstream_url: "{{ player_service_url }}/announcement/v1/cancel" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2055,9 +2054,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getAnnouncementInbox - uris: "{{announcement_service_prefix}}/v1/user/inbox" + request_path: "{{announcement_service_prefix}}/v1/user/inbox" upstream_url: "{{ player_service_url }}/announcement/v1/user/inbox" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2071,9 +2070,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getAnnouncementOutbox - uris: "{{announcement_service_prefix}}/v1/user/outbox" + request_path: "{{announcement_service_prefix}}/v1/user/outbox" upstream_url: "{{ player_service_url }}/announcement/v1/user/outbox" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2087,9 +2086,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getAnnouncement - uris: "{{announcement_service_prefix}}/v1/get" + request_path: "{{announcement_service_prefix}}/v1/get" upstream_url: "{{ player_service_url }}/announcement/v1/get" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2104,9 +2103,9 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerClient - uris: "{{ data_service_prefix }}/v1/client/register" + request_path: "{{ data_service_prefix }}/v1/client/register" upstream_url: "{{ learning_service_url }}/v1/client/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2120,9 +2119,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateClientKey - uris: "{{ data_service_prefix }}/v1/client/key/update" + request_path: "{{ data_service_prefix }}/v1/client/key/update" upstream_url: "{{ learning_service_url }}/v1/client/key/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2136,9 +2135,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getClientKey - uris: "{{ data_service_prefix }}/v1/client/key/read" + request_path: "{{ data_service_prefix }}/v1/client/key/read" upstream_url: "{{ learning_service_url }}/v1/client/key/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2152,9 +2151,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getTenantPreference - uris: "{{ org_service_prefix }}/v1/tc/read" + request_path: "{{ org_service_prefix }}/v1/tc/read" upstream_url: "{{ learning_service_url }}/v1/org/tc/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2168,9 +2167,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createTenantPreference - uris: "{{ org_service_prefix }}/v1/tc/create" + request_path: "{{ org_service_prefix }}/v1/tc/create" upstream_url: "{{ learning_service_url }}/v1/org/tc/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2184,9 +2183,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateTenantPreference - uris: "{{ org_service_prefix }}/v1/tc/update" + request_path: "{{ org_service_prefix }}/v1/tc/update" upstream_url: "{{ learning_service_url }}/v1/org/tc/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2200,9 +2199,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateUserTcStatus - uris: "{{ user_service_prefix }}/v1/tc/update" + request_path: "{{ user_service_prefix }}/v1/tc/update" upstream_url: "{{ learning_service_url }}/v1/user/tc/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2216,9 +2215,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createLocation - uris: "{{ org_service_prefix }}/v1/location/create" + request_path: "{{ org_service_prefix }}/v1/location/create" upstream_url: "{{ learning_service_url }}/v1/notification/location/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2232,9 +2231,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getLocation - uris: "{{ org_service_prefix }}/v1/location/read" + request_path: "{{ org_service_prefix }}/v1/location/read" upstream_url: "{{ learning_service_url }}/v1/notification/location/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2248,9 +2247,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: deleteLocation - uris: "{{ org_service_prefix }}/v1/location/delete" + request_path: "{{ org_service_prefix }}/v1/location/delete" upstream_url: "{{ learning_service_url }}/v1/notification/location/delete" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2264,9 +2263,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateLocation - uris: "{{ org_service_prefix }}/v1/location/update" + request_path: "{{ org_service_prefix }}/v1/location/update" upstream_url: "{{ learning_service_url }}/v1/notification/location/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2280,9 +2279,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: profileVisibility - uris: "{{ user_service_prefix }}/v1/profile/visibility" + request_path: "{{ user_service_prefix }}/v1/profile/visibility" upstream_url: "{{ learning_service_url }}/v1/user/profile/visibility" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2296,9 +2295,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: sendNotification - uris: "{{ data_service_prefix }}/v1/notification/send" + request_path: "{{ data_service_prefix }}/v1/notification/send" upstream_url: "{{ learning_service_url }}/v1/notification/send" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2312,9 +2311,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: announcementResend - uris: "{{ announcement_service_prefix }}/v1/resend" + request_path: "{{ announcement_service_prefix }}/v1/resend" upstream_url: "{{ player_service_url }}/announcement/v1/resend" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2328,9 +2327,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: announcementReceived - uris: "{{ announcement_service_prefix }}/v1/received" + request_path: "{{ announcement_service_prefix }}/v1/received" upstream_url: "{{ player_service_url }}/announcement/v1/received" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2344,9 +2343,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: announcementRead - uris: "{{ announcement_service_prefix }}/v1/read" + request_path: "{{ announcement_service_prefix }}/v1/read" upstream_url: "{{ player_service_url }}/announcement/v1/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2360,9 +2359,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: metricsSearchData - uris: "{{ data_service_prefix }}/v1/object/metrics" + request_path: "{{ data_service_prefix }}/v1/object/metrics" upstream_url: "{{ learning_service_url }}/v1/object/metrics" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2376,9 +2375,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateSystemSettings - uris: "{{ data_service_prefix }}/v1/system/settings/list" + request_path: "{{ data_service_prefix }}/v1/system/settings/list" upstream_url: "{{ learning_service_url }}/v1/system/settings/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2392,9 +2391,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getAudienceCount - uris: "{{ data_service_prefix }}/v1/notification/audience" + request_path: "{{ data_service_prefix }}/v1/notification/audience" upstream_url: "{{ learning_service_url }}/v1/notification/audience" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2408,9 +2407,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: generateDialcodes - uris: "{{ dialcode_service_prefix }}/v1/generate" + request_path: "{{ dialcode_service_prefix }}/v1/generate" upstream_url: "{{ content_service_url }}/v1/dialcode/generate" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2424,9 +2423,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readDialcode - uris: "{{ dialcode_service_prefix }}/v1/read" + request_path: "{{ dialcode_service_prefix }}/v1/read" upstream_url: "{{ content_service_url }}/v1/dialcode/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2440,9 +2439,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateDialcode - uris: "{{ dialcode_service_prefix }}/v1/update" + request_path: "{{ dialcode_service_prefix }}/v1/update" upstream_url: "{{ content_service_url }}/v1/dialcode/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2456,9 +2455,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listDialcodes - uris: "{{ dialcode_service_prefix }}/v1/list" + request_path: "{{ dialcode_service_prefix }}/v1/list" upstream_url: "{{ content_service_url }}/v1/dialcode/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2472,9 +2471,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: publishDialcode - uris: "{{ dialcode_service_prefix }}/v1/publish" + request_path: "{{ dialcode_service_prefix }}/v1/publish" upstream_url: "{{ content_service_url }}/v1/dialcode/publish" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2488,9 +2487,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchDialcodes - uris: "{{ dialcode_service_prefix }}/v1/search" + request_path: "{{ dialcode_service_prefix }}/v1/search" upstream_url: "{{ content_service_url }}/v1/dialcode/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2504,9 +2503,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: qrCodeBatchProcessStatus - uris: "{{ dialcode_service_prefix }}/v1/process/status" + request_path: "{{ dialcode_service_prefix }}/v1/process/status" upstream_url: "{{ content_service_url }}/v1/dialcode/process/status" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2520,9 +2519,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: qrCodeBatchProcessRetry - uris: "{{ dialcode_service_prefix }}/v1/process/retry" + request_path: "{{ dialcode_service_prefix }}/v1/process/retry" upstream_url: "{{ content_service_url }}/v1/dialcode/process/retry" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2536,9 +2535,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createPublisher - uris: "{{ dialcode_service_prefix }}/v1/publisher/create" + request_path: "{{ dialcode_service_prefix }}/v1/publisher/create" upstream_url: "{{ content_service_url }}/v1/dialcode/publisher/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2552,9 +2551,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updatePublisher - uris: "{{ dialcode_service_prefix }}/v1/publisher/update" + request_path: "{{ dialcode_service_prefix }}/v1/publisher/update" upstream_url: "{{ content_service_url }}/v1/dialcode/publisher/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2568,9 +2567,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readPublisher - uris: "{{ dialcode_service_prefix }}/v1/publisher/read" + request_path: "{{ dialcode_service_prefix }}/v1/publisher/read" upstream_url: "{{ content_service_url }}/v1/dialcode/publisher/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2584,9 +2583,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: linkDialcodeContent - uris: "{{ dialcode_service_prefix }}/v1/content/link" + request_path: "{{ dialcode_service_prefix }}/v1/content/link" upstream_url: "{{ content_service_url }}/v1/dialcode/content/link" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2600,9 +2599,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readChannel - uris: "{{ channel_service_prefix }}/v1/read" + request_path: "{{ channel_service_prefix }}/v1/read" upstream_url: "{{ content_service_url }}/v1/channel/read" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -2613,9 +2612,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listChannel - uris: "{{ channel_service_prefix }}/v1/list" + request_path: "{{ channel_service_prefix }}/v1/list" upstream_url: "{{ content_service_url }}/v1/channel/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2629,9 +2628,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchChannel - uris: "{{ channel_service_prefix }}/v1/search" + request_path: "{{ channel_service_prefix }}/v1/search" upstream_url: "{{ content_service_url }}/v1/channel/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2645,9 +2644,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createChannel - uris: "{{ channel_service_prefix }}/v1/create" + request_path: "{{ channel_service_prefix }}/v1/create" upstream_url: "{{ content_service_url }}/v1/channel/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2661,9 +2660,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateChannel - uris: "{{ channel_service_prefix }}/v1/update" + request_path: "{{ channel_service_prefix }}/v1/update" upstream_url: "{{ content_service_url }}/v1/channel/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2677,9 +2676,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readFramework - uris: "{{ framework_service_prefix }}/v1/read" + request_path: "{{ framework_service_prefix }}/v1/read" upstream_url: "{{ content_service_url }}/v1/framework/read" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -2690,9 +2689,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listFramework - uris: "{{ framework_service_prefix }}/v1/list" + request_path: "{{ framework_service_prefix }}/v1/list" upstream_url: "{{ content_service_url }}/v1/framework/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2706,9 +2705,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createFramework - uris: "{{ framework_service_prefix }}/v1/create" + request_path: "{{ framework_service_prefix }}/v1/create" upstream_url: "{{ content_service_url }}/v1/framework/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2722,9 +2721,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateFramework - uris: "{{ framework_service_prefix }}/v1/update" + request_path: "{{ framework_service_prefix }}/v1/update" upstream_url: "{{ content_service_url }}/v1/framework/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2738,9 +2737,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: copyFramework - uris: "{{ framework_service_prefix }}/v1/copy" + request_path: "{{ framework_service_prefix }}/v1/copy" upstream_url: "{{ content_service_url }}/v1/framework/copy" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2754,9 +2753,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readFrameworkTerm - uris: "{{ framework_service_prefix }}/v1/term/read" + request_path: "{{ framework_service_prefix }}/v1/term/read" upstream_url: "{{ content_service_url }}/v1/framework/term/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2770,9 +2769,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchFrameworkTerm - uris: "{{ framework_service_prefix }}/v1/term/search" + request_path: "{{ framework_service_prefix }}/v1/term/search" upstream_url: "{{ content_service_url }}/v1/framework/term/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2786,9 +2785,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createFrameworkTerm - uris: "{{ framework_service_prefix }}/v1/term/create" + request_path: "{{ framework_service_prefix }}/v1/term/create" upstream_url: "{{ content_service_url }}/v1/framework/term/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2802,9 +2801,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateFrameworkTerm - uris: "{{ framework_service_prefix }}/v1/term/update" + request_path: "{{ framework_service_prefix }}/v1/term/update" upstream_url: "{{ content_service_url }}/v1/framework/term/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2818,9 +2817,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readFrameworkCategory - uris: "{{ framework_service_prefix }}/v1/category/read" + request_path: "{{ framework_service_prefix }}/v1/category/read" upstream_url: "{{ content_service_url }}/v1/framework/category/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2834,9 +2833,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchFrameworkCategory - uris: "{{ framework_service_prefix }}/v1/category/search" + request_path: "{{ framework_service_prefix }}/v1/category/search" upstream_url: "{{ content_service_url }}/v1/framework/category/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2850,9 +2849,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createFrameworkCategory - uris: "{{ framework_service_prefix }}/v1/category/create" + request_path: "{{ framework_service_prefix }}/v1/category/create" upstream_url: "{{ content_service_url }}/v1/framework/category/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2866,9 +2865,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateFrameworkCategory - uris: "{{ framework_service_prefix }}/v1/category/update" + request_path: "{{ framework_service_prefix }}/v1/category/update" upstream_url: "{{ content_service_url }}/v1/framework/category/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2882,9 +2881,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateCourseHierarchy - uris: '{{ course_service_prefix }}/v1/hierarchy/update' + request_path: '{{ course_service_prefix }}/v1/hierarchy/update' upstream_url: '{{ content_service_url }}/v1/course/hierarchy/update' - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2898,9 +2897,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: '{{ small_request_size_limit }}' - name: submitDatasetRequest - uris: "{{ data_service_prefix }}/v1/dataset/request/submit" + request_path: "{{ data_service_prefix }}/v1/dataset/request/submit" upstream_url: "{{ content_service_url }}/v1/dataset/request/submit" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2914,9 +2913,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listDatasetRequest - uris: "{{ data_service_prefix }}/v1/dataset/request/list" + request_path: "{{ data_service_prefix }}/v1/dataset/request/list" upstream_url: "{{ content_service_url }}/v1/dataset/request/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2930,9 +2929,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readDatasetRequest - uris: "{{ data_service_prefix }}/v1/dataset/request/read" + request_path: "{{ data_service_prefix }}/v1/dataset/request/read" upstream_url: "{{ content_service_url }}/v1/dataset/request/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2946,9 +2945,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: channelDatasetRequest - uris: "{{ data_service_prefix }}/v1/dataset/request" + request_path: "{{ data_service_prefix }}/v1/dataset/request" upstream_url: "{{ content_service_url }}/v1/dataset/request" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2962,9 +2961,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createAssertion - uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/create" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/create" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2978,9 +2977,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getAssertion - uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/read" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/read" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -2994,9 +2993,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getAssertionList - uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/search" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/search" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3010,9 +3009,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: revokeAssertion - uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/delete" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/delete" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/delete" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3026,9 +3025,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createBadgeClass - uris: "{{ badge_service_prefix }}/v1/issuer/badge/create" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/create" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3042,9 +3041,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getBadgeClass - uris: "{{ badge_service_prefix }}/v1/issuer/badge/read" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/read" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3058,9 +3057,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: searchBadgeClass - uris: "{{ badge_service_prefix }}/v1/issuer/badge/search" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/search" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3074,9 +3073,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: deleteBadgeClass - uris: "{{ badge_service_prefix }}/v1/issuer/badge/delete" + request_path: "{{ badge_service_prefix }}/v1/issuer/badge/delete" upstream_url: "{{ learning_service_url }}/v1/issuer/badge/delete" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3090,9 +3089,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createissuer - uris: "{{ badge_service_prefix }}/v1/issuer/create" + request_path: "{{ badge_service_prefix }}/v1/issuer/create" upstream_url: "{{ learning_service_url }}/v1/issuer/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3106,9 +3105,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getIssuerDetails - uris: "{{ badge_service_prefix }}/v1/issuer/read" + request_path: "{{ badge_service_prefix }}/v1/issuer/read" upstream_url: "{{ learning_service_url }}/v1/issuer/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3122,9 +3121,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: getAllIssuer - uris: "{{ badge_service_prefix }}/v1/issuer/list" + request_path: "{{ badge_service_prefix }}/v1/issuer/list" upstream_url: "{{ learning_service_url }}/v1/issuer/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3138,9 +3137,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: deleteIssuer - uris: "{{ badge_service_prefix }}/v1/issuer/delete" + request_path: "{{ badge_service_prefix }}/v1/issuer/delete" upstream_url: "{{ learning_service_url }}/v1/issuer/delete" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3154,9 +3153,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createForm - uris: "{{ data_service_prefix }}/v1/form/create" + request_path: "{{ data_service_prefix }}/v1/form/create" upstream_url: "{{ player_service_url }}/plugin/v1/form/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3170,9 +3169,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: updateForm - uris: "{{ data_service_prefix }}/v1/form/update" + request_path: "{{ data_service_prefix }}/v1/form/update" upstream_url: "{{ player_service_url }}/plugin/v1/form/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3186,9 +3185,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: announcementtypeCreate - uris: "{{ announcement_service_prefix }}/v1/manage/announcement-type/create" + request_path: "{{ announcement_service_prefix }}/v1/manage/announcement-type/create" upstream_url: "{{ player_service_url }}/announcement/v1/manage/announcement-type/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3202,9 +3201,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: announcementtypeUpdate - uris: "{{ announcement_service_prefix }}/v1/manage/announcement-type/update" + request_path: "{{ announcement_service_prefix }}/v1/manage/announcement-type/update" upstream_url: "{{ player_service_url }}/announcement/v1/manage/announcement-type/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3218,9 +3217,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: announcementtypeList - uris: "{{ announcement_service_prefix }}/v1/manage/announcement-type/list" + request_path: "{{ announcement_service_prefix }}/v1/manage/announcement-type/list" upstream_url: "{{ player_service_url }}/announcement/v1/manage/announcement-type/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3234,9 +3233,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readForm - uris: "{{ data_service_prefix }}/v1/form/read" + request_path: "{{ data_service_prefix }}/v1/form/read" upstream_url: "{{ player_service_url }}/plugin/v1/form/read" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -3247,9 +3246,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: masterLocationCreate - uris: "{{ data_service_prefix }}/v1/location/create" + request_path: "{{ data_service_prefix }}/v1/location/create" upstream_url: "{{ learning_service_url }}/v1/location/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3263,9 +3262,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: masterLocationUpdate - uris: "{{ data_service_prefix }}/v1/location/update" + request_path: "{{ data_service_prefix }}/v1/location/update" upstream_url: "{{ learning_service_url }}/v1/location/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3279,9 +3278,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: masterLocationSearch - uris: "{{ data_service_prefix }}/v1/location/search" + request_path: "{{ data_service_prefix }}/v1/location/search" upstream_url: "{{ learning_service_url }}/v1/location/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3295,9 +3294,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: masterLocationUpload - uris: "{{ data_service_prefix }}/v1/bulk/location/upload" + request_path: "{{ data_service_prefix }}/v1/bulk/location/upload" upstream_url: "{{ learning_service_url }}/v1/bulk/location/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3312,9 +3311,9 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: copyContent - uris: "{{ content_service_prefix }}/v1/copy" + request_path: "{{ content_service_prefix }}/v1/copy" upstream_url: "{{ content_service_url }}/v1/content/copy" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3329,9 +3328,9 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: fetchURLMetaInformation - uris: "{{ content_service_prefix }}/v1/fetchmeta" + request_path: "{{ content_service_prefix }}/v1/fetchmeta" upstream_url: "{{ content_service_url }}/v1/url/fetchmeta" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3345,9 +3344,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: publishFramework - uris: "{{ framework_service_prefix }}/v1/publish" + request_path: "{{ framework_service_prefix }}/v1/publish" upstream_url: "{{ content_service_url }}/v1/framework/publish" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3361,9 +3360,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: pluginSearch - uris: "{{ plugin_service_prefix }}/v1/search" + request_path: "{{ plugin_service_prefix }}/v1/search" upstream_url: "{{ content_service_url }}/v1/plugins/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3377,9 +3376,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateCollaborators - uris: "{{ content_service_prefix }}/v1/collaborator/update" + request_path: "{{ content_service_prefix }}/v1/collaborator/update" upstream_url: "{{ content_service_url }}/v1/content/collaborator/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3393,9 +3392,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: reserveDialcode - uris: "{{ dialcode_service_prefix }}/v1/reserve" + request_path: "{{ dialcode_service_prefix }}/v1/reserve" upstream_url: "{{ content_service_url }}/v1/dialcode/reserve" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3409,9 +3408,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: releaseDialcode - uris: "{{ dialcode_service_prefix }}/v1/release" + request_path: "{{ dialcode_service_prefix }}/v1/release" upstream_url: "{{ content_service_url }}/v1/dialcode/release" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3425,9 +3424,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createLock - uris: "{{ lock_service_prefix }}/v1/create" + request_path: "{{ lock_service_prefix }}/v1/create" upstream_url: "{{ content_service_url }}/v1/lock/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3441,9 +3440,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: refreshLock - uris: "{{ lock_service_prefix }}/v1/refresh" + request_path: "{{ lock_service_prefix }}/v1/refresh" upstream_url: "{{ content_service_url }}/v1/lock/refresh" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3457,9 +3456,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: retireLock - uris: "{{ lock_service_prefix }}/v1/retire" + request_path: "{{ lock_service_prefix }}/v1/retire" upstream_url: "{{ content_service_url }}/v1/lock/retire" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3473,9 +3472,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listLock - uris: "{{ lock_service_prefix }}/v1/list" + request_path: "{{ lock_service_prefix }}/v1/list" upstream_url: "{{ content_service_url }}/v1/lock/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3489,9 +3488,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createSession - uris: "{{ sso_service_prefix }}/v1/create/session" + request_path: "{{ sso_service_prefix }}/v1/create/session" upstream_url: "{{ player_service_url }}/v1/sso/create/session" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3507,9 +3506,9 @@ kong_apis: # Data pipeline - name: "datasetSubmitRequest" - uris: "{{ data_service_prefix }}/v3/dataset/request/submit" + request_path: "{{ data_service_prefix }}/v3/dataset/request/submit" upstream_url: "{{ sunbird_analytics_api_base_url }}/dataset/request/submit" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3518,9 +3517,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "datasetReadRequest" - uris: "{{ data_service_prefix }}/v3/dataset/request/read" + request_path: "{{ data_service_prefix }}/v3/dataset/request/read" upstream_url: "{{ sunbird_analytics_api_base_url }}/dataset/request/read" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3529,9 +3528,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "datasetListRequest" - uris: "{{ data_service_prefix }}/v3/dataset/request/list" + request_path: "{{ data_service_prefix }}/v3/dataset/request/list" upstream_url: "{{ sunbird_analytics_api_base_url }}/dataset/request/list" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3540,9 +3539,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "deviceRegister" - uris: "/v3/device/register" + request_path: "/v3/device/register" upstream_url: "{{ sunbird_analytics_api_base_url }}/v1/device/register" - strip_uri: true + strip_request_path: true plugins: - {name: 'cors'} - "{{ statsd_pulgin }}" @@ -3558,9 +3557,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "channelSpecificTelemetryExhaust" - uris: "{{ data_service_prefix }}/v3/dataset/get" + request_path: "{{ data_service_prefix }}/v3/dataset/get" upstream_url: "{{ sunbird_analytics_api_base_url }}/dataset/get" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3570,9 +3569,9 @@ kong_apis: - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "dataproductsCumulativeMetrics" - uris: "{{ data_service_prefix }}/v3/metrics" + request_path: "{{ data_service_prefix }}/v3/metrics" upstream_url: "{{ sunbird_analytics_api_base_url }}/metrics" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3582,21 +3581,9 @@ kong_apis: - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "experimentcreate" - uris: "{{ data_service_prefix }}/v1/experiement/create" + request_path: "{{ data_service_prefix }}/v1/experiement/create" upstream_url: "{{ sunbird_analytics_api_base_url }}/experiment/create" - strip_uri: true - plugins: - - {name: 'jwt'} - - {name: 'cors'} - - "{{ statsd_pulgin }}" - - {name: 'acl', config.whitelist: 'publicUser'} - - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - - - name: "experimentcreate" - uris: "{{ data_service_prefix }}/v1/experiement/create" - upstream_url: "{{ sunbird_analytics_api_base_url }}/experiment/create" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3606,9 +3593,9 @@ kong_apis: - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "experimentread" - uris: "{{ data_service_prefix }}/v1/experiement/get" + request_path: "{{ data_service_prefix }}/v1/experiement/get" upstream_url: "{{ sunbird_analytics_api_base_url }}/experiment/get" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3617,9 +3604,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "configRefresh" - uris: "{{ config_service_prefix }}/v1/refresh" + request_path: "{{ config_service_prefix }}/v1/refresh" upstream_url: "{{ config_service_url }}/config-service/v1/refresh" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3629,9 +3616,9 @@ kong_apis: - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "getConfigByKey" - uris: "{{ config_service_prefix }}/v1/read" + request_path: "{{ config_service_prefix }}/v1/read" upstream_url: "{{ config_service_url }}/config-service/v1/read" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3640,9 +3627,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ large_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "addSystemSettings" - uris: "{{ data_service_prefix }}/v1/system/settings/set" + request_path: "{{ data_service_prefix }}/v1/system/settings/set" upstream_url: "{{ learning_service_url }}/v1/system/settings/set" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3651,9 +3638,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "getSystemSettings" - uris: "{{ data_service_prefix }}/v1/system/settings/get" + request_path: "{{ data_service_prefix }}/v1/system/settings/get" upstream_url: "{{ learning_service_url }}/v1/system/settings/get" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3662,9 +3649,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "getConfigStatus" - uris: "{{ config_service_prefix }}/v1/status" + request_path: "{{ config_service_prefix }}/v1/status" upstream_url: "{{ config_service_url }}/config-service/v1/status" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3673,9 +3660,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ small_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "getConfigHealth" - uris: "{{ config_service_prefix }}/v1/health" + request_path: "{{ config_service_prefix }}/v1/health" upstream_url: "{{ config_service_url }}/config-service/v1/health" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3684,9 +3671,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ small_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: onboardConsumer - uris: "{{ api_manager_perfix }}/v1/consumer/create/jwt" + request_path: "{{ api_manager_perfix }}/v1/consumer/create/jwt" upstream_url: "{{ am_util_url }}/v1/consumer/create/jwt" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3700,9 +3687,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: KongConsumerApi - uris: "{{ api_manager_perfix }}/v1/consumer" + request_path: "{{ api_manager_perfix }}/v1/consumer" upstream_url: "{{ am_util_url }}/v1/consumer" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3716,9 +3703,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: uploadTOC - uris: "{{ textbook_service_prefix }}/v1/toc/upload" + request_path: "{{ textbook_service_prefix }}/v1/toc/upload" upstream_url: "{{ lms_service_url }}/v1/textbook/toc/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3732,9 +3719,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: downloadTOC - uris: "{{ textbook_service_prefix }}/v1/toc/download" + request_path: "{{ textbook_service_prefix }}/v1/toc/download" upstream_url: "{{ lms_service_url }}/v1/textbook/toc/download" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3748,9 +3735,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: acceptTermsAndCondition - uris: "{{ user_service_prefix }}/v1/tnc/accept" + request_path: "{{ user_service_prefix }}/v1/tnc/accept" upstream_url: "{{ learning_service_url }}/v1/user/tnc/accept" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3764,9 +3751,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: generateOtp - uris: "{{ otp_service_prefix }}/v1/generate" + request_path: "{{ otp_service_prefix }}/v1/generate" upstream_url: "{{ learning_service_url }}/v1/otp/generate" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3780,9 +3767,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: verifyOtp - uris: "{{ otp_service_prefix }}/v1/verify" + request_path: "{{ otp_service_prefix }}/v1/verify" upstream_url: "{{ learning_service_url }}/v1/otp/verify" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3796,9 +3783,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserByKey - uris: "{{ user_service_prefix }}/v1/get" + request_path: "{{ user_service_prefix }}/v1/get" upstream_url: "{{ learning_service_url }}/v1/user/get" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3813,9 +3800,9 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerMobileAppTeacherAid - uris: "{{ api_manager_perfix }}/v1/consumer/mobile_app_teacheraid/credential/register" + request_path: "{{ api_manager_perfix }}/v1/consumer/mobile_app_teacheraid/credential/register" upstream_url: "{{ am_util_url }}/v1/consumer/mobile_app_teacheraid/credential/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3830,9 +3817,9 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: registerMobileDeviceTeacherAid - uris: "{{ api_manager_perfix }}/v1/consumer/mobile_device_teacheraid/credential/register" + request_path: "{{ api_manager_perfix }}/v1/consumer/mobile_device_teacheraid/credential/register" upstream_url: "{{ am_util_url }}/v1/consumer/mobile_device_teacheraid/credential/register" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3846,9 +3833,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: "contentBadgeLink" - uris: "{{ badge_service_prefix }}/v1/content/link" + request_path: "{{ badge_service_prefix }}/v1/content/link" upstream_url: "{{ lms_service_url }}/v1/content/link" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3857,9 +3844,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "contentBadgeUnLink" - uris: "{{ badge_service_prefix }}/v1/content/unlink" + request_path: "{{ badge_service_prefix }}/v1/content/unlink" upstream_url: "{{ lms_service_url }}/v1/content/unlink" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3868,9 +3855,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "privateUserUpdate" - uris: "{{ user_service_prefix }}/private/v1/update" + request_path: "{{ user_service_prefix }}/private/v1/update" upstream_url: "{{ learning_service_url }}/private/user/v1/update" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3879,9 +3866,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "getUserType" - uris: "{{ user_service_prefix }}/v1/type/list" + request_path: "{{ user_service_prefix }}/v1/type/list" upstream_url: "{{ learning_service_url }}/v1/user/type/list" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3890,9 +3877,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "masterLocationDelete" - uris: "{{data_service_prefix }}/v1/location/delete" + request_path: "{{data_service_prefix }}/v1/location/delete" upstream_url: "{{ learning_service_url }}/v1/location/delete" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3901,9 +3888,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "migrateUser" - uris: "{{ user_service_prefix }}/v1/migrate" + request_path: "{{ user_service_prefix }}/v1/migrate" upstream_url: "{{ learning_service_url }}/private/user/v1/migrate" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3912,9 +3899,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "privateUserRead" - uris: "{{ user_service_prefix }}/private/v1/read" + request_path: "{{ user_service_prefix }}/private/v1/read" upstream_url: "{{ learning_service_url }}/private/user/v1/read" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3923,9 +3910,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "privateUserAssignRole" - uris: "{{ user_service_prefix }}/private/v1/assign/role" + request_path: "{{ user_service_prefix }}/private/v1/assign/role" upstream_url: "{{ learning_service_url }}/private/user/v1/assign/role" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -3934,9 +3921,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: createUserV3 - uris: "{{ user_service_prefix }}/v1.3/create" + request_path: "{{ user_service_prefix }}/v1.3/create" upstream_url: "{{ user_org_service_url }}/v1.3/user/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3950,9 +3937,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: createUserVersion2V3 - uris: "{{ user_service_prefix }}/v2.3/create" + request_path: "{{ user_service_prefix }}/v2.3/create" upstream_url: "{{ user_org_service_url }}/v2.3/user/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3966,9 +3953,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserProfileV3 - uris: "{{ user_service_prefix }}/v1.3/read" + request_path: "{{ user_service_prefix }}/v1.3/read" upstream_url: "{{ user_org_service_url }}/v1.3/user/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3982,9 +3969,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserProfileV2V3 - uris: "{{ user_service_prefix }}/v2.3/read" + request_path: "{{ user_service_prefix }}/v2.3/read" upstream_url: "{{ user_org_service_url }}/v2.3/user/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -3998,9 +3985,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readUserProfileV3 - uris: "{{ user_service_prefix }}/v1.3/profile/read" + request_path: "{{ user_service_prefix }}/v1.3/profile/read" upstream_url: "{{ user_org_service_url }}/v1.3/user/getuser" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4014,9 +4001,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getUserByKeyV3 - uris: "{{ user_service_prefix }}/v1.3/get" + request_path: "{{ user_service_prefix }}/v1.3/get" upstream_url: "{{ user_org_service_url }}/v1.3/user/get" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4030,9 +4017,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchUserV3 - uris: "{{ user_service_prefix }}/v1.3/search" + request_path: "{{ user_service_prefix }}/v1.3/search" upstream_url: "{{ user_org_service_url }}/v1.3/user/search" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4046,9 +4033,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: getMediaTypesV3 - uris: "{{ user_service_prefix }}/v1.3/mediatype/list" + request_path: "{{ user_service_prefix }}/v1.3/mediatype/list" upstream_url: "{{ user_org_service_url }}/v1.3/user/mediatype/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4062,9 +4049,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: profileVisibilityV3 - uris: "{{ user_service_prefix }}/v1.3/profile/visibility" + request_path: "{{ user_service_prefix }}/v1.3/profile/visibility" upstream_url: "{{ user_org_service_url }}/v1.3/user/profile/visibility" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4078,9 +4065,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: "getUserTypeV3" - uris: "{{ user_service_prefix }}/v1.3/type/list" + request_path: "{{ user_service_prefix }}/v1.3/type/list" upstream_url: "{{ user_org_service_url }}/v1.3/user/type/list" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -4089,9 +4076,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: blockUserV3 - uris: "{{ user_service_prefix }}/v1.3/block" + request_path: "{{ user_service_prefix }}/v1.3/block" upstream_url: "{{ user_org_service_url }}/v1.3/user/block" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4105,9 +4092,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: unblockUserV3 - uris: "{{ user_service_prefix }}/v1.3/unblock" + request_path: "{{ user_service_prefix }}/v1.3/unblock" upstream_url: "{{ user_org_service_url }}/v1.3/user/unblock" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4121,9 +4108,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readRoleMappingV3 - uris: "{{ data_service_prefix }}/v1.3/role/read" + request_path: "{{ data_service_prefix }}/v1.3/role/read" upstream_url: "{{ user_org_service_url }}/v1.3/role/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4137,9 +4124,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: assignRoleV3 - uris: "{{ user_service_prefix }}/v1.3/role/assign" + request_path: "{{ user_service_prefix }}/v1.3/role/assign" upstream_url: "{{ user_org_service_url }}/v1.3/user/assign/role" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4153,9 +4140,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: "privateUserAssignRoleV3" - uris: "{{ user_service_prefix }}/private/v1.3/assign/role" + request_path: "{{ user_service_prefix }}/private/v1.3/assign/role" upstream_url: "{{ user_org_service_url }}/private/user/v1.3/assign/role" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -4164,9 +4151,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: updateUserV3 - uris: "{{ user_service_prefix }}/v1.3/update" + request_path: "{{ user_service_prefix }}/v1.3/update" upstream_url: "{{ user_org_service_url }}/v1.3/user/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4180,9 +4167,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: "privateUserUpdateV3" - uris: "{{ user_service_prefix }}/private/v1.3/update" + request_path: "{{ user_service_prefix }}/private/v1.3/update" upstream_url: "{{ user_org_service_url }}/private/user/v1.3/update" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -4191,9 +4178,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: updateUserloginTimeV3 - uris: "{{ user_service_prefix }}/v1.3/update/logintime" + request_path: "{{ user_service_prefix }}/v1.3/update/logintime" upstream_url: "{{ user_org_service_url }}/v1.3/user/update/logintime" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4207,9 +4194,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: acceptTermsAndConditionV3 - uris: "{{ user_service_prefix }}/v1.3/tnc/accept" + request_path: "{{ user_service_prefix }}/v1.3/tnc/accept" upstream_url: "{{ user_org_service_url }}/v1.3/user/tnc/accept" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4223,9 +4210,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: DecryptDataV3 - uris: "{{ data_service_prefix }}/v1.3/user/decrypt" + request_path: "{{ data_service_prefix }}/v1.3/user/decrypt" upstream_url: "{{ user_org_service_url }}/v1.3/user/data/decrypt" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4239,9 +4226,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: encryptDataV3 - uris: "{{ data_service_prefix }}/v1.3/user/encrypt" + request_path: "{{ data_service_prefix }}/v1.3/user/encrypt" upstream_url: "{{ user_org_service_url }}/v1.3/user/data/encrypt" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4255,9 +4242,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createOrgV3 - uris: "{{ org_service_prefix }}/v1.3/create" + request_path: "{{ org_service_prefix }}/v1.3/create" upstream_url: "{{ user_org_service_url }}/v1.3/org/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4271,9 +4258,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateOrgV3 - uris: "{{ org_service_prefix }}/v1.3/update" + request_path: "{{ org_service_prefix }}/v1.3/update" upstream_url: "{{ user_org_service_url }}/v1.3/org/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4287,9 +4274,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: readOrgV3 - uris: "{{ org_service_prefix }}/v1.3/read" + request_path: "{{ org_service_prefix }}/v1.3/read" upstream_url: "{{ user_org_service_url }}/v1.3/org/read" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4303,9 +4290,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: searchOrgV3 - uris: "{{ org_service_prefix }}/v1.3/search" + request_path: "{{ org_service_prefix }}/v1.3/search" upstream_url: "{{ user_org_service_url }}/v1.3/org/search" - strip_uri: true + strip_request_path: true plugins: - name: cors - "{{ statsd_pulgin }}" @@ -4316,9 +4303,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: addMemberV3 - uris: "{{ org_service_prefix }}/v1.3/member/add" + request_path: "{{ org_service_prefix }}/v1.3/member/add" upstream_url: "{{ user_org_service_url }}/v1.3/org/member/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4332,9 +4319,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: removeMemberV3 - uris: "{{ org_service_prefix }}/v1.3/member/remove" + request_path: "{{ org_service_prefix }}/v1.3/member/remove" upstream_url: "{{ user_org_service_url }}/v1.3/org/member/remove" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4348,9 +4335,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: updateOrgStatusV3 - uris: "{{ org_service_prefix }}/v1.3/status/update" + request_path: "{{ org_service_prefix }}/v1.3/status/update" upstream_url: "{{ user_org_service_url }}/v1.3/org/status/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4364,9 +4351,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: listOrgTypesV3 - uris: "{{ org_service_prefix }}/v1.3/type/list" + request_path: "{{ org_service_prefix }}/v1.3/type/list" upstream_url: "{{ user_org_service_url }}/v1.3/org/type/list" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4380,9 +4367,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: createOrgTypeV3 - uris: "{{ org_service_prefix }}/v1.3/type/create" + request_path: "{{ org_service_prefix }}/v1.3/type/create" upstream_url: "{{ user_org_service_url }}/v1.3/org/type/create" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4396,9 +4383,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: updateOrgTypeV3 - uris: "{{ org_service_prefix }}/v1.3/type/update" + request_path: "{{ org_service_prefix }}/v1.3/type/update" upstream_url: "{{ user_org_service_url }}/v1.3/org/type/update" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4412,18 +4399,18 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: "telemetryErrorLogging" - uris: "/data/v1/client/logs" + request_path: "/data/v1/client/logs" upstream_url: "{{ sunbird_analytics_api_base_url }}/data/v1/client/logs" - strip_uri: true + strip_request_path: true plugins: - {name: 'cors'} - "{{ statsd_pulgin }}" - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: generateCertificate - uris: "{{ cert_service_prefix }}/v1/certs/generate" + request_path: "{{ cert_service_prefix }}/v1/certs/generate" upstream_url: "{{ cert_service_url }}/v1/certs/generate" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4437,9 +4424,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: "certValidation" - uris: "{{ user_service_prefix }}/v1/certs/validate" + request_path: "{{ user_service_prefix }}/v1/certs/validate" upstream_url: "{{ learning_service_url }}/private/user/v1/certs/validate" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -4496,9 +4483,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: "orgAssignKeys" - uris: "{{ org_service_prefix }}/v1/assign/key" + request_path: "{{ org_service_prefix }}/v1/assign/key" upstream_url: "{{ learning_service_url }}/v1/org/assign/key" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -4507,9 +4494,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: "mergeUserAccounts" - uris: "{{ user_service_prefix }}/v1/account/merge" + request_path: "{{ user_service_prefix }}/v1/account/merge" upstream_url: "{{ learning_service_url }}/private/user/v1/account/merge" - strip_uri: true + strip_request_path: true plugins: - {name: 'jwt'} - {name: 'cors'} @@ -4518,9 +4505,9 @@ kong_apis: - {name: 'rate-limiting', config.policy: "local", config.hour: "{{ medium_rate_limit_per_hour }}"} - {name: 'request-size-limiting', config.allowed_payload_size: "{{ small_request_size_limit }}" } - name: qrCodeDownload - uris: "{{ course_service_prefix }}/v1/qrcode/download" + request_path: "{{ course_service_prefix }}/v1/qrcode/download" upstream_url: "{{ lms_service_url }}/v1/course/qrcode/download" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4534,9 +4521,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: courseIssueCertificate - uris: "{{ course_service_prefix }}/batch/cert/v1/issue" + request_path: "{{ course_service_prefix }}/batch/cert/v1/issue" upstream_url: "{{ lms_service_url }}/v1/course/batch/cert/issue" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4582,9 +4569,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: downloadCertificate - uris: "{{ user_service_prefix }}/v1/certs/download" + request_path: "{{ user_service_prefix }}/v1/certs/download" upstream_url: "{{ learning_service_url }}/v1/user/certs/download" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4598,9 +4585,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: UserBulkUploadv2 - uris: "{{ user_service_prefix }}/v2/bulk/upload" + request_path: "{{ user_service_prefix }}/v2/bulk/upload" upstream_url: "{{ learning_service_url }}/v2/bulk/user/upload" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4614,9 +4601,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: downloadRegCertificate - uris: "{{ cert_registry_service_prefix }}/v1/certs/download" + request_path: "{{ cert_registry_service_prefix }}/v1/certs/download" upstream_url: "{{ cert_registry_service_url }}/certs/v1/registry/download" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4630,9 +4617,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: validateRegCertificate - uris: "{{ cert_registry_service_prefix }}/v1/certs/validate" + request_path: "{{ cert_registry_service_prefix }}/v1/certs/validate" upstream_url: "{{ cert_registry_service_url }}/certs/v1/registry/validate" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors @@ -4646,9 +4633,9 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - name: addRegCertificate - uris: "{{ cert_registry_service_prefix }}/v1/certs/add" + request_path: "{{ cert_registry_service_prefix }}/v1/certs/add" upstream_url: "{{ cert_registry_service_url }}/certs/v1/registry/add" - strip_uri: true + strip_request_path: true plugins: - name: jwt - name: cors diff --git a/ansible/roles/postgresql-data-update-managed/defaults/main.yml b/ansible/roles/postgresql-data-update-managed/defaults/main.yml new file mode 100755 index 0000000000..9a65ac5302 --- /dev/null +++ b/ansible/roles/postgresql-data-update-managed/defaults/main.yml @@ -0,0 +1,114 @@ +--- +postgresql_user: postgres +postgresql_group: postgres +postgresql_unix_socket_directories: + - /var/run/postgresql + +############# Postgres users and databases ############### +postgresql_users: + - name: "{{kong_postgres_user}}" + login_host: "{{kong_postgres_host}}" + login_password: "{{kong_postgres_password}}" + password: "{{postgres_password}}" + db: "{{kong_postgres_database}}" + login_user: "{{kong_postgres_user}}" + priv: "ALL" + - name: "{{keycloak_postgres_user}}" + login_host: "{{keycloak_postgres_host}}" + login_password: "{{keycloak_postgres_password}}" + password: "{{postgres_password}}" + db: "{{keycloak_postgres_database}}" + login_user: "{{keycloak_postgres_user}}" + priv: "ALL" + - name: "{{application_postgres_user}}" + login_host: "{{application_postgres_host}}" + login_password: "{{application_postgres_password}}" + password: "{{postgres_password}}" + db: "{{application_postgres_database}}" + login_user: "{{application_postgres_user}}" + priv: "ALL" + - name: "{{badger_postgres_user}}" + login_host: "{{badger_postgres_host}}" + login_password: "{{badger_postgres_password}}" + password: "{{postgres_password}}" + login_user: "{{badger_postgres_user}}" + db: "{{badger_postgres_database}}" + priv: "ALL" + - name: "{{user_org_service_postgres_user}}" + login_host: "{{user_org_service_postgres_host}}" + login_password: "{{user_org_service_postgres_password}}" + password: "{{user_org_service_postgres_password}}" + db: "{{user_org_service_postgres_database}}" + login_user: "{{user_org_service_postgres_user}}" + priv: "ALL" + - name: "{{enc_postgres_user}}" + login_host: "{{enc_postgres_host}}" + login_password: "{{enc_postgres_password}}" + password: "{{enc_postgres_password}}" + db: "{{enc_postgres_database}}" + login_user: "{{enc_postgres_user}}" + priv: "ALL" + + +postgresql_databases: + - name: "{{kong_postgres_database}}" + login_host: "{{kong_postgres_host}}" + login_password: "{{kong_postgres_password}}" + owner: "{{kong_postgres_user}}" + login_user: "{{kong_postgres_user}}" + - name: "{{keycloak_postgres_database}}" + login_host: "{{keycloak_postgres_host}}" + login_password: "{{keycloak_postgres_password}}" + owner: "{{keycloak_postgres_user}}" + login_user: "{{keycloak_postgres_user}}" + - name: "{{application_postgres_database}}" + login_host: "{{application_postgres_host}}" + login_password: "{{application_postgres_password}}" + owner: "{{application_postgres_user}}" + login_user: "{{application_postgres_user}}" + - name: "{{badger_postgres_database}}" + login_host: "{{badger_postgres_host}}" + login_password: "{{badger_postgres_password}}" + owner: "{{badger_postgres_user}}" + login_user: "{{badger_postgres_user}}" + - name: "{{user_org_service_postgres_database}}" + login_host: "{{user_org_service_postgres_host}}" + login_password: "{{user_org_service_postgres_password}}" + owner: "{{user_org_service_postgres_user}}" + login_user: "{{user_org_service_postgres_user}}" + - name: "{{enc_postgres_database}}" + login_host: "{{enc_postgres_host}}" + login_password: "{{enc_postgres_password}}" + owner: "{{enc_postgres_user}}" + login_user: "{{enc_postgres_user}}" + +########################################################## + + +# Databases to ensure exist. +#postgresql_databases: [] + # - name: exampledb # required; the rest are optional + # lc_collate: # defaults to 'en_US.UTF-8' + # lc_ctype: # defaults to 'en_US.UTF-8' + # encoding: # defaults to 'UTF-8' + # template: # defaults to 'template0' + # login_host: # defaults to 'localhost' + # login_password: # defaults to not set + # login_user: # defaults to '{{ postgresql_user }}' + # login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories + # port: # defaults to not set + # state: # defaults to 'present' + +# Users to ensure exist. +#postgresql_users: [] + # - name: jdoe #required; the rest are optional + # password: # defaults to not set + # priv: # defaults to not set + # role_attr_flags: # defaults to not set + # db: # defaults to not set + # login_host: # defaults to 'localhost' + # login_password: # defaults to not set + # login_user: # defaults to '{{ postgresql_user }}' + # login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories + # port: # defaults to not set + # state: # defaults to 'present' diff --git a/ansible/roles/postgresql-data-update-managed/tasks/databases.yml b/ansible/roles/postgresql-data-update-managed/tasks/databases.yml new file mode 100644 index 0000000000..dc96ae4cc9 --- /dev/null +++ b/ansible/roles/postgresql-data-update-managed/tasks/databases.yml @@ -0,0 +1,14 @@ +--- +- name: Ensure PostgreSQL databases are present. + postgresql_db: + name: "{{ item.name }}" + login_host: "{{ item.login_host | default('localhost') }}" + login_password: "{{ item.login_password | default(omit) }}" + login_user: "{{ item.login_user | default(postgresql_user) }}" + login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}" + port: "{{ item.port | default(omit) }}" + owner: '{{ item.owner.split("@")[0] | default(postgresql_user) }}' + state: "{{ item.state | default('present') }}" + with_items: "{{ postgresql_databases }}" + vars: + ansible_ssh_pipelining: true diff --git a/ansible/roles/postgresql-data-update-managed/tasks/main.yml b/ansible/roles/postgresql-data-update-managed/tasks/main.yml new file mode 100644 index 0000000000..250de30d7d --- /dev/null +++ b/ansible/roles/postgresql-data-update-managed/tasks/main.yml @@ -0,0 +1,41 @@ +- name: install psycopg2 + package: + name: python-psycopg2 + state: present + +- name: Verifying db users are present else creating them + include: databases.yml + +- name: creating database + include: users.yml + +- name: Copy the templates + become: yes + template: src={{item}} dest=/tmp/{{item}} + with_items: + - tables_postgres.sql + - enc_postgres.sql + +- name: Install postgres client to create schema from file + apt: + name: postgresql-client + state: present + update_cache: yes + +- name: Dump api manager database to a file + postgresql_db: + login_user: "{{ application_postgres_user }}" + login_password: "{{ application_postgres_password }}" + login_host: "{{ application_postgres_host }}" + name: "{{ application_postgres_database }}" + state: restore + target: "/tmp/tables_postgres.sql" + +- name: Create the schema for encryption service + postgresql_db: + login_user: "{{ enc_postgres_user }}" + login_password: "{{ enc_postgres_password }}" + login_host: "{{ enc_postgres_host }}" + name: "{{ enc_postgres_database }}" + state: restore + target: "/tmp/enc_postgres.sql" diff --git a/ansible/roles/postgresql-data-update-managed/tasks/users.yml b/ansible/roles/postgresql-data-update-managed/tasks/users.yml new file mode 100755 index 0000000000..fdbb3b43dc --- /dev/null +++ b/ansible/roles/postgresql-data-update-managed/tasks/users.yml @@ -0,0 +1,17 @@ +--- +- name: Ensure PostgreSQL users are present. + postgresql_user: + name: "{{ item.name }}" + password: "{{ item.password | default(omit) }}" + priv: "{{ item.priv | default(omit) }}" + role_attr_flags: "{{ item.role_attr_flags | default(omit) }}" + db: "{{ item.db | default(omit) }}" + login_host: "{{ item.login_host | default('localhost') }}" + login_password: "{{ item.login_password | default(omit) }}" + login_user: "{{ item.login_user | default(postgresql_user) }}" + encrypted: "{{ item.encrypted | default('yes')}}" + state: "{{ item.state | default('present') }}" + with_items: "{{ postgresql_users }}" + vars: + ansible_ssh_pipelining: true + diff --git a/ansible/roles/postgresql-data-update-managed/templates/enc_postgres.sql b/ansible/roles/postgresql-data-update-managed/templates/enc_postgres.sql new file mode 100644 index 0000000000..ada819c60f --- /dev/null +++ b/ansible/roles/postgresql-data-update-managed/templates/enc_postgres.sql @@ -0,0 +1,12 @@ +CREATE TYPE "enum_Keys_type" AS ENUM ('MASTER','OTHER'); +CREATE TABLE "Keys" ( + id SERIAL PRIMARY KEY, + public text NOT NULL, + private text NOT NULL, + type "enum_Keys_type" NOT NULL, + active boolean DEFAULT true NOT NULL, + reserved boolean DEFAULT false NOT NULL, + "createdAt" timestamp with time zone NOT NULL, + "updatedAt" timestamp with time zone NOT NULL +); +commit; diff --git a/ansible/roles/postgresql-data-update-managed/templates/tables_postgres.sql b/ansible/roles/postgresql-data-update-managed/templates/tables_postgres.sql new file mode 100644 index 0000000000..e2da042a1a --- /dev/null +++ b/ansible/roles/postgresql-data-update-managed/templates/tables_postgres.sql @@ -0,0 +1,181 @@ +drop table qrtz_fired_triggers; +DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS; +DROP TABLE QRTZ_SCHEDULER_STATE; +DROP TABLE QRTZ_LOCKS; +drop table qrtz_simple_triggers; +drop table qrtz_cron_triggers; +drop table qrtz_simprop_triggers; +DROP TABLE QRTZ_BLOB_TRIGGERS; +drop table qrtz_triggers; +drop table qrtz_job_details; +drop table qrtz_calendars; + +CREATE TABLE qrtz_job_details + ( + SCHED_NAME VARCHAR(120) NOT NULL, + JOB_NAME VARCHAR(200) NOT NULL, + JOB_GROUP VARCHAR(200) NOT NULL, + DESCRIPTION VARCHAR(250) NULL, + JOB_CLASS_NAME VARCHAR(250) NOT NULL, + IS_DURABLE BOOL NOT NULL, + IS_NONCONCURRENT BOOL NOT NULL, + IS_UPDATE_DATA BOOL NOT NULL, + REQUESTS_RECOVERY BOOL NOT NULL, + JOB_DATA BYTEA NULL, + PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) +); + +CREATE TABLE qrtz_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + JOB_NAME VARCHAR(200) NOT NULL, + JOB_GROUP VARCHAR(200) NOT NULL, + DESCRIPTION VARCHAR(250) NULL, + NEXT_FIRE_TIME BIGINT NULL, + PREV_FIRE_TIME BIGINT NULL, + PRIORITY INTEGER NULL, + TRIGGER_STATE VARCHAR(16) NOT NULL, + TRIGGER_TYPE VARCHAR(8) NOT NULL, + START_TIME BIGINT NOT NULL, + END_TIME BIGINT NULL, + CALENDAR_NAME VARCHAR(200) NULL, + MISFIRE_INSTR SMALLINT NULL, + JOB_DATA BYTEA NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) + REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP) +); + +CREATE TABLE qrtz_simple_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + REPEAT_COUNT BIGINT NOT NULL, + REPEAT_INTERVAL BIGINT NOT NULL, + TIMES_TRIGGERED BIGINT NOT NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +CREATE TABLE qrtz_cron_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + CRON_EXPRESSION VARCHAR(120) NOT NULL, + TIME_ZONE_ID VARCHAR(80), + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +CREATE TABLE qrtz_simprop_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + STR_PROP_1 VARCHAR(512) NULL, + STR_PROP_2 VARCHAR(512) NULL, + STR_PROP_3 VARCHAR(512) NULL, + INT_PROP_1 INT NULL, + INT_PROP_2 INT NULL, + LONG_PROP_1 BIGINT NULL, + LONG_PROP_2 BIGINT NULL, + DEC_PROP_1 NUMERIC(13,4) NULL, + DEC_PROP_2 NUMERIC(13,4) NULL, + BOOL_PROP_1 BOOL NULL, + BOOL_PROP_2 BOOL NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +CREATE TABLE qrtz_blob_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + BLOB_DATA BYTEA NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +CREATE TABLE qrtz_calendars + ( + SCHED_NAME VARCHAR(120) NOT NULL, + CALENDAR_NAME VARCHAR(200) NOT NULL, + CALENDAR BYTEA NOT NULL, + PRIMARY KEY (SCHED_NAME,CALENDAR_NAME) +); + + +CREATE TABLE qrtz_paused_trigger_grps + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP) +); + +CREATE TABLE qrtz_fired_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + ENTRY_ID VARCHAR(95) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + INSTANCE_NAME VARCHAR(200) NOT NULL, + FIRED_TIME BIGINT NOT NULL, + SCHED_TIME BIGINT NOT NULL, + PRIORITY INTEGER NOT NULL, + STATE VARCHAR(16) NOT NULL, + JOB_NAME VARCHAR(200) NULL, + JOB_GROUP VARCHAR(200) NULL, + IS_NONCONCURRENT BOOL NULL, + REQUESTS_RECOVERY BOOL NULL, + PRIMARY KEY (SCHED_NAME,ENTRY_ID) +); + +CREATE TABLE qrtz_scheduler_state + ( + SCHED_NAME VARCHAR(120) NOT NULL, + INSTANCE_NAME VARCHAR(200) NOT NULL, + LAST_CHECKIN_TIME BIGINT NOT NULL, + CHECKIN_INTERVAL BIGINT NOT NULL, + PRIMARY KEY (SCHED_NAME,INSTANCE_NAME) +); + +CREATE TABLE qrtz_locks + ( + SCHED_NAME VARCHAR(120) NOT NULL, + LOCK_NAME VARCHAR(40) NOT NULL, + PRIMARY KEY (SCHED_NAME,LOCK_NAME) +); + +create index idx_qrtz_j_req_recovery on qrtz_job_details(SCHED_NAME,REQUESTS_RECOVERY); +create index idx_qrtz_j_grp on qrtz_job_details(SCHED_NAME,JOB_GROUP); + +create index idx_qrtz_t_j on qrtz_triggers(SCHED_NAME,JOB_NAME,JOB_GROUP); +create index idx_qrtz_t_jg on qrtz_triggers(SCHED_NAME,JOB_GROUP); +create index idx_qrtz_t_c on qrtz_triggers(SCHED_NAME,CALENDAR_NAME); +create index idx_qrtz_t_g on qrtz_triggers(SCHED_NAME,TRIGGER_GROUP); +create index idx_qrtz_t_state on qrtz_triggers(SCHED_NAME,TRIGGER_STATE); +create index idx_qrtz_t_n_state on qrtz_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_STATE); +create index idx_qrtz_t_n_g_state on qrtz_triggers(SCHED_NAME,TRIGGER_GROUP,TRIGGER_STATE); +create index idx_qrtz_t_next_fire_time on qrtz_triggers(SCHED_NAME,NEXT_FIRE_TIME); +create index idx_qrtz_t_nft_st on qrtz_triggers(SCHED_NAME,TRIGGER_STATE,NEXT_FIRE_TIME); +create index idx_qrtz_t_nft_misfire on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME); +create index idx_qrtz_t_nft_st_misfire on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_STATE); +create index idx_qrtz_t_nft_st_misfire_grp on qrtz_triggers(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_GROUP,TRIGGER_STATE); + +create index idx_qrtz_ft_trig_inst_name on qrtz_fired_triggers(SCHED_NAME,INSTANCE_NAME); +create index idx_qrtz_ft_inst_job_req_rcvry on qrtz_fired_triggers(SCHED_NAME,INSTANCE_NAME,REQUESTS_RECOVERY); +create index idx_qrtz_ft_j_g on qrtz_fired_triggers(SCHED_NAME,JOB_NAME,JOB_GROUP); +create index idx_qrtz_ft_jg on qrtz_fired_triggers(SCHED_NAME,JOB_GROUP); +create index idx_qrtz_ft_t_g on qrtz_fired_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP); +create index idx_qrtz_ft_tg on qrtz_fired_triggers(SCHED_NAME,TRIGGER_GROUP); + +commit; diff --git a/ansible/roles/postgresql-data-update/defaults/main.yml b/ansible/roles/postgresql-data-update/defaults/main.yml index 9a65ac5302..998588f529 100755 --- a/ansible/roles/postgresql-data-update/defaults/main.yml +++ b/ansible/roles/postgresql-data-update/defaults/main.yml @@ -4,87 +4,6 @@ postgresql_group: postgres postgresql_unix_socket_directories: - /var/run/postgresql -############# Postgres users and databases ############### -postgresql_users: - - name: "{{kong_postgres_user}}" - login_host: "{{kong_postgres_host}}" - login_password: "{{kong_postgres_password}}" - password: "{{postgres_password}}" - db: "{{kong_postgres_database}}" - login_user: "{{kong_postgres_user}}" - priv: "ALL" - - name: "{{keycloak_postgres_user}}" - login_host: "{{keycloak_postgres_host}}" - login_password: "{{keycloak_postgres_password}}" - password: "{{postgres_password}}" - db: "{{keycloak_postgres_database}}" - login_user: "{{keycloak_postgres_user}}" - priv: "ALL" - - name: "{{application_postgres_user}}" - login_host: "{{application_postgres_host}}" - login_password: "{{application_postgres_password}}" - password: "{{postgres_password}}" - db: "{{application_postgres_database}}" - login_user: "{{application_postgres_user}}" - priv: "ALL" - - name: "{{badger_postgres_user}}" - login_host: "{{badger_postgres_host}}" - login_password: "{{badger_postgres_password}}" - password: "{{postgres_password}}" - login_user: "{{badger_postgres_user}}" - db: "{{badger_postgres_database}}" - priv: "ALL" - - name: "{{user_org_service_postgres_user}}" - login_host: "{{user_org_service_postgres_host}}" - login_password: "{{user_org_service_postgres_password}}" - password: "{{user_org_service_postgres_password}}" - db: "{{user_org_service_postgres_database}}" - login_user: "{{user_org_service_postgres_user}}" - priv: "ALL" - - name: "{{enc_postgres_user}}" - login_host: "{{enc_postgres_host}}" - login_password: "{{enc_postgres_password}}" - password: "{{enc_postgres_password}}" - db: "{{enc_postgres_database}}" - login_user: "{{enc_postgres_user}}" - priv: "ALL" - - -postgresql_databases: - - name: "{{kong_postgres_database}}" - login_host: "{{kong_postgres_host}}" - login_password: "{{kong_postgres_password}}" - owner: "{{kong_postgres_user}}" - login_user: "{{kong_postgres_user}}" - - name: "{{keycloak_postgres_database}}" - login_host: "{{keycloak_postgres_host}}" - login_password: "{{keycloak_postgres_password}}" - owner: "{{keycloak_postgres_user}}" - login_user: "{{keycloak_postgres_user}}" - - name: "{{application_postgres_database}}" - login_host: "{{application_postgres_host}}" - login_password: "{{application_postgres_password}}" - owner: "{{application_postgres_user}}" - login_user: "{{application_postgres_user}}" - - name: "{{badger_postgres_database}}" - login_host: "{{badger_postgres_host}}" - login_password: "{{badger_postgres_password}}" - owner: "{{badger_postgres_user}}" - login_user: "{{badger_postgres_user}}" - - name: "{{user_org_service_postgres_database}}" - login_host: "{{user_org_service_postgres_host}}" - login_password: "{{user_org_service_postgres_password}}" - owner: "{{user_org_service_postgres_user}}" - login_user: "{{user_org_service_postgres_user}}" - - name: "{{enc_postgres_database}}" - login_host: "{{enc_postgres_host}}" - login_password: "{{enc_postgres_password}}" - owner: "{{enc_postgres_user}}" - login_user: "{{enc_postgres_user}}" - -########################################################## - - # Databases to ensure exist. #postgresql_databases: [] # - name: exampledb # required; the rest are optional diff --git a/ansible/roles/postgresql-data-update/tasks/databases.yml b/ansible/roles/postgresql-data-update/tasks/databases.yml index dc96ae4cc9..1d9087d6a4 100644 --- a/ansible/roles/postgresql-data-update/tasks/databases.yml +++ b/ansible/roles/postgresql-data-update/tasks/databases.yml @@ -2,13 +2,15 @@ - name: Ensure PostgreSQL databases are present. postgresql_db: name: "{{ item.name }}" - login_host: "{{ item.login_host | default('localhost') }}" - login_password: "{{ item.login_password | default(omit) }}" + login_host: "localhost" + login_password: "{{ omit }}" login_user: "{{ item.login_user | default(postgresql_user) }}" login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}" port: "{{ item.port | default(omit) }}" owner: '{{ item.owner.split("@")[0] | default(postgresql_user) }}' state: "{{ item.state | default('present') }}" with_items: "{{ postgresql_databases }}" + become: yes + become_user: "{{ postgresql_user }}" vars: ansible_ssh_pipelining: true diff --git a/ansible/roles/postgresql-data-update/tasks/users.yml b/ansible/roles/postgresql-data-update/tasks/users.yml index fdbb3b43dc..fea2331ac5 100755 --- a/ansible/roles/postgresql-data-update/tasks/users.yml +++ b/ansible/roles/postgresql-data-update/tasks/users.yml @@ -6,12 +6,14 @@ priv: "{{ item.priv | default(omit) }}" role_attr_flags: "{{ item.role_attr_flags | default(omit) }}" db: "{{ item.db | default(omit) }}" - login_host: "{{ item.login_host | default('localhost') }}" - login_password: "{{ item.login_password | default(omit) }}" + login_host: "localhost" + login_password: "{{ omit }}" login_user: "{{ item.login_user | default(postgresql_user) }}" + login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}" encrypted: "{{ item.encrypted | default('yes')}}" state: "{{ item.state | default('present') }}" with_items: "{{ postgresql_users }}" + become: yes + become_user: "{{ postgresql_user }}" vars: ansible_ssh_pipelining: true - diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index fc8f25b678..56af749b5d 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -18,13 +18,14 @@ actor_limit_memory: 1024M learner_replicas: 1 learner_reservation_memory: 256M learner_limit_memory: 512M +learner_reservation_cpu: 0 #Config Service Vars config_replicas: 1 config_reservation_memory: 1024M config_limit_memory: 1024M config_limit_cpu: 1 -config_reservation_cpu: 1 +config_reservation_cpu: 0 # Notification Service vars notification_replicas: 1 @@ -77,19 +78,19 @@ telemetry_logstash_limit_memory: 2g sunbird_telemetry_api: sunbird_enable_signup: content_limit_cpu: 1 -content_reservation_cpu: 1 +content_reservation_cpu: 0 user_org_replicas: 1 user_org_reservation_memory: 750MB user_org_limit_memory: 800MB user_org_limit_cpu: 1 -user_org_reservation_cpu: 1 +user_org_reservation_cpu: 0 cert_replicas: 1 cert_reservation_memory: 500MB cert_limit_memory: 550MB cert_limit_cpu: 1 -cert_reservation_cpu: 1 +cert_reservation_cpu: 0 cert_registry_replicas: 1 cert_registry_limit_memory: 500MB @@ -100,7 +101,7 @@ enc_replicas: 1 enc_reservation_memory: 750MB enc_limit_memory: 800MB enc_limit_cpu: 1 -enc_reservation_cpu: 1 +enc_reservation_cpu: 0 postgres_port: 5432 enc_dialect: postgres enc_entry_passwod: password diff --git a/ansible/roles/stack-sunbird/tasks/lms_service.yml b/ansible/roles/stack-sunbird/tasks/lms_service.yml index f99ef4502a..5388bb281a 100644 --- a/ansible/roles/stack-sunbird/tasks/lms_service.yml +++ b/ansible/roles/stack-sunbird/tasks/lms_service.yml @@ -6,4 +6,4 @@ - name: Deploy lms service shell: "docker service create --with-registry-auth --replicas {{ learner_replicas }} -p 9005:9000 --name lms-service --hostname lms-service --reserve-memory {{ learner_reservation_memory }} --limit-memory {{ learner_limit_memory }} --limit-cpu {{ learner_limit_cpu }} --reserve-cpu {{ learner_reservation_cpu }} --health-cmd 'wget -qO- lms-service:9000/service/health || exit 1' --health-timeout 3s --health-retries 3 --network application_default --env-file /home/deployer/env/sunbird_lms-service.env {{hub_org}}/{{image_name}}:{{image_tag}}" args: - chdir: /home/deployer/stack \ No newline at end of file + chdir: /home/deployer/stack diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh index 04abe30096..8294a629ef 100755 --- a/deploy/jenkins/jenkins-jobs-setup.sh +++ b/deploy/jenkins/jenkins-jobs-setup.sh @@ -48,6 +48,7 @@ setupJobs(){ syncJobs(){ read -p 'YES/NO: ' changes +echo -e "\e[0;33m${bold}This might take a while... Do not kill the process!${normal}" if [[ $changes == "YES" ]]; then rsync -r $JENKINS_TMP/* /var/lib/jenkins/jobs chown -R jenkins:jenkins /var/lib/jenkins/jobs diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh index 7eb60d79d1..9794383488 100755 --- a/deploy/jenkins/jenkins-server-setup.sh +++ b/deploy/jenkins/jenkins-server-setup.sh @@ -2,6 +2,9 @@ bold=$(tput bold) normal=$(tput sgr0) +echo -e "\n\e[0;32m${bold}Clean up${normal}" +rm -rf /etc/apt/sources.list.d/azure-cli.list /etc/apt/sources.list.d/packages_microsoft_com_repos_azure_cli.list* + echo -e "\n\e[0;32m${bold}Updating the apt repo${normal}\n" apt-get update @@ -12,7 +15,7 @@ echo -e "\n\e[0;32m${bold}Installating Jenkins${normal}" wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add - apt-add-repository "deb https://pkg.jenkins.io/debian-stable binary/" apt-get update -apt-get install -y jenkins=2.176.2 +apt-get install -y jenkins=2.190.2 echo -e "\n\e[0;32m${bold}Installating PIP${normal}" apt-get install -y python-pip @@ -44,7 +47,13 @@ apt-get install -y docker-ce docker-ce-cli containerd.io echo -e "\n\e[0;32m${bold}Installating node and npm modules" wget https://nodejs.org/download/release/v6.1.0/node-v6.1.0-linux-x64.tar.gz -tar -xvf node-v6.1.0-linux-x64.tar.gz +tar -xf node-v6.1.0-linux-x64.tar.gz +rm -rf /usr/local/lib/node-v6.1.0-linux-x64 +rm -rf /usr/bin/node +rm -rf /usr/bin/npm +rm -rf /usr/bin/grunt +rm -rf /usr/bin/bower +rm -rf /usr/bin/gulp mv node-v6.1.0-linux-x64 /usr/local/lib/ ln -s /usr/local/lib/node-v6.1.0-linux-x64/bin/node /usr/bin/node ln -s /usr/local/lib/node-v6.1.0-linux-x64/bin/npm /usr/bin/npm @@ -54,27 +63,27 @@ npm install -g bower@1.8.0 ln -s /usr/local/lib/node-v6.1.0-linux-x64/bin/bower /usr/bin/bower npm install -g gulp@3.9.1 ln -s /usr/local/lib/node-v6.1.0-linux-x64/bin/gulp /usr/bin/gulp +rm -rf node-v6.1.0-linux-x64* echo -e "\n\e[0;32m${bold}Installating Ansible${normal}" pip install ansible==2.5.0 echo -e "\n\e[0;32m${bold}Installating azure cli${normal}" -apt-get install curl apt-transport-https lsb-release gpg -curl -sL https://packages.microsoft.com/keys/microsoft.asc | \ - gpg --dearmor | \ +apt-get install ca-certificates curl apt-transport-https lsb-release gnupg +curl -sL https://packages.microsoft.com/keys/microsoft.asc | + gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null AZ_REPO=$(lsb_release -cs) -echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | \ +echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list - -apt-get update -apt-get install azure-cli +sudo apt-get update +sudo apt-get install azure-cli # Install azcopy echo -e "\n\e[0;32m${bold}Installating AzCopy${normal}" apt update wget https://aka.ms/downloadazcopy-v10-linux -tar -xvf downloadazcopy-v10-linux +tar -xf downloadazcopy-v10-linux cp ./azcopy_linux_amd64_*/azcopy /usr/bin/ rm -rf downloadazcopy-v10-linux* azcopy_linux_amd* ### @@ -85,10 +94,6 @@ pip install docker-py echo -e "\n\e[0;32m${bold}Installating colordiff${normal}" apt-get install -y colordiff -echo -e "\n\e[0;32m${bold}Installating git lfs${normal}" -curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash -apt-get install git-lfs - echo -e "\n\e[0;32m${bold}Adding jenkins user to docker group${normal}" usermod -aG docker jenkins @@ -96,4 +101,16 @@ echo -e "\n\e[0;32m${bold}Creating bashrc for jenkins user ${normal}" cp /etc/skel/.bashrc /var/lib/jenkins chown jenkins:jenkins /var/lib/jenkins/.bashrc -echo -e "\n\e[0;32m${bold}Installation complete. Please go to your jenkins URL and continue setup if this first run..${normal}" +echo -e "\n\e[0;32m${bold}Setting timezone to IST ${normal}" +timedatectl set-timezone Asia/Kolkata + +echo -e "\n\e[0;32m${bold}Installing nvm${normal}" +su jenkins bash -c "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash" + +echo -e "\n\e[0;32m${bold}Installing jmespath${normal}" +pip install jmespath + +echo -e "\n\e[0;32m${bold}Clean up${normal}" +sudo apt -y autoremove + +echo -e "\n\e[0;32m${bold}Installation complete. Please go to your jenkins URL and continue setup if this is the first run..${normal}" diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml deleted file mode 100644 index fc06750462..0000000000 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - Build/Core/Cert - false - - - image_tag - <font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font> - - false - - - artifact_source - <font color=dimgray size=2><b> -ArtifactRepo - Push the docker image to container registry. -</b></font> - - - ArtifactRepo - - - - - - - 0 - 0 - - false - project - false - - - - - - - /Build/Core/Cert - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${public_repo_branch} - - - false - - - - true - false - - 0 - false - - - - pipelines/upload/docker/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml deleted file mode 100644 index 63b79ae5a5..0000000000 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - Build/Core/Config - false - - - image_tag - <font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font> - - false - - - artifact_source - <font color=dimgray size=2><b> -ArtifactRepo - Push the docker image to container registry. -</b></font> - - - ArtifactRepo - - - - - - - 0 - 0 - - false - project - false - - - - - - - /Build/Core/Config - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${public_repo_branch} - - - false - - - - true - false - - 1 - false - - - - pipelines/upload/docker/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml deleted file mode 100644 index 77c780c037..0000000000 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - Build/Core/EncService - false - - - image_tag - <font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font> - - false - - - artifact_source - <font color=dimgray size=2><b> -ArtifactRepo - Push the docker image to container registry. -</b></font> - - - ArtifactRepo - - - - - - - 0 - 0 - - false - project - false - - - - - - - /Build/Core/EncService - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${public_repo_branch} - - - false - - - - true - false - - 0 - false - - - - pipelines/upload/docker/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml index c5ea94efef..28100d104e 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml @@ -1,7 +1,7 @@ - + - + hudson.model.ParametersDefinitionProperty com.sonyericsson.rebuild.RebuildSettings @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry. - - + + 2 @@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry. false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml index e2088015b9..eecb2f3184 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry. - - + + 2 diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml deleted file mode 100644 index 26c03bc496..0000000000 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - Build/Core/UserOrg - false - - - image_tag - <font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font> - - false - - - artifact_source - <font color=dimgray size=2><b> -ArtifactRepo - Push the docker image to container registry. -</b></font> - - - ArtifactRepo - - - - - - - 0 - 0 - - false - project - false - - - - - - - /Build/Core/UserOrg - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${public_repo_branch} - - - false - - - - true - false - - 0 - false - - - - pipelines/upload/docker/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml index 5be56a4e05..37e2c9b17a 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml index e030ca1a32..b4671cf176 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml @@ -1,7 +1,7 @@ - + - + hudson.model.ParametersDefinitionProperty com.sonyericsson.rebuild.RebuildSettings @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J - - + + 2 @@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml index c1e7765151..b7fac14259 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml @@ -1,7 +1,7 @@ - + - + hudson.model.ParametersDefinitionProperty com.sonyericsson.rebuild.RebuildSettings @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J - - + + 2 @@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml deleted file mode 100644 index 3705f36ebb..0000000000 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=black size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - /Build/DataPipeline/ml-workbench - false - - - image_tag - <font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font> - - false - - - artifact_source - <font color=black size=2><b> -ArtifactRepo - Push the docker image to container registry. -</b></font> - - - ArtifactRepo - - - - - - - 0 - 0 - - false - project - false - - 1 - - - - - - /Build/DataPipeline/MLWorkbench - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-data-pipeline.git - - - - - ${public_repo_branch} - - - false - - - - true - false - - 0 - false - - - - pipelines/upload/docker/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml index 6762d58feb..d417bc70ef 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J - - + + 2 diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml index 0f9ec569f5..b721b03160 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J - - + + 2 diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml index e5049623f0..da60236ff1 100644 --- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml +++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/config.xml index 5be56a4e05..37e2c9b17a 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/config.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml index bbbe5001a1..04dbdbed4c 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml @@ -46,7 +46,7 @@ - H/15 * * * * + false diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml index 7139f56b63..14795c564e 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -46,14 +46,14 @@ - H/15 * * * * + false - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml index f15d2d44c4..cb94118ff4 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml @@ -46,7 +46,7 @@ - H/15 * * * * + false @@ -82,4 +82,4 @@ false - \ No newline at end of file + diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml index 0a0fc0e72a..6a91f4b580 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml @@ -71,7 +71,7 @@ return """<b>This parameter is not used</b>"&quo - H/15 * * * * + false diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml deleted file mode 100644 index 70772a31db..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 10 - - - - - false - false - - - - - github_release_tag - <font color=blue size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - H/15 * * * * - false - - - - - - - 2 - - - https://github.com/project-sunbird/cert-service.git - - - - - ${github_release_tag} - - - false - - - - true - false - - 0 - false - - - - Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml deleted file mode 100644 index 3196c3f144..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 1 - - - - - false - false - - - - - github_release_tag - <font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - H/15 * * * * - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-cloud-storage-sdk.git - - - - - ${github_release_tag} - - - false - - - - true - false - - 0 - false - - - - Jenkinsfile - false - - - true - diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml deleted file mode 100644 index 10ef228799..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 10 - - - - - false - false - - - - - github_release_tag - <font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - 1 - - - - - H/15 * * * * - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-config.git - - - - - ${github_release_tag} - - - false - - - - true - false - - 0 - false - - - - Jenkinsfile - false - - - true - diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml index 69c41b03b8..715da0d80c 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -39,14 +39,14 @@ - H/15 * * * * + false - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml deleted file mode 100644 index 013e1a9f87..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 10 - - - - false - false - - - - - github_release_tag - <font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - H/15 * * * * - false - - - - - - - 2 - - - https://github.com/project-sunbird/enc-service.git - - - - - ${github_release_tag} - - - false - - - - true - false - - 0 - false - - - - Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml index db86c5b99b..ebec821833 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -39,13 +39,14 @@ - H/15 * * * * + false - + + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml index 98efefa753..df134e70a2 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -46,14 +46,14 @@ - H/15 * * * * + false - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml index 3346b4cbea..69ca284968 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml @@ -1,5 +1,5 @@ - + @@ -48,7 +48,7 @@ - + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml index 39cc60bada..903757eea3 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -34,20 +34,20 @@ sunbird_content_editor_artifact_url - - https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/content-editor-iframe-2.3.0.zip + <font color=dimgray size=2><b>Blob URL for content editor zip file</b></font> + https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/content-editor-iframe-2.5.0.zip false sunbird_collection_editor_artifact_url - - https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/collection-editor-iframe-2.3.0.zip + <font color=dimgray size=2><b>Blob URL for collection editor zip file</b></font> + https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/collection-editor-iframe-2.5.0.zip false sunbird_generic_editor_artifact_url - - https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/generic-editor-iframe-2.3.0.zip + <font color=dimgray size=2><b>Blob URL for generic editor zip file</b></font> + https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/generic-editor-iframe-2.5.0.zip false @@ -64,14 +64,14 @@ - H/15 * * * * + false - - + + 2 @@ -100,4 +100,4 @@ false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml index d059ad5c8f..833132b7da 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml @@ -46,7 +46,7 @@ - H/15 * * * * + false diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml deleted file mode 100644 index 3b5cc656b2..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 10 - - - - false - false - - - - - github_release_tag - <font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - H/15 * * * * - false - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-user-service.git - - - - - ${github_release_tag} - - - false - - - - true - false - - 0 - false - - - - Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml index 33da16452d..1edcb16ffa 100644 --- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -46,13 +46,14 @@ - H/15 * * * * + false - + + - - + + 2 @@ -81,4 +82,4 @@ false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml index 9dcf52ce02..c3548f16ca 100644 --- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml @@ -1,13 +1,13 @@ - + - + - + - + diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml index 226fbb7aa5..ea682d2b7b 100644 --- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -46,14 +46,14 @@ - H/15 * * * * + false - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml index 38231f3ed1..9af36894a0 100644 --- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -46,14 +46,14 @@ - H/15 * * * * + false - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml deleted file mode 100644 index 3fed52f3c1..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 10 - - - - - false - false - - - - - github_release_tag - <font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-ml-workbench.git - - - - - ${github_release_tag} - - - false - - - - true - false - - 0 - false - - - - Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml index 73562d61b6..c8cf0cb5d6 100644 --- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml @@ -1,4 +1,3 @@ - @@ -47,7 +46,7 @@ - H/15 * * * * + false diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml index 6fe3ca0b64..c3548f16ca 100644 --- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml @@ -1,12 +1,17 @@ - + - + - + + + + + + diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml index 10dc48157a..b7a1b0f5f5 100644 --- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -44,16 +44,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml index 049883d03b..5bd27bb903 100644 --- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -54,16 +54,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml index d9f3222e2a..73cfe087ed 100644 --- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -46,14 +46,14 @@ - H/15 * * * * + false - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml index d54b59c528..28432d6de1 100644 --- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml @@ -1,5 +1,5 @@ - + @@ -46,14 +46,14 @@ - H/15 * * * * + false - + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml index 061e714fa0..b04764d9bf 100644 --- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -58,8 +58,8 @@ - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/MasterBuild/config.xml b/deploy/jenkins/jobs/Build/jobs/MasterBuild/config.xml deleted file mode 100644 index d9a053031e..0000000000 --- a/deploy/jenkins/jobs/Build/jobs/MasterBuild/config.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - -false - - -false -false - - - - -repos - -This is a sample only. Replace contents accordingly. Do not remove the first line header - - -Sequence Module JobName Tag 1 Core AdminUtils release-2.0.0 1 Core APIManager release-2.0.0 1 Core APIManagerEcho release-2.0.0 - -false - - - - -0 -0 - -false -project -false - - - - - -2 - - - -https://github.com/project-sunbird/sunbird-devops.git - - - - - -release-2.0.0 - - -false - - - -true -true - -0 -false - - - -pipelines/master-build/Jenkinsfile -true - - -false - diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml index 32c3ebcfee..d5b2510284 100644 --- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -37,16 +37,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml index c0e7595348..819f456cbd 100644 --- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -37,16 +37,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml index 86ff33fd8e..714b6d1eee 100644 --- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -37,16 +37,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml index b659edb268..144527f9bc 100644 --- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -37,16 +37,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml index 2145e41e08..25d012db12 100644 --- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml +++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -37,16 +37,11 @@ - - - H/15 * * * * - false - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml index 5be56a4e05..37e2c9b17a 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml index 655900ffe6..ac77776dcb 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -44,7 +44,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -69,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -115,8 +115,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml index dd9fc89129..9b8aacb94d 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -25,7 +25,7 @@ choice-parameter-186487879604743 1 false - + false @@ -50,7 +50,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-186487885338467 1 false - + false @@ -82,8 +82,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml deleted file mode 100644 index 54d79c38fe..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - false - false - - - - - hosts - <font color=dimgray size=2><b>Enter the host name to be bootstrapped.</b></font> - all - false - - - private_branch - - choice-parameter-2544395024638227 - 1 - - false - - - - false - - - Bootstrap - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-2620434998790477 - 1 - - false - - - - false - - - Bootstrap - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - pipelines/bootstrap/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml index a02e83d8f1..4642fe0f48 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -32,14 +32,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9600649228560 1 false - + false @@ -57,7 +57,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9600651313765 1 false - + false @@ -84,7 +84,7 @@ return "<b>Not Applicable</b>" choice-parameter-9600653373369 1 false - + false @@ -110,7 +110,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -135,7 +135,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -181,8 +181,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml deleted file mode 100644 index e921e22d15..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - ArtifactUpload/dev/Core/Config - false - - - image_tag - <font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font> - - false - - - private_branch - - choice-parameter-2544395024638227 - 1 - - false - - - - false - - - Config - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-2620434998790477 - 1 - - false - - - - false - - - Config - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 0 - false - - - - pipelines/deploy/config-service/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml deleted file mode 100644 index 46fec0d7d2..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - ArtifactUpload/dev/Core/EncService - false - - - image_tag - <font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font> - - false - - - private_branch - - choice-parameter-2544395024638227 - 1 - - false - - - - false - - - EncService - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-2620434998790477 - 1 - - false - - - - false - - - EncService - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - - ArtifactUpload/dev/Core/EncService - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/deploy/enc/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml deleted file mode 100644 index daafb2f6a1..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - false - - - - - H 23 * * * - - - - - - -1 - 15 - -1 - -1 - - - - false - false - - - 0 - 0 - - false - project - false - - 1 - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml similarity index 86% rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml index d8fa81c34f..f531557703 100644 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -29,10 +29,10 @@ private_branch - choice-parameter-196499327272611 + choice-parameter-188157054642539 1 false - + false - TelemetrySearch + KafkaSetup ET_FORMATTED_HTML @@ -54,10 +54,10 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-196499346601896 + choice-parameter-188157057910170 1 false - + false - TelemetrySearch + KafkaSetup - ET_FORMATTED_HTML + ET_UNORDERED_LIST true @@ -89,12 +89,12 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 - https://github.com/project-sunbird/sunbird-data-pipeline.git + https://github.com/project-sunbird/sunbird-devops.git @@ -109,14 +109,14 @@ return """<b>This parameter is not used</b>"&quo true false - 0 + 1 false - pipelines/provision/telemetry-elasticsearch/Jenkinsfile + pipelines/deploy/kafka/Jenkinsfile false false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml index 747d614acd..54b2dacce9 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -32,14 +32,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9600649228560 1 false - + false @@ -57,7 +57,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9600651313765 1 false - + false @@ -84,7 +84,7 @@ return "<b>Not Applicable</b>" choice-parameter-9600653373369 1 false - + false @@ -110,7 +110,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -135,7 +135,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -187,8 +187,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -202,18 +202,10 @@ return """<b>This parameter is not used</b>"&quo false - - - true - false - - 1 - false - - + pipelines/deploy/keycloak/Jenkinsfile - false + true false diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml deleted file mode 100644 index ea8d3abf52..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - private_branch - - choice-parameter-196487835595646 - 1 - - false - - - - false - - - KeycloakAddClients - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-196487838166797 - 1 - - false - - - - false - - - KeycloakAddClients - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/deploy/keycloak/Jenkinsfile.custom - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml index d6bac1240f..3ee98f84fa 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml @@ -1,5 +1,5 @@ - + @@ -116,7 +116,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml index 4c4de2008b..ee332f9bc8 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -44,7 +44,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -69,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -115,8 +115,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml index 7b84dfd1fc..57b6a7530d 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml @@ -127,4 +127,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml index 4c6cdc1e8d..be515d6a9d 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml @@ -1,5 +1,5 @@ - + false @@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 @@ -110,7 +110,7 @@ return """<b>This parameter is not used</b>"&quo - sunbird-monitoring-release-2.2.0 + ${branch_or_tag} false @@ -130,4 +130,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml index 399db6c948..a90507de47 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -25,7 +25,7 @@ choice-parameter-186759255678992 1 false - + false @@ -50,7 +50,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-186759262347032 1 false - + false @@ -92,8 +92,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml index 995d399e07..9676eb0fe3 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml @@ -1,5 +1,5 @@ - + @@ -90,7 +90,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml index 1788c2ba2b..04b4bc73bd 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -44,7 +44,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -69,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -115,8 +115,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml index c2f151135e..a4b38cda3b 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -44,7 +44,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -69,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -121,8 +121,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml index 7ae908b9a7..b41cfe595c 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml @@ -1,5 +1,5 @@ - + false @@ -109,7 +109,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml index 4a28f677ea..bc7f06688a 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml @@ -1,5 +1,5 @@ - + false @@ -12,7 +12,7 @@ -1 - + false false @@ -36,22 +36,11 @@ - - - - Deploy/dev/Core/Player - - SUCCESS - 0 - BLUE - true - - - + - - + + 2 @@ -80,4 +69,4 @@ false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml index 7b3b96d354..d41ac682b3 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml @@ -1,7 +1,7 @@ - + - + hudson.model.ParametersDefinitionProperty com.sonyericsson.rebuild.RebuildSettings @@ -20,7 +20,7 @@ - + false false @@ -44,7 +44,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -69,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -115,8 +115,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -145,4 +145,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml deleted file mode 100644 index 3f59f70e35..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - Deploys Telemetry Logstash Service - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - private_branch - - choice-parameter-186827048551040 - 1 - - false - - - - false - - - TelemetryLogstash - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-186827051364357 - 1 - - false - - - - false - - - TelemetryLogstash - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/deploy/telemetry-logstash/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml deleted file mode 100644 index e0c97eb85c..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - Deploys Telemetry Logstash Datapipeline Service - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - private_branch - - choice-parameter-186648049683240 - 1 - - false - - - - false - - - TelemetryLogstashDataPipeline - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-186648052870335 - 1 - - false - - - - false - - - TelemetryLogstashDataPipeline - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/deploy/telemetry-logstash-datapipeline/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml deleted file mode 100644 index 557e5f4597..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - ArtifactUpload/dev/Core/UserOrg - false - - - image_tag - <font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font> - - false - - - private_branch - - choice-parameter-2544395024638227 - 1 - - false - - - - false - - - UserOrg - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-2620434998790477 - 1 - - false - - - - false - - - UserOrg - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - - ArtifactUpload/dev/Core/UserOrg - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/deploy/userorg/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml index c0e651d0d0..10a02619bf 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml @@ -1,6 +1,13 @@ - - + + + + + hudson.model.ParametersDefinitionProperty + com.sonyericsson.rebuild.RebuildSettings + + + false @@ -13,7 +20,7 @@ - + false false @@ -29,17 +36,17 @@ artifact_source <font color=dimgray size=2><b> ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font> - choice-parameter-9600649228560 + choice-parameter-9061667106947 1 false - + false @@ -54,10 +61,10 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif build_number - choice-parameter-9600651313765 + choice-parameter-9061670571657 1 false - + false @@ -81,10 +88,10 @@ return "<b>Not Applicable</b>" artifact_version - choice-parameter-9600653373369 + choice-parameter-9061673103864 1 false - + false @@ -110,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -135,15 +142,16 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -154,6 +162,31 @@ return """<b>This parameter is not used</b>"&quo ET_FORMATTED_HTML true + + job_names_to_deploy + <font color=green size=2><b>Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.</b></font> + choice-parameter-8026182213525059 + 1 + + false + + + + false + + + Yarn + + + PT_MULTI_SELECT + false + 1 + @@ -169,8 +202,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -189,7 +222,7 @@ return """<b>This parameter is not used</b>"&quo true false - 0 + 1 false @@ -199,4 +232,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml deleted file mode 100644 index a36d642597..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - ArtifactUpload/dev/Core/Keycloak - false - - - artifact_source - <font color=dimgray size=2><b> -ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font> - choice-parameter-9600649228560 - 1 - - false - - - - false - - - user-Keycloak - - - PT_SINGLE_SELECT - false - 1 - - - build_number - - choice-parameter-9600651313765 - 1 - - false - - - - false - - - user-Keycloak - - artifact_source - ET_FORMATTED_HTML - true - - - artifact_version - - choice-parameter-9600653373369 - 1 - - false - - - - false - - - user-Keycloak - - artifact_source - ET_FORMATTED_HTML - true - - - private_branch - - choice-parameter-2544395024638227 - 1 - - false - - - - false - - - user-Keycloak - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-2620434998790477 - 1 - - false - - - - false - - - user-Keycloak - - - ET_FORMATTED_HTML - true - - - sunbird_auth_branch_or_tag - <font color=dimgray size=2><b>Provide the branch or tag of sunbird auth repo.</b></font> - ${branch_or_tag} - false - - - - - 0 - 0 - - false - project - false - - - - - - - ArtifactUpload/dev/Core/Keycloak - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/deploy/keycloak/Jenkinsfile.user - false - - - false - diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml index 5be56a4e05..37e2c9b17a 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml index 46d23adeae..bbce94b853 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -39,14 +39,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9061667106947 1 false - + false @@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9061670571657 1 false - + false @@ -91,7 +91,7 @@ return "<b>Not Applicable</b>" choice-parameter-9061673103864 1 false - + false @@ -117,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -142,7 +142,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -174,22 +174,11 @@ return """<b>This parameter is not used</b>"&quo - - - - ArtifactUpload/dev/DataPipeline/Analytics - - SUCCESS - 0 - BLUE - true - - - + - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml index ae3cea5ade..110022cbc8 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -54,7 +54,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -79,7 +79,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -111,8 +111,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml index 1b90cf0654..3a4a7183be 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188130479612620 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188130482273762 1 false - + false @@ -89,8 +89,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml index 9f7fa497f1..adcdeca5a6 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -74,7 +74,7 @@ choice-parameter-2544395024638227 1 false - + false @@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -131,8 +131,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml index df883dd1de..b1efd0f52e 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188134496458577 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188134511232202 1 false - + false @@ -89,8 +89,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -119,4 +119,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml index 8ffba1995b..12d476f34c 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -39,14 +39,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9061667106947 1 false - + false @@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-9061670571657 1 false - + false @@ -91,7 +91,7 @@ return "<b>Not Applicable</b>" choice-parameter-9061673103864 1 false - + false @@ -117,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -142,7 +142,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -188,8 +188,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml index fa67b95137..08a817f996 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -41,7 +41,7 @@ Please provide the tag name. choice-parameter-2544395024638227 1 false - + false @@ -66,7 +66,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -101,8 +101,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml index 95949c8c65..4a67ac124a 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188153004575082 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188153015326365 1 false - + false @@ -89,8 +89,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml index bea4f25e62..bb134aaf64 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188157054642539 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188157057910170 1 false - + false @@ -89,8 +89,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml deleted file mode 100644 index 1beabc6b72..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - absolute_job_path - <font color=black size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - ArtifactUpload/dev/DataPipeline/ml-workbench - false - - - image_tag - <font color=red size=2><b>CAUTION: If the value is blank, latest built image will be deployed.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - - ArtifactUpload/dev/DataPipeline/ml-workbench - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-data-pipeline.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 0 - false - - - - pipelines/deploy/ml-workbench/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml index 5037d875f8..2f4da21a18 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml @@ -1,5 +1,5 @@ - + @@ -189,7 +189,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 @@ -218,4 +218,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml index 7d90f8a75e..9f51edc8f1 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml @@ -1,5 +1,5 @@ - + @@ -177,7 +177,10 @@ return """<b>This parameter is not used</b>"&quo 'TelemetryExtractor_1', 'TelemetryLocationUpdater_1', 'TelemetryRouter_1', -'TelemetryValidator_1'] +'TelemetryValidator_1', +'DeviceProfileUpdater_1', +'AssessmentAggregator_1', +'DerivedDeDuplication_1'] false @@ -208,7 +211,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 @@ -237,4 +240,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml index 300590a6f1..651ff3f5d5 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188160224505093 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188160228215280 1 false - + false @@ -92,8 +92,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -122,4 +122,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml index f664493b07..d4d9795999 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -39,14 +39,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-12566219493457 1 false - + false @@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-12566221440336 1 false - + false @@ -91,7 +91,7 @@ return "<b>Not Applicable</b>" choice-parameter-12566223395914 1 false - + false @@ -117,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -142,7 +142,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -188,8 +188,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml index 5d3066a2a9..979e769aa0 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188161640748171 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188161652021198 1 false - + false @@ -92,8 +92,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml index 8677506935..4734ae9106 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -39,14 +39,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-12566219493457 1 false - + false @@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-12566221440336 1 false - + false @@ -91,7 +91,7 @@ return "<b>Not Applicable</b>" choice-parameter-12566223395914 1 false - + false @@ -117,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -142,7 +142,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -188,8 +188,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml index 611389b297..bd7b405d6b 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-188174424977419 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-188174429374717 1 false - + false @@ -92,8 +92,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml index 3e4c7cc630..be8578de2e 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml @@ -1,5 +1,5 @@ - + @@ -124,6 +124,8 @@ return "<b>Not Applicable</b>" syncleafnodescountbyids syncleafnodesbyids syncbatch + migratequestionextproperties + migrate-dialcodeRequired @@ -207,7 +209,7 @@ return """<b>This parameter is not used</b>"&quo - + 2 @@ -236,4 +238,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml index 5e6ed2a1a4..1981e866f2 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -39,14 +39,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-14760318274338 1 false - + false @@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-14760320375443 1 false - + false @@ -91,7 +91,7 @@ return "<b>Not Applicable</b>" choice-parameter-14760322347747 1 false - + false @@ -117,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -142,7 +142,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -188,8 +188,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml index f8b36d5e3e..abeeb8955b 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -39,14 +39,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-2874232768088857 1 false - + false @@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-2874449088885218 1 false - + false @@ -91,7 +91,7 @@ return "<b>Not Applicable</b>" choice-parameter-2877900313772031 1 false - + false @@ -117,7 +117,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -142,7 +142,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -188,8 +188,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/MasterDeploy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/MasterDeploy/config.xml deleted file mode 100644 index a286ed0821..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/MasterDeploy/config.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - -false - - -false -false - - - - -repos - -This is a sample only. Replace contents accordingly. Do not remove the first line header - - -Sequence Module JobName Tag 1 Core AdminUtils release-2.0.0 1 Core APIManager release-2.0.0 1 Core APIManagerEcho release-2.0.0 - -false - - - - -0 -0 - -false -project -false - - - - - -2 - - - -https://github.com/project-sunbird/sunbird-devops.git - - - - - -release-2.0.0 - - -false - - - -true -true - -0 -false - - - -pipelines/master-deploy/Jenkinsfile -true - - -false - diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml index 5d376baa59..8e06439289 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml @@ -129,7 +129,7 @@ return """<b>This parameter is not used</b>"&quo @@ -202,4 +202,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml index aeb5191636..2206e127f4 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml @@ -1,11 +1,11 @@ - + false - + false false @@ -24,14 +24,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-620062284617427 1 false - + false @@ -49,7 +49,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif choice-parameter-620062286335119 1 false - + false @@ -76,7 +76,7 @@ return "<b>Not Applicable</b>" choice-parameter-620062288387509 1 false - + false @@ -102,7 +102,7 @@ return "<b>Not Applicable</b>" choice-parameter-2544395024638227 1 false - + false @@ -127,15 +127,15 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2620434998790477 1 false - + false @@ -172,8 +172,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -202,4 +202,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml index f3435240c6..d1097f1bda 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml @@ -129,7 +129,7 @@ return """<b>This parameter is not used</b>"&quo @@ -202,4 +202,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml index cd5e78ec74..37fdaa0d4d 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml @@ -129,7 +129,7 @@ return """<b>This parameter is not used</b>"&quo @@ -202,4 +202,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml index a36fa43de7..0890c7d1fe 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml +++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml @@ -129,7 +129,7 @@ return """<b>This parameter is not used</b>"&quo @@ -202,4 +202,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/config.xml deleted file mode 100644 index 68477b8ac7..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - All - false - false - - - - - - - - false - - - - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml deleted file mode 100644 index d18cd415eb..0000000000 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 10 - - - - - false - false - - - 0 - 0 - - false - project - false - - - - - - - Deploy/dev/Core/Content,Deploy/dev/Core/Player,Deploy/dev/Core/Learner,Deploy/dev/Core/Telemetry,Deploy/dev/Core/Proxy,Deploy/dev/KnowledgePlatform/Search,Deploy/dev/KnowledgePlatform/Learning,Deploy/dev/KnowledgePlatform/Yarn,Deploy/dev/DataPipeline/Secor,Deploy/dev/DataPipeline/Yarn,Deploy/dev/DataPipeline/AnalyticsAPI,Deploy/dev/DataPipeline/DataProducts - - SUCCESS - 0 - BLUE - true - - - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${public_repo_branch} - - - false - - - - true - false - - 0 - false - - - - pipelines/summary/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml index 876fe40385..cf408df53e 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - 30 2 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml index 928ea26350..30252b1ead 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml @@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml index 586936dd88..a1a5cfe296 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - 30 3 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml new file mode 100644 index 0000000000..27be9187b1 --- /dev/null +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml @@ -0,0 +1,43 @@ + + + + + false + + + false + false + + + 0 + 0 + + false + project + false + + + + + true + false + false + false + + + + + + false + + + echo "Before clearing" +df -h +docker image rm $(docker images | awk 'NR>1 {print $3}') --force 2> /dev/null +echo "After clearing" +df -h + + + + + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml new file mode 100644 index 0000000000..54a50a49d7 --- /dev/null +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml @@ -0,0 +1,50 @@ + + + + + false + + + false + false + + + 0 + 0 + + false + project + false + + 1 + + + + true + false + false + false + + + + + + false + + + echo "Before clearing" +df -h + +rm -rf /var/lib/jenkins/workspace/Build +rm -rf /var/lib/jenkins/workspace/Provision +rm -rf /var/lib/jenkins/workspace/ArtifactUpload +rm -rf /var/lib/jenkins/workspace/Deploy +rm -rf /var/lib/jenkins/workspace/OpsAdministration + +echo "After clearing" +df -h + + + + + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml index 249c04df01..cfda6e5ec2 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml @@ -1,10 +1,10 @@ - + false - + false false @@ -50,7 +50,7 @@ choice-parameter-189741599993386 1 false - + false @@ -75,7 +75,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-189741602917876 1 false - + false @@ -107,8 +107,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -137,4 +137,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml index bcec962f3e..0227b7997a 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml @@ -1,5 +1,5 @@ - + false @@ -27,7 +27,7 @@ - Registry + KeyRotation ET_FORMATTED_HTML @@ -47,7 +77,7 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-196491346584243 + choice-parameter-189737249857994 1 - Registry + KeyRotation ET_FORMATTED_HTML @@ -107,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo - pipelines/provision/registry/Jenkinsfile + pipelines/bootstrap/Jenkinsfile.rotatekey false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml index 1ad4de77ef..07e68fe7ed 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - 30 1 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml index 47679630a8..7982bb2c21 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml @@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml index fcdb859d99..413b0297a6 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml @@ -107,7 +107,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml index c7cfae7ca0..423e818557 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml @@ -121,7 +121,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresManagedBackup/config.xml similarity index 81% rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresManagedBackup/config.xml index 3eb2c0ae65..1f13a4b494 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresManagedBackup/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -22,10 +22,10 @@ private_branch - choice-parameter-193687699799775 + choice-parameter-189733897665665 1 false - + false - DruidPostgresBackup + PostgresManagedBackup ET_FORMATTED_HTML @@ -47,33 +47,33 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-193687712890752 + choice-parameter-189733901134743 1 false - + false - DruidPostgresBackup + PostgresManagedBackup ET_FORMATTED_HTML true - remote + postgres_env - druid-postgres + dev_old false @@ -87,9 +87,16 @@ return """<b>This parameter is not used</b>"&quo false + + + + + + + - - + + 2 @@ -113,7 +120,7 @@ return """<b>This parameter is not used</b>"&quo - pipelines/backup/postgresql-backup/Jenkinsfile + pipelines/backup/managed-postgres-backup/Jenkinsfile false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml index ca87b16be2..17dafade9e 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -25,7 +25,7 @@ choice-parameter-189733897665665 1 false - + false @@ -50,7 +50,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-189733901134743 1 false - + false @@ -73,15 +73,24 @@ return """<b>This parameter is not used</b>"&quo + 0 + 0 false project false + + + + + + + - - + + 2 diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml index 7db6e451b5..2f40bf26bf 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - 30 1 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml index 7c67b35b11..e305739a80 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - 30 2 * * * + @@ -119,4 +119,4 @@ return """<b>This parameter is not used</b>"&quo false - \ No newline at end of file + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml index 3fe6940958..7b842f76dd 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml @@ -91,7 +91,7 @@ return """<b>This parameter is not used</b>"&quo 2 - https://github.com/project-sunbird/sunbird-devops.git + https://github.com/project-sunbird/sunbird-data-pipeline.git diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml index 4ba1917a4e..eac80e8292 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml @@ -103,7 +103,7 @@ return """<b>This parameter is not used</b>"&quo - 30 5 * * * + @@ -138,4 +138,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml similarity index 82% rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml index 7a9b58e234..99b502af94 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml @@ -1,5 +1,5 @@ - + @@ -20,32 +20,19 @@ - + false false - - action - <font color=red size=2><b> -To start task: [start-task] -To stop task: [stop-task] -</b></font> - - - start-task - stop-task - - - private_branch - choice-parameter-193684482193674 + choice-parameter-2914866095851737 1 false - + false - DruidIngestion + ConsumerLagAlert ET_FORMATTED_HTML @@ -67,10 +54,10 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-193684493817846 + choice-parameter-2914866097410763 1 false - + false - DruidIngestion + ConsumerLagAlert ET_FORMATTED_HTML true + + tag + + consumer_lag_monitor + false + @@ -102,11 +95,15 @@ return """<b>This parameter is not used</b>"&quo - + + + + + - - + + 2 @@ -130,7 +127,7 @@ return """<b>This parameter is not used</b>"&quo - pipelines/ops/druid/Jenkinsfile.ingestion + pipelines/ops/samza/Jenkinsfile.throughputalert false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml index 22d49a7561..36c5c00492 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-2914866095851737 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2914866097410763 1 false - + false @@ -91,17 +91,17 @@ return """<b>This parameter is not used</b>"&quo - 30 10 * * * + - - + + 2 - https://github.com/project-sunbird/sunbird-devops.git + https://github.com/project-sunbird/sunbird-data-pipeline.git @@ -126,4 +126,4 @@ return """<b>This parameter is not used</b>"&quo false - \ No newline at end of file + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml index 0205cb8e31..a5dbaf9ec4 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml @@ -97,7 +97,7 @@ return """<b>This parameter is not used</b>"&quo - H 2 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml similarity index 97% rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/health/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml index 39bac521ca..870f364914 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/health/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml @@ -28,7 +28,7 @@ - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml index f83da39bf9..61ae7e1d52 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml @@ -91,7 +91,7 @@ return """<b>This parameter is not used</b>"&quo - 0 0 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxdbRestore/config.xml similarity index 97% rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxdbRestore/config.xml index 7af30738b8..47ef53cdcc 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxdbRestore/config.xml @@ -45,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo ET_FORMATTED_HTML - true + false @@ -69,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo - ${public_repo_branch} + ${branch_or_tag} false @@ -81,4 +81,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml similarity index 71% rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml index cac92eae53..faaea481ff 100644 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml @@ -1,13 +1,6 @@ - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - + false @@ -26,10 +19,40 @@ + + bootstrap_user + <font color="black" size=2><b>Deployer user</b></font> + deployer + false + + + bootstrap_user_public_key + <font color="black" size=2><b>Deployer user public key keep in single quotes</b></font> + + false + + + ssh_user + <font color="black" size=2><b>ops user</b></font> + ops + false + + + ssh_private_file + <font color="black" size=2><b>location of ssh key for ops user from '/'</b></font> + + false + + + ssh_public_key + <font color="black" size=2><b>ops public key</b></font> + + false + private_branch - choice-parameter-196497749695581 + choice-parameter-193687012897757 1 - Kibana + KeyRotation ET_FORMATTED_HTML @@ -54,7 +77,7 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-196497753237991 + choice-parameter-193687017745852 1 - Kibana + KeyRotation ET_FORMATTED_HTML @@ -80,6 +103,8 @@ return """<b>This parameter is not used</b>"&quo + 0 + 0 false project @@ -92,7 +117,7 @@ return """<b>This parameter is not used</b>"&quo 2 - https://github.com/project-sunbird/sunbird-data-pipeline.git + https://github.com/project-sunbird/sunbird-devops.git @@ -112,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo - pipelines/provision/kibana/Jenkinsfile + pipelines/bootstrap/Jenkinsfile.rotatekey false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml similarity index 94% rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml index 6f95f42617..03bd2126b7 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml @@ -39,7 +39,7 @@ return """<b>This parameter is not used</b>"&quo ET_FORMATTED_HTML - true + false @@ -58,12 +58,12 @@ return """<b>This parameter is not used</b>"&quo 2 - https://github.com/project-sunbird/sunbird-data-pipeline.git + https://github.com/project-sunbird/sunbird-devops.git - refs/tags/tag-for-backups + ${branch_or_tag} false @@ -75,4 +75,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml index 6b6c0151d4..946d752590 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-2914866095851737 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2914866097410763 1 false - + false @@ -91,13 +91,13 @@ return """<b>This parameter is not used</b>"&quo - */30 * * * * + - - + + 2 @@ -106,7 +106,7 @@ return """<b>This parameter is not used</b>"&quo - ${branch_or_tag} + refs/tags/tag-for-backups false @@ -126,4 +126,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml index 2358d9536b..ffb576656f 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml @@ -102,7 +102,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml index f0af0e0e71..293f2e6b95 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml @@ -123,7 +123,7 @@ return """<b>This parameter is not used</b>"&quo - ${branch_or_tag} + refs/tags/tag-for-backups false @@ -143,4 +143,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml index 0377d9636d..879a1aa13b 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml @@ -91,7 +91,7 @@ return """<b>This parameter is not used</b>"&quo - 15 5 * * * + @@ -126,4 +126,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml index f378f722f4..15ad71d1a8 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml @@ -44,7 +44,7 @@ - ${public_repo_branch} + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml index ea413aed16..a5700c4188 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml @@ -47,7 +47,7 @@ - 0 */2 * * * + @@ -62,7 +62,7 @@ - ${public_repo_branch} + refs/tags/tag-for-backups false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml index 5a272c6aec..48bd33ea82 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-2914866095851737 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2914866097410763 1 false - + false @@ -77,6 +77,12 @@ return """<b>This parameter is not used</b>"&quo ET_FORMATTED_HTML true + + tag + + throughput_monitor + false + @@ -91,13 +97,13 @@ return """<b>This parameter is not used</b>"&quo - H/60 * * * * + - - + + 2 @@ -106,7 +112,7 @@ return """<b>This parameter is not used</b>"&quo - ${public_repo_branch} + refs/tags/tag-for-backups false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml index 09acd0fcac..5239bf8bef 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-2914866095851737 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-2914866097410763 1 false - + false @@ -92,8 +92,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -102,7 +102,7 @@ return """<b>This parameter is not used</b>"&quo - ${public_repo_branch} + ${branch_or_tag} false @@ -122,4 +122,4 @@ return """<b>This parameter is not used</b>"&quo false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml index d765e4077e..d54e0f9acb 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml @@ -97,7 +97,7 @@ return """<b>This parameter is not used</b>"&quo - H 1 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml index 67fc8edc1e..aa26d8091b 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml @@ -112,7 +112,7 @@ ex: dev_script_store,dev_hierarchy_store - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml index 6d31d9283b..97338a1827 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml @@ -112,7 +112,7 @@ return """<b>This parameter is not used</b>"&quo 2 - https://github.com/project-sunbird/sunbird-learning-platform.git + https://github.com/project-sunbird/sunbird-devops.git diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml index 2f4001e05f..1dae910f7e 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - H 1 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml index 8ffa333918..0372d6d3c5 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml @@ -106,7 +106,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml similarity index 91% rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/health/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml index 4ca4e249dc..545f98faf6 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/health/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml @@ -23,12 +23,12 @@ 2 - https://github.com/project-sunbird/sunbird-learning-platform.git + https://github.com/project-sunbird/sunbird-devops.git - refs/tags/tag-for-backups + ${branch_or_tag} false @@ -40,4 +40,4 @@ false - \ No newline at end of file + diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml similarity index 71% rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml index 35db830c2e..70003b8d7f 100644 --- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml @@ -1,13 +1,6 @@ - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - + false @@ -27,24 +20,42 @@ - absolute_job_path - <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font> - ArtifactUpload/dev/Core/Cert + bootstrap_user + <font color="black" size=2><b>Deployer user</b></font> + deployer false - image_tag - <font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font> + bootstrap_user_public_key + <font color="black" size=2><b>Deployer user public key keep in single quotes</b></font> + + false + + + ssh_user + <font color="black" size=2><b>ops user</b></font> + ops + false + + + ssh_private_file + <font color="black" size=2><b>location of ssh key for ops user from '/'</b></font> + + false + + + ssh_public_key + <font color="black" size=2><b>ops public key</b></font> false private_branch - choice-parameter-2544395024638227 + choice-parameter-193694766371480 1 false - + false - Cert + KeyRotation ET_FORMATTED_HTML @@ -66,24 +77,24 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-2620434998790477 + choice-parameter-193694770443996 1 false - + false - Cert + KeyRotation ET_FORMATTED_HTML @@ -100,22 +111,8 @@ return """<b>This parameter is not used</b>"&quo false - - - - - ArtifactUpload/dev/Core/Cert - - SUCCESS - 0 - BLUE - true - - - - - + 2 @@ -135,14 +132,14 @@ return """<b>This parameter is not used</b>"&quo true false - 1 + 0 false - pipelines/deploy/cert/Jenkinsfile + pipelines/bootstrap/Jenkinsfile.rotatekey false false - \ No newline at end of file + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml index 658f1cb6d1..a8e7cfc7c2 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml @@ -107,7 +107,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml index a929800a22..9bdcb636dd 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml @@ -121,7 +121,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml index 1b83d545dd..498562efc3 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - H 2 * * * + diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml index 51ee7d7185..ea94929067 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml @@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"&quo - refs/tags/tag-for-backups + ${branch_or_tag} false diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml index 35eabbf473..5f3669a81c 100644 --- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml +++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml @@ -84,7 +84,7 @@ return """<b>This parameter is not used</b>"&quo - H 2 * * * + diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml deleted file mode 100644 index 3f3e9b8f3a..0000000000 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - <font color=red size=2><b>This jobs is currently disabled as it's not being used.</b></font> - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - jenkins_host - <font color=dimgray size=2><b>Provide the IP of Jenkins host.</b></font> - - false - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 0 - false - - - - pipelines/provision/jenkins-slave/Jenkinsfile - false - - - true - diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml deleted file mode 100644 index 38d15edda7..0000000000 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - private_branch - - choice-parameter-196488765575840 - 1 - - false - - - - false - - - LogElasticSearch - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-196488769510321 - 1 - - false - - - - false - - - LogElasticSearch - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 0 - false - - - - pipelines/provision/log-es/Jenkinsfile - false - - - false - diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade5xx/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade5xx/config.xml deleted file mode 100644 index 02b9ed5b9f..0000000000 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade5xx/config.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - private_branch - - choice-parameter-186487879604743 - 1 - - false - - - - false - - - LogEsUpgrade - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-186487885338467 - 1 - - false - - - - false - - - LogEsUpgrade - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/provision/log-es-upgrade/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml similarity index 87% rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml rename to deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml index 102641d9ff..504dfb72b3 100644 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml +++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + false false @@ -22,10 +22,10 @@ private_branch - choice-parameter-196492081645652 + choice-parameter-196490490920280 1 false - + false - Secor + PostgresDbUpdateManaged ET_FORMATTED_HTML @@ -47,10 +47,10 @@ return """<b>This parameter is not used</b>"&quo branch_or_tag - choice-parameter-196492094618716 + choice-parameter-196490493760485 1 false - + false - Secor + PostgresDbUpdateManaged ET_FORMATTED_HTML @@ -82,8 +82,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 @@ -107,9 +107,9 @@ return """<b>This parameter is not used</b>"&quo - pipelines/provision/secor/Jenkinsfile + pipelines/provision/postgres-db-update-managed/Jenkinsfile false false - + \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml deleted file mode 100644 index 8e96c2c6ca..0000000000 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - - - private_branch - - choice-parameter-196487835595646 - 1 - - false - - - - false - - - user-keycloak - - - ET_FORMATTED_HTML - true - - - branch_or_tag - - choice-parameter-196487838166797 - 1 - - false - - - - false - - - user-keycloak - - - ET_FORMATTED_HTML - true - - - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-devops.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 1 - false - - - - pipelines/provision/keycloak/Jenkinsfile.user - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml deleted file mode 100644 index 5c4158f484..0000000000 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - hudson.model.ParametersDefinitionProperty - com.sonyericsson.rebuild.RebuildSettings - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-data-pipeline.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 0 - false - - - - pipelines/provision/druid/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml deleted file mode 100644 index aaaae31a19..0000000000 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - false - - - - -1 - -1 - -1 - 5 - - - - - false - false - - - 0 - 0 - - false - project - false - - - - - - 2 - - - https://github.com/project-sunbird/sunbird-data-pipeline.git - - - - - ${branch_or_tag} - - - false - - - - true - false - - 0 - false - - - true - false - - 0 - false - - - - pipelines/provision/ml-workbench/Jenkinsfile - false - - - false - \ No newline at end of file diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml similarity index 99% rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml rename to deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml index d5019a12d5..3fb7ca18ef 100644 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml +++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml @@ -122,4 +122,4 @@ return """<b>This parameter is not used</b>"&quo false - \ No newline at end of file + diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml index 71e80c448d..a80bfacf88 100644 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml +++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - + false false @@ -32,7 +32,7 @@ choice-parameter-196502397927441 1 false - + false @@ -57,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo choice-parameter-196502408664232 1 false - + false @@ -92,8 +92,8 @@ return """<b>This parameter is not used</b>"&quo - - + + 2 diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml similarity index 99% rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml rename to deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml index ac60bdee1e..ec9074fd86 100644 --- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml +++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml @@ -122,4 +122,4 @@ return """<b>This parameter is not used</b>"&quo false - \ No newline at end of file + diff --git a/deploy/jenkins/plugins.txt b/deploy/jenkins/plugins.txt index 0f01db183d..bcd6e30065 100644 --- a/deploy/jenkins/plugins.txt +++ b/deploy/jenkins/plugins.txt @@ -1,116 +1,117 @@ junit@1.28 workflow-basic-steps@2.18 variant@1.3 -uno-choice@2.1 +uno-choice@2.2.1 workflow-step-api@2.20 simple-theme-plugin@0.5.1 -pam-auth@1.5.1 +pam-auth@1.6 jsch@0.1.55.1 -workflow-durable-task-step@2.33 +workflow-durable-task-step@2.35 matrix-project@1.14 docker-commons@1.15 -github-branch-source@2.5.5 -blueocean-rest-impl@1.18.1 -pipeline-model-api@1.3.9 +github-branch-source@2.5.8 +blueocean-rest-impl@1.19.0 +pipeline-model-api@1.5.0-rc1 pipeline-rest-api@2.12 -lockable-resources@2.5 +lockable-resources@2.7 pipeline-github-lib@1.0 jacoco@3.0.4 build-timestamp@1.0.3 ws-cleanup@0.37 pipeline-build-step@2.9 conditional-buildstep@1.3.6 -durable-task@1.30 -pipeline-model-extensions@1.3.9 +durable-task@1.33 +pipeline-model-extensions@1.5.0-rc1 jquery-ui@1.0.2 -htmlpublisher@1.18 +htmlpublisher@1.21 greenballs@1.15 -workflow-cps@2.73 +workflow-cps@2.75 config-file-provider@3.6.2 preSCMbuildstep@0.3 ssh-agent@1.17 display-url-api@2.3.2 structs@1.20 -workflow-api@2.36 +workflow-api@2.37 build-pipeline-plugin@1.5.8 ansicolor@0.6.2 -ssh-credentials@1.17.1 +ssh-credentials@1.18 pipeline-milestone-step@1.3.1 pipeline-graph-analysis@1.10 -token-macro@2.8 -blueocean-core-js@1.18.1 -github@1.29.4 +token-macro@2.10 +blueocean-core-js@1.19.0 +github@1.29.5 thinBackup@1.9 github-api@1.95 ldap@1.20 pipeline-model-declarative-agent@1.1.1 configurationslicing@1.47 -gradle@1.33 -blueocean-pipeline-editor@1.18.1 +gradle@1.34 +blueocean-pipeline-editor@1.19.0 plain-credentials@1.5 workflow-support@3.3 -pipeline-model-definition@1.3.9 -matrix-auth@2.4.2 +pipeline-model-definition@1.5.0-rc1 +matrix-auth@2.5 run-condition@1.2 -windows-slaves@1.4 -build-name-setter@2.0.1 -jquery@1.12.4-0 +windows-slaves@1.5 +build-name-setter@2.0.3 +jquery@1.12.4-1 dynamic_extended_choice_parameter@1.0.1 active-directory@2.16 jobgenerator@1.22 -script-security@1.62 -credentials@2.2.1 -copyartifact@1.42.1 +script-security@1.66 +credentials@2.3.0 +copyartifact@1.43 throttle-concurrents@2.0.1 workflow-multibranch@2.21 -ant@1.9 +ant@1.10 +trilead-api@1.0.5 branch-api@2.5.4 -email-ext@2.66 -role-strategy@2.13 -git@3.11.0 -ssh-slaves@1.30.1 +email-ext@2.68 +role-strategy@2.15 +git@4.0.0 +ssh-slaves@1.31.0 view-job-filters@2.1.1 momentjs@1.1.1 pipeline-stage-view@2.12 -apache-httpcomponents-client-4-api@4.5.5-3.0 +apache-httpcomponents-client-4-api@4.5.10-2.0 extensible-choice-parameter@1.6.0 -slack@2.28 +slack@2.34 jdk-tool@1.3 -jackson2-api@2.9.9.1 -blueocean-web@1.18.1 +jackson2-api@2.10.0 +blueocean-web@1.19.0 workflow-scm-step@2.9 -antisamy-markup-formatter@1.5 +antisamy-markup-formatter@1.6 credentials-binding@1.20 -docker-workflow@1.19 +docker-workflow@1.21 ace-editor@1.1 -workflow-job@2.33 -blueocean-dashboard@1.18.1 +workflow-job@2.36 +blueocean-dashboard@1.19.0 favorite@2.3.2 -blueocean-jwt@1.18.1 +blueocean-jwt@1.19.0 scm-api@2.6.3 -blueocean-rest@1.18.1 +blueocean-rest@1.19.0 bouncycastle-api@2.17 authentication-tokens@1.3 -jenkins-design-language@1.18.1 -jobConfigHistory@2.23.1 -pipeline-input-step@2.10 +jenkins-design-language@1.19.0 +jobConfigHistory@2.24 +pipeline-input-step@2.11 javadoc@1.5 pipeline-stage-step@2.3 -mailer@1.24 +mailer@1.29 git-parameter@0.9.11 mapdb-api@1.0.9.0 -code-coverage-api@1.0.13 +code-coverage-api@1.1.1 handlebars@1.1.1 -blueocean-pipeline-api-impl@1.18.1 +blueocean-pipeline-api-impl@1.19.0 git-server@1.8 -pipeline-multibranch-defaults@2.0 -git-client@2.8.0 -blueocean-pipeline-scm-api@1.18.1 +pipeline-multibranch-defaults@2.1 +git-client@3.0.0 +blueocean-pipeline-scm-api@1.19.0 subversion@2.12.2 command-launcher@1.3 -resource-disposer@0.13 +resource-disposer@0.14 rebuild@1.31 -job-dsl@1.74 +job-dsl@1.76 jquery-detached@1.2.1 build-timeout@1.19 workflow-aggregator@2.6 @@ -120,9 +121,9 @@ cloudbees-folder@6.9 audit-trail@2.5 maven-plugin@3.4 workflow-cps-global-lib@2.15 -dashboard-view@2.11 -cobertura@1.14 +dashboard-view@2.12 +cobertura@1.15 parameterized-trigger@2.35.2 -blueocean-commons@1.18.1 -pipeline-stage-tags-metadata@1.3.9 -pubsub-light@1.12 +blueocean-commons@1.19.0 +pipeline-stage-tags-metadata@1.5.0-rc1 +pubsub-light@1.13 diff --git a/pipelines/deploy/ContentFramework/Jenkinsfile b/pipelines/deploy/ContentFramework/Jenkinsfile index 6c18a855fe..1bfc4efe9a 100644 --- a/pipelines/deploy/ContentFramework/Jenkinsfile +++ b/pipelines/deploy/ContentFramework/Jenkinsfile @@ -18,7 +18,7 @@ node() { stage('get artifact') { currentWs = sh(returnStdout: true, script: 'pwd').trim() artifact = values.artifact_name + ":" + values.artifact_version - commit_hash = values.artifact_version.split('_')[1] + commit_hash = values.artifact_version.split('-')[1] values.put('currentWs', currentWs) values.put('artifact', artifact) artifact_download(values) diff --git a/pipelines/deploy/cassandra-deploy/Jenkinsfile.trigger b/pipelines/deploy/cassandra-deploy/Jenkinsfile.trigger index f1d6eb75da..e436585b3f 100644 --- a/pipelines/deploy/cassandra-deploy/Jenkinsfile.trigger +++ b/pipelines/deploy/cassandra-deploy/Jenkinsfile.trigger @@ -22,6 +22,7 @@ node() { } stage('deploy artifact') { sh """ + unzip ${artifact} mv cassandra-trigger-*.jar ansible/static-files/ """ ansiblePlaybook = "${currentWs}/ansible/cassandra-trigger-deploy.yml" diff --git a/pipelines/provision/postgres-db-update-managed/Jenkinsfile b/pipelines/provision/postgres-db-update-managed/Jenkinsfile new file mode 100644 index 0000000000..a5c41651bc --- /dev/null +++ b/pipelines/provision/postgres-db-update-managed/Jenkinsfile @@ -0,0 +1,45 @@ +@Library('deploy-conf') _ +node() { + try { + String ANSI_GREEN = "\u001B[32m" + String ANSI_NORMAL = "\u001B[0m" + String ANSI_BOLD = "\u001B[1m" + String ANSI_RED = "\u001B[31m" + String ANSI_YELLOW = "\u001B[33m" + + stage('checkout public repo') { + cleanWs() + checkout scm + } + + ansiColor('xterm') { + stage('deploy'){ + values = [:] + currentWs = sh(returnStdout: true, script: 'pwd').trim() + envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim() + module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim() + jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim() + ansiblePlaybook = "${currentWs}/ansible/postgresql-data-update-managed.yml" + ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass" + values.put('currentWs', currentWs) + values.put('env', envDir) + values.put('module', module) + values.put('jobName', jobName) + values.put('ansiblePlaybook', ansiblePlaybook) + values.put('ansibleExtraArgs', ansibleExtraArgs) + println values + ansible_playbook_run(values) + currentBuild.result = 'SUCCESS' + currentBuild.description = "Private: ${params.private_branch}, Public: ${params.branch_or_tag}" + } + } + } + catch (err) { + currentBuild.result = 'FAILURE' + throw err + } + finally { + slack_notify(currentBuild.result) + email_notify() + } +} diff --git a/pipelines/provision/postgres/Jenkinsfile b/pipelines/provision/postgres/Jenkinsfile index dec776381b..5693fe7ec4 100644 --- a/pipelines/provision/postgres/Jenkinsfile +++ b/pipelines/provision/postgres/Jenkinsfile @@ -20,7 +20,7 @@ node() { module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim() jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim() ansiblePlaybook = "${currentWs}/ansible/provision.yml" - ansibleExtraArgs = "--tags postgresql-master --vault-password-file /var/lib/jenkins/secrets/vault-pass -v" + ansibleExtraArgs = "--skip-tags \"cassandra,es,log-es,postgresql-slave\" --vault-password-file /var/lib/jenkins/secrets/vault-pass -v" values.put('currentWs', currentWs) values.put('env', envDir) values.put('module', module) diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml index 1ac7bcaca1..0923e704f5 100644 --- a/private_repo/ansible/inventory/dev/Core/common.yml +++ b/private_repo/ansible/inventory/dev/Core/common.yml @@ -17,7 +17,7 @@ sunbird_default_channel: # Organization channel name which portal sunbird_app_name: # By default app name will be sunbird azure_account_name: # Storage account name for blobs sunbird_content_azure_storage_container: # Conatainer store assets/public -swarm_load_balancer: # Loadbalancer ip to push the logspout result to logstash in swarm +sunbird_swarm_manager_lb_ip: # Swarm manager load balancer private IP. If you don't have a load swarm manager load balancer, you can use swarm manager private ip. # Blob where data analytics pushing content # Check same variable in DP common.yml @@ -56,3 +56,13 @@ upstream_url: "{{azure_account_name}}.blob.core.windows.net/{{sunbird_content_az cert_service_container_name: e-credentials # conatiner name for cert service to store cert templates cert_service_cloud_storage_type: azure # can be updated if we are using some other blob + + +### Modified for plugins - Release - 2.4.0 ### +sunbird_ekstep_proxy_base_url: "{{proto}}://{{domain_name}}" +upstream_url: "{{azure_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}" # Proxy url to get /assets/public +plugin_upstream_url: "{{upstream_url}}" +azure_plugin_storage_account_name: "{{azure_account_name}}" +azure_plugin_storage_account_key: "{{core_vault_sunbird_azure_storage_key}}" +plugin_container_name: "{{sunbird_content_azure_storage_container}}" + diff --git a/private_repo/ansible/inventory/dev/Core/hosts b/private_repo/ansible/inventory/dev/Core/hosts index dbf41b480c..ea0572cc61 100644 --- a/private_repo/ansible/inventory/dev/Core/hosts +++ b/private_repo/ansible/inventory/dev/Core/hosts @@ -18,6 +18,12 @@ swarm-agent-for-prometheus [swarm-manager:children] swarm-manager-1 +[swarm-node-1] +11.3.0.27 + +[swarm-worker:children] +swarm-node-1 + [keycloak-1] 18.0.0.9 @@ -128,7 +134,6 @@ swarm-manager swarm-manager swarm-bootstrap-manager swarm-agent-for-prometheus -swarm-agent-for-grafana swarm-agent-for-alertmanager [node-exporter:children] @@ -165,3 +170,4 @@ swarm-manager # ansible_ssh_user=deployer ansible_ssh_private_key_file=/var/lib/jenkins/secrets/deployer_ssh_key +logger_es6_host="{{ groups['log-es-2'][0] }}" diff --git a/private_repo/ansible/inventory/dev/DataPipeline/hosts b/private_repo/ansible/inventory/dev/DataPipeline/hosts index c0faba071c..2ea13f6cb6 100644 --- a/private_repo/ansible/inventory/dev/DataPipeline/hosts +++ b/private_repo/ansible/inventory/dev/DataPipeline/hosts @@ -2,10 +2,6 @@ [swarm-bootstrap-manager] 15.0.1.4 -# Sunbird zookeeper -[ingestion-cluster-zookeepers] -15.0.0.8 - [core-cassandra] 15.0.0.7 @@ -105,6 +101,9 @@ localhost [broker] 0.0.0.0 #### its required for data products deploy +[coordinator] +0.0.0.0 #### its required for analytics deploy + [dp:children] local processing-cluster-kafka diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml index bb15711bdd..d3ea4f2322 100644 --- a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml +++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml @@ -23,3 +23,5 @@ artifacts_container: ## backup backup_azure_storage_account_name: backup_azure_storage_access_key: "{{lp_vault_azure_storage_secret}}" + +swarm_manager_lb_ip: # Enter the LB IP in case you are using a swarm manager load balancer OR Swarm manager's IP if not using a load balancer diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts b/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts index a0aad45eac..1d2c32b88e 100644 --- a/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts +++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts @@ -43,6 +43,12 @@ cassandra-node-1 [core-cassandra] 15.0.2.5 +[core-es-1] +18.0.0.9 # This should be elasticsearch master IP of Core + +[core-es:children] +core-es-1 + [composite-search-cluster] 15.0.2.6