forked from openstreetmap/chef
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed: openstreetmap/operations#501 Signed-off-by: Grant Slater <[email protected]>
- Loading branch information
Showing
95 changed files
with
75 additions
and
8,009 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -101,5 +101,3 @@ | |
group "root" | ||
mode "755" | ||
end | ||
|
||
munin_plugin "chef_status" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -445,38 +445,21 @@ | |
if controller && controller[:device] | ||
device = controller[:device].sub("/dev/", "") | ||
smart = disk[:smart_device] | ||
|
||
if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/ | ||
array = node[:hardware][:disk][:arrays][disk[:arrays].first] | ||
munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}" | ||
elsif smart =~ /^.*,(\d+)$/ | ||
munin = "#{device}-#{Regexp.last_match(1)}" | ||
elsif smart =~ %r{^.*,(\d+)/(\d+)$} | ||
munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}" | ||
end | ||
elsif disk[:device] | ||
device = disk[:device].sub("/dev/", "") | ||
smart = disk[:smart_device] | ||
|
||
if smart =~ /^.*,(\d+),(\d+),(\d+)$/ | ||
munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}:#{Regexp.last_match(3)}" | ||
end | ||
end | ||
elsif disk[:device] =~ %r{^/dev/(nvme\d+)n\d+$} | ||
device = Regexp.last_match(1) | ||
munin = device | ||
elsif disk[:device] | ||
device = disk[:device].sub("/dev/", "") | ||
munin = device | ||
end | ||
|
||
next if device.nil? || munin.nil? | ||
next if device.nil? | ||
|
||
Hash[ | ||
:device => device, | ||
:smart => smart, | ||
:munin => munin, | ||
:hddtemp => munin.tr("-:", "_") | ||
:smart => smart | ||
] | ||
end | ||
|
||
|
@@ -536,48 +519,12 @@ | |
private_users false | ||
protect_clock false | ||
end | ||
|
||
# Don't try and do munin monitoring of disks behind | ||
# an Areca controller as they only allow one thing to | ||
# talk to the controller at a time and smartd will | ||
# throw errors if it clashes with munin | ||
disks = disks.reject { |disk| disk[:smart]&.start_with?("areca,") } | ||
|
||
disks.each do |disk| | ||
munin_plugin "smart_#{disk[:munin]}" do | ||
target "smart_" | ||
conf "munin.smart.erb" | ||
conf_variables :disk => disk | ||
end | ||
end | ||
else | ||
service "smartd" do | ||
action [:stop, :disable] | ||
end | ||
end | ||
|
||
if disks.count.positive? | ||
munin_plugin "hddtemp_smartctl" do | ||
conf "munin.hddtemp.erb" | ||
conf_variables :disks => disks | ||
end | ||
else | ||
munin_plugin "hddtemp_smartctl" do | ||
action :delete | ||
conf "munin.hddtemp.erb" | ||
end | ||
end | ||
|
||
plugins = Dir.glob("/etc/munin/plugins/smart_*").map { |p| File.basename(p) } - | ||
disks.map { |d| "smart_#{d[:munin]}" } | ||
|
||
plugins.each do |plugin| | ||
munin_plugin plugin do | ||
action :delete | ||
conf "munin.smart.erb" | ||
end | ||
end | ||
|
||
if File.exist?("/etc/mdadm/mdadm.conf") | ||
mdadm_conf = edit_file "/etc/mdadm/mdadm.conf" do |line| | ||
line.gsub!(/^MAILADDR .*$/, "MAILADDR [email protected]") | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.