vmpooler 0.14.7 → 0.16.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/vmpooler.rb +3 -6
  3. data/lib/vmpooler/api.rb +5 -1
  4. data/lib/vmpooler/api/healthcheck.rb +14 -0
  5. data/lib/vmpooler/version.rb +1 -1
  6. metadata +255 -44
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aa377464c0b9bfa6ac09d96064dceb410417ddcfc81e2523e5d32e691f7e8091
4
- data.tar.gz: d61f1c0ea6fe636b593912cbe26954edd253b07952b999205adf6b9271c8ae3b
3
+ metadata.gz: 31bdf8074a90f48a8ad6acc2b72ac11e4633c17414bf9b4c66643f09c6c4943e
4
+ data.tar.gz: ed293229d57664a18c921919efb92c334f35205bbda5fe56f1a2da731f3a6a77
5
5
  SHA512:
6
- metadata.gz: 1f5c68048317e9374725e4c5cf71c53d32c28ad3e287b7f82c54a2bb852e039f21b8326fa62160f77dcf7572ed39b4035a005bf214097634844052bab59c828a
7
- data.tar.gz: 877db96232be8617987096b227f390a643b788d50971ebc629de7f5aca720cd96202d8d0292ecffa8a7fe2e366ee649f9e2eda59202423929abd94f90beae1cd
6
+ metadata.gz: 4f36487542a591f481844fbacd9f619085bbe82f88d6f053236de97b40a92ab66a7ba9c25ea33ed8e4959a24611bd159ee39a6a30724d365f61038012b60d2a9
7
+ data.tar.gz: ab67900cbcc0a709b26546faaf6d252d8d2f025b491ec0519ae41da770c8e72765ff6c81d437f26ff4f1691f19d293f53936f6852e8fd823eb6884d149d88cce
data/lib/vmpooler.rb CHANGED
@@ -257,13 +257,10 @@ module Vmpooler
257
257
 
258
258
  c.add_span_processor(span_processor)
259
259
 
260
+ c.service_name = service_name
261
+ c.service_version = version
262
+
260
263
  c.resource = OpenTelemetry::Resource::Detectors::AutoDetector.detect
261
- c.resource = OpenTelemetry::SDK::Resources::Resource.create(
262
- {
263
- OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:name] => service_name,
264
- OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:version] => version
265
- }
266
- )
267
264
  end
268
265
  end
269
266
  end
data/lib/vmpooler/api.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  module Vmpooler
4
4
  class API < Sinatra::Base
5
5
  # Load API components
6
- %w[helpers dashboard reroute v1 request_logger].each do |lib|
6
+ %w[helpers dashboard reroute v1 request_logger healthcheck].each do |lib|
7
7
  require "vmpooler/api/#{lib}"
8
8
  end
9
9
  # Load dashboard components
@@ -40,6 +40,10 @@ module Vmpooler
40
40
  require 'prometheus/middleware/exporter'
41
41
  use Vmpooler::Metrics::Promstats::CollectorMiddleware, metrics_prefix: "#{metrics.prometheus_prefix}_http"
42
42
  use Prometheus::Middleware::Exporter, path: metrics.prometheus_endpoint
43
+ # Note that a user may want to use this check without prometheus
44
+ # However, prometheus setup includes the web server which is required for this check
45
+ # At this time prometheus is a requirement of using the health check on manager
46
+ use Vmpooler::API::Healthcheck
43
47
  end
44
48
 
45
49
  if torun.include? :api
data/lib/vmpooler/api/healthcheck.rb ADDED
@@ -0,0 +1,14 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Vmpooler
4
+ class API
5
+ class Healthcheck < Sinatra::Base
6
+ get '/healthcheck/?' do
7
+ content_type :json
8
+
9
+ status 200
10
+ JSON.pretty_generate({ 'ok' => true })
11
+ end
12
+ end
13
+ end
14
+ end
data/lib/vmpooler/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Vmpooler
4
- VERSION = '0.14.7'
4
+ VERSION = '0.16.1'
5
5
  end
metadata CHANGED
@@ -1,119 +1,183 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vmpooler
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.14.7
4
+ version: 0.16.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-18 00:00:00.000000000 Z
11
+ date: 2020-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: pickup
14
+ name: concurrent-ruby
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.0.11
19
+ version: '1.1'
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.0.11
26
+ version: '1.1'
27
27
  - !ruby/object:Gem::Dependency
