diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 868b3ab..2d8394c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,16 @@ zoomdata-formula ================ +2.6.23 (2018-11-19) **The end of Active Support for the Zoomdata release 2.6** + +- The Zoomdata 2.6 Long Term Support release has stopped receiving bugfixes. + The last version of the Zoomdata Core service binaries is ``2.6.23``. +- The default variables were updated to reflect latest 2.6 release state +- Allowed downloading JDBC drivers for datasource connectors (EDC services) + from URLs in package metadata file +- Fixed the Zoomdata packages, services and versions detection +- Cleaned up configuration file templates + 3.6.0 (2018-10-24) - Added new ``zoomdata.setup`` SLS that allows setting up initial passwords, diff --git a/VERSION b/VERSION index 40c341b..fef250d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.6.0 +2.6.23 diff --git a/pillar.example b/pillar.example index 665db66..e458139 100644 --- a/pillar.example +++ b/pillar.example @@ -1,11 +1,19 @@ # -*- coding: utf-8 -*- # vim: ft=yaml ts=2 sts=2 sw=2 et -### Zoomdata 3.6 provisioning configuration example. +### The Zoomdata provisioning configuration example file +### ==================================================== ### ### This is Salt Pillar file written in SaltStack's (SLS) format: -### YAML rendered with Jinja2 template engine. - +### a tree-like data structure in YAML rendered with Jinja2 templating engine. +### https://docs.saltstack.com/en/latest/topics/tutorials/pillar.html +### https://docs.saltstack.com/en/latest/topics/yaml/ +### https://docs.saltstack.com/en/latest/topics/jinja/ +### +### It has default values for latest Generally Available Zoomdata release. +### The settings for the last Long Term Supported release are coded within the +### formula in the ``zoomdata/defaults.yaml`` file, which applies out of the +### box unless redefined in the Pillar file. zoomdata: ## Package installation settings diff --git a/zoomdata/defaults.yaml b/zoomdata/defaults.yaml index 16916b1..01a4eb9 100644 --- a/zoomdata/defaults.yaml +++ b/zoomdata/defaults.yaml @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +# Default variables for the Zoomdata LTS 2.6 release deployment + zoomdata: # Constants prefix: '/opt/zoomdata' @@ -10,12 +12,11 @@ zoomdata: # Defaults which could be overridden in Pillar base_url: 'http://repo.zoomdata.com' gpgkey: 'https://repo.zoomdata.com/ZOOMDATA-GPG-KEY.pub' - release: 2.5 + release: '2.6' repositories: - tools components: - stable - #- licensed #- unstable bootstrap: False @@ -26,24 +27,24 @@ zoomdata: packages: - zoomdata - zoomdata-consul + - zoomdata-query-engine - zoomdata-scheduler - - zoomdata-spark-proxy - zoomdata-xvfb edc: #version: 'latest' packages: - zoomdata-edc-apache-solr - - zoomdata-edc-aurora - zoomdata-edc-cloudera-search - - zoomdata-edc-elasticsearch-1.7 - - zoomdata-edc-elasticsearch-2.0 + - zoomdata-edc-elasticsearch-5.0 + - zoomdata-edc-elasticsearch-6.0 - zoomdata-edc-impala - zoomdata-edc-memsql + - zoomdata-edc-mongo - zoomdata-edc-mssql - zoomdata-edc-mysql - zoomdata-edc-oracle - - zoomdata-edc-phoenix-4.5 + - zoomdata-edc-phoenix-4.7-queryserver - zoomdata-edc-postgresql - zoomdata-edc-redshift - zoomdata-edc-rts @@ -56,7 +57,9 @@ zoomdata: microservices: #version: 'latest' - packages: [] + packages: + - zoomdata-stream-writer + - zoomdata-upload-service tools: packages: @@ -80,6 +83,15 @@ zoomdata: spring.datasource.url: 'jdbc:postgresql://localhost:5432/zoomdata' spring.datasource.username: zoomdata spring.datasource.password: 'PleaseChangeMe' + keyset.destination.params.jdbc_url: 'jdbc:postgresql://localhost:5432/zoomdata-keyset' + keyset.destination.params.user_name: 'zoomdata' + keyset.destination.params.password: 'PleaseChangeMe' + keyset.destination.schema: 'public' + upload.destination.params.jdbc_url: 'jdbc:postgresql://localhost:5432/zoomdata-upload' + upload.destination.params.user_name: 'zoomdata' + upload.destination.params.password: 'PleaseChangeMe' + upload.destination.schema: 'public' + upload.batch-size: 1000 screenshot.daemon.enabled: False screenshot.daemon.schedule.rate: '168h' screenshots.dashboards.enabled: False @@ -109,23 +121,25 @@ zoomdata: services: - zoomdata-consul - zoomdata-edc-apache-solr - - zoomdata-edc-aurora - zoomdata-edc-cloudera-search - - zoomdata-edc-elasticsearch-1.7 - - zoomdata-edc-elasticsearch-2.0 + - zoomdata-edc-elasticsearch-5.0 + - zoomdata-edc-elasticsearch-6.0 - zoomdata-edc-impala - - zoomdata-edc-memsql - - zoomdata-edc-mssql - - zoomdata-edc-mysql - - zoomdata-edc-oracle - - zoomdata-edc-phoenix-4.5 + #- zoomdata-edc-memsql + - zoomdata-edc-mongo + #- zoomdata-edc-mssql + #- zoomdata-edc-mysql + #- zoomdata-edc-oracle + - zoomdata-edc-phoenix-4.7-queryserver - zoomdata-edc-postgresql - - zoomdata-edc-redshift + #- zoomdata-edc-redshift - zoomdata-edc-rts - zoomdata-edc-sparksql - zoomdata-edc-tez + - zoomdata-query-engine - zoomdata-scheduler - - zoomdata-spark-proxy + - zoomdata-stream-writer + - zoomdata-upload-service - zoomdata #- zoomdata-xvfb