prometheus-splash 0.9.0 → 0.9.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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/lib/splash/commands.rb +1 -1
  4. data/lib/splash/constants.rb +1 -1
  5. data/lib/splash/daemon/metrics.rb +1 -1
  6. data/lib/splash/logs.rb +1 -1
  7. data/lib/splash/processes.rb +1 -1
  8. data/lib/splash/transfers.rb +1 -1
  9. data/prometheus-splash.gemspec +20 -18
  10. metadata +53 -39
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 13eaca07cd4d8de11c4eb5b54798a59d2a16d2b258eab9e800405b9333b7caba
4
- data.tar.gz: 00170e2f5a7e8b51ec9b4b638e75ed8a5dd53ba6f5a644a752f83f0c0eb77179
3
+ metadata.gz: 7edcf33eead96abe4e4b35371b2df5b0dfc7ffbb59c4f10b31caee5d6196298e
4
+ data.tar.gz: 2e8262ced56fd85c88b36c90eb4aa5060e2b1c8226272132b3b86f1fbccb3886
5
5
  SHA512:
6
- metadata.gz: 848fcec8f9d390cbd59fdd5104d32667fe03a581ee6597de6bcdd64dc923863d1a821ec417285816bcf093a955b668fa563934b599691292eceee9bfa8e3affa
7
- data.tar.gz: 5541a02ed39ae1a86e1602886a9a0eb1590d6bae431517fd8d0a2b91ce1a62092dd641f0dac8a6d496b5b46490cf176cb2cb7707c997b1e671ca40ae55984109
6
+ metadata.gz: da51839f5426b4cc83b10def4f16d985766b9c362b28acdd6f9ca9f333d93996f976a6989eed55f1cc2fd2ab60e741a56986ae34986dca0b952cf4beab296ce2
7
+ data.tar.gz: 0fc4a5f61bf769fa50b3384e44dbb136f065dcbc2b6baf05e478e2ac8786698f5071b9347f863f8a4475f4d74d549ebd4df3dce7b45d85f080cbc4e7ce277df3
data/README.md CHANGED
@@ -9,7 +9,7 @@ SPLASH is **Supervision with Prometheus of Logs and Asynchronous tasks orchestra
9
9
  * Web : http://www.ultragreen.net
10
10
  * Github : https://github.com/Ultragreen/prometheus-splash
11
11
  * Rubygems : https://rubygems.org/gems/prometheus-splash
12
- * DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.8.5
12
+ * DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.9.1
13
13
 
14
14
  Prometheus Logs and Batchs supervision over PushGateway
15
15
 
data/lib/splash/commands.rb CHANGED
@@ -34,7 +34,7 @@ module Splash
34
34
  @@metric_exitcode.set(@exitcode)
35
35
  @@metric_time.set(@time)
36
36
  hostname = Socket.gethostname
37
- return Prometheus::Client::Push.new(@name, hostname, @url).add(@@registry)
37
+ return Prometheus::Client::Push.new(job: @name, grouping_key: { instance: hostname}, gateway: @url).add(@@registry)
38
38
  end
39
39
 
40
40
  end
data/lib/splash/constants.rb CHANGED
@@ -7,7 +7,7 @@ module Splash
7
7
  module Constants
8
8
 
9
9
  # Current splash version
10
- VERSION = "0.9.0"
10
+ VERSION = "0.9.1"
11
11
  # the path to th config file, not overridable by config
12
12
  CONFIG_FILE = "/etc/splash.yml"
13
13
  # the default execution trace_path if backend file
data/lib/splash/daemon/metrics.rb CHANGED
@@ -88,7 +88,7 @@ module Splash
88
88
 
89
89
  hostname = Socket.gethostname
90
90
  url = @config.prometheus_pushgateway_url
91
- Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
91
+ Prometheus::Client::Push.new(job: "Splash", grouping_key: { instance: hostname}, gateway: url).add(@registry)
92
92
  log.debug "Sending to Prometheus PushGateway done.", @session
93
93
  return {:case => :quiet_exit }
94
94
  end
data/lib/splash/logs.rb CHANGED
@@ -35,7 +35,7 @@ module Splash
35
35
  @@metric_count.set(@errors, labels: { log: @name })
36
36
  @@metric_lines.set(@lines, labels: { log: @name })