28
- name: puma
28
+ name: connection_pool
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '4.3'
33
+ version: '2.2'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '4.3'
40
+ version: '2.2'
41
41
  - !ruby/object:Gem::Dependency
42
- name: rack
42
+ name: net-ldap
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '2.2'
47
+ version: '0.16'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '2.2'
54
+ version: '0.16'
55
55
  - !ruby/object:Gem::Dependency
56
- name: rake
56
+ name: nokogiri
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '13.0'
61
+ version: '1.10'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '13.0'
68
+ version: '1.10'
69
69
  - !ruby/object:Gem::Dependency
70
- name: redis
70
+ name: opentelemetry-api
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '4.1'
75
+ version: 0.7.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '4.1'
82
+ version: 0.7.0
83
83
  - !ruby/object:Gem::Dependency
84
- name: rbvmomi
84
+ name: opentelemetry-exporter-jaeger
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '2.1'
90
- - - "<"
89
+ version: 0.7.0
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
91
95
  - !ruby/object:Gem::Version
92
- version: '4.0'
96
+ version: 0.7.0
97
+ - !ruby/object:Gem::Dependency
98
+ name: opentelemetry-instrumentation-concurrent_ruby
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - "~>"
102
+ - !ruby/object:Gem::Version
103
+ version: 0.7.0
93
104
  type: :runtime
94
105
  prerelease: false
95
106
  version_requirements: !ruby/object:Gem::Requirement
96
107
  requirements:
97
- - - ">="
108
+ - - "~>"
98
109
  - !ruby/object:Gem::Version
99
- version: '2.1'
100
- - - "<"
110
+ version: 0.7.0
111
+ - !ruby/object:Gem::Dependency
112
+ name: opentelemetry-instrumentation-redis
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - "~>"
101
116
  - !ruby/object:Gem::Version
102
- version: '4.0'
117
+ version: 0.7.0
118
+ type: :runtime
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - "~>"
123
+ - !ruby/object:Gem::Version
124
+ version: 0.7.0
103
125
  - !ruby/object:Gem::Dependency
104
- name: sinatra
126
+ name: opentelemetry-instrumentation-sinatra
105
127
  requirement: !ruby/object:Gem::Requirement
106
128
  requirements:
107
129
  - - "~>"
108
130
  - !ruby/object:Gem::Version
109
- version: '2.0'
131
+ version: 0.7.0
110
132
  type: :runtime
111
133
  prerelease: false
112
134
  version_requirements: !ruby/object:Gem::Requirement
113
135
  requirements:
114
136
  - - "~>"
115
137
  - !ruby/object:Gem::Version
116
- version: '2.0'
138
+ version: 0.7.0
139
+ - !ruby/object:Gem::Dependency
140
+ name: opentelemetry-resource_detectors
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - "~>"
144
+ - !ruby/object:Gem::Version
145
+ version: 0.7.0
146
+ type: :runtime
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - "~>"
151
+ - !ruby/object:Gem::Version
152
+ version: 0.7.0
153
+ - !ruby/object:Gem::Dependency
154
+ name: opentelemetry-sdk
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - "~>"
158
+ - !ruby/object:Gem::Version
159
+ version: 0.7.0
160
+ type: :runtime
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - "~>"
165
+ - !ruby/object:Gem::Version
166
+ version: 0.7.0
167
+ - !ruby/object:Gem::Dependency
168
+ name: pickup
169
+ requirement: !ruby/object:Gem::Requirement
170
+ requirements:
171
+ - - "~>"
172
+ - !ruby/object:Gem::Version
173
+ version: 0.0.11
174
+ type: :runtime
175
+ prerelease: false
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - "~>"
179
+ - !ruby/object:Gem::Version
180
+ version: 0.0.11
117
181
  - !ruby/object:Gem::Dependency
118
182
  name: prometheus-client
119
183
  requirement: !ruby/object:Gem::Requirement
@@ -129,75 +193,95 @@ dependencies:
129
193
  - !ruby/object:Gem::Version
130
194
  version: '2.0'
131
195
  - !ruby/object:Gem::Dependency
132
- name: net-ldap
196
+ name: puma
133
197
  requirement: !ruby/object:Gem::Requirement
134
198
  requirements:
135
199
  - - "~>"
136
200
  - !ruby/object:Gem::Version
137
- version: '0.16'
201
+ version: '4.3'
138
202
  type: :runtime
139
203
  prerelease: false
140
204
  version_requirements: !ruby/object:Gem::Requirement
