Skip to content

Commit

Permalink
Add support for influxdb 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Friedrich committed Sep 8, 2016
1 parent 907ae12 commit f6c3fb6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 11 deletions.
8 changes: 8 additions & 0 deletions README.md
Expand Up @@ -26,6 +26,14 @@ such as databases, users, and privileges.

## Deprecation Warning

Notes for version 3.1.1+:

influxdb 1.0.0 contains [breaking changes](https://github.com/influxdata/influxdb/blob/master/CHANGELOG.md#v100-2016-09-08)
which require changing the `data_logging_enabled` config attribute to `trace_logging_enabled`.
The other configuration changes are managed by the `influxdb.conf.erb` template already.

Notes for versions older than 3.1.1:

This release is a major refactoring of the module which means that the API
changed in backwards incompatible ways. If your project depends on the old API
and you need to use influxdb prior to 0.10.X, please pin your module
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Expand Up @@ -29,7 +29,7 @@
$wal_partition_flush_delay = '2s'
$wal_dir = '/var/lib/influxdb/wal'
$wal_logging_enabled = true
$data_logging_enabled = true
$trace_logging_enabled = true
$wal_ready_series_size = undef
$wal_compaction_threshold = undef
$wal_max_series_size = undef
Expand Down
2 changes: 1 addition & 1 deletion manifests/server.pp
Expand Up @@ -30,7 +30,7 @@
$wal_partition_flush_delay = $influxdb::params::wal_partition_flush_delay,
$wal_dir = $influxdb::params::wal_dir,
$wal_logging_enabled = $influxdb::params::wal_logging_enabled,
$data_logging_enabled = $influxdb::params::data_logging_enabled,
$trace_logging_enabled = $influxdb::params::trace_logging_enabled,
$wal_ready_series_size = $influxdb::params::wal_ready_series_size,
$wal_compaction_threshold = $influxdb::params::wal_compaction_threshold,
$wal_max_series_size = $influxdb::params::wal_max_series_size,
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/config.pp
Expand Up @@ -33,7 +33,7 @@
$wal_partition_flush_delay = $influxdb::server::wal_partition_flush_delay
$wal_dir = $influxdb::server::wal_dir
$wal_logging_enabled = $influxdb::server::wal_logging_enabled
$data_logging_enabled = $influxdb::server::data_logging_enabled
$trace_logging_enabled = $influxdb::server::trace_logging_enabled
$wal_ready_series_size = $influxdb::server::wal_ready_series_size
$wal_compaction_threshold = $influxdb::server::wal_compaction_threshold
$wal_max_series_size = $influxdb::server::wal_max_series_size
Expand Down
16 changes: 8 additions & 8 deletions templates/influxdb.conf.erb
Expand Up @@ -23,7 +23,7 @@ reporting-disabled = <%= @reporting_disabled %>
wal-partition-flush-delay = "<%= @wal_partition_flush_delay %>"
wal-dir = "<%= @wal_dir %>"
wal-logging-enabled = <%= @wal_logging_enabled %>
data-logging-enabled = <%= @data_logging_enabled %>
trace-logging-enabled = <%= @trace_logging_enabled %>
<% if @wal_ready_series_size -%>
wal-ready-series-size = <%= @wal_ready_series_size %>
<% end -%>
Expand Down Expand Up @@ -71,7 +71,7 @@ reporting-disabled = <%= @reporting_disabled %>
retry-max-interval = "<%= @hinted_handoff_retry_max_interval %>"
purge-interval = "<%= @hinted_handoff_purge_interval %>"

[cluster]
[coordinator]
shard-writer-timeout = "<%= @shard_writer_timeout %>"
write-timeout = "<%= @cluster_write_timeout %>"

Expand Down Expand Up @@ -148,7 +148,7 @@ reporting-disabled = <%= @reporting_disabled %>
<% if @collectd_options and ! @collectd_options.empty? -%>
<% if @collectd_options.is_a?(Hash) -%>
[collectd]
[[collectd]]
<% @collectd_options.keys.sort.each do |key| -%>
<% val = @collectd_options[key]
if val =~ /^(true|false|[0-9]+)$/ or val.is_a?(TrueClass) or val.is_a?(FalseClass) or val.is_a?(Fixnum) -%>
Expand All @@ -159,7 +159,7 @@ reporting-disabled = <%= @reporting_disabled %>
<% end -%>
<% elsif @collectd_options.is_a?(Array) -%>
<% @collectd_options.each do |option| -%>
[collectd]
[[collectd]]
<% option.keys.sort.each do |key| -%>
<% val = @option[key]
if val =~ /^(true|false|[0-9]+)$/ or val.is_a?(TrueClass) or val.is_a?(FalseClass) or val.is_a?(Fixnum) -%>
Expand All @@ -171,13 +171,13 @@ reporting-disabled = <%= @reporting_disabled %>
<% end -%>
<% end -%>
<% else -%>
[collectd]
[[collectd]]
enabled = false
<% end -%>
<% if @opentsdb_options and ! @opentsdb_options.empty? -%>
<% if @opentsdb_options.is_a?(Hash) -%>
[opentsdb]
[[opentsdb]]
<% @opentsdb_options.keys.sort.each do |key|
val = @opentsdb_options[key]
-%>
Expand All @@ -189,7 +189,7 @@ reporting-disabled = <%= @reporting_disabled %>
<% end -%>
<% elsif @opentsdb_options.is_a?(Array) -%>
<% @opentsdb_options.each do |option| -%>
[opentsdb]
[[opentsdb]]
<% option.keys.sort.each do |key|
val = @option[key]
-%>
Expand All @@ -202,7 +202,7 @@ reporting-disabled = <%= @reporting_disabled %>
<% end -%>
<% end -%>
<% else -%>
[opentsdb]
[[opentsdb]]
enabled = false
<% end -%>
Expand Down

0 comments on commit f6c3fb6

Please sign in to comment.