Release 3.7.0 into Release-3.8.0 (#2302)

* Adding portal session secret (#2283)

* added empty list as value for monitoring_stack_additional_charts (#2290)

* adding the config.xml file from dev jenkin job (#2296)

Co-authored-by: Ubuntu <deployer@Jenkins.a0djcfflzpiujkx3kmz3oltkhg.rx.internal.cloudapp.net>

* fix: python unicode rendering issue (#2299)

* change the default value from tag to head in Yarn build job config file (#2301)

* adding the config.xml file from dev jenkin job

* change the default value from tag to head for Yarn build job

Co-authored-by: Ubuntu <deployer@Jenkins.a0djcfflzpiujkx3kmz3oltkhg.rx.internal.cloudapp.net>

* Issue #DIK-4850 fix:  datasource name update (#2300)

Co-authored-by: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Co-authored-by: G33tha <geethap240@gmail.com>
Co-authored-by: Badal <37176231+badaltechiepi@users.noreply.github.com>
Co-authored-by: Ubuntu <deployer@Jenkins.a0djcfflzpiujkx3kmz3oltkhg.rx.internal.cloudapp.net>
Co...

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

@@ -141,5 +141,5 @@ user_enrolments_response_cache_ttl={{ user_enrolments_response_cache_ttl | defau
 druid_proxy_api_host={{groups['raw-broker'][0]}}
 druid_proxy_api_port=8082
 druid_proxy_api_endpoint=/druid/v2/
-collection_summary_agg_data_source={{ summary_agg_data_source | default('telemetry-events') }}
+collection_summary_agg_data_source={{ summary_agg_data_source | default('audit-rollup-syncts') }}
 collection_summary_agg_cache_ttl={{ summary_agg_ttl | default(21600)  }}

deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml

@@ -33,7 +33,7 @@
 <li>The default value of ${public_repo_branch} will be the release / tag version set in global configuration</li>
 <li>To build from a differnt branch, replace the ${public_repo_branch} with your branch</li>
 &lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>refs/tags/${public_repo_branch}</defaultValue>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
           <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>

deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml

-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -43,12 +43,34 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
           <name>job_id</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the job id.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>collection-summary-report-v2</string>
+              <string>collection-summary-report</string>
+              <string>program-collection-summary-report</string>
+              <string>audit-metrics-report</string>
+              <string>admin-user-reports</string>
+              <string>admin-geo-reports</string>
+              <string>district-weekly</string>
+              <string>district-monthly</string>
+              <string>desktop-consumption-report</string>
+              <string>wfs</string>
+              <string>content-rating-updater</string>
+              <string>druid-query-processor</string>
+              <string>monitor-job-summ</string>
+              <string>course-enrollment-report</string>
+              <string>textbook-progress-report</string>
+              <string>etb-metrics</string>
+              <string>daily-metrics</string>
+              <string>progress-exhaust</string>
+              <string>userinfo-exhaust</string>
+              <string>response-exhaust</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>batch_identifier</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify The BatchId to Generate report for specific batch&lt;/b&gt;&lt;/font&gt;
@@ -74,13 +96,13 @@
           <defaultValue>30</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -88,7 +110,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -100,13 +122,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -115,7 +137,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -129,13 +151,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.StringParameterDefinition>
           <name>keyword</name>
-          <description>Optional - Enter a keyword to generate a report for the "program-collection-summary-report" </description>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Optional - Enter a keyword to generate a report for the "program-collection-summary-report"&lt;/b&gt;&lt;/font&gt;</description>
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -146,8 +168,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>

kubernetes/ansible/roles/logging/templates/elasticsearch-curator.yaml

@@ -34,5 +34,5 @@ configMaps:
   config_yml: |-
     ---
     client:
-      hosts: {{ groups['log-es'] }}
+      hosts: ["{{ groups['log-es'] | join('", "') }}"]
       port: 9200

kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml

@@ -18,7 +18,7 @@ monitoring_stack:
 # monitoring_stack_additional_charts:
   # - custom_chart1
   # - custom_monitoring_chart2
-monitoring_stack_additional_charts:
+monitoring_stack_additional_charts: []
 
 namespace: monitoring