fluent-plugin-output-solr 0.4.4 → 0.4.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a050a00d5aa505b5992569b6c4860c016788851f
4
- data.tar.gz: d40e2dd717f946afd6161526f3de1d513cd9a8cb
3
+ metadata.gz: c3b1d94e9b198256826b6717b367f3d908f9cf2f
4
+ data.tar.gz: dff11f4040d0a6efb8edbcd6b4c9b7cdefd86ebd
5
5
  SHA512:
6
- metadata.gz: 70c322a8b3d9f4e625e73508e78eab4ed091b081747a4a0e2f91f828ed74db1f29aa81a51f1859dc6fd50974e3d2fe58e9233c453e66f60a34598038f89324f3
7
- data.tar.gz: 97854b50cb8dd55aa74e317e8f4740f6fe751ef84b5aa36762057fa9cb8807def57781c12bac356a91958b1ffd8753afd38801f2a765f5a7f65e6b24c33712f4
6
+ metadata.gz: 774d85e8cca935a67f2c13e4c0948ee094b8dbd2161fb479c40c823c72e585658659fae1cc4d756c415e4a4628c445ee8f802ff1bb853d491f2e1e46a61513a8
7
+ data.tar.gz: b8a36d1441c7c956e9f5dde485f6a8f30663586990a9ca759e54073a43cf0d22280227fef99c33538b6fe4a03408405f8c63c2ef532d1520b0bfa614e620f4b1
data/README.md CHANGED
@@ -2,6 +2,16 @@
2
2
 
3
3
  This is a [Fluentd](http://fluentd.org/) output plugin for send data to [Apache Solr](http://lucene.apache.org/solr/). It support [SolrCloud](https://cwiki.apache.org/confluence/display/solr/SolrCloud) not only Standalone Solr.
4
4
 
5
+ ## Requirements
6
+
7
+ | fluent-plugin-output-solr | fluentd | td-agent | ruby |
8
+ | ------------------------- | --------------- | -------- | ------ |
9
+ | 1.x.x | >= 0.14.0, < 2 | 3 | >= 2.1 |
10
+ | 0.x.x | ~> 0.12.0 | 2 | >= 1.9 |
11
+
12
+ * The 1.x.x series is developed from this branch (master)
13
+ * The 0.x.x series (compatible with fluentd v0.12, and td-agent 2) is developed on the [v0.x.x branch](https://github.com/mosuka/fluent-plugin-output-solr/tree/v0.x.x)
14
+
5
15
  ## Installation
6
16
 
7
17
  Install it yourself as:
@@ -86,6 +96,13 @@ A number of events to queue up before writing to Solr (default 100).
86
96
  flush_size 100
87
97
  ```
88
98
 
99
+ ### commit_with_flush
100
+
101
+ Send commit command to Solr with flush (default true).
102
+
103
+ ```
104
+ commit_with_flush true
105
+ ```
89
106
 
90
107
  ## Plugin setup examples
91
108
 
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "fluent-plugin-output-solr"
7
- spec.version = "0.4.4"
7
+ spec.version = "0.4.5"
8
8
  spec.authors = ["Minoru Osuka"]
9
9
  spec.email = ["minoru.osuka@gmail.com"]
10
10
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
20
20
  spec.require_paths = ["lib"]
21
21
 
22
- spec.add_runtime_dependency 'fluentd', '~> 0.12.32'
22
+ spec.add_runtime_dependency 'fluentd', '~> 0.12.0'
23
23
  spec.add_runtime_dependency 'rsolr-cloud', '~> 1.1.0'
24
24
  spec.add_runtime_dependency 'rsolr', '~> 1.0.12'
25
25
  spec.add_runtime_dependency 'zk', '~> 1.9.5'
data/fluent.conf CHANGED
@@ -59,4 +59,5 @@
59
59
  buffer_queue_limit 64m
60
60
  buffer_chunk_limit 8m
61
61
  flush_interval 10s
62
+ commit_with_flush true
62
63
  </match>
@@ -12,6 +12,7 @@ module Fluent
12
12
  DEFAULT_TAG_FIELD = 'tag'
13
13
  DEFAULT_TIMESTAMP_FIELD = 'event_timestamp'
14
14
  DEFAULT_FLUSH_SIZE = 100
15
+ DEFAULT_COMMIT_WITH_FLUSH = true
15
16
 
16
17
  MODE_STANDALONE = 'Standalone'
17
18
  MODE_SOLRCLOUD = 'SolrCloud'
@@ -45,6 +46,9 @@ module Fluent
45
46
  config_param :flush_size, :integer, :default => DEFAULT_FLUSH_SIZE,
46
47
  :desc => 'A number of events to queue up before writing to Solr (default 100).'
47
48
 
49
+ config_param :commit_with_flush, :bool, :default => DEFAULT_COMMIT_WITH_FLUSH,
50
+ :desc => 'Send commit command to Solr with flush (default true).'
51
+
48
52
  def initialize
49
53
  super
50
54
  end
@@ -134,10 +138,10 @@ module Fluent
134
138
 
135
139
  def update(documents)
136
140
  if @mode == MODE_STANDALONE then
137
- @solr.add documents, :params => {:commit => true}
141
+ @solr.add documents, :params => {:commit => @commit_with_flush}
138
142
  log.debug "Added %d document(s) to Solr" % documents.count
139
143
  elsif @mode == MODE_SOLRCLOUD then
140
- @solr.add documents, collection: @collection, :params => {:commit => true}
144
+ @solr.add documents, collection: @collection, :params => {:commit => @commit_with_flush}
141
145
  log.debug "Update: Added %d document(s) to Solr" % documents.count
142
146
  end
143
147
  rescue Exception => e
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-output-solr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.4
4
+ version: 0.4.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Minoru Osuka
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-03-24 00:00:00.000000000 Z
11
+ date: 2017-03-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.12.32
19
+ version: 0.12.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.12.32
26
+ version: 0.12.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rsolr-cloud
29
29
  requirement: !ruby/object:Gem::Requirement