Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Rory Browne
Коммит
055a84394a
|
|
@ -1,3 +1,7 @@
|
|||
##2016-06-06 - Release 3.1.1
|
||||
###Summary
|
||||
- metadata updates (quality score update)
|
||||
|
||||
##2016-06-05 - Release 3.1.0
|
||||
###Summary
|
||||
- Fix compatibility requirements
|
||||
|
|
|
|||
36
Gemfile
36
Gemfile
|
|
@ -1,34 +1,34 @@
|
|||
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
||||
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
||||
|
||||
group :development, :test do
|
||||
gem 'rake', :require => false
|
||||
gem 'rspec','< 3.2.0', :require => false
|
||||
gem 'rspec-puppet','~> 2.2', :require => false
|
||||
gem 'puppetlabs_spec_helper', :require => false
|
||||
gem 'puppet-lint', :require => false
|
||||
gem 'simplecov', :require => false
|
||||
gem 'puppet_facts', :require => false
|
||||
gem 'json_pure','~> 1.8', :require => false
|
||||
gem 'json', :require => false
|
||||
gem 'metadata-json-lint', :require => false
|
||||
gem 'rspec-puppet-facts', '~> 0.10'
|
||||
gem 'rake', require: false
|
||||
gem 'rspec', '< 3.2.0', require: false
|
||||
gem 'rspec-puppet', '~> 2.3', require: false
|
||||
gem 'puppetlabs_spec_helper', require: false
|
||||
gem 'puppet-lint', require: false
|
||||
gem 'simplecov', require: false
|
||||
gem 'puppet_facts', require: false
|
||||
gem 'json_pure', '~> 1.8', require: false
|
||||
gem 'json', require: false
|
||||
gem 'metadata-json-lint', require: false
|
||||
gem 'rspec-puppet-facts', require: false
|
||||
end
|
||||
|
||||
group :system_tests do
|
||||
gem 'beaker-rspec', :require => false
|
||||
gem 'serverspec', :require => false
|
||||
gem 'beaker-rspec', require: false
|
||||
gem 'serverspec', require: false
|
||||
end
|
||||
|
||||
if facterversion = ENV['FACTER_GEM_VERSION']
|
||||
gem 'facter', facterversion, :require => false
|
||||
gem 'facter', facterversion, require: false
|
||||
else
|
||||
gem 'facter', :require => false
|
||||
gem 'facter', require: false
|
||||
end
|
||||
|
||||
if puppetversion = ENV['PUPPET_GEM_VERSION']
|
||||
gem 'puppet', puppetversion, :require => false
|
||||
gem 'puppet', puppetversion, require: false
|
||||
else
|
||||
gem 'puppet', :require => false
|
||||
gem 'puppet', require: false
|
||||
end
|
||||
|
||||
# vim:ft=ruby
|
||||
|
|
|
|||
103
README.md
103
README.md
|
|
@ -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
|
||||
|
|
@ -118,17 +126,17 @@ Enable UDP listener
|
|||
```puppet
|
||||
$udp_options = [
|
||||
{ 'enabled' => true,
|
||||
'bind-address' => '":8089"',
|
||||
'database' => '"udp_db1"',
|
||||
'bind-address' => ':8089',
|
||||
'database' => 'udp_db1',
|
||||
'batch-size' => 10000,
|
||||
'batch-timeout' => '"1s"',
|
||||
'batch-timeout' => '1s',
|
||||
'batch-pending' => 5,
|
||||
},
|
||||
{ 'enabled' => true,
|
||||
'bind-address' => '":8090"',
|
||||
'database' => '"udp_db2"',
|
||||
'bind-address' => ':8090',
|
||||
'database' => 'udp_db2',
|
||||
'batch-size' => 10000,
|
||||
'batch-timeout' => '"1s"',
|
||||
'batch-timeout' => '1s',
|
||||
'batch-pending' => 5,
|
||||
},
|
||||
]
|
||||
|
|
@ -268,61 +276,6 @@ Enable WAL logging.
|
|||
NEW in 0.9.3+
|
||||
Default: true
|
||||
|
||||
##### `wal_ready_series_size`
|
||||
|
||||
When a series in the WAL in-memory cache reaches this size in bytes it is
|
||||
marked as ready to flush to the index.
|
||||
NEW in 0.9.3+
|
||||
Default: 25600
|
||||
|
||||
##### `wal_compaction_threshold`
|
||||
|
||||
Flush and compact a partition once this ratio of series are over the ready size.
|
||||
NEW in 0.9.3+
|
||||
Default: 0.6
|
||||
|
||||
##### `wal_max_series_size`
|
||||
|
||||
Force a flush and compaction if any series in a partition
|
||||
gets above this size in bytes.
|
||||
NEW in 0.9.3+
|
||||
Default: 2097152
|
||||
|
||||
##### `wal_flush_cold_interval`
|
||||
|
||||
Force a flush of all series and full compaction if there have been
|
||||
no writes in this amount of time.
|
||||
This is useful for ensuring that shards that are cold for writes
|
||||
don't keep a bunch of data cached in memory and in the WAL.
|
||||
NEW in 0.9.3+
|
||||
Default: 10m
|
||||
|
||||
##### `wal_partition_size_threshold`
|
||||
|
||||
Force a partition to flush its largest series if it reaches
|
||||
this approximate size in bytes.
|
||||
Remember there are 5 partitions so you'll need at least
|
||||
5x this amount of memory. The more memory you have, the bigger this can be.
|
||||
NEW in 0.9.3+Default: 20971520
|
||||
|
||||
##### `max_wal_size`
|
||||
|
||||
Maximum size the WAL can reach before a flush.
|
||||
*DEPRECATED* since version 0.9.3.
|
||||
Default: 100MB
|
||||
|
||||
##### `wal_flush_interval`
|
||||
|
||||
Maximum time data can sit in WAL before a flush.
|
||||
*DEPRECATED* since version 0.9.3.
|
||||
Default: 10m
|
||||
|
||||
##### `wal_partition_flush_delay`
|
||||
|
||||
The delay time between each WAL partition being flushed.
|
||||
*DEPRECATED* since version 0.9.3.
|
||||
Default: 2s
|
||||
|
||||
##### `shard_writer_timeout`
|
||||
|
||||
The time within which a shard must respond to write.
|
||||
|
|
@ -395,6 +348,28 @@ Default: false
|
|||
|
||||
Default: undef
|
||||
|
||||
##### `http_https_private_key`
|
||||
|
||||
Default: undef
|
||||
|
||||
##### `http_max_row_limit`
|
||||
|
||||
Default: 10000
|
||||
|
||||
##### `http_realm`
|
||||
|
||||
Default: InfluxDB
|
||||
|
||||
##### `subscriber_enabled`
|
||||
|
||||
Controls the subscriptions, which can be used to fork a copy of all data
|
||||
received by the InfluxDB host.
|
||||
Default: true
|
||||
|
||||
##### `subscriber_http_timeout`
|
||||
|
||||
Default: 30s
|
||||
|
||||
##### `graphite_options`
|
||||
|
||||
Controls the listener for InfluxDB line protocol data via Graphite.
|
||||
|
|
@ -440,6 +415,12 @@ Default true
|
|||
|
||||
Default: 1s
|
||||
|
||||
##### `max_series_per_database`
|
||||
|
||||
Controls the number of series allowed per database. Change the setting
|
||||
to 0 to allow an unlimited number of series per database.
|
||||
Default: 1000000
|
||||
|
||||
##### `hinted_handoff_enabled`
|
||||
|
||||
Controls the hinted handoff feature, which allows nodes to temporarily
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@ class influxdb::params {
|
|||
|
||||
$data_enabled = true
|
||||
$data_dir = '/var/lib/influxdb/data'
|
||||
$max_wal_size = 104857600
|
||||
$wal_flush_interval = '10m'
|
||||
$wal_partition_flush_delay = '2s'
|
||||
$wal_dir = '/var/lib/influxdb/wal'
|
||||
$wal_logging_enabled = true
|
||||
$trace_logging_enabled = false
|
||||
|
|
@ -42,6 +39,7 @@ class influxdb::params {
|
|||
$compact_full_write_cold_duration = undef
|
||||
$max_points_per_block = undef
|
||||
$max_connection_limit = undef
|
||||
$max_series_per_database = 1000000
|
||||
|
||||
$hinted_handoff_enabled = true
|
||||
$hinted_handoff_dir = '/var/lib/influxdb/hh'
|
||||
|
|
@ -52,12 +50,13 @@ class influxdb::params {
|
|||
$hinted_handoff_retry_max_interval = '1m'
|
||||
$hinted_handoff_purge_interval = '1h'
|
||||
|
||||
$shard_writer_timeout = '5s'
|
||||
$cluster_write_timeout = '10s'
|
||||
$max_concurrent_queries = undef
|
||||
$query_timeout = undef
|
||||
$log_queries_after = undef
|
||||
$max_select_series = undef
|
||||
$max_select_point = undef
|
||||
$max_select_buckets = undef
|
||||
|
||||
$retention_enabled = true
|
||||
$retention_check_interval = '30m'
|
||||
|
|
@ -83,6 +82,12 @@ class influxdb::params {
|
|||
$http_pprof_enabled = false
|
||||
$http_https_enabled = false
|
||||
$http_https_certificate = '/etc/ssl/influxdb.pem'
|
||||
$http_https_private_key = undef
|
||||
$http_max_row_limit = 10000
|
||||
$http_realm = 'InfluxDB'
|
||||
|
||||
$subscriber_enabled = true
|
||||
$subscriber_http_timeout = '30s'
|
||||
|
||||
$graphite_options = undef
|
||||
$collectd_options = undef
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@ class influxdb::server (
|
|||
|
||||
$data_enabled = $influxdb::params::data_enabled,
|
||||
$data_dir = $influxdb::params::data_dir,
|
||||
$max_wal_size = $influxdb::params::max_wal_size,
|
||||
$wal_flush_interval = $influxdb::params::wal_flush_interval,
|
||||
$wal_partition_flush_delay = $influxdb::params::wal_partition_flush_delay,
|
||||
$wal_dir = $influxdb::params::wal_dir,
|
||||
$wal_logging_enabled = $influxdb::params::wal_logging_enabled,
|
||||
$trace_logging_enabled = $influxdb::params::trace_logging_enabled,
|
||||
|
|
@ -43,6 +40,7 @@ class influxdb::server (
|
|||
$compact_full_write_cold_duration = $influxdb::params::compact_full_write_cold_duration,
|
||||
$max_points_per_block = $influxdb::params::max_points_per_block,
|
||||
$max_connection_limit = $influxdb::params::max_connection_limit,
|
||||
$max_series_per_database = $influxdb::params::max_series_per_database,
|
||||
|
||||
$hinted_handoff_enabled = $influxdb::params::hinted_handoff_enabled,
|
||||
$hinted_handoff_dir = $influxdb::params::hinted_handoff_dir,
|
||||
|
|
@ -53,12 +51,13 @@ class influxdb::server (
|
|||
$hinted_handoff_retry_max_interval = $influxdb::params::hinted_handoff_retry_max_interval,
|
||||
$hinted_handoff_purge_interval = $influxdb::params::hinted_handoff_purge_interval,
|
||||
|
||||
$shard_writer_timeout = $influxdb::params::shard_writer_timeout,
|
||||
$cluster_write_timeout = $influxdb::params::cluster_write_timeout,
|
||||
$max_concurrent_queries = $influxdb::params::max_concurrent_queries,
|
||||
$query_timeout = $influxdb::params::query_timeout,
|
||||
$log_queries_after = $influxdb::params::log_queries_after,
|
||||
$max_select_series = $influxdb::params::max_select_series,
|
||||
$max_select_point = $influxdb::params::max_select_point,
|
||||
$max_select_buckets = $influxdb::params::max_select_buckets,
|
||||
|
||||
$retention_enabled = $influxdb::params::retention_enabled,
|
||||
$retention_check_interval = $influxdb::params::retention_check_interval,
|
||||
|
|
@ -84,6 +83,12 @@ class influxdb::server (
|
|||
$http_pprof_enabled = $influxdb::params::http_pprof_enabled,
|
||||
$http_https_enabled = $influxdb::params::http_https_enabled,
|
||||
$http_https_certificate = $influxdb::params::http_https_certificate,
|
||||
$http_https_private_key = $influxdb::params::http_https_private_key,
|
||||
$http_max_row_limit = $influxdb::params::http_max_row_limit,
|
||||
$http_realm = $influxdb::params::http_realm,
|
||||
|
||||
$subscriber_enabled = $influxdb::params::subscriber_enabled,
|
||||
$subscriber_http_timeout = $influxdb::params::subscriber_http_timeout,
|
||||
|
||||
$graphite_options = $influxdb::params::graphite_options,
|
||||
$collectd_options = $influxdb::params::collectd_options,
|
||||
|
|
|
|||
|
|
@ -28,9 +28,6 @@ class influxdb::server::config {
|
|||
|
||||
$data_enabled = $influxdb::server::data_enabled
|
||||
$data_dir = $influxdb::server::data_dir
|
||||
$max_wal_size = $influxdb::server::max_wal_size
|
||||
$wal_flush_interval = $influxdb::server::wal_flush_interval
|
||||
$wal_partition_flush_delay = $influxdb::server::wal_partition_flush_delay
|
||||
$wal_dir = $influxdb::server::wal_dir
|
||||
$wal_logging_enabled = $influxdb::server::wal_logging_enabled
|
||||
$trace_logging_enabled = $influxdb::server::trace_logging_enabled
|
||||
|
|
@ -46,6 +43,7 @@ class influxdb::server::config {
|
|||
$compact_full_write_cold_duration = $influxdb::server::compact_full_write_cold_duration
|
||||
$max_points_per_block = $influxdb::server::max_points_per_block
|
||||
$max_connection_limit = $influxdb::server::max_connection_limit
|
||||
$max_series_per_database = $influxdb::server::max_series_per_database
|
||||
|
||||
$hinted_handoff_enabled = $influxdb::server::hinted_handoff_enabled
|
||||
$hinted_handoff_dir = $influxdb::server::hinted_handoff_dir
|
||||
|
|
@ -56,12 +54,13 @@ class influxdb::server::config {
|
|||
$hinted_handoff_retry_max_interval = $influxdb::server::hinted_handoff_retry_max_interval
|
||||
$hinted_handoff_purge_interval = $influxdb::server::hinted_handoff_purge_interval
|
||||
|
||||
$shard_writer_timeout = $influxdb::server::shard_writer_timeout
|
||||
$cluster_write_timeout = $influxdb::server::cluster_write_timeout
|
||||
$max_concurrent_queries = $influxdb::server::max_concurrent_queries
|
||||
$query_timeout = $influxdb::server::query_timeout
|
||||
$log_queries_after = $influxdb::server::log_queries_after
|
||||
$max_select_series = $influxdb::server::max_select_series
|
||||
$max_select_point = $influxdb::server::max_select_point
|
||||
$max_select_buckets = $influxdb::server::max_select_buckets
|
||||
|
||||
$retention_enabled = $influxdb::server::retention_enabled
|
||||
$retention_check_interval = $influxdb::server::retention_check_interval
|
||||
|
|
@ -87,6 +86,12 @@ class influxdb::server::config {
|
|||
$http_pprof_enabled = $influxdb::server::http_pprof_enabled
|
||||
$http_https_enabled = $influxdb::server::http_https_enabled
|
||||
$http_https_certificate = $influxdb::server::http_https_certificate
|
||||
$http_https_private_key = $influxdb::server::http_https_private_key
|
||||
$http_max_row_limit = $influxdb::server::http_max_row_limit
|
||||
$http_realm = $influxdb::server::http_realm
|
||||
|
||||
$subscriber_enabled = $influxdb::server::subscriber_enabled
|
||||
$subscriber_http_timeout = $influxdb::server::subscriber_http_timeout
|
||||
|
||||
$graphite_options = $influxdb::server::graphite_options
|
||||
$collectd_options = $influxdb::server::collectd_options
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@ describe 'influxdb::server', :type => :class do
|
|||
'leader_lease_timeout' => '500ms',
|
||||
'commit_timeout' => '50ms',
|
||||
'data_dir' => '/var/opt/influxdb/data',
|
||||
'max_wal_size' => 104857600,
|
||||
'wal_flush_interval' => '10m',
|
||||
'wal_partition_flush_delay' => '2s',
|
||||
'shard_writer_timeout' => '5s',
|
||||
'cluster_write_timeout' => '5s',
|
||||
'retention_enabled' => true,
|
||||
|
|
@ -34,6 +31,7 @@ describe 'influxdb::server', :type => :class do
|
|||
'monitoring_database' => '_internal',
|
||||
'monitoring_write_interval' => '24h',
|
||||
'continuous_queries_enabled' => true,
|
||||
'max_series_per_database' => 1000000,
|
||||
'hinted_handoff_enabled' => true,
|
||||
'hinted_handoff_dir' => '/var/opt/influxdb/hh',
|
||||
'hinted_handoff_max_size' => 1073741824,
|
||||
|
|
@ -59,6 +57,7 @@ describe 'influxdb::server', :type => :class do
|
|||
it { is_expected.to contain_file('/etc/influxdb/influxdb.conf').with_content(/bind-address = ":8088"/) }
|
||||
it { is_expected.to contain_file('/etc/influxdb/influxdb.conf').with_content(/http-bind-address = ":8091"/) }
|
||||
it { is_expected.to contain_file('/etc/influxdb/influxdb.conf').with_content(/commit-timeout = "50ms"/) }
|
||||
it { is_expected.to contain_file('/etc/influxdb/influxdb.conf').with_content(/http-timeout = "30s"/) }
|
||||
|
||||
case facts[:osfamily]
|
||||
when 'Debian'
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@ max-series-per-database = 0
|
|||
[data]
|
||||
enabled = <%= @data_enabled %>
|
||||
dir = "<%= @data_dir %>"
|
||||
max-wal-size = <%= @max_wal_size %>
|
||||
wal-flush-interval = "<%= @wal_flush_interval %>"
|
||||
wal-partition-flush-delay = "<%= @wal_partition_flush_delay %>"
|
||||
wal-dir = "<%= @wal_dir %>"
|
||||
wal-logging-enabled = <%= @wal_logging_enabled %>
|
||||
trace-logging-enabled = <%= @trace_logging_enabled %>
|
||||
|
|
@ -61,6 +58,7 @@ max-series-per-database = 0
|
|||
<% if @max_points_per_block -%>
|
||||
max-points-per-block = <%= @max_points_per_block %>
|
||||
<% end -%>
|
||||
max-series-per-database = <%= @max_series_per_database %>
|
||||
|
||||
[hinted-handoff]
|
||||
enabled = <%= @hinted_handoff_enabled %>
|
||||
|
|
@ -87,6 +85,12 @@ max-series-per-database = 0
|
|||
<% if @max_select_series -%>
|
||||
max-select-series = <%= @max_select_series %>
|
||||
<% end -%>
|
||||
<% if @max_select_bucket -%>
|
||||
max-select-point = <%= @max_select_point %>
|
||||
<% end -%>
|
||||
<% if @max_select_point -%>
|
||||
max-select-buckets = <%= @max_select_buckets %>
|
||||
<% end -%>
|
||||
|
||||
[retention]
|
||||
enabled = <%= @retention_enabled %>
|
||||
|
|
@ -120,6 +124,15 @@ max-series-per-database = 0
|
|||
<% if @max_connection_limit -%>
|
||||
max-connection-limit = <%= @max_connection_limit %>
|
||||
<% end -%>
|
||||
<% if @http_https_private_key -%>
|
||||
https-private-key = "<%= @http_https_private_key %>"
|
||||
<% end -%>
|
||||
max-row-limit = <%= @http_max_row_limit %>
|
||||
realm = "<%= @http_realm %>"
|
||||
|
||||
[subscriber]
|
||||
enabled = <%= @subscriber_enabled %>
|
||||
http-timeout = "<%= @subscriber_http_timeout %>"
|
||||
|
||||
<% if @graphite_options and ! @graphite_options.empty? -%>
|
||||
<% if @graphite_options.is_a?(Hash) -%>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче