flapjack 0.7.29 → 0.7.30

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. data/CHANGELOG.md +8 -0
  2. data/bin/flapjack-nagios-receiver +20 -15
  3. data/bin/flapjack-populator +30 -13
  4. data/bin/flapper +1 -1
  5. data/bin/receive-events +13 -10
  6. data/bin/simulate-failed-check +13 -3
  7. data/dist/etc/init.d/flapjack +5 -42
  8. data/dist/etc/init.d/flapjack-nagios-receiver +3 -17
  9. data/dist/etc/init.d/flapper +3 -12
  10. data/etc/flapjack_config.yaml.example +81 -52
  11. data/features/cli.feature +30 -13
  12. data/features/cli_flapjack-nagios-receiver.feature +66 -0
  13. data/features/cli_flapjack-populator.feature +80 -0
  14. data/features/cli_flapper.feature +45 -0
  15. data/features/cli_receive-events.feature +27 -0
  16. data/features/cli_simulate-failed-check.feature +31 -0
  17. data/features/events.feature +3 -6
  18. data/features/packaging-lintian.feature +2 -2
  19. data/features/rollup.feature +2 -4
  20. data/features/steps/cli_steps.rb +25 -7
  21. data/features/steps/packaging-lintian_steps.rb +12 -6
  22. data/features/support/daemons.rb +11 -1
  23. data/features/support/env.rb +16 -4
  24. data/lib/flapjack/coordinator.rb +1 -1
  25. data/lib/flapjack/filters/delays.rb +1 -1
  26. data/lib/flapjack/gateways/email/alert.html.erb +1 -1
  27. data/lib/flapjack/gateways/email/alert.text.erb +1 -1
  28. data/lib/flapjack/gateways/email/rollup.html.erb +1 -1
  29. data/lib/flapjack/gateways/email/rollup.text.erb +1 -1
  30. data/lib/flapjack/gateways/web/views/check.html.erb +1 -1
  31. data/lib/flapjack/gateways/web/views/contact.html.erb +37 -32
  32. data/lib/flapjack/gateways/web.rb +7 -7
  33. data/lib/flapjack/logger.rb +25 -45
  34. data/lib/flapjack/version.rb +1 -1
  35. data/spec/lib/flapjack/coordinator_spec.rb +9 -7
  36. data/spec/lib/flapjack/logger_spec.rb +19 -13
  37. data/tasks/benchmarks.rake +1 -1
  38. data/tasks/support/flapjack_config_benchmark.yaml +1 -29
  39. metadata +97 -47
  40. checksums.yaml +0 -7
  41. data/bin/flapjack-netsaint-parser +0 -432
  42. data/dist/puppet/flapjack/files/.stub +0 -0
  43. data/dist/puppet/flapjack/manifests/common.pp +0 -61
  44. data/dist/puppet/flapjack/manifests/notifier.pp +0 -13
  45. data/dist/puppet/flapjack/manifests/worker.pp +0 -13
  46. data/dist/puppet/flapjack/templates/.stub +0 -0
  47. data/dist/puppet/ruby/manifests/dev.pp +0 -5
  48. data/dist/puppet/ruby/manifests/rubygems.pp +0 -14
  49. data/dist/puppet/sqlite3/manifests/dev.pp +0 -5
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flapjack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.29
4
+ version: 0.7.30
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Lindsay Holmwood
@@ -10,39 +11,44 @@ authors:
10
11
  autorequire:
11
12
  bindir: bin
12
13
  cert_chain: []
13
- date: 2013-11-01 00:00:00.000000000 Z
14
+ date: 2013-11-06 00:00:00.000000000 Z
14
15
  dependencies:
15
16
  - !ruby/object:Gem::Dependency
16
17
  name: dante
17
18
  requirement: !ruby/object:Gem::Requirement
19
+ none: false
18
20
  requirements:
19
- - - '>='
21
+ - - ! '>='
20
22
  - !ruby/object:Gem::Version
21
23
  version: '0'
22
24
  type: :runtime
23
25
  prerelease: false
24
26
  version_requirements: !ruby/object:Gem::Requirement
27
+ none: false
25
28
  requirements:
26
- - - '>='
29
+ - - ! '>='
27
30
  - !ruby/object:Gem::Version
