sensu-plugins-php-fpm 0.1.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -13
  2. data/CHANGELOG.md +18 -1
  3. data/bin/metrics-php-fpm.rb +13 -11
  4. data/lib/sensu-plugins-php-fpm/version.rb +3 -3
  5. metadata +27 -41
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NzYxZDVjZTQwYjJjMWIzOTgzOTE1Y2RlMGQ1Zjk0ZGFkMjIzYzcwNA==
5
- data.tar.gz: !binary |-
6
- Yzc0ZTFhOGNlNzFhMDFhNTVlMWQ4YTc4M2Q1NGIwMWJhNjA4NzNkYw==
2
+ SHA1:
3
+ metadata.gz: 12d7a1692f062bf6908517130270e370080c9c3a
4
+ data.tar.gz: 20f34acda678989961e33e94d5e74ffc9b550e01
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ZmY0NjIzMzE5MDJiMGU3OTg0MDVlYjU2ZGZlM2RjOWVlNTBjMzMwMWRlYTQx
10
- OGZiNjJjOTg2MTViYjRkZDEyYmUwZDA5YzZmMjI2NWUzYjVjNTUzNGQwOTUz
11
- M2UzODkzZjU3MTQ3NmYwNjNmNmVmYTY1OTk2M2ZhOGU2M2QyNTI=
12
- data.tar.gz: !binary |-
13
- OTFiODFmZGZlMTY3OTc3MjQ3OGZkMmNlOWExNGUyOTk2NTZmMzhjYzk3MDE5
14
- Zjc1NDc3ZGZjMTBlMjBhYmUyZTZmMTQ0MjQzYTg3NTQzZTU0YzAzYWI4Y2Jk
15
- MzQ1ZDE5NTZhYTgzYzljMmM3NzAzYjE3ZDRjYTQyOTdkNDFjMGQ=
6
+ metadata.gz: 44efc19b2c20936023cb51d7175a7f593126920a371c30485096b832276ccc1ffd18e9df25c16454121814c6edc0ed36ed919d8262c9f798f6a368c8871b2f60
7
+ data.tar.gz: edac9945dc598bf311aca1428e1d36dc02b0d4b8e75eec37361640068232159399822c1f7d2c40710671e269d5519285d363a6a7d4378d3f1b04d78b67690986
data/CHANGELOG.md CHANGED
@@ -5,6 +5,21 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
5
5
 
6
6
  ## [Unreleased]
7
7
 
8
+ ## [1.0.1] 2017-07-14
9
+ ### No-op
10
+ - no real change (deployment issues)
11
+
12
+ ## [1.0.0] 2017-07-14
13
+ ### Added
14
+ - ruby 2.3, 2.4 testing
15
+
16
+ ### Breaking Changes
17
+ - removed < 2.0 ruby support
18
+
19
+ ### Changed
20
+ - Removed Crack as a dependency of the metric script
21
+ - Better feedback for missing/invalid URL in the metric script
22
+
8
23
  ## [0.1.0] - 2016-09-25
9
24
  ### Added
10
25
  - check-php-fpm.rb: added --pool option for mapping pools based on args in Nginx
@@ -36,7 +51,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
36
51
  ### Added
37
52
  - initial release
38
53
 