37
37
  hostname = Socket.gethostname
38
- return Prometheus::Client::Push.new("Splash", hostname, @url).add(@@registry)
38
+ return Prometheus::Client::Push.new(job: "Splash", grouping_key: { instance: hostname}, gateway: @url).add(@@registry)
39
39
  end
40
40
 
41
41
  end
data/lib/splash/processes.rb CHANGED
@@ -37,7 +37,7 @@ module Splash
37
37
  @@metric_cpu_percent.set(@cpu_percent, labels: { process: @name })
38
38
  @@metric_status.set(@status, labels: { process: @name })
39
39
  hostname = Socket.gethostname
40
- return Prometheus::Client::Push.new("Splash", hostname, @url).add(@@registry)
40
+ return Prometheus::Client::Push.new(job: "Splash", grouping_key: { instance: hostname}, gateway: @url).add(@@registry)
41
41
  end
42
42
 
43
43
  end
data/lib/splash/transfers.rb CHANGED
@@ -40,7 +40,7 @@ module Splash
40
40
  @@metric_nbfiles_failed.set(@nbfiles_failed)
41
41
  @@metric_time.set(@time)
42
42
  hostname = Socket.gethostname
43
- return Prometheus::Client::Push.new(@name, hostname, @url).add(@@registry)
43
+ return Prometheus::Client::Push.new(job: @name, grouping_key: { instance: hostname}, gateway: @url).add(@@registry)
44
44
  end
45
45
 
46
46
  end
data/prometheus-splash.gemspec CHANGED
@@ -19,31 +19,33 @@ Gem::Specification.new do |spec|
19
19
  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
20
20
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
21
21
  spec.require_paths = ["lib"]
22
- spec.add_runtime_dependency 'thor','~> 1.0.1'
23
- spec.add_runtime_dependency 'prometheus-client','~> 2.0.0'
24
- spec.add_runtime_dependency 'rufus-scheduler','~> 3.6.0'
25
- spec.add_runtime_dependency 'redis','~> 4.1.3'
26
- spec.add_runtime_dependency 'bunny','~> 2.15.0'
22
+ spec.add_runtime_dependency 'thor','~> 1.3.1'
23
+ spec.add_runtime_dependency 'prometheus-client','~> 4.2.2'
24
+ spec.add_runtime_dependency 'rufus-scheduler','~> 3.9.1'
25
+ spec.add_runtime_dependency 'redis','~> 5.1.0'
26
+ spec.add_runtime_dependency 'bunny','~> 2.22.0'
27
27
  spec.add_runtime_dependency 'ps-ruby','~> 0.0.4'
28
- spec.add_runtime_dependency 'tty-markdown','~> 0.7.0'
28
+ spec.add_runtime_dependency 'tty-markdown','~> 0.7.2'
29
29
  spec.add_runtime_dependency 'tty-pager','~> 0.14.0'
30
30
  spec.add_runtime_dependency 'tty-table','~> 0.12.0'
31
- spec.add_runtime_dependency 'net-ssh','~> 6.1.0'
32
- spec.add_runtime_dependency 'net-scp','~> 3.0.0'
33
- spec.add_runtime_dependency 'colorize','~> 0.8.1'
34
- spec.add_runtime_dependency 'sinatra','~> 2.1.0'
35
- spec.add_runtime_dependency 'thin','~> 1.7.2'
31
+ spec.add_runtime_dependency 'net-ssh','~> 7.2.1'
32
+ spec.add_runtime_dependency 'net-scp','~> 4.0.0'
33
+ spec.add_runtime_dependency 'colorize','~> 1.1.0'
34
+ spec.add_runtime_dependency 'sinatra','~> 4.0.0'
35
+ spec.add_runtime_dependency 'thin'
36
+ spec.add_runtime_dependency 'rack', '~> 3.0.10'
36
37
  spec.add_runtime_dependency 'rest-client','~> 2.1.0'
37
- spec.add_runtime_dependency 'slim','~> 4.1.0'
38
- spec.add_runtime_dependency 'kramdown','~> 2.3.0'
38
+ spec.add_runtime_dependency 'slim','~> 5.2.1'
39
+ spec.add_runtime_dependency 'kramdown','~> 2.4.0'
39
40
  spec.add_runtime_dependency 'rack-reverse-proxy','~> 0.12.0'