28
31
  version: '0'
29
32
  - !ruby/object:Gem::Dependency
30
33
  name: oj
31
34
  requirement: !ruby/object:Gem::Requirement
35
+ none: false
32
36
  requirements:
33
- - - '>='
37
+ - - ! '>='
34
38
  - !ruby/object:Gem::Version
35
39
  version: '0'
36
40
  type: :runtime
37
41
  prerelease: false
38
42
  version_requirements: !ruby/object:Gem::Requirement
43
+ none: false
39
44
  requirements:
40
- - - '>='
45
+ - - ! '>='
41
46
  - !ruby/object:Gem::Version
42
47
  version: '0'
43
48
  - !ruby/object:Gem::Dependency
44
49
  name: eventmachine
45
50
  requirement: !ruby/object:Gem::Requirement
51
+ none: false
46
52
  requirements:
47
53
  - - ~>
48
54
  - !ruby/object:Gem::Version
@@ -50,6 +56,7 @@ dependencies:
50
56
  type: :runtime
51
57
  prerelease: false
52
58
  version_requirements: !ruby/object:Gem::Requirement
59
+ none: false
53
60
  requirements:
54
61
  - - ~>
55
62
  - !ruby/object:Gem::Version
@@ -57,20 +64,23 @@ dependencies:
57
64
  - !ruby/object:Gem::Dependency
58
65
  name: hiredis
59
66
  requirement: !ruby/object:Gem::Requirement
67
+ none: false
60
68
  requirements:
61
- - - '>='
69
+ - - ! '>='
62
70
  - !ruby/object:Gem::Version
63
71
  version: '0'
64
72
  type: :runtime
65
73
  prerelease: false
66
74
  version_requirements: !ruby/object:Gem::Requirement
75
+ none: false
67
76
  requirements:
68
- - - '>='
77
+ - - ! '>='
69
78
  - !ruby/object:Gem::Version
70
79
  version: '0'
71
80
  - !ruby/object:Gem::Dependency
72
81
  name: em-synchrony
73
82
  requirement: !ruby/object:Gem::Requirement
83
+ none: false
74
84
  requirements:
75
85
  - - ~>
76
86
  - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
78
88
  type: :runtime
79
89
  prerelease: false
80
90
  version_requirements: !ruby/object:Gem::Requirement
91
+ none: false
81
92
  requirements:
82
93
  - - ~>
83
94
  - !ruby/object:Gem::Version
@@ -85,48 +96,55 @@ dependencies:
85
96
  - !ruby/object:Gem::Dependency
86
97
  name: em-http-request
87
98
  requirement: !ruby/object:Gem::Requirement
99
+ none: false
88
100
  requirements:
89
- - - '>='
101
+ - - ! '>='
90
102
  - !ruby/object:Gem::Version
91
103
  version: '0'
92
104
  type: :runtime
93
105
  prerelease: false
94
106
  version_requirements: !ruby/object:Gem::Requirement
107
+ none: false
95
108
  requirements:
96
- - - '>='
109
+ - - ! '>='
97
110
  - !ruby/object:Gem::Version
98
111
  version: '0'
99
112
  - !ruby/object:Gem::Dependency
100
113
  name: redis
101
114
  requirement: !ruby/object:Gem::Requirement
115
+ none: false
102
116
  requirements:
103
- - - '>='
117
+ - - ! '>='
104
118
  - !ruby/object:Gem::Version
105
119
  version: '0'
106
120
  type: :runtime
107
121
  prerelease: false
108
122
  version_requirements: !ruby/object:Gem::Requirement
123
+ none: false
109
124
  requirements:
110
- - - '>='
125
+ - - ! '>='
111
126
  - !ruby/object:Gem::Version
112
127
  version: '0'
113
128
  - !ruby/object:Gem::Dependency
114
129
  name: em-resque
115
130
  requirement: !ruby/object:Gem::Requirement
131
+ none: false
116
132
  requirements:
117
- - - '>='
133
+ - - ! '>='
118
134
  - !ruby/object:Gem::Version
119
135
  version: '0'
120
136
  type: :runtime
121
137
  prerelease: false
122
138
  version_requirements: !ruby/object:Gem::Requirement
139
+ none: false
123
140
  requirements:
124
- - - '>='
141
+ - - ! '>='
125
142
  - !ruby/object:Gem::Version
126
143
  version: '0'
127
144
  - !ruby/object:Gem::Dependency
128
145
  name: resque
129
146
  requirement: !ruby/object:Gem::Requirement
147
+ none: false
130
148
  requirements:
131
149
  - - ~>
132
150
  - !ruby/object:Gem::Version
@@ -134,6 +152,7 @@ dependencies:
134
152
  type: :runtime
135
153
  prerelease: false
136
154
  version_requirements: !ruby/object:Gem::Requirement
155
+ none: false
137
156
  requirements:
138
157
  - - ~>
139
158
  - !ruby/object:Gem::Version
@@ -141,62 +160,71 @@ dependencies:
141
160
  - !ruby/object:Gem::Dependency
142
161
  name: sinatra
143
162
  requirement: !ruby/object:Gem::Requirement
163
+ none: false
144
164
  requirements:
145
- - - '>='
165
+ - - ! '>='
146
166
  - !ruby/object:Gem::Version
147
167
  version: '0'
148
168
  type: :runtime
149
169
  prerelease: false
150
170
  version_requirements: !ruby/object:Gem::Requirement
171
+ none: false
151
172
  requirements:
152
- - - '>='
173
+ - - ! '>='
153
174
  - !ruby/object:Gem::Version
154
175
  version: '0'
155
176
  - !ruby/object:Gem::Dependency
156
177
  name: rack-fiber_pool
157
178
  requirement: !ruby/object:Gem::Requirement
179
+ none: false
158
180
  requirements:
159
- - - '>='
181
+ - - ! '>='
160
182
  - !ruby/object:Gem::Version
161
183
  version: '0'
162
184
  type: :runtime
163
185
  prerelease: false
164
186
  version_requirements: !ruby/object:Gem::Requirement
187
+ none: false
165
188
  requirements:
166
- - - '>='
189
+ - - ! '>='
167
190
  - !ruby/object:Gem::Version
168
191
  version: '0'
169
192
  - !ruby/object:Gem::Dependency
170
193
  name: thin
171
194
  requirement: !ruby/object:Gem::Requirement
195
+ none: false
172
196
  requirements:
173
- - - '>='
197
+ - - ! '>='
174
198
  - !ruby/object:Gem::Version
175
199
  version: '0'
176
200
  type: :runtime
177
201
  prerelease: false
178
202
  version_requirements: !ruby/object:Gem::Requirement
203
+ none: false
179
204
  requirements:
180
- - - '>='
205
+ - - ! '>='
181
206
  - !ruby/object:Gem::Version
182
207
  version: '0'
183
208
  - !ruby/object:Gem::Dependency
184
209
  name: mail
185
210
  requirement: !ruby/object:Gem::Requirement
211
+ none: false
186
212
  requirements:
187
- - - '>='
213
+ - - ! '>='
188
214
  - !ruby/object:Gem::Version
189
215
  version: '0'
190
216
  type: :runtime
191
217
  prerelease: false
192
218
  version_requirements: !ruby/object:Gem::Requirement
219
+ none: false
193
220
  requirements:
194
- - - '>='
221
+ - - ! '>='
195
222
  - !ruby/object:Gem::Version
196
223
  version: '0'
197
224
  - !ruby/object:Gem::Dependency
198
225
  name: blather
199
226
  requirement: !ruby/object:Gem::Requirement
227
+ none: false
200
228
  requirements:
201
229
  - - ~>
202
230
  - !ruby/object:Gem::Version
@@ -204,6 +232,7 @@ dependencies:
204
232
  type: :runtime
205
233
  prerelease: false
206
234
  version_requirements: !ruby/object:Gem::Requirement
235
+ none: false
207
236
  requirements:
208
237
  - - ~>
209
238
  - !ruby/object:Gem::Version
@@ -211,34 +240,39 @@ dependencies:
211
240
  - !ruby/object:Gem::Dependency
212
241
  name: chronic
213
242
  requirement: !ruby/object:Gem::Requirement
243
+ none: false
214
244
  requirements:
215
- - - '>='
245
+ - - ! '>='
216
246
  - !ruby/object:Gem::Version
217
247
  version: '0'
218
248
  type: :runtime
219
249
  prerelease: false
220
250
  version_requirements: !ruby/object:Gem::Requirement
251
+ none: false
221
252
  requirements:
222
- - - '>='
253
+ - - ! '>='
223
254
  - !ruby/object:Gem::Version
224
255
  version: '0'
225
256
  - !ruby/object:Gem::Dependency
226
257
  name: chronic_duration
227
258
  requirement: !ruby/object:Gem::Requirement
259
+ none: false
228
260
  requirements:
229
- - - '>='
261
+ - - ! '>='
230
262
  - !ruby/object:Gem::Version
231
263
  version: '0'
232
264
  type: :runtime
233
265
  prerelease: false
234
266
  version_requirements: !ruby/object:Gem::Requirement
267
+ none: false
235
268
  requirements:
236
- - - '>='
269
+ - - ! '>='
237
270
  - !ruby/object:Gem::Version
238
271
  version: '0'
239
272
  - !ruby/object:Gem::Dependency
240
273
  name: activesupport
241
274
  requirement: !ruby/object:Gem::Requirement
275
+ none: false
242
276
  requirements:
243
277
  - - ~>
244
278
  - !ruby/object:Gem::Version
@@ -246,6 +280,7 @@ dependencies:
246
280
  type: :runtime
247
281
  prerelease: false
248
282
  version_requirements: !ruby/object:Gem::Requirement
283
+ none: false
249
284
  requirements:
250
285
  - - ~>
251
286
  - !ruby/object:Gem::Version
@@ -253,20 +288,23 @@ dependencies:
253
288
  - !ruby/object:Gem::Dependency
254
289
  name: ice_cube
255
290
  requirement: !ruby/object:Gem::Requirement
291
+ none: false
256
292
  requirements:
257
- - - '>='
293
+ - - ! '>='
258
294
  - !ruby/object:Gem::Version
259
295
  version: '0'
260
296
  type: :runtime
261
297
  prerelease: false
262
298
  version_requirements: !ruby/object:Gem::Requirement
299
+ none: false
263
300
  requirements:
264
- - - '>='
301
+ - - ! '>='
265
302
  - !ruby/object:Gem::Version
266
303
  version: '0'
267
304
  - !ruby/object:Gem::Dependency
268
305
  name: tzinfo
269
306
  requirement: !ruby/object:Gem::Requirement
307
+ none: false
270
308
  requirements:
271
309
  - - ~>
272
310
  - !ruby/object:Gem::Version
@@ -274,6 +312,7 @@ dependencies:
274
312
  type: :runtime
275
313
  prerelease: false
276
314
  version_requirements: !ruby/object:Gem::Requirement
315
+ none: false
277
316
  requirements:
278
317
  - - ~>
279
318
  - !ruby/object:Gem::Version
@@ -281,29 +320,33 @@ dependencies:
281
320
  - !ruby/object:Gem::Dependency
282
321
  name: tzinfo-data
283
322
  requirement: !ruby/object:Gem::Requirement
323
+ none: false
284
324
  requirements:
285
- - - '>='
325
+ - - ! '>='
286
326
  - !ruby/object:Gem::Version
287
327
  version: '0'
288
328
  type: :runtime
289
329
  prerelease: false
290
330
  version_requirements: !ruby/object:Gem::Requirement
331
+ none: false
291
332
  requirements:
292
- - - '>='
333
+ - - ! '>='
293
334
  - !ruby/object:Gem::Version
294
335
  version: '0'
295
336
  - !ruby/object:Gem::Dependency
296
337
  name: rake
297
338
  requirement: !ruby/object:Gem::Requirement
339
+ none: false
298
340
  requirements:
299
- - - '>='
341
+ - - ! '>='
300
342
  - !ruby/object:Gem::Version
301
343
  version: '0'
302
344
  type: :development
303
345
  prerelease: false
304
346
  version_requirements: !ruby/object:Gem::Requirement
347
+ none: false
305
348
  requirements:
306
- - - '>='
349
+ - - ! '>='
307
350
  - !ruby/object:Gem::Version
308
351
  version: '0'
309
352
  description: Flapjack is distributed monitoring notification system that provides