141
205
  requirements:
142
206
  - - "~>"
143
207
  - !ruby/object:Gem::Version
144
- version: '0.16'
208
+ version: '4.3'
145
209
  - !ruby/object:Gem::Dependency
146
- name: statsd-ruby
210
+ name: rack
147
211
  requirement: !ruby/object:Gem::Requirement
148
212
  requirements:
149
213
  - - "~>"
150
214
  - !ruby/object:Gem::Version
151
- version: '1.4'
215
+ version: '2.2'
152
216
  type: :runtime
153
217
  prerelease: false
154
218
  version_requirements: !ruby/object:Gem::Requirement
155
219
  requirements:
156
220
  - - "~>"
157
221
  - !ruby/object:Gem::Version
158
- version: '1.4'
222
+ version: '2.2'
159
223
  - !ruby/object:Gem::Dependency
160
- name: connection_pool
224
+ name: rake
161
225
  requirement: !ruby/object:Gem::Requirement
162
226
  requirements:
163
227
  - - "~>"
164
228
  - !ruby/object:Gem::Version
165
- version: '2.2'
229
+ version: '13.0'
166
230
  type: :runtime
167
231
  prerelease: false
168
232
  version_requirements: !ruby/object:Gem::Requirement
169
233
  requirements:
170
234
  - - "~>"
171
235
  - !ruby/object:Gem::Version
172
- version: '2.2'
236
+ version: '13.0'
173
237
  - !ruby/object:Gem::Dependency
174
- name: concurrent-ruby
238
+ name: rbvmomi
239
+ requirement: !ruby/object:Gem::Requirement
240
+ requirements:
241
+ - - ">="
242
+ - !ruby/object:Gem::Version
243
+ version: '2.1'
244
+ - - "<"
245
+ - !ruby/object:Gem::Version
246
+ version: '4.0'
247
+ type: :runtime
248
+ prerelease: false
249
+ version_requirements: !ruby/object:Gem::Requirement
250
+ requirements:
251
+ - - ">="
252
+ - !ruby/object:Gem::Version
253
+ version: '2.1'
254
+ - - "<"
255
+ - !ruby/object:Gem::Version
256
+ version: '4.0'
257
+ - !ruby/object:Gem::Dependency
258
+ name: redis
175
259
  requirement: !ruby/object:Gem::Requirement
176
260
  requirements:
177
261
  - - "~>"
178
262
  - !ruby/object:Gem::Version
179
- version: '1.1'
263
+ version: '4.1'
180
264
  type: :runtime
181
265
  prerelease: false
182
266
  version_requirements: !ruby/object:Gem::Requirement
183
267
  requirements:
184
268
  - - "~>"
185
269
  - !ruby/object:Gem::Version
186
- version: '1.1'
270
+ version: '4.1'
187
271
  - !ruby/object:Gem::Dependency
188
- name: nokogiri
272
+ name: sinatra
189
273
  requirement: !ruby/object:Gem::Requirement
190
274
  requirements:
191
275
  - - "~>"
192
276
  - !ruby/object:Gem::Version
193
- version: '1.10'
277
+ version: '2.0'
194
278
  type: :runtime
195
279
  prerelease: false
196
280
  version_requirements: !ruby/object:Gem::Requirement
197
281
  requirements:
198
282
  - - "~>"
199
283
  - !ruby/object:Gem::Version
200
- version: '1.10'
284
+ version: '2.0'
201
285
  - !ruby/object:Gem::Dependency
202
286
  name: spicy-proton
203
287
  requirement: !ruby/object:Gem::Requirement
@@ -212,6 +296,132 @@ dependencies:
212
296
  - - "~>"
213
297
  - !ruby/object:Gem::Version
214
298
  version: '2.1'
