From b147d8864020f6ec8177e7a5261b5a2373ac6e08 Mon Sep 17 00:00:00 2001
From: Manjunath Davanam <manjunathd@ilimi.in>
Date: Wed, 3 Mar 2021 20:09:16 +0530
Subject: [PATCH] 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-authored-by: Keshav Prasad <keshavprasadms@gmail.com>
---
.../templates/sunbird_lms-service.env | 2 +-
.../KnowledgePlatform/jobs/Yarn/config.xml | 2 +-
.../jobs/AnalyticsReplayJobs/config.xml | 54 +++++++++++++------
.../templates/elasticsearch-curator.yaml | 2 +-
.../sunbird-monitoring/defaults/main.yml | 2 +-
5 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
index 728b81234..ffec7bbaa 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
+++ b/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) }}
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 e4ff68b85..e2a9e806e 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/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>
</b></font></description>
- <defaultValue>refs/tags/${public_repo_branch}</defaultValue>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
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 99c84de21..725424f77 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,6 +1,6 @@
-<?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><font color=dimgray size=2><b>Specify the job id.</b></font></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><font color=dimgray size=2><b>Specify The BatchId to Generate report for specific batch</b></font>
@@ -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 """<input name="value" value="${private_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout a different branch from private repository.</b></font>"""
}
@@ -88,7 +110,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -100,13 +122,13 @@ return """<b>This parameter is not used</b>"""</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 """<input name="value" value="" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Provide the tag or branch name to checkout the Jenkinsfile and codebase.<br>Note: The tag or branch name for this job should be taken from <a href="https://github.com/project-sunbird/sunbird-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -115,7 +137,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -129,13 +151,13 @@ return """<b>This parameter is not used</b>"""</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><font color=dimgray size=2><b>Optional - Enter a keyword to generate a report for the "program-collection-summary-report"</b></font></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 """<b>This parameter is not used</b>"""</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>
diff --git a/kubernetes/ansible/roles/logging/templates/elasticsearch-curator.yaml b/kubernetes/ansible/roles/logging/templates/elasticsearch-curator.yaml
index f71a82b16..b411d48ad 100644
--- a/kubernetes/ansible/roles/logging/templates/elasticsearch-curator.yaml
+++ b/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
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index b65da6b62..05342cddf 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/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
--
GitLab