Commit d2bece23 authored by Pascal Morillon's avatar Pascal Morillon
Browse files

[admin] Update sensors

parent 8ee623f5
...@@ -132,11 +132,11 @@ site :nancy do |site_uid| ...@@ -132,11 +132,11 @@ site :nancy do |site_uid|
:switch => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'switch_name'), :switch => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
:switch_port => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'switch_port') :switch_port => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'switch_port')
}] }]
pdu({ # pdu({
:vendor => "American Power Conversion", # :vendor => "American Power Conversion",
:pdu => lookup('graphene', node_uid, 'pdu', 'pdu_name'), # :pdu => lookup('graphene', node_uid, 'pdu', 'pdu_name'),
:pdu_port => lookup('graphene', node_uid, 'pdu', 'pdu_position') # :pdu_port => lookup('graphene', node_uid, 'pdu', 'pdu_position')
}) # })
bios({ bios({
:version => lookup('graphene', node_uid, 'bios', 'version'), :version => lookup('graphene', node_uid, 'bios', 'version'),
:vendor => "American Megatrends Inc.", :vendor => "American Megatrends Inc.",
...@@ -147,29 +147,29 @@ site :nancy do |site_uid| ...@@ -147,29 +147,29 @@ site :nancy do |site_uid|
}) })
if (105<=i+1 and i+1<=144) then if (105<=i+1 and i+1<=144) then
monitoring({ sensors({
:wattmeter => true :power => {
}) :available => true,
:via => {
sensors({ :api => { :metric => 'pdu' },
:power => { :pdu => {
:available => true, :uid => lookup('graphene', node_uid, 'pdu', 'pdu_name'),
:via => { :port => lookup('graphene', node_uid, 'pdu', 'pdu_position'),
:ganglia => { :metric => 'pdu' } }
}
} }
} })
})
else else
monitoring({ sensors({
:wattmeter => false :power => {
}) :available => false, # Set to true when pdu resources will be declared
:via => {
sensors({ :pdu => { :uid => lookup('graphene', node_uid, 'pdu', 'pdu_name') }
:power => { }
:available => false }
} })
})
end end
end end
end end
end # cluster graphene end # cluster graphene
......
...@@ -114,12 +114,13 @@ site :nancy do |site_uid| ...@@ -114,12 +114,13 @@ site :nancy do |site_uid|
:switch => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_name'), :switch => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
:switch_port => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_port') :switch_port => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_port')
}] }]
pdu({ # pdu({
:vendor => "American Power Conversion", # :vendor => "American Power Conversion",
:pdu => lookup('griffon', node_uid, 'pdu', 'pdu_name'), # :pdu => lookup('griffon', node_uid, 'pdu', 'pdu_name'),
:pdu_port => lookup('griffon', node_uid, 'pdu', 'pdu_position'), # :pdu_port => lookup('griffon', node_uid, 'pdu', 'pdu_position'),
}) # })
bios({
bios({
:version => lookup('griffon', node_uid, 'bios', 'version'), :version => lookup('griffon', node_uid, 'bios', 'version'),
:vendor => lookup('griffon', node_uid, 'bios', 'vendor'), :vendor => lookup('griffon', node_uid, 'bios', 'vendor'),
:release_date => lookup('griffon', node_uid, 'bios', 'release_date'), :release_date => lookup('griffon', node_uid, 'bios', 'release_date'),
...@@ -128,15 +129,12 @@ site :nancy do |site_uid| ...@@ -128,15 +129,12 @@ site :nancy do |site_uid|
:gpu => false :gpu => false
}) })
monitoring({
:wattmeter => false
})
sensors({ sensors({
:power => { :power => {
:available => false :available => false, # Set to true when pdu resources will be declared
:via => {
:pdu => { :uid => lookup('griffon', node_uid, 'pdu', 'pdu_name') }
}
} }
}) })
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment