fluent-plugin-zabbix 0.0.2 → 0.0.3

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: bf49b619e8d3bcfa0f2e1e456964d19d6a557b66
4
- data.tar.gz: 644a96eb558d5b7abd91bf54711bf75a37f2ad0c
3
+ metadata.gz: e43040b784e1f30ebcf9d3d563ee29b037ee0455
4
+ data.tar.gz: 9d147154a237892102d535fbf251f5220bb3c08f
5
5
  SHA512:
6
- metadata.gz: ed4f648a53075202cabc361d164d6b53091e25acbed2a08b6138d5c102376533fee1225a25700ab3c5534bb64bfd46f22856bc44f5f003404e54c83919927997
7
- data.tar.gz: 9bb6bf01b9fe8b0cd5982890b1b2460e68343841e50abcbb1d7795365a4642a5b5c5f42b1e115d366f867f89edd44793a6bd59a2b04902cebbb0ecaf4f0f2c60
6
+ metadata.gz: 7faea03b7cbb919c5311d9bb6e70f06435d1e6ce9e2ea502c0fa5728950a37223108b0028102e0fb1415cbf0a43ef1d596fa4659dd6abd4904926d5a2468007e
7
+ data.tar.gz: d94f298c331c50958ec855b1a2f6af11ae61a515d4cba78880d78a55ee1eaae14b06b71bd91e1d2889ab8b1aee49fcf28dff3cc159aea0ce6330981451a1757e
data/.travis.yml ADDED
@@ -0,0 +1,8 @@
1
+ language: ruby
2
+ rvm:
3
+ - 1.9.3
4
+ - 2.0.0
5
+ - 2.1.1
6
+ gemfile:
7
+ - Gemfile
8
+ - Gemfile.fluentd.lt.0.10.43
@@ -0,0 +1,5 @@
1
+ source 'https://rubygems.org'
2
+
3
+ # Specify your gem's dependencies in fluent-plugin-zabbix.gemspec
4
+ gem 'fluentd', '= 0.10.42'
5
+ gemspec
@@ -13,8 +13,9 @@ Gem::Specification.new do |gem|
13
13
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
14
14
  gem.name = "fluent-plugin-zabbix"
15
15
  gem.require_paths = ["lib"]
16
- gem.version = "0.0.2"
16
+ gem.version = "0.0.3"
17
17
 
18
18
  gem.add_runtime_dependency "fluentd", "~> 0.10"
19
19
  gem.add_runtime_dependency "zabbix", ">= 0.4"
20
+ gem.add_development_dependency "rake", ">= 0.9.2"
20
21
  end
@@ -15,6 +15,11 @@ class Fluent::ZabbixOutput < Fluent::Output
15
15
  config_param :name_key_pattern, :string, :default => nil
16
16
  config_param :add_key_prefix, :string, :default => nil
17
17
 
18
+ # Define `log` method for v0.10.42 or earlier
19
+ unless method_defined?(:log)
20
+ define_method("log") { $log }
21
+ end
22
+
18
23
  def configure(conf)
19
24
  super
20
25
 
@@ -50,17 +55,17 @@ class Fluent::ZabbixOutput < Fluent::Output
50
55
  end
51
56
  begin
52
57
  zbx = Zabbix::Sender.new(:host => @zabbix_server, :port => @port)
53
- $log.debug("zabbix: #{zbx}, #{name}: #{value}, host: #{host}, ts: #{time}")
58
+ log.debug("zabbix: #{zbx}, #{name}: #{value}, host: #{host}, ts: #{time}")
54
59
  opts = { :host => host, :ts => time }
55
60
  status = zbx.send_data(name, value.to_s, opts)
56
61
 
57
62
  rescue IOError, EOFError, SystemCallError
58
63
  # server didn't respond
59
- $log.warn "plugin-zabbix: Zabbix::Sender.send_data raises exception: #{$!.class}, '#{$!.message}'"
64
+ log.warn "plugin-zabbix: Zabbix::Sender.send_data raises exception: #{$!.class}, '#{$!.message}'"
60
65
  status = false
61
66
  end
62
67
  unless status
63
- $log.warn "plugin-zabbix: failed to send to zabbix_server: #{@zabbix_server}:#{@port}, host:#{host} '#{name}': #{value}"
68
+ log.warn "plugin-zabbix: failed to send to zabbix_server: #{@zabbix_server}:#{@port}, host:#{host} '#{name}': #{value}"
64
69
  end
65
70
  end
66
71
 
@@ -92,7 +97,7 @@ class Fluent::ZabbixOutput < Fluent::Output
92
97
  if record[@host_key]
93
98
  host = record[@host_key]
94
99
  else
95
- $log.warn "plugin-zabbix: host_key is configured '#{@host_key}', but this record has no such key. use host '#{@host}'"
100
+ log.warn "plugin-zabbix: host_key is configured '#{@host_key}', but this record has no such key. use host '#{@host}'"
96
101
  host = @host
97
102
  end
98
103
  else
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-zabbix
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - FUJIWARA Shunichiro
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-21 00:00:00.000000000 Z
11
+ date: 2014-09-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -38,6 +38,20 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0.4'
41
+ - !ruby/object:Gem::Dependency
42
+ name: rake
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: 0.9.2
48
+ type: :development
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: 0.9.2
41
55
  description: Output data plugin to Zabbix
42
56
  email:
43
57
  - fujiwara.shunichiro@gmail.com
@@ -46,7 +60,9 @@ extensions: []
46
60
  extra_rdoc_files: []
47
61
  files:
48
62
  - ".gitignore"
63
+ - ".travis.yml"
49
64
  - Gemfile
65
+ - Gemfile.fluentd.lt.0.10.43
50
66
  - LICENSE
51
67
  - README.rdoc
52
68
  - Rakefile
@@ -73,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
73
89
  version: '0'
74
90
  requirements: []
75
91
  rubyforge_project:
76
- rubygems_version: 2.2.0
92
+ rubygems_version: 2.2.2
77
93
  signing_key:
78
94
  specification_version: 4
79
95
  summary: Output data plugin to Zabbix (like zabbix_sender)