40
- spec.add_development_dependency 'rake', '~> 13.0.1'
41
- spec.add_development_dependency 'rspec', '~> 3.9.0'
42
- spec.add_development_dependency 'yard', '~> 0.9.24'
43
- spec.add_development_dependency 'rdoc', '~> 6.2.1'
41
+
42
+ spec.add_development_dependency 'rake', '~> 13.1.0'
43
+ spec.add_development_dependency 'rspec', '~> 3.13.0'
44
+ spec.add_development_dependency 'yard', '~> 0.9.36'
45
+ spec.add_development_dependency 'rdoc', '~> 6.6.3.1'
44
46
  spec.add_development_dependency 'roodi', '~> 5.0.0'
45
47
  spec.add_development_dependency 'code_statistics', '~> 0.2.13'
46
48
  spec.add_development_dependency 'yard-rspec', '~> 0.1'
47
- spec.add_development_dependency 'bundler', '~> 2.1.4'
49
+ spec.add_development_dependency 'bundler', '~> 2.5.7'
48
50
 
49
51
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: prometheus-splash
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Romain GEORGES
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-05-04 00:00:00.000000000 Z
11
+ date: 2024-03-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -16,70 +16,70 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.1
19
+ version: 1.3.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: 1.0.1
26
+ version: 1.3.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: prometheus-client
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.0.0
33
+ version: 4.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: 2.0.0
40
+ version: 4.2.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rufus-scheduler
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 3.6.0
47
+ version: 3.9.1
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: 3.6.0
54
+ version: 3.9.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: redis
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 4.1.3
61
+ version: 5.1.0
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: 4.1.3
68
+ version: 5.1.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bunny
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 2.15.0
75
+ version: 2.22.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: 2.15.0
82
+ version: 2.22.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: ps-ruby
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 0.7.0
103
+ version: 0.7.2
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 0.7.0
110
+ version: 0.7.2
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: tty-pager
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -142,70 +142,84 @@ dependencies:
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 6.1.0
145
+ version: 7.2.1
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 6.1.0
152
+ version: 7.2.1
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: net-scp
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 3.0.0
159
+ version: 4.0.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 3.0.0
166
+ version: 4.0.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: colorize
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
171
  - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: 0.8.1
173
+ version: 1.1.0
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: 0.8.1
180
+ version: 1.1.0
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: sinatra
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
185
  - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: 2.1.0
187
+ version: 4.0.0
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - "~>"
193
193
  - !ruby/object:Gem::Version
194
- version: 2.1.0
194
+ version: 4.0.0
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: thin
197
+ requirement: !ruby/object:Gem::Requirement
198
+ requirements:
199
+ - - ">="
200
+ - !ruby/object:Gem::Version
201
+ version: '0'
202
+ type: :runtime
203
+ prerelease: false
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - ">="
207
+ - !ruby/object:Gem::Version
208
+ version: '0'
209
+ - !ruby/object:Gem::Dependency
210
+ name: rack
197
211
  requirement: !ruby/object:Gem::Requirement
198
212
  requirements:
199
213
  - - "~>"
200
214
  - !ruby/object:Gem::Version
201
- version: 1.7.2
215
+ version: 3.0.10
202
216
  type: :runtime
203
217
  prerelease: false
204
218
  version_requirements: !ruby/object:Gem::Requirement
205
219
  requirements:
206
220
  - - "~>"
207
221
  - !ruby/object:Gem::Version
208
- version: 1.7.2
222
+ version: 3.0.10
209
223
  - !ruby/object:Gem::Dependency
210
224
  name: rest-client
211
225
  requirement: !ruby/object:Gem::Requirement
@@ -226,28 +240,28 @@ dependencies:
226
240
  requirements:
227
241
  - - "~>"
228
242
  - !ruby/object:Gem::Version
229
- version: 4.1.0
243
+ version: 5.2.1
230
244
  type: :runtime
231
245
  prerelease: false
232
246
  version_requirements: !ruby/object:Gem::Requirement
233
247
  requirements:
234
248
  - - "~>"
235
249
  - !ruby/object:Gem::Version
236
- version: 4.1.0
250
+ version: 5.2.1
237
251
  - !ruby/object:Gem::Dependency
238
252
  name: kramdown
239
253
  requirement: !ruby/object:Gem::Requirement
240
254
  requirements:
241
255
  - - "~>"
242
256
  - !ruby/object:Gem::Version
243
- version: 2.3.0
257
+ version: 2.4.0
244
258
  type: :runtime
245
259
  prerelease: false
246
260
  version_requirements: !ruby/object:Gem::Requirement
247
261
  requirements:
248
262
  - - "~>"
249
263
  - !ruby/object:Gem::Version
250
- version: 2.3.0
264
+ version: 2.4.0
251
265
  - !ruby/object:Gem::Dependency
252
266
  name: rack-reverse-proxy
253
267
  requirement: !ruby/object:Gem::Requirement
@@ -268,56 +282,56 @@ dependencies:
268
282
  requirements:
269
283
  - - "~>"
270
284
  - !ruby/object:Gem::Version
271
- version: 13.0.1
285
+ version: 13.1.0
272
286
  type: :development
273
287
  prerelease: false
274
288
  version_requirements: !ruby/object:Gem::Requirement
275
289
  requirements:
276
290
  - - "~>"
277
291
  - !ruby/object:Gem::Version
278
- version: 13.0.1
292
+ version: 13.1.0
279
293
  - !ruby/object:Gem::Dependency
280
294
  name: rspec
281
295
  requirement: !ruby/object:Gem::Requirement
282
296
  requirements:
283
297
  - - "~>"
284
298
  - !ruby/object:Gem::Version
285
- version: 3.9.0
299
+ version: 3.13.0
286
300
  type: :development
287
301
  prerelease: false
288
302
  version_requirements: !ruby/object:Gem::Requirement
289
303
  requirements:
290
304
  - - "~>"
291
305
  - !ruby/object:Gem::Version
292
- version: 3.9.0
306
+ version: 3.13.0
293
307
  - !ruby/object:Gem::Dependency
294
308
  name: yard
295
309
  requirement: !ruby/object:Gem::Requirement
296
310
  requirements:
297
311
  - - "~>"
298
312
  - !ruby/object:Gem::Version
299
- version: 0.9.24
313
+ version: 0.9.36
300
314
  type: :development
301
315
  prerelease: false
302
316
  version_requirements: !ruby/object:Gem::Requirement
303
317
  requirements:
304
318
  - - "~>"
305
319
  - !ruby/object:Gem::Version
306
- version: 0.9.24
320
+ version: 0.9.36
307
321
  - !ruby/object:Gem::Dependency
308
322
  name: rdoc
309
323
  requirement: !ruby/object:Gem::Requirement
310
324
  requirements:
311
325
  - - "~>"
312
326
  - !ruby/object:Gem::Version
313
- version: 6.2.1
327
+ version: 6.6.3.1
314
328
  type: :development
315
329
  prerelease: false
316
330
  version_requirements: !ruby/object:Gem::Requirement
317
331
  requirements:
318
332
  - - "~>"
319
333
  - !ruby/object:Gem::Version
320
- version: 6.2.1
334
+ version: 6.6.3.1
321
335
  - !ruby/object:Gem::Dependency
322
336
  name: roodi
323
337
  requirement: !ruby/object:Gem::Requirement
@@ -366,14 +380,14 @@ dependencies:
366
380
  requirements:
367
381
  - - "~>"
368
382
  - !ruby/object:Gem::Version
369
- version: 2.1.4
383
+ version: 2.5.7
370
384
  type: :development
371
385
  prerelease: false
372
386
  version_requirements: !ruby/object:Gem::Requirement
373
387
  requirements:
374
388
  - - "~>"
375
389
  - !ruby/object:Gem::Version
376
- version: 2.1.4
390
+ version: 2.5.7
377
391
  description: Prometheus Logs and Batchs supervision over PushGateway and commands
378
392
  orchestration
379
393
  email:
@@ -534,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
534
548
  - !ruby/object:Gem::Version
535
549
  version: '0'
536
550
  requirements: []
537
- rubygems_version: 3.1.2
551
+ rubygems_version: 3.4.19
538
552
  signing_key:
539
553
  specification_version: 4
540
554
  summary: Supervision with Prometheus of Logs and Asynchronous tasks orchestration