sensu-plugins-varnish 0.0.3 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/CHANGELOG.md +8 -3
  5. data/README.md +1 -1
  6. data/bin/metrics-varnish.rb +26 -8
  7. data/lib/sensu-plugins-varnish/version.rb +1 -1
  8. metadata +37 -37
  9. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f50ec609dc210085aadc7b4bc8ddb4fbda864daf
4
- data.tar.gz: eaf482fbad1a2788cfdbe393819eea86e424ab42
3
+ metadata.gz: cd13d49a8f81e49f6693d5caee04a83ef0d03bbf
4
+ data.tar.gz: e67db8b94c93e495939f06c421d20ab2a0ed2876
5
5
  SHA512:
6
- metadata.gz: 6bd97aa5656647c123ce063aafae520767fd02e40205e1399e46b1a11c7c1682f58b7f6cb54c26cf9ffe6f51229d83ab8f0b9baa73918db2bdc933eea9536f36
7
- data.tar.gz: 6612e2a66bbadf3d3d736a1d504555bcae1179f0a6007e79c2618513effefea33204849edbd6549fed513ea4706e97f83b943f57dc5043916a517916f98d24dc
6
+ metadata.gz: aeb03f7854de448186ae2e926b1d1ddb01e908814bbef3cce296847f8eb0843f245f410e136ebc915f96d42c811dfc986186e2edc2d890fe3de41ec128d8e1b0
7
+ data.tar.gz: a4a05d6e5b7720751fc82430f5562745e020031141de1b34bf878649754e06fa40a8e7fb381c2711a2476b2c01abcf64adad39004a5af10bd57c48ee466c2a2d
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -3,14 +3,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
3
3
 
4
4
  This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
5
5
 
6
- ## Unreleased][unreleased]
6
+ ## [0.0.4] - 2015-09-14
7
+ ### Added
8
+ - Add option to select varnishstat fields
7
9
 
8
10
  ## [0.0.3] - 2015-07-14
9
11
  ### Changed
10
12
  - updated sensu-plugin gem to 1.2.0
11
13
 
12
14
  ## [0.0.2] - 2015-06-03
13
-
14
15
  ### Fixed
15
16
  - added binstubs
16
17
 
@@ -18,7 +19,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
18
19
  - removed cruft from /lib
19
20
 
20
21
  ## 0.0.1 - 2015-05-20
21
-
22
22
  ### Added
23
23
  - initial release
24
24
 
