Commit 1a38a8ba authored by Flávio Ramalho's avatar Flávio Ramalho
Browse files

Merge branch 'cherry-pick-5f3a6333' into 'stable/ocata'

Updated influxdb version to 1.1.0

See merge request !2
parents 2e6c1e0e 9c6f65c1
......@@ -54,7 +54,7 @@ os_mon_agent_password: "password"
mysql_root_pass: "password"
## InfluxDB
influxdb_version: "0.9.5"
influxdb_version: "1.1.0"
## Kafka
base_kafka_version: "0.8.1.1"
......
......@@ -15,7 +15,7 @@
- name: Download influxdb
get_url:
url: "http://s3.amazonaws.com/influxdb/influxdb_{{ influxdb_version }}_amd64.deb"
url: "https://dl.influxdata.com/influxdb/releases/influxdb_{{ influxdb_version }}_amd64.deb"
dest: "/root/influxdb_{{ influxdb_version }}_amd64.deb"
mode: 0440
tags:
......
# {{ ansible_managed }}
### Welcome to the InfluxDB configuration file.
# Once every 24 hours InfluxDB will report anonymous data to m.influxdb.com
......@@ -126,13 +124,14 @@ reporting-disabled = false
purge-interval = "1h"
###
### [cluster]
### In v1.0.0 [cluster] was replaced with [coordinator]
### [coordinator]
###
### Controls non-Raft cluster behavior, which generally includes how data is
### shared across shards.
###
[cluster]
[coordinator]
shard-writer-timeout = "10s" # The time within which a shard must respond to write.
write-timeout = "5s" # The time within which a write operation must complete on the cluster.
......@@ -245,12 +244,13 @@ reporting-disabled = false
# ignore-unnamed = true
###
### [collectd]
### In v1.0.0 support for config option [collectd] was replaced with [[collectd]]
### [[collectd]]
###
### Controls the listener for collectd data.
###
[collectd]
[[collectd]]
enabled = false
# bind-address = ""
# database = ""
......@@ -266,12 +266,13 @@ reporting-disabled = false
# read-buffer = 0 # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
###
### [opentsdb]
### In v1.0.0 support for config option [opentsdb] was replaced with [[opentsdb]]
### [[opentsdb]]
###
### Controls the listener for OpenTSDB data.
###
[opentsdb]
[[opentsdb]]
enabled = false
# bind-address = ":4242"
# database = "opentsdb"
......
......@@ -109,7 +109,7 @@ sporadicMetricNamespaces:
- foo
database:
driverClass: com.mysql.jdbc.Driver
driverClass: "com.mysql.jdbc.jdbc2.optional.MysqlDataSource"
url: "jdbc:mysql://{{ ansible_default_ipv4.address }}/mon?useSSL=true"
user: "thresh"
password: "password"
......@@ -119,12 +119,28 @@ database:
maxWaitForConnection: 1s
# the SQL query to run when validating a connection's liveness
validationQuery: "/* MyService Health Check */ SELECT 1"
validationQuery: "/* mysql Health Check */ SELECT 1"
# the minimum number of connections to keep open
minSize: 8
# the maximum number of connections to keep open
maxSize: 41
# flag indicates if Hibernate support enabled
hibernateSupport: false
maxSize: 41
# hibernate provider class
providerClass: com.zaxxer.hikari.hibernate.HikariConnectionProvider
# database name
databaseName: mon
# server name/address
serverName: {{ ansible_default_ipv4.address }}
# server port number
portNumber: 3306
# hibernate auto configuretion parameter
autoConfig: validate
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment