Skip to content

Commit

Permalink
Release 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Denys Havrysh authored and vutny committed Jul 30, 2018
1 parent 4885508 commit 9369060
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
zoomdata-formula
================

3.3.0 (2018-07-30)

- Fixed state run when ``backup:destination`` Pillar is unset

3.2.0 (2018-07-02)

- Deprecated the ``zoomdata-xvfb`` service
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.3.0
22 changes: 11 additions & 11 deletions pillar.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml ts=2 sts=2 sw=2 et

### Zoomdata 3.2 provisioning configuration example.
### Zoomdata 3.3 provisioning configuration example.
###
### This is Salt Pillar file that written in SaltStack (SLS) format:
### YAML rendered with Jinja2.
Expand All @@ -20,7 +20,7 @@ zoomdata:
gpgkey: 'https://repo.zoomdata.com/ZOOMDATA-GPG-KEY.pub'
# Repository branch from which the packages would be installed.
# This would be overridden by ``ZOOMDATA_RELEASE`` environment variable.
release: 3.2
release: 3.3

# Additional repositories under the ``base_url`` to get packages from
repositories:
Expand Down Expand Up @@ -56,10 +56,10 @@ zoomdata:
# This would be overridden by ``ZOOMDATA_VERSION`` environment variable.
{%- if grains['os'] == 'Ubuntu' %}
# Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
#version: "3.2.0-6+{{ grains['oscodename'] }}.stable"
#version: "3.3.0-6+{{ grains['oscodename'] }}.stable"
{%- else %}
# Packages version for RHEL/CentOS systems
#version: '3.2.0'
#version: '3.3.0'
{%- endif %}

# Zoomdata Server packages to install
Expand All @@ -81,10 +81,10 @@ zoomdata:
# This would be overridden by ``ZOOMDATA_EDC_VERSION`` environment variable.
{%- if grains['os'] == 'Ubuntu' %}
# Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
#version: "3.2.0-1+{{ grains['oscodename'] }}.stable"
#version: "3.3.0-1+{{ grains['oscodename'] }}.stable"
{%- else %}
# Packages version for RHEL/CentOS systems
#version: '3.2.0'
#version: '3.3.0'
{%- endif %}

# Zoomdata EDC packages to install
Expand Down Expand Up @@ -133,10 +133,10 @@ zoomdata:
# This would be overridden by ``ZOOMDATA_EDC_VERSION`` environment variable.
{%- if grains['os'] == 'Ubuntu' %}
# Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
#version: "3.2.0-1+{{ grains['oscodename'] }}.stable"
#version: "3.3.0-1+{{ grains['oscodename'] }}.stable"
{%- else %}
# Packages version for RHEL/CentOS systems
#version: '3.2.0'
#version: '3.3.0'
{%- endif %}

# Zoomdata microservice packages to install
Expand Down Expand Up @@ -221,14 +221,14 @@ zoomdata:
upload.batch-size: 1000
## Screenshot Feature: we disable it by default.
# Look at these pages for instructions how to set it up on your platform:
# https://www.zoomdata.com/docs/3.2/screenshot-for-rpm.html
# https://www.zoomdata.com/docs/3.2/setting-up-the-screenshot-feature-for-ubuntu.html
# https://www.zoomdata.com/docs/3.3/screenshot-for-rpm.html
# https://www.zoomdata.com/docs/3.3/setting-up-the-screenshot-feature-for-ubuntu.html
screenshot.daemon.enabled: False
screenshot.daemon.schedule.rate: '168h' # 1 week
screenshots.dashboards.enabled: False
screenshots.datasource-charts.enabled: False
## Configure HTTPS for Zoomdata (see ``tls`` item below):
# https://www.zoomdata.com/docs/3.2/adding-ssl-certificate-to-the-zoomdata-server.html
# https://www.zoomdata.com/docs/3.3/adding-ssl-certificate-to-the-zoomdata-server.html
#server.ssl.enabled: True
#server.ssl.key-store: '/etc/zoomdata/zoomdata.jks'
#server.ssl.key-store-password: 'your_keystore_password'
Expand Down

0 comments on commit 9369060

Please sign in to comment.