Merge branch 'release-2.5.0' of github.com:project-sunbird/sunbird-devops into release-2.5.0

ansible/roles/es-mapping/files/indices/cert-templates.json

+{
+    "settings": {
+        "index": {
+            "number_of_shards": "5",
+            "number_of_replicas": "1",
+            "analysis": {
+                "filter": {
+                    "mynGram": {
+                        "token_chars": [
+                            "letter",
+                            "digit",
+                            "whitespace",
+                            "punctuation",
+                            "symbol"
+                        ],
+                        "min_gram": "1",
+                        "type": "ngram",
+                        "max_gram": "20"
+                    }
+                },
+                "analyzer": {
+                    "cs_index_analyzer": {
+                        "filter": [
+                            "lowercase",
+                            "mynGram"
+                        ],
+                        "type": "custom",
+                        "tokenizer": "standard"
+                    },
+                    "keylower": {
+                        "filter": "lowercase",
+                        "type": "custom",
+                        "tokenizer": "keyword"
+                    },
+                    "cs_search_analyzer": {
+                        "filter": [
+                            "lowercase",
+                            "standard"
+                        ],
+                        "type": "custom",
+                        "tokenizer": "standard"
+                    }
+                }
+            }
+        }
+    },
+    "mappings": {
+        "_doc": {
+            "dynamic": false,
+            "properties": {
+                "all_fields": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower"
+                        }
+                    },
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer"
+                },
+                "identifier": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "name": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "template": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "params": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "createdBy": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "updatedBy": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "createdOn": {
+                    "type": "date",
+                    "fields": {
+                        "raw": {
+                            "type": "date"
+                        }
+                    }
+                },
+                "updatedOn": {
+                    "type": "date",
+                    "fields": {
+                        "raw": {
+                            "type": "date"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

ansible/roles/es-mapping/files/mappings/cert-templates-mapping.json

+{
+  "dynamic": false,
+  "properties": {
+    "all_fields": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower"
+        }
+      },
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer"
+    },
+    "identifier": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower",
+          "fielddata": true
+        }
+      },
+      "copy_to": [
+        "all_fields"
+      ],
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer",
+      "fielddata": true
+    },
+    "name": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower",
+          "fielddata": true
+        }
+      },
+      "copy_to": [
+        "all_fields"
+      ],
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer",
+      "fielddata": true
+    },
+    "template": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower",
+          "fielddata": true
+        }
+      },
+      "copy_to": [
+        "all_fields"
+      ],
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer",
+      "fielddata": true
+    },
+    "params": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower",
+          "fielddata": true
+        }
+      },
+      "copy_to": [
+        "all_fields"
+      ],
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer",
+      "fielddata": true
+    },
+    "createdBy": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower",
+          "fielddata": true
+        }
+      },
+      "copy_to": [
+        "all_fields"
+      ],
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer",
+      "fielddata": true
+    },
+    "updatedBy": {
+      "type": "text",
+      "fields": {
+        "raw": {
+          "type": "text",
+          "analyzer": "keylower",
+          "fielddata": true
+        }
+      },
+      "copy_to": [
+        "all_fields"
+      ],
+      "analyzer": "cs_index_analyzer",
+      "search_analyzer": "cs_search_analyzer",
+      "fielddata": true
+    },
+    "createdOn": {
+      "type": "date",
+      "fields": {
+        "raw": {
+          "type": "date"
+        }
+      }
+    },
+    "updatedOn": {
+      "type": "date",
+      "fields": {
+        "raw": {
+          "type": "date"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

ansible/roles/es-mapping/files/mappings/course-batch-mapping.json

@@ -259,6 +259,9 @@
                     "type": "date"
                 }
             }
+        },
+        "cert_templates": {
+            "type": "nested"
         }
     }
 }
\ No newline at end of file

ansible/roles/kong-api/defaults/main.yml

