cloudstack-nagios 0.10.3 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/cloudstack-nagios/commands/router.rb +5 -3
- data/lib/cloudstack-nagios/templates/cloudstack_capacities.cfg.erb +1 -1
- data/lib/cloudstack-nagios/templates/cloudstack_hostgroups.cfg.erb +0 -6
- data/lib/cloudstack-nagios/templates/cloudstack_router_hosts.cfg.erb +1 -1
- data/lib/cloudstack-nagios/templates/cloudstack_router_services.cfg.erb +19 -9
- data/lib/cloudstack-nagios/templates/cloudstack_storage_pools.cfg.erb +1 -1
- data/lib/cloudstack-nagios/version.rb +1 -1
- metadata +23 -23
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c162aca81eaf885a3a5389873193e38b7d100047
|
4
|
+
data.tar.gz: 12211d6826e16f6ab20df1281bf162d97a4d4128
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ed63fc185edf1abe010e577276f11bf32d7f47d525826bd6bc3c8388a62a8ad1a084915bbad8d9787c08aaa2c906107cf3458debeb690885ee7f86f9bef77941
|
7
|
+
data.tar.gz: 0c0efc830fc273fc4f86cb91d3f0e67b543bce1dddc513dd49baaae4ba577f696a75126d4c46adc8a702f78d1a3c1c767625917b13c48bfb2ad98dac5d5acd8f
|
data/Gemfile.lock
CHANGED
@@ -58,18 +58,20 @@ class Router < CloudstackNagios::Base
|
|
58
58
|
end
|
59
59
|
|
60
60
|
desc "disk_usage", "check the disk space usage of the root volume"
|
61
|
+
option :partition, desc: "The partition to check", default: '/', aliases: '-P'
|
61
62
|
def disk_usage
|
62
63
|
begin
|
63
64
|
host = systemvm_host
|
65
|
+
partition = options[:partition]
|
64
66
|
proc_out = ""
|
65
67
|
on host do |h|
|
66
|
-
proc_out = capture(:df, '
|
68
|
+
proc_out = capture(:df, '-l', partition)
|
67
69
|
end
|
68
|
-
match = proc_out.match(/.*\s(\d+)%\s
|
70
|
+
match = proc_out.match(/.*\s(\d+)%\s.*/)
|
69
71
|
if match
|
70
72
|
usage = match[1]
|
71
73
|
data = check_data(100, usage, options[:warning], options[:critical])
|
72
|
-
puts "DISK_USAGE #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}%"
|
74
|
+
puts "DISK_USAGE #{RETURN_CODES[data[0]]} (Partition #{options[:partition]}) - usage = #{data[1]}% | usage=#{data[1]}%"
|
73
75
|
else
|
74
76
|
puts "DISK_USAGE UNKNOWN"
|
75
77
|
end
|
@@ -10,7 +10,7 @@ define command {
|
|
10
10
|
<% zones.each do |zone| -%>
|
11
11
|
<% capacity_types.each do |cap_type, cap_values| -%>
|
12
12
|
define service {
|
13
|
-
|
13
|
+
host_name Cloudstack_<%= zone['name'] %>
|
14
14
|
service_description Cloudstack <%= zone['name'] %> <%= cap_values[:name] %>
|
15
15
|
display_name Cloudstack <%= zone['name'] %> <%= cap_values[:method_name] %>
|
16
16
|
use Generic-Service,service-pnp
|
@@ -6,7 +6,7 @@ define host {
|
|
6
6
|
display_name <%= router['name'] %> (<%= router['linklocalip'] %>)<%= " - #{router['project']}" if router['project'] %> - <%= router['zonename'] %>
|
7
7
|
address <%= router['linklocalip'] %>
|
8
8
|
use Linux-Host,host-pnp
|
9
|
-
hostgroups
|
9
|
+
hostgroups Cloudstack_<%= router['zonename'] %>
|
10
10
|
check_command check-host-alive
|
11
11
|
register 1
|
12
12
|
}
|
@@ -25,12 +25,13 @@ define command {
|
|
25
25
|
|
26
26
|
define command {
|
27
27
|
command_name cs-nagios_check-diskusage
|
28
|
-
command_line <%= bin_path -%>cs-nagios check router disk_usage -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
|
28
|
+
command_line <%= bin_path -%>cs-nagios check router disk_usage -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -P $ARG3$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
|
29
29
|
register 1
|
30
30
|
}
|
31
31
|
|
32
|
+
|
32
33
|
define service {
|
33
|
-
hostgroup_name
|
34
|
+
hostgroup_name <%= zones.map {|zone| "Cloudstack_#{zone['name']}" }.join(',') %>
|
34
35
|
service_description Cloudstack Virtual Router Memory
|
35
36
|
display_name Cloudstack Virtual Router Memory
|
36
37
|
use Generic-Service,service-pnp
|
@@ -39,7 +40,7 @@ define service {
|
|
39
40
|
}
|
40
41
|
|
41
42
|
define service {
|
42
|
-
hostgroup_name
|
43
|
+
hostgroup_name <%= zones.map {|zone| "Cloudstack_#{zone['name']}" }.join(',') %>
|
43
44
|
service_description Cloudstack Virtual Router CPU
|
44
45
|
display_name Cloudstack Virtual Router CPU
|
45
46
|
use Generic-Service,service-pnp
|
@@ -48,7 +49,7 @@ define service {
|
|
48
49
|
}
|
49
50
|
|
50
51
|
define service {
|
51
|
-
hostgroup_name
|
52
|
+
hostgroup_name <%= zones.map {|zone| "Cloudstack_#{zone['name']}" }.join(',') %>
|
52
53
|
service_description Cloudstack Virtual Router Network
|
53
54
|
display_name Cloudstack Virtual Router Network
|
54
55
|
use Generic-Service,service-pnp
|
@@ -57,7 +58,7 @@ define service {
|
|
57
58
|
}
|
58
59
|
|
59
60
|
define service {
|
60
|
-
hostgroup_name
|
61
|
+
hostgroup_name <%= zones.map {|zone| "Cloudstack_#{zone['name']}" }.join(',') %>
|
61
62
|
service_description Cloudstack Virtual Router RootFS rw
|
62
63
|
display_name Cloudstack Virtual Router RootFS rw
|
63
64
|
use Generic-Service,service-pnp
|
@@ -66,10 +67,19 @@ define service {
|
|
66
67
|
}
|
67
68
|
|
68
69
|
define service {
|
69
|
-
hostgroup_name
|
70
|
-
service_description Cloudstack Virtual
|
71
|
-
display_name Cloudstack Virtual Router DiskUsage
|
70
|
+
hostgroup_name <%= zones.map {|zone| "Cloudstack_#{zone['name']}" }.join(',') %>
|
71
|
+
service_description Cloudstack Virtual RouterDiskUsageRoot
|
72
|
+
display_name Cloudstack Virtual Router DiskUsage Root
|
73
|
+
use Generic-Service,service-pnp
|
74
|
+
check_command cs-nagios_check-diskusage!80!90!/
|
75
|
+
register 1
|
76
|
+
}
|
77
|
+
|
78
|
+
define service {
|
79
|
+
hostgroup_name <%= zones.map {|zone| "Cloudstack_#{zone['name']}" }.join(',') %>
|
80
|
+
service_description Cloudstack Virtual RouterDiskUsageVar
|
81
|
+
display_name Cloudstack Virtual Router DiskUsage Var
|
72
82
|
use Generic-Service,service-pnp
|
73
|
-
check_command cs-nagios_check-diskusage!80!90
|
83
|
+
check_command cs-nagios_check-diskusage!80!90!/var
|
74
84
|
register 1
|
75
85
|
}
|
@@ -7,7 +7,7 @@ define command {
|
|
7
7
|
|
8
8
|
<% storage_pools.each do |storage_pool| -%>
|
9
9
|
define service {
|
10
|
-
|
10
|
+
host_name Cloudstack_<%= storage_pool['zonename'] %>
|
11
11
|
service_description Cloudstack Storage Pool <%= storage_pool['zonename'] %> <%= storage_pool['name'] %>
|
12
12
|
display_name Cloudstack Storage Pool <%= storage_pool['zonename'] %> <%= storage_pool['name'] %>
|
13
13
|
use Generic-Service,service-pnp
|
metadata
CHANGED
@@ -1,117 +1,117 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cloudstack-nagios
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.11.0
|
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-
|
11
|
+
date: 2014-05-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rdoc
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '0'
|
20
20
|
type: :development
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rake
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - ~>
|
31
|
+
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
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
40
|
version: 10.3.1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: cloudstack_client
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - ~>
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '0.5'
|
48
|
-
- -
|
48
|
+
- - ">="
|
49
49
|
- !ruby/object:Gem::Version
|
50
50
|
version: 0.5.0
|
51
51
|
type: :runtime
|
52
52
|
prerelease: false
|
53
53
|
version_requirements: !ruby/object:Gem::Requirement
|
54
54
|
requirements:
|
55
|
-
- - ~>
|
55
|
+
- - "~>"
|
56
56
|
- !ruby/object:Gem::Version
|
57
57
|
version: '0.5'
|
58
|
-
- -
|
58
|
+
- - ">="
|
59
59
|
- !ruby/object:Gem::Version
|
60
60
|
version: 0.5.0
|
61
61
|
- !ruby/object:Gem::Dependency
|
62
62
|
name: thor
|
63
63
|
requirement: !ruby/object:Gem::Requirement
|
64
64
|
requirements:
|
65
|
-
- - ~>
|
65
|
+
- - "~>"
|
66
66
|
- !ruby/object:Gem::Version
|
67
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
74
|
version: 0.19.1
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
name: erubis
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|
78
78
|
requirements:
|
79
|
-
- - ~>
|
79
|
+
- - "~>"
|
80
80
|
- !ruby/object:Gem::Version
|
81
81
|
version: 2.7.0
|
82
82
|
type: :runtime
|
83
83
|
prerelease: false
|
84
84
|
version_requirements: !ruby/object:Gem::Requirement
|
85
85
|
requirements:
|
86
|
-
- - ~>
|
86
|
+
- - "~>"
|
87
87
|
- !ruby/object:Gem::Version
|
88
88
|
version: 2.7.0
|
89
89
|
- !ruby/object:Gem::Dependency
|
90
90
|
name: sshkit
|
91
91
|
requirement: !ruby/object:Gem::Requirement
|
92
92
|
requirements:
|
93
|
-
- - ~>
|
93
|
+
- - "~>"
|
94
94
|
- !ruby/object:Gem::Version
|
95
95
|
version: 1.3.0
|
96
96
|
type: :runtime
|
97
97
|
prerelease: false
|
98
98
|
version_requirements: !ruby/object:Gem::Requirement
|
99
99
|
requirements:
|
100
|
-
- - ~>
|
100
|
+
- - "~>"
|
101
101
|
- !ruby/object:Gem::Version
|
102
102
|
version: 1.3.0
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
name: highline
|
105
105
|
requirement: !ruby/object:Gem::Requirement
|
106
106
|
requirements:
|
107
|
-
- - ~>
|
107
|
+
- - "~>"
|
108
108
|
- !ruby/object:Gem::Version
|
109
109
|
version: 1.6.20
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
112
|
version_requirements: !ruby/object:Gem::Requirement
|
113
113
|
requirements:
|
114
|
-
- - ~>
|
114
|
+
- - "~>"
|
115
115
|
- !ruby/object:Gem::Version
|
116
116
|
version: 1.6.20
|
117
117
|
description: cloudstack-nagios generates nagios configuration and checks for monitoring
|
@@ -123,7 +123,7 @@ executables:
|
|
123
123
|
extensions: []
|
124
124
|
extra_rdoc_files: []
|
125
125
|
files:
|
126
|
-
- .gitignore
|
126
|
+
- ".gitignore"
|
127
127
|
- Gemfile
|
128
128
|
- Gemfile.lock
|
129
129
|
- LICENSE.txt
|
@@ -157,18 +157,18 @@ licenses:
|
|
157
157
|
metadata: {}
|
158
158
|
post_install_message:
|
159
159
|
rdoc_options:
|
160
|
-
- --line-numbers
|
161
|
-
- --inline-source
|
160
|
+
- "--line-numbers"
|
161
|
+
- "--inline-source"
|
162
162
|
require_paths:
|
163
163
|
- lib
|
164
164
|
required_ruby_version: !ruby/object:Gem::Requirement
|
165
165
|
requirements:
|
166
|
-
- -
|
166
|
+
- - ">="
|
167
167
|
- !ruby/object:Gem::Version
|
168
168
|
version: 1.9.3
|
169
169
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
|
-
- -
|
171
|
+
- - ">="
|
172
172
|
- !ruby/object:Gem::Version
|
173
173
|
version: '0'
|
174
174
|
requirements: []
|