sensu 0.13.0.beta.1 → 0.13.0.beta.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 06c4221b329539aeeca46fd4e8cd4defebc6ca41
4
- data.tar.gz: 1d97b6669db13f4e5db48a72fb9628777ab4b05c
3
+ metadata.gz: ebe8f2ff35d35e0e0e23a9e81ba46e8d3a03fbaf
4
+ data.tar.gz: c5af1513036eb83da709fd3fb931e61cb4d66b95
5
5
  SHA512:
6
- metadata.gz: b84ad62f1f09def1515e543787bfbcd19ac1fd994344c7a9c3f9092d5de56041c76b10fc24692f53f2942e918255a3afcf28f03f2eacc74709280116dcc76841
7
- data.tar.gz: 174bc2ea21a3711708d20ce0525978b3dce08d95566f585311c46b6d3694b804e6daafe41f616ae742cd146b3d364cf9279f2ba8030f6b77c7c9fa2f2567c01f
6
+ metadata.gz: e56c505782becada98dae8663a443c118f37c5523395a374bd52b0c88cda28f7144dd42d65fe4ecb76ce677e5d44cbaf48409561efe24071f7387f9b3bd49892
7
+ data.tar.gz: f38f0e7cccc4b65b0a9cd1fe788bacaad1129aca8f6f6c08db49864a723e051a68aedc44f21543117b0ab9b26b6a1c43cffeacb061f07d34740d764a32019aaf
@@ -1,6 +1,6 @@
1
1
  module Sensu
2
2
  unless defined?(Sensu::VERSION)
3
- VERSION = '0.13.0.beta.1'
3
+ VERSION = '0.13.0.beta.2'
4
4
 
5
5
  SEVERITIES = %w[ok warning critical unknown]
6
6
 
data/lib/sensu/daemon.rb CHANGED
@@ -2,12 +2,12 @@ require 'rubygems'
2
2
 
3
3
  gem 'multi_json', '1.10.1'
4
4
 
5
- gem 'sensu-em', '2.1.0'
5
+ gem 'sensu-em', '2.2.0'
6
6
  gem 'sensu-logger', '0.0.1'
7
7
  gem 'sensu-settings', '0.0.7'
8
8
  gem 'sensu-extension', '0.0.3'
9
9
  gem 'sensu-extensions', '0.0.5'
10
- gem 'sensu-transport', '0.0.6'
10
+ gem 'sensu-transport', '0.0.7'
11
11
  gem 'sensu-spawn', '0.0.3'
12
12
 
13
13
  require 'time'
data/lib/sensu/server.rb CHANGED
@@ -537,17 +537,21 @@ module Sensu
537
537
 
538
538
  def determine_stale_clients
539
539
  @logger.info('determining stale clients')
540
+ keepalive_check = {
541
+ :thresholds => {
542
+ :warning => 120,
543
+ :critical => 180
544
+ }
545
+ }
546
+ if @settings.handler_exists?(:keepalive)
547
+ keepalive_check[:handler] = "keepalive"
548
+ end
540
549
  @redis.smembers('clients') do |clients|
541
550
  clients.each do |client_name|
542
551
  @redis.get('client:' + client_name) do |client_json|
543
552
  unless client_json.nil?
544
553
  client = MultiJson.load(client_json)
545
- check = {
546
- :thresholds => {
547
- :warning => 120,
548
- :critical => 180
549
- }
550
- }
554
+ check = keepalive_check.dup
551
555
  if client.has_key?(:keepalive)
552
556
  check = deep_merge(check, client[:keepalive])
553
557
  end
data/sensu.gemspec CHANGED
@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
16
16
  s.add_dependency('json') if RUBY_VERSION < "1.9"
17
17
  s.add_dependency('multi_json', '1.10.1')
18
18
  s.add_dependency('uuidtools', '2.1.4')
19
- s.add_dependency('sensu-em', '2.1.0')
19
+ s.add_dependency('sensu-em', '2.2.0')
20
20
  s.add_dependency('sensu-logger', '0.0.1')
21
21
  s.add_dependency('sensu-settings', '0.0.7')
22
22
  s.add_dependency('sensu-extension', '0.0.3')
23
23
  s.add_dependency('sensu-extensions', '0.0.5')
24
- s.add_dependency('sensu-transport', '0.0.6')
24
+ s.add_dependency('sensu-transport', '0.0.7')
25
25
  s.add_dependency('sensu-spawn', '0.0.3')
26
26
  s.add_dependency('em-redis-unified', '0.5.0')
27
27
  s.add_dependency('sinatra', '1.3.5')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.0.beta.1
4
+ version: 0.13.0.beta.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Porter
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-05-29 00:00:00.000000000 Z
12
+ date: 2014-06-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: multi_json
@@ -45,14 +45,14 @@ dependencies:
45
45
  requirements:
46
46
  - - '='
47
47
  - !ruby/object:Gem::Version
48
- version: 2.1.0
48
+ version: 2.2.0
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - '='
54
54
  - !ruby/object:Gem::Version
55
- version: 2.1.0
55
+ version: 2.2.0
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: sensu-logger
58
58
  requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
115
115
  requirements:
116
116
  - - '='
117
117
  - !ruby/object:Gem::Version
118
- version: 0.0.6
118
+ version: 0.0.7
119
119
  type: :runtime
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - '='
124
124
  - !ruby/object:Gem::Version
125
- version: 0.0.6
125
+ version: 0.0.7
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: sensu-spawn
128
128
  requirement: !ruby/object:Gem::Requirement