@@ -4447,6 +4447,54 @@ kong_apis:
     - {name: 'acl', config.whitelist: 'userUpdate'}
     - {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: createCertTemplate
+    uris: "{{ cert_service_prefix }}/v1/template/create"
+    upstream_url: "{{ cert_service_url }}/cert/v1/template/create"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist: orgUpdate
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+  - name: updateCertTemplate
+    uris: "{{ cert_service_prefix }}/v1/template/update"
+    upstream_url: "{{ cert_service_url }}/cert/v1/template/update"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist: orgUpdate
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+  - name: readCertTemplate
+    uris: "{{ cert_service_prefix }}/v1/template/read"
+    upstream_url: "{{ cert_service_url }}/cert/v1/template/read"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist: orgUpdate
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
   - name: "orgAssignKeys"
     uris: "{{ org_service_prefix }}/v1/assign/key"
     upstream_url: "{{ learning_service_url }}/v1/org/assign/key"
@@ -4501,6 +4549,38 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
+  - name: courseBatchAddCertificateTemplate
+    uris: "{{ course_service_prefix }}/batch/cert/v1/template/add"
+    upstream_url: "{{ lms_service_url }}/v1/course/batch/cert/template/add"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist: courseUser
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
+  - name: courseBatchRemoveCertificateTemplate
+    uris: "{{ course_service_prefix }}/batch/cert/v1/template/remove"
+    upstream_url: "{{ lms_service_url }}/v1/course/batch/cert/template/remove"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist: courseUser
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
   - name: downloadCertificate
     uris: "{{ user_service_prefix }}/v1/certs/download"
     upstream_url: "{{ learning_service_url }}/v1/user/certs/download"

ansible/roles/samza-jobs/defaults/main.yml

@@ -7,6 +7,13 @@ __yarn_port__: 8000
 cassandra_port: 9042
 es_port: 9200
 __fcm_account_key__: "{{sunbird_fcm_account_key}}"
+__sunbird_msg_91_auth__: "{{sunbird_msg_91_auth}}"
+__sunbird_notification_msg_default_sender__: "{{sunbird_msg_sender}}"
+__sunbird_mail_server_from_email__: "{{sunbird_mail_server_from_email}}"
+__sunbird_mail_server_host__: "{{sunbird_mail_server_host}}"
+__sunbird_mail_server_password__: "{{sunbird_mail_server_port}}"
+__sunbird_mail_server_username__: "{{sunbird_mail_server_username}}"
+__sunbird_mail_server_password__: "{{sunbird_mail_server_password}}"
 samza_tar_files_localpath: roles/samza-jobs/defaults
 job_names:
   lms.user-account-merger_1:

ansible/roles/stack-sunbird/defaults/main.yml

@@ -10,6 +10,7 @@ sunbird_keycloak_public:
 sunbird_cache_store:
 sunbird_cache_ttl: 1800
 sunbird_es_port: 9300 # If this port is same for all the machines, single vaule is enough! else comma seperated values
+sunbird_es_http_port: 9200
 actor_replicas: 1
 actor_reservation_memory: 768M
 actor_limit_memory: 1024M

ansible/roles/stack-sunbird/templates/sunbird_cert-service.env

@@ -4,4 +4,5 @@ AZURE_STORAGE_SECRET={{sunbird_azure_storage_key}}
 AZURE_STORAGE_KEY={{sunbird_azure_storage_account}}
 sunbird_cert_domain_url={{proto}}://{{proxy_server_name}}
 sunbird_cert_enc_service_url=http://enc-service:8013
-download_link_expiry_timeout=600
\ No newline at end of file
+download_link_expiry_timeout=600
+es_conn_info={{sunbird_es_host}}:{{sunbird_es_http_port}}
\ No newline at end of file

ansible/roles/stack-sunbird/templates/sunbird_lms-service.env

@@ -104,4 +104,6 @@ sunbird_user_org_api_base_url={{sunbird_user_org_api_base_url}}
 kafka_topics_instruction={{kafka_topics_instruction}}
 kafka_urls={{kafka_urls}}
 kafka_topics_certificate_instruction={{kafka_topics_certificate_instruction}}
-kafka_assessment_topic={{kafka_assessment_topic}}
\ No newline at end of file
+kafka_assessment_topic={{kafka_assessment_topic}}
+# Required by lms service to call cert service
+sunbird_cert_service_base_url=http://cert-service:9000
\ No newline at end of file