@@ -313,7 +356,6 @@ email: lindsay@holmwood.id.au
313
356
  executables:
314
357
  - flapjack
315
358
  - flapjack-nagios-receiver
316
- - flapjack-netsaint-parser
317
359
  - flapjack-populator
318
360
  - flapper
319
361
  - receive-events
@@ -333,7 +375,6 @@ files:
333
375
  - Rakefile
334
376
  - bin/flapjack
335
377
  - bin/flapjack-nagios-receiver
336
- - bin/flapjack-netsaint-parser
337
378
  - bin/flapjack-populator
338
379
  - bin/flapper
339
380
  - bin/receive-events
@@ -341,16 +382,13 @@ files:
341
382
  - dist/etc/init.d/flapjack
342
383
  - dist/etc/init.d/flapjack-nagios-receiver
343
384
  - dist/etc/init.d/flapper
344
- - dist/puppet/flapjack/files/.stub
345
- - dist/puppet/flapjack/manifests/common.pp
346
- - dist/puppet/flapjack/manifests/notifier.pp
347
- - dist/puppet/flapjack/manifests/worker.pp
348
- - dist/puppet/flapjack/templates/.stub
349
- - dist/puppet/ruby/manifests/dev.pp
350
- - dist/puppet/ruby/manifests/rubygems.pp
351
- - dist/puppet/sqlite3/manifests/dev.pp
352
385
  - etc/flapjack_config.yaml.example
353
386
  - features/cli.feature
387
+ - features/cli_flapjack-nagios-receiver.feature
388
+ - features/cli_flapjack-populator.feature
389
+ - features/cli_flapper.feature
390
+ - features/cli_receive-events.feature
391
+ - features/cli_simulate-failed-check.feature
354
392
  - features/events.feature
355
393
  - features/events_check_names.feature
356
394
  - features/notification_rules.feature
@@ -508,29 +546,41 @@ files:
508
546
  homepage: http://flapjack-project.com/
509
547
  licenses:
510
548
  - MIT
511
- metadata: {}
512
549
  post_install_message:
513
550
  rdoc_options: []
514
551
  require_paths:
515
552
  - lib
516
553
  required_ruby_version: !ruby/object:Gem::Requirement
554
+ none: false
517
555
  requirements:
518
- - - '>='
556
+ - - ! '>='
519
557
  - !ruby/object:Gem::Version
520
558
  version: '0'
559
+ segments:
560
+ - 0
561
+ hash: 300994649610136235
521
562
  required_rubygems_version: !ruby/object:Gem::Requirement
563
+ none: false
522
564
  requirements:
523
- - - '>='
565
+ - - ! '>='
524
566
  - !ruby/object:Gem::Version
525
567
  version: '0'
568
+ segments:
569
+ - 0
570
+ hash: 300994649610136235
526
571
  requirements: []
527
572
  rubyforge_project:
528
- rubygems_version: 2.0.3
573
+ rubygems_version: 1.8.23
529
574
  signing_key:
530
- specification_version: 4
575
+ specification_version: 3
531
576
  summary: Intelligent, scalable, distributed monitoring notification system.
532
577
  test_files:
533
578
  - features/cli.feature
579
+ - features/cli_flapjack-nagios-receiver.feature
580
+ - features/cli_flapjack-populator.feature
581
+ - features/cli_flapper.feature
582
+ - features/cli_receive-events.feature
583
+ - features/cli_simulate-failed-check.feature
534
584
  - features/events.feature
535
585
  - features/events_check_names.feature
536
586
  - features/notification_rules.feature
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: a8a6bbb199b138fb0da3af9765f5f0fe7b2ad552
4
- data.tar.gz: 3dbd00e9e7e63978726cb0f1e78fc96639f1762b
5
- SHA512:
6
- metadata.gz: 981b9061652d0a75e5e32cb82590c20eeca4a7b2d624aad076097c8a39c799a0850110e67fe080afa6ffac5dbe16d39184d06014db3d3cdbf1c469353425019f
7
- data.tar.gz: cad93481bc1dfd36c636ea84a0e7d59a9e5b1c926e046cf15b35a58cf4d4d06545bdd600b0cfe4d3e343ab6298944b40efc6ea89747355da04c456db56f46058