cloudstack-nagios 0.10.2 → 0.10.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +7 -7
  3. data/cloudstack-nagios.gemspec +2 -2
  4. data/lib/cloudstack-nagios/commands/check.rb +10 -2
  5. data/lib/cloudstack-nagios/templates/cloudstack_storage_pools.cfg.erb +1 -1
  6. data/lib/cloudstack-nagios/version.rb +1 -1
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: baeaf5831f34fb4fd2c7dfcdce45d1a52e91c0a1
4
- data.tar.gz: f1904656f9ae1a7fa0ff638689723a6fc95eacf8
3
+ metadata.gz: 995b79f717cdabbfc52a5d9c577ca0911b467ac9
4
+ data.tar.gz: c28a5f0d78b468d06e010f82dc5720cd220f37cb
5
5
  SHA512:
6
- metadata.gz: 1335405d86cdc98228a980472ecfbe27329bbea160841791f0fe1a19b5601c4d28cf89f5ce9e3da4cfffccd86220bb516205016c5e2279541059fe80bf386ed3
7
- data.tar.gz: c0628f00201cbb1c6449d0a3528a50be2a3f5323af38ac25ed7c15e2b62f403e542b997ad84af6943edc9cf8671eed6cf93a58777f68467963de1d93912cca3c
6
+ metadata.gz: a358e1cc9068da37e27e1676b21bc0ef7e5ad8e9745a541b6b578f2c67011bca15e5eb64e1c9514faf3d028315de8b5c84571f0b818b1849491a616dc0477914
7
+ data.tar.gz: 34b88ce835276f049c3e4759639325e6bf27fa11f45a7c28ff7892b25b68bbcfb2a0b41311007017083d512cc2182045d4055d0dd21b2d71d4e87a0b42a72305
data/Gemfile.lock CHANGED
@@ -1,12 +1,12 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cloudstack-nagios (0.9.0)
4
+ cloudstack-nagios (0.10.2)
5
5
  cloudstack_client (~> 0.5, >= 0.5.0)
6
6
  erubis (~> 2.7.0)
7
7
  highline (~> 1.6.20)
8
8
  sshkit (~> 1.3.0)
9
- thor (~> 0.18.1)
9
+ thor (~> 0.19.1)
10
10
 
11
11
  GEM
12
12
  remote: https://rubygems.org/
@@ -15,10 +15,10 @@ GEM
15
15
  erubis (2.7.0)
16
16
  highline (1.6.21)
17
17
  json (1.8.1)
18
- net-scp (1.1.2)
18
+ net-scp (1.2.0)
19
19
  net-ssh (>= 2.6.5)
20
20
  net-ssh (2.8.0)
21
- rake (10.1.1)
21
+ rake (10.3.1)
22
22
  rdoc (4.1.1)
23
23
  json (~> 1.4)
24
24
  sshkit (1.3.0)
@@ -27,13 +27,13 @@ GEM
27
27
  term-ansicolor
28
28
  term-ansicolor (1.3.0)
29
29
  tins (~> 1.0)
30
- thor (0.18.1)
31
- tins (1.0.0)
30
+ thor (0.19.1)
31
+ tins (1.1.0)
32
32
 
33
33
  PLATFORMS
34
34
  ruby
35
35
 
36
36
  DEPENDENCIES
37
37
  cloudstack-nagios!
38
- rake (~> 10.1.1)
38
+ rake (~> 10.3.1)
39
39
  rdoc
data/cloudstack-nagios.gemspec CHANGED
@@ -21,10 +21,10 @@ Gem::Specification.new do |gem|
21
21
  gem.rdoc_options = %w[--line-numbers --inline-source]
22
22
 
23
23
  gem.add_development_dependency('rdoc')
24
- gem.add_development_dependency('rake', '~> 10.1.1')
24
+ gem.add_development_dependency('rake', '~> 10.3.1')
25
25
 
26
26
  gem.add_dependency('cloudstack_client', '~> 0.5', '>= 0.5.0')
27
- gem.add_dependency('thor', '~> 0.18.1')
27
+ gem.add_dependency('thor', '~> 0.19.1')
28
28
  gem.add_dependency('erubis', '~> 2.7.0')
29
29
  gem.add_dependency('sshkit', '~> 1.3.0')
30
30
  gem.add_dependency('highline', '~> 1.6.20')
data/lib/cloudstack-nagios/commands/check.rb CHANGED
@@ -42,11 +42,19 @@ class Check < CloudstackNagios::Base
42
42
  desc "capacity", "check capacity of storage_pool"
43
43
  option :pool_name, required: true
44
44
  option :zone
45
- option :over_provisioning, type: :numeric, default: 1.0
45
+ option :over_provisioning, type: :numeric, default: 1.0,
46
+ desc: "Overprovisioning factor (only taken into account for type = NetworkFilesystem)"
46
47
  def storage_pool
47
48
  pool = client.list_storage_pools(name: options[:pool_name], zone: options[:zone]).first
49
+ # calculate overprovisioning only for network file systems
50
+ total_size = case pool['type']
51
+ when 'NetworkFilesystem'
52
+ pool['disksizetotal'] * options[:over_provisioning]
53
+ else
54
+ pool['disksizetotal']
55
+ end
48
56
  data = check_data(
49
- pool['disksizetotal'] * options[:over_provisioning],
57
+ total_size,
50
58
  pool['disksizeallocated'].to_f,
51
59
  options[:warning],
52
60
  options[:critical]
data/lib/cloudstack-nagios/templates/cloudstack_storage_pools.cfg.erb CHANGED
@@ -15,4 +15,4 @@ define service {
15
15
  register 1
16
16
  }
17
17
 
18
- <% end -%>
18
+ <% end -%>
data/lib/cloudstack-nagios/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CloudstackNagios
2
- VERSION = "0.10.2"
2
+ VERSION = "0.10.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cloudstack-nagios
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.2
4
+ version: 0.10.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nik Wolfgramm
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-11 00:00:00.000000000 Z
11
+ date: 2014-04-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rdoc
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 10.1.1
33
+ version: 10.3.1
34
34
  type: :development
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: 10.1.1
40
+ version: 10.3.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cloudstack_client
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
64
64
  requirements:
65
65
  - - ~>
66
66
  - !ruby/object:Gem::Version
67
- version: 0.18.1
67
+ version: 0.19.1
68
68
  type: :runtime
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - ~>
73
73
  - !ruby/object:Gem::Version
74
- version: 0.18.1
74
+ version: 0.19.1
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: erubis
77
77
  requirement: !ruby/object:Gem::Requirement