25
+ [unreleased]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.4...HEAD
26
+ [0.0.5]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.4...0.0.5
27
+ [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.3...0.0.4
28
+ [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.2...0.0.3
29
+ [0.0.2]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.1...0.0.2
data/README.md CHANGED
@@ -16,6 +16,6 @@
16
16
 
17
17
  ## Installation
18
18
 
19
- [Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
19
+ [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
20
20
 
21
21
  ## Notes
data/bin/metrics-varnish.rb CHANGED
@@ -49,6 +49,11 @@ class VarnishMetrics < Sensu::Plugin::Metric::CLI::Graphite
49
49
  short: '-n VARNISH_NAME',
50
50
  long: '--name VARNISH_NAME'
51
51
 
52
+ option :fields,
53
+ description: 'The stats fields to get from varnish, comma sepparated. See varnishstat -f',
54
+ short: '-f fieldlist',
55
+ long: '--fields fieldlist'
56
+
52
57
  def graphite_path_sanitize(path)
53
58
  # accept only a small set of chars in a graphite path and convert anything else
54
59
  # to underscores
@@ -57,18 +62,31 @@ class VarnishMetrics < Sensu::Plugin::Metric::CLI::Graphite
57
62
 
58
63
  def run
59
64
  begin
65
+ fieldargs = ''
66
+ if config[:fields]
67
+ if config[:fields].include? ','
68
+ config[:fields].split(',').each | field |
69
+ fieldargs << " -f '#{field}'"
70
+ else
71
+ fieldargs << " -f '#{config[:fields]}'"
72
+ end
73
+ end
74
+ puts "fields: #{fieldargs}"
75
+
60
76
  if config[:varnish_name]
61
- varnishstat = `varnishstat -x -n #{config[:varnish_name]}`
77
+ varnishstat = `varnishstat -x -n #{config[:varnish_name]} #{fieldargs}`
62
78
  else
63
- varnishstat = `varnishstat -x`
79
+ varnishstat = `varnishstat -x #{fieldargs}`
64
80
  end
65
81
  stats = Crack::XML.parse(varnishstat)
66
- stats['varnishstat']['stat'].each do |stat|
67
- path = "#{config[:scheme]}"
68
- path += '.' + graphite_path_sanitize(stat['type']) if stat['type']
69
- path += '.' + graphite_path_sanitize(stat['ident']) if stat['ident']
70
- path += '.' + graphite_path_sanitize(stat['name'])
71
- output path, stat['value']
82
+ if stats['varnishstat']['stat']
83
+ stats['varnishstat']['stat'].each do |stat|
84
+ path = "#{config[:scheme]}"
85
+ path += '.' + graphite_path_sanitize(stat['type']) if stat['type']
86
+ path += '.' + graphite_path_sanitize(stat['ident']) if stat['ident']
87
+ path += '.' + graphite_path_sanitize(stat['name'])
88
+ output path, stat['value']
89
+ end
72
90
  end
73
91
  rescue => e
74
92
  puts "Error: exception: #{e}"
data/lib/sensu-plugins-varnish/version.rb CHANGED
@@ -2,7 +2,7 @@ module SensuPluginsVarnish
2
2
  module Version
3
3
  MAJOR = 0
4
4
  MINOR = 0
5
- PATCH = 3
5
+ PATCH = 4
6
6
 
7
7
  VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu-plugins-varnish
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sensu Plugins and contributors
@@ -30,92 +30,92 @@ cert_chain:
30
30
  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
31
31
  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
32
32
  -----END CERTIFICATE-----
33
- date: 2015-07-14 00:00:00.000000000 Z
33
+ date: 2015-09-14 00:00:00.000000000 Z
34
34
  dependencies:
35
35
  - !ruby/object:Gem::Dependency
36
- name: sensu-plugin
36
+ name: crack
37
37
  requirement: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - '='
40
40
  - !ruby/object:Gem::Version
41
- version: 1.2.0
41
+ version: 0.4.2
42
42
  type: :runtime
43
43
  prerelease: false
44
44
  version_requirements: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - '='
47
47
  - !ruby/object:Gem::Version
48
- version: 1.2.0
48
+ version: 0.4.2
49
49
  - !ruby/object:Gem::Dependency
50
- name: crack
50
+ name: sensu-plugin
51
51
  requirement: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - '='
54
54
  - !ruby/object:Gem::Version
55
- version: 0.4.2
55
+ version: 1.2.0
56
56
  type: :runtime
57
57
  prerelease: false
58
58
  version_requirements: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - '='
61
61
  - !ruby/object:Gem::Version
62
- version: 0.4.2
62
+ version: 1.2.0
63
63
  - !ruby/object:Gem::Dependency
64
- name: codeclimate-test-reporter
64
+ name: bundler
65
65
  requirement: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: '0.4'
69
+ version: '1.7'
70
70
  type: :development
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
73
73
  requirements:
74
74
  - - "~>"
75
75
  - !ruby/object:Gem::Version
76
- version: '0.4'
76
+ version: '1.7'
77
77
  - !ruby/object:Gem::Dependency
78
- name: rubocop
78
+ name: codeclimate-test-reporter
79
79
  requirement: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - '='
81
+ - - "~>"
82
82
  - !ruby/object:Gem::Version
83
- version: '0.30'
83
+ version: '0.4'
84
84
  type: :development
85
85
  prerelease: false
86
86
  version_requirements: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - '='
88
+ - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: '0.30'
90
+ version: '0.4'
91
91
  - !ruby/object:Gem::Dependency
92
- name: rspec
92
+ name: github-markup
93
93
  requirement: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: '3.1'
97
+ version: '1.3'
98
98
  type: :development
99
99
  prerelease: false
100
100
  version_requirements: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - "~>"
103
103
  - !ruby/object:Gem::Version
104
- version: '3.1'
104
+ version: '1.3'
105
105
  - !ruby/object:Gem::Dependency
106
- name: bundler
106
+ name: pry
107
107
  requirement: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - "~>"
110
110
  - !ruby/object:Gem::Version
111
- version: '1.7'
111
+ version: '0.10'
112
112
  type: :development
113
113
  prerelease: false
114
114
  version_requirements: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - "~>"
117
117
  - !ruby/object:Gem::Version
118
- version: '1.7'
118
+ version: '0.10'
119
119
  - !ruby/object:Gem::Dependency
120
120
  name: rake
121
121
  requirement: !ruby/object:Gem::Requirement
@@ -131,61 +131,61 @@ dependencies:
131
131
  - !ruby/object:Gem::Version
132
132
  version: '10.0'
133
133
  - !ruby/object:Gem::Dependency
134
- name: github-markup
134
+ name: redcarpet
135
135
  requirement: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - "~>"
138
138
  - !ruby/object:Gem::Version
139
- version: '1.3'
139
+ version: '3.2'
140
140
  type: :development
141
141
  prerelease: false
142
142
  version_requirements: !ruby/object:Gem::Requirement
143
143
  requirements:
144
144
  - - "~>"
145
145
  - !ruby/object:Gem::Version
146
- version: '1.3'
146
+ version: '3.2'
147
147
  - !ruby/object:Gem::Dependency
148
- name: redcarpet
148
+ name: rspec
149
149
  requirement: !ruby/object:Gem::Requirement
150
150
  requirements:
151
151
  - - "~>"
152
152
  - !ruby/object:Gem::Version
153
- version: '3.2'
153
+ version: '3.1'
154
154
  type: :development
155
155
  prerelease: false
156
156
  version_requirements: !ruby/object:Gem::Requirement
157
157
  requirements:
158
158
  - - "~>"
159
159
  - !ruby/object:Gem::Version
160
- version: '3.2'
160
+ version: '3.1'
161
161
  - !ruby/object:Gem::Dependency
162
- name: yard
162
+ name: rubocop
163
163
  requirement: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - "~>"
165
+ - - '='
166
166
  - !ruby/object:Gem::Version
167
- version: '0.8'
167
+ version: 0.32.1
168
168
  type: :development
169
169
  prerelease: false
170
170
  version_requirements: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - "~>"
172
+ - - '='
173
173
  - !ruby/object:Gem::Version
174
- version: '0.8'
174
+ version: 0.32.1
175
175
  - !ruby/object:Gem::Dependency
176
- name: pry
176
+ name: yard
177
177
  requirement: !ruby/object:Gem::Requirement
178
178
  requirements:
179
179
  - - "~>"
180
180
  - !ruby/object:Gem::Version
181
- version: '0.10'
181
+ version: '0.8'
182
182
  type: :development
183
183
  prerelease: false
184
184
  version_requirements: !ruby/object:Gem::Requirement
185
185
  requirements:
186
186
  - - "~>"
187
187
  - !ruby/object:Gem::Version
188
- version: '0.10'
188
+ version: '0.8'
189
189
  description: Sensu plugins for varnish
190
190
  email: "<sensu-users@googlegroups.com>"
191
191
  executables:
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
225
225
  version: '0'
226
226
  requirements: []
227
227
  rubyforge_project:
228
- rubygems_version: 2.4.6
228
+ rubygems_version: 2.4.8
229
229
  signing_key:
230
230
  specification_version: 4
231
231
  summary: Sensu plugins for varnish
metadata.gz.sig CHANGED
Binary file