299
+ - !ruby/object:Gem::Dependency
300
+ name: statsd-ruby
301
+ requirement: !ruby/object:Gem::Requirement
302
+ requirements:
303
+ - - "~>"
304
+ - !ruby/object:Gem::Version
305
+ version: '1.4'
306
+ type: :runtime
307
+ prerelease: false
308
+ version_requirements: !ruby/object:Gem::Requirement
309
+ requirements:
310
+ - - "~>"
311
+ - !ruby/object:Gem::Version
312
+ version: '1.4'
313
+ - !ruby/object:Gem::Dependency
314
+ name: climate_control
315
+ requirement: !ruby/object:Gem::Requirement
316
+ requirements:
317
+ - - ">="
318
+ - !ruby/object:Gem::Version
319
+ version: 0.2.0
320
+ type: :development
321
+ prerelease: false
322
+ version_requirements: !ruby/object:Gem::Requirement
323
+ requirements:
324
+ - - ">="
325
+ - !ruby/object:Gem::Version
326
+ version: 0.2.0
327
+ - !ruby/object:Gem::Dependency
328
+ name: mock_redis
329
+ requirement: !ruby/object:Gem::Requirement
330
+ requirements:
331
+ - - ">="
332
+ - !ruby/object:Gem::Version
333
+ version: 0.17.0
334
+ type: :development
335
+ prerelease: false
336
+ version_requirements: !ruby/object:Gem::Requirement
337
+ requirements:
338
+ - - ">="
339
+ - !ruby/object:Gem::Version
340
+ version: 0.17.0
341
+ - !ruby/object:Gem::Dependency
342
+ name: pry
343
+ requirement: !ruby/object:Gem::Requirement
344
+ requirements:
345
+ - - ">="
346
+ - !ruby/object:Gem::Version
347
+ version: '0'
348
+ type: :development
349
+ prerelease: false
350
+ version_requirements: !ruby/object:Gem::Requirement
351
+ requirements:
352
+ - - ">="
353
+ - !ruby/object:Gem::Version
354
+ version: '0'
355
+ - !ruby/object:Gem::Dependency
356
+ name: rack-test
357
+ requirement: !ruby/object:Gem::Requirement
358
+ requirements:
359
+ - - ">="
360
+ - !ruby/object:Gem::Version
361
+ version: '0.6'
362
+ type: :development
363
+ prerelease: false
364
+ version_requirements: !ruby/object:Gem::Requirement
365
+ requirements:
366
+ - - ">="
367
+ - !ruby/object:Gem::Version
368
+ version: '0.6'
369
+ - !ruby/object:Gem::Dependency
370
+ name: rspec
371
+ requirement: !ruby/object:Gem::Requirement
372
+ requirements:
373
+ - - ">="
374
+ - !ruby/object:Gem::Version
375
+ version: '3.2'
376
+ type: :development
377
+ prerelease: false
378
+ version_requirements: !ruby/object:Gem::Requirement
379
+ requirements:
380
+ - - ">="
381
+ - !ruby/object:Gem::Version
382
+ version: '3.2'
383
+ - !ruby/object:Gem::Dependency
384
+ name: rubocop
385
+ requirement: !ruby/object:Gem::Requirement
386
+ requirements:
387
+ - - ">="
388
+ - !ruby/object:Gem::Version
389
+ version: '0'
390
+ type: :development
391
+ prerelease: false
392
+ version_requirements: !ruby/object:Gem::Requirement
393
+ requirements:
394
+ - - ">="
395
+ - !ruby/object:Gem::Version
396
+ version: '0'
397
+ - !ruby/object:Gem::Dependency
398
+ name: simplecov
399
+ requirement: !ruby/object:Gem::Requirement
400
+ requirements:
401
+ - - ">="
402
+ - !ruby/object:Gem::Version
403
+ version: 0.11.2
404
+ type: :development
405
+ prerelease: false
406
+ version_requirements: !ruby/object:Gem::Requirement
407
+ requirements:
408
+ - - ">="
409
+ - !ruby/object:Gem::Version
410
+ version: 0.11.2
411
+ - !ruby/object:Gem::Dependency
412
+ name: yarjuf
413
+ requirement: !ruby/object:Gem::Requirement
414
+ requirements:
415
+ - - ">="
416
+ - !ruby/object:Gem::Version
417
+ version: '2.0'
418
+ type: :development
419
+ prerelease: false
420
+ version_requirements: !ruby/object:Gem::Requirement
421
+ requirements:
422
+ - - ">="
423
+ - !ruby/object:Gem::Version
424
+ version: '2.0'
215
425
  description:
216
426
  email:
217
427
  - support@puppet.com
@@ -224,6 +434,7 @@ files:
224
434
  - lib/vmpooler.rb
225
435
  - lib/vmpooler/api.rb
226
436
  - lib/vmpooler/api/dashboard.rb
437
+ - lib/vmpooler/api/healthcheck.rb
227
438
  - lib/vmpooler/api/helpers.rb
228
439
  - lib/vmpooler/api/request_logger.rb
229
440
  - lib/vmpooler/api/reroute.rb