Merge pull request #3792 from project-sunbird/release-5.1.0

Merge Release 5.1.0 to release-5.2.0
project-sunbird · Apr 26, 2023 · 93f2251 · 93f2251
2 parents d6b2c2c + bee2ee6
commit 93f2251
Show file tree

Hide file tree

Showing 28 changed files with 82 additions and 53 deletions.
diff --git a/ansible/roles/keycloak-provision/tasks/main.yml b/ansible/roles/keycloak-provision/tasks/main.yml
@@ -27,3 +27,14 @@
   with_items:
     - zip
     - unzip
+
+- name: Install pip2
+  apt:
+    name: python-pip
+    state: present
+  become: true    
+
+- name: Install Certifi python package supported to python2
+  pip: 
+    name: certifi==2018.1.18
+  become: true
diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml
@@ -68,6 +68,9 @@ anonymous_user_groups:
   - anonymousAppAccess
   - anonymousUserCreate
 
+userAccess:
+  - userAccess
+
 kong_all_consumer_groups:
   - announcementAccess
   - appAccess

diff --git a/ansible/roles/stack-sunbird/templates/transformer.env b/ansible/roles/stack-sunbird/templates/transformer.env
@@ -15,6 +15,7 @@ KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.odk.*
 KAFKA_LOGS_TOPIC={{env_name}}.inbound-unprocessed
 KAFKA_PROCESS_OUTBOUND={{env_name}}.process-outbound
 KAFKA_BROADCAST_TRANSFORMER_TOPIC={{env_name}}.broadcast-transformer
+KAFKA_GENERIC_TRANSFORMER_TOPIC={{env_name}}.generic-transformer
 
 #FormsDB
 FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
@@ -77,4 +78,18 @@ SUNBIRD_CLOUD_MEDIA_STORAGE_SECRET={{cloud_private_storage_secret}}
 SUNBIRD_CLOUD_MEDIA_STORAGE_CONTAINER={{cloud_storage_uci_bucketname | default('uci-' + env )}}
 
 #Selected CDN Configuration
-SELECTED_FILE_CDN=sunbird
+SELECTED_FILE_CDN=sunbird
+
+#Doubtnut config
+DOUBTNUT_BASE_URL={{doubtnut_base_url | default("") }}
+DOUBTNUT_AUTH_KEY={{doubtnut_auth_key | default("") }}
+DOUBTNUT_WELCOME_MSG={{doubtnut_bot_welcome_msg | default("Welcome to doubtnut") }}
+DOUBTNUT_WELCOME_VIDEO={{doubtnut_bot_video_url | default("") }}
+
+
+#nl app url
+NLAPP_USER_URL={{nlapp_user_url | default("") }}
+NLAPP_USER_AUTH={{nl_user_auth | default("") }}
+NLAPP_USER_XAPPID={{nlapp_user_xappid | default("") }}
+
+
diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
@@ -89,6 +89,7 @@ apt update
 wget https://aka.ms/downloadazcopy-v10-linux
 tar -xf downloadazcopy-v10-linux
 cp ./azcopy_linux_amd64_*/azcopy /usr/bin/
+chmod +x /usr/bin/azcopy
 rm -rf downloadazcopy-v10-linux* azcopy_linux_amd*
 ###
 

diff --git a/deploy/jenkins/jenkins.yaml b/deploy/jenkins/jenkins.yaml
@@ -46,6 +46,10 @@ jenkins:
         value: "${GH_PRIVATE_REPO_URL}"
       - key: public_repo_branch
         value: "${GH_PUBLIC_REPO_BRANCH}"
+      - key: kp_public_repo_branch
+        value: "${KP_PUBLIC_REPO_BRANCH}" # branch of https://github.com/project-sunbird/sunbird-learning-platform
+      - key: dp_public_repo_branch
+        value: "${DP_PUBLIC_REPO_BRANCH}" # branch of https://github.com/project-sunbird/sunbird-data-pipeline.git
       - key: override_private_branch
         value: "true"
       - key: override_public_branch

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

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
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -86,7 +86,7 @@ ArtifactRepo - Push the docker image to container registry.
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/...y/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/...y/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/...kins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DruidAnomalyDetection/config.xml b/...kins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DruidAnomalyDetection/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/.../jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/.../jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Push the docker image to container registry.
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

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
@@ -85,7 +85,7 @@ ArtifactRepo - Push the docker image to container registry.
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
@@ -86,7 +86,7 @@ ArtifactRepo - Push the docker image to container registry.
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${dp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/...kins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/...kins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${kp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Push the docker image to container registry.
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${kp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${kp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${kp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

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
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${kp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

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
@@ -85,7 +85,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
+          <name>${kp_public_repo_branch}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -99,7 +99,6 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             <secureScript plugin="[email protected]">
               <script>return[
 'video-stream-generator',
-'questionset-publish',
 'search-indexer',
 'asset-enrichment',
 'audit-event-generator',

diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
@@ -96,7 +96,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
 'azure_cli',
 'aws_cli',
 'gcloud_cli',
-'oci_cli'
+'oci_cli',
 'all']</script>
               <sandbox>true</sandbox>
             </secureScript>

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -828,7 +828,7 @@ proxyconfig: |-
       add_header             Access-Control-Allow-Origin "*";
       add_header             Access-Control-Allow-Methods GET;
       proxy_set_header X-Request-ID $sb_request_id;
-      proxy_pass             https://$offline_bucket/$url_full;
+      proxy_pass             $offline_bucket/$url_full;
     }
     # compression for svg certs download
     location /api/certreg/v2/certs/download {
@@ -1111,10 +1111,6 @@ nginxconfig: |
           server kong:8000;
           keepalive 1000;
       }
-      upstream encryption {
-          server enc-service:8013;
-          keepalive 1000;
-      }
       upstream keycloak {
           server {{ keycloak_url.split('//')[-1] }};
           keepalive 1000;
@@ -1302,4 +1298,4 @@ serviceMonitor:
 
 {# Add the apple site association json contents in a single line within single quotes as shown below in Core/common.yml  #}
 {# apple_app_site_association: '{"applinks":{"apps":[],"details":[{"appID":"123456.dev.sunbird.app","paths":["/explore","/dial/*","/get/dial","/play/content","/play/collection","/learn/course","/explore-course/course","/explore-course","/search","/search/Library","/faq","/profile","/play/quiz","/explore","/learn","/resources"]}]}}' #}
-apple_universal_links: '{{ apple_app_site_association | default("") }}'
+apple_universal_links: '{{ apple_app_site_association | default("") }}'
diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -7,19 +7,6 @@ dockerhub: "change.docker.url"   # docker hub username or url incase of private
 # This ip should be in the kubenetes subnet range. For example, if your kube cluster is running in `10.0.0.0/24, then it can be 10.0.0.5. Make sure this ip is not allocated to any other things.`
 private_ingressgateway_ip: ""     # your private kubernetes load balancer ip
 
-# For sendgrid, if you want to change, update the following
-mail_server_host: "smtp.sendgrid.net"                               # Email host, can be any email provider
-mail_server_username: "apikey"                           # Email provider username; for sendgrid you can use "apikey"
-
-# This mail id should be verified by your provider. This is the mail id which will be used for `From Address`. For example,
-#
-# From: [email protected]
-# Subject: Forgot password
-# Hi.....
-sunbird_mail_server_from_email: "[email protected]"       # Email ID that should be as from address in mails
-# List of mail ids to whome the monitoring alerts should be sent.
-alerts_mailing_list : "[email protected]"                         # Comma separated mail list for Alerts; eg: [email protected], [email protected]
-
 # Cloud Service Provider Variables
 # If cloud_service_provider is AWS then update with access key as value
 # Example: cloud_public_storage_accountname: "AKSHKSJHFJDHJDSHFKSD"
@@ -170,6 +157,19 @@ certs_badge_root_org_id: ""          # Root org ID for which the certs will be c
 certs_badge_issuer_name: ""          # The issuer of the certs name e.g value is "Government of karnataka"
 certs_badge_issuer_url:  ""          # Issuer organisation official URL e.g value is "https://testdomain.in"
 
+# For sendgrid, if you want to change, update the following
+mail_server_host: "smtp.sendgrid.net"                               # Email host, can be any email provider
+mail_server_username: "apikey"                           # Email provider username; for sendgrid you can use "apikey"
+
+# This mail id should be verified by your provider. This is the mail id which will be used for `From Address`. For example,
+#
+# From: [email protected]
+# Subject: Forgot password
+# Hi.....
+sunbird_mail_server_from_email: "[email protected]"       # Email ID that should be as from address in mails
+# List of mail ids to whome the monitoring alerts should be sent.
+alerts_mailing_list : "[email protected]"                         # Comma separated mail list for Alerts; eg: [email protected], [email protected]
+
 # ------------------------------------------------------------------------------------------------------------ #
 # Sensible defaults which you need not change - But if you would like to change, you are free to do so
 env_name: "{{ env }}"
@@ -474,4 +474,4 @@ kong_desktop_device_consumer_names_for_opa: '["desktop_devicev2", "desktop_devic
 sunbird_kong_device_register: 'true'  # enables refersh token api call after login
 sunbird_kong_device_register_anonymous: 'true'  # enables anonymous sessions
 sunbird_session_store_type: redis  # uses redis for session data instead of cassandra
-portal_redis_connection_string: "redis://:@{{ sunbird_redis_host }}:6379/3"  # Uses KP redis and DB number 3 to store session data
+portal_redis_connection_string: "redis://:@{{ sunbird_redis_host }}:6379/3"  # Uses KP redis and DB number 3 to store session data
diff --git a/private_repo/ansible/inventory/dev/Core/hosts b/private_repo/ansible/inventory/dev/Core/hosts
@@ -9,18 +9,6 @@ ansible_ssh_private_key_file=/var/lib/jenkins/secrets/deployer_ssh_key
 [keycloak:children]
 keycloak-1
 
-[graylog-1]
-10.0.1.9 mongodb_master=True graylog_is_master=True
-
-[graylog:children]
-graylog-1
-
-[log-es-1]
-10.0.1.9 es_instance_name=log-es-1 node_name=log-es-1 es_etc_node_master=true es_etc_node_data=true
-
-[log-es:children]
-log-es-1
-
 [mongo_master]
 10.0.1.8 mongodb_master=True
 
@@ -130,6 +118,18 @@ localhost
 yarn-master
 yarn-slave
 
+[graylog-1]
+10.0.1.9 mongodb_master=True graylog_is_master=True
+
+[graylog:children]
+graylog-1
+
+[log-es-1]
+10.0.1.9 es_instance_name=log-es-1 node_name=log-es-1 es_etc_node_master=true es_etc_node_data=true
+
+[log-es:children]
+log-es-1
+
 [node-exporter]
 # Add all your VM IP's under this group
 10.1.4.4