39
- [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.1.0...HEAD
54
+ [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/1.0.1...HEAD
55
+ [1.0.1]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/1.0.0...1.0.1
56
+ [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.1.0...1.0.0
40
57
  [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.5...0.1.0
41
58
  [0.0.5]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.4...0.0.5
42
59
  [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.3...0.0.4
data/bin/metrics-php-fpm.rb CHANGED
@@ -3,8 +3,6 @@
3
3
  # Pull php-fpm metrics from php-fpm status page
4
4
  # ===
5
5
  #
6
- # Requires `crack` gem to parse xml.
7
- #
8
6
  # Copyright 2014 Ilari Makela ilari at i28.fi
9
7
  #
10
8
  # Released under the same terms as Sensu (the MIT license); see LICENSE
@@ -13,13 +11,13 @@
13
11
  require 'sensu-plugin/metric/cli'
14
12
  require 'net/https'
15
13
  require 'uri'
16
- require 'crack'
17
14
 
18
15
  class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
19
16
  option :url,
20
17
  short: '-u URL',
21
18
  long: '--url URL',
22
- description: 'Full URL to php-fpm status page, example: http://yoursite.com/php-fpm-status'
19
+ description: 'Full URL to php-fpm status page, example: http://yoursite.com/php-fpm-status',
20
+ required: true
23
21
 
24
22
  option :scheme,
25
23
  description: 'Metric naming scheme, text to prepend to metric',
@@ -39,24 +37,26 @@ class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
39
37
  # #YELLOW
40
38
  until found || attempts >= 10
41
39
  attempts += 1
42
- if config[:url]
43
- uri = URI.parse(config[:url])
40
+ url = config[:url]
41
+ if url
42
+ uri = URI.parse(url)
44
43
  http = Net::HTTP.new(uri.host, uri.port)
45
44
  if uri.scheme == 'https'
46
45
  http.use_ssl = true
47
46
  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
48
47
  end
49
- request = Net::HTTP::Get.new(uri.request_uri + '?xml', 'User-Agent' => config[:agent].to_s)
48
+ request = Net::HTTP::Get.new(uri.request_uri, 'User-Agent' => config[:agent].to_s)
50
49
  response = http.request(request)
51
50
  if response.code == '200'
52
51
  found = true
53
52
  elsif !response.header['location'].nil?
54
- config[:url] = response.header['location']
53
+ url = response.header['location']
55
54
  end
56
55
  end
57
56
  end # until
58
57
 
59
- stats = Crack::XML.parse(response.body)
58
+ critical "Unable to load url #{config[:url]}" if response.nil? || response.code != '200'
59
+
60
60
  stat = %w(start_since
61
61
  accepted_conn
62
62
  listen_queue
@@ -68,8 +68,10 @@ class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
68
68
  max_active_processes
69
69
  max_children_reached
70
70
  slow_requests)
71
- stat.each do |name|
72
- output "#{config[:scheme]}.#{name}", stats['status'][name]
71
+ response.body.each_line do |line|
72
+ k, v = line.split(':').map(&:strip)
73
+ k.tr! ' ', '_'
74
+ output "#{config[:scheme]}.#{k}", v if stat.include? k
73
75
  end
74
76
  ok
75
77
  end
data/lib/sensu-plugins-php-fpm/version.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module SensuPluginsPhpFpm
2
2
  module Version
3
- MAJOR = 0
4
- MINOR = 1
5
- PATCH = 0
3
+ MAJOR = 1
4
+ MINOR = 0
5
+ PATCH = 1
6
6
 
7
7
  VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,171 +1,157 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu-plugins-php-fpm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sensu-Plugins and contributors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-26 00:00:00.000000000 Z
11
+ date: 2017-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: crack
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - '='
18
- - !ruby/object:Gem::Version
19
- version: 0.4.2
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - '='
25
- - !ruby/object:Gem::Version
26
- version: 0.4.2
27
13
  - !ruby/object:Gem::Dependency
28
14
  name: sensu-plugin
29
15
  requirement: !ruby/object:Gem::Requirement
30
16
  requirements:
31
- - - ~>
17
+ - - "~>"
32
18
  - !ruby/object:Gem::Version
33
19
  version: '1.2'
34
20
  type: :runtime
35
21
  prerelease: false
36
22
  version_requirements: !ruby/object:Gem::Requirement
37
23
  requirements:
38
- - - ~>
24
+ - - "~>"
39
25
  - !ruby/object:Gem::Version
40
26
  version: '1.2'
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: bundler
43
29
  requirement: !ruby/object:Gem::Requirement
44
30
  requirements:
45
- - - ~>
31
+ - - "~>"
46
32
  - !ruby/object:Gem::Version
47
33
  version: '1.7'
48
34
  type: :development
49
35
  prerelease: false
50
36
  version_requirements: !ruby/object:Gem::Requirement
51
37
  requirements:
52
- - - ~>
38
+ - - "~>"
53
39
  - !ruby/object:Gem::Version
54
40
  version: '1.7'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: codeclimate-test-reporter
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
- - - ~>
45
+ - - "~>"
60
46
  - !ruby/object:Gem::Version
61
47
  version: '0.4'
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - ~>
52
+ - - "~>"
67
53
  - !ruby/object:Gem::Version
68
54
  version: '0.4'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: github-markup
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
- - - ~>
59
+ - - "~>"
74
60
  - !ruby/object:Gem::Version
75
61
  version: '1.3'
76
62
  type: :development
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
- - - ~>
66
+ - - "~>"
81
67
  - !ruby/object:Gem::Version
82
68
  version: '1.3'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: pry
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
- - - ~>
73
+ - - "~>"
88
74
  - !ruby/object:Gem::Version
89
75
  version: '0.10'
90
76
  type: :development
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
- - - ~>
80
+ - - "~>"
95
81
  - !ruby/object:Gem::Version
96
82
  version: '0.10'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: rake
99
85
  requirement: !ruby/object:Gem::Requirement
100
86
  requirements:
101
- - - ~>
87
+ - - "~>"
102
88
  - !ruby/object:Gem::Version
103
89
  version: '10.0'
104
90
  type: :development
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
- - - ~>
94
+ - - "~>"
109
95
  - !ruby/object:Gem::Version
110
96
  version: '10.0'
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: redcarpet
113
99
  requirement: !ruby/object:Gem::Requirement
114
100
  requirements:
115
- - - ~>
101
+ - - "~>"
116
102
  - !ruby/object:Gem::Version
117
103
  version: '3.2'
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
107
  requirements:
122
- - - ~>
108
+ - - "~>"
123
109
  - !ruby/object:Gem::Version
124
110
  version: '3.2'
125
111
  - !ruby/object:Gem::Dependency
126
112
  name: rubocop
127
113
  requirement: !ruby/object:Gem::Requirement
128
114
  requirements:
129
- - - ~>
115
+ - - "~>"
130
116
  - !ruby/object:Gem::Version
131
117
  version: 0.40.0
132
118
  type: :development
133
119
  prerelease: false
134
120
  version_requirements: !ruby/object:Gem::Requirement
135
121
  requirements:
136
- - - ~>
122
+ - - "~>"
137
123
  - !ruby/object:Gem::Version
138
124
  version: 0.40.0
139
125
  - !ruby/object:Gem::Dependency
140
126
  name: rspec
141
127
  requirement: !ruby/object:Gem::Requirement
142
128
  requirements:
143
- - - ~>
129
+ - - "~>"
144
130
  - !ruby/object:Gem::Version
145
131
  version: '3.1'
146
132
  type: :development
147
133
  prerelease: false
148
134
  version_requirements: !ruby/object:Gem::Requirement
149
135
  requirements:
150
- - - ~>
136
+ - - "~>"
151
137
  - !ruby/object:Gem::Version
152
138
  version: '3.1'
153
139
  - !ruby/object:Gem::Dependency
154
140
  name: yard
155
141
  requirement: !ruby/object:Gem::Requirement
156
142
  requirements:
157
- - - ~>
143
+ - - "~>"
158
144
  - !ruby/object:Gem::Version
159
145
  version: '0.8'
160
146
  type: :development
161
147
  prerelease: false
162
148
  version_requirements: !ruby/object:Gem::Requirement
163
149
  requirements:
164
- - - ~>
150
+ - - "~>"
165
151
  - !ruby/object:Gem::Version
166
152
  version: '0.8'
167
153
  description: Sensu plugins for php-fpm
168
- email: <sensu-users@googlegroups.com>
154
+ email: "<sensu-users@googlegroups.com>"
169
155
  executables:
170
156
  - check-php-fpm.rb
171
157
  - metrics-php-fpm.rb
@@ -183,7 +169,7 @@ homepage: https://github.com/sensu-plugins/sensu-plugins-php-fpm
183
169
  licenses:
184
170
  - MIT
185
171
  metadata:
186
- maintainer: ! '@tas50'
172
+ maintainer: "@tas50"
187
173
  development_status: active
188
174
  production_status: unstable - testing recommended
189
175
  release_draft: 'false'
@@ -195,12 +181,12 @@ require_paths:
195
181
  - lib
196
182
  required_ruby_version: !ruby/object:Gem::Requirement
197
183
  requirements:
198
- - - ! '>='
184
+ - - ">="
199
185
  - !ruby/object:Gem::Version
200
- version: 1.9.3
186
+ version: 2.0.0
201
187
  required_rubygems_version: !ruby/object:Gem::Requirement
202
188
  requirements:
203
- - - ! '>='
189
+ - - ">="
204
190
  - !ruby/object:Gem::Version
205
191
  version: '0'
206
192
  requirements: []