deac/ruby-nsca
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

check: perfdata-labels are symbols. perfdata works.

Browse source
This commit is contained in:
Denis Knauf 2013-04-09 12:20:55 +02:00
parent 4114d20840
commit aeaabffc40
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/nsca/check.rb
View file

@ -14,7 +14,7 @@ module NSCA
def measure &block def measure &block
timeout ||= 0 timeout ||= 0
exception = Class.new Timeout::Error exception = Class.new Timeout::Error
pd = perfdatas[perfdata_label] pd = perfdatas[perfdata_label.to_sym]
timeout = pd.max timeout = pd.max
m = realtime do m = realtime do
begin begin
@ -35,6 +35,7 @@ module NSCA
def min() self.class.min end def min() self.class.min end
def max() self.class.max end def max() self.class.max end
def to_s() "#{label}=#{value}#{unit},#{warn},#{crit},#{min},#{max}" end def to_s() "#{label}=#{value}#{unit},#{warn},#{crit},#{min},#{max}" end
def to_sym() self.class.label.to_sym end
def return_code def return_code
if @value.nil? then 3 if @value.nil? then 3
@ -71,17 +72,29 @@ module NSCA
def init return_code = nil, status = nil, perfdatas = nil, timestamp = nil def init return_code = nil, status = nil, perfdatas = nil, timestamp = nil
@return_code = return_code if return_code @return_code = return_code if return_code
@status = status if status @status = status if status
perfdatas.each &method( :[]) if perfdatas case perfdatas
when Hash
perfdatas.each &method( :[])
when Array
push *perfdatas
end
@timestamp = timestamp if timestamp @timestamp = timestamp if timestamp
self self
end end
def [] perfdata_label def [] perfdata_label
pd = @perfdatas[perfdata_label] pd = @perfdatas[perfdata_label.to_sym]
pd && pd.value pd && pd.value
end end
def push *perfdatas
perfdatas.each {|perfdata| @perfdatas[perfdata.label] = perfdata }
@perfdatas
end
def []= perfdata_label, value def []= perfdata_label, value
return push value if value.is_a? PerformanceData::Base
perfdata_label = perfdata_label.to_sym
cl = self.class.perfdatas[perfdata_label] cl = self.class.perfdatas[perfdata_label]
cl ||= PerformanceData::Base.new perfdata_label cl ||= PerformanceData::Base.new perfdata_label
@perfdatas[perfdata_label] = cl.new value @perfdatas[perfdata_label] = cl.new value
@ -89,11 +102,13 @@ module NSCA
def text def text
r = "#{status || ReturnCode.find(return_code)}" r = "#{status || ReturnCode.find(return_code)}"
r += " | #{perfdatas.map( &:to_s).join ' '}" unless perfdatas.empty? r += " | #{perfdatas.each_value.map( &:to_s).join ' '}" unless perfdatas.empty?
r r
end end
def measure( perfdata_label, &block) @perfdatas[perfdata_label].measure &block end def measure perfdata_label, &block
@perfdatas[perfdata_label.to_sym].measure &block
end
def send() NSCA::send self end def send() NSCA::send self end
def ok status = nil, perfdatas = nil def ok status = nil, perfdatas = nil
@ -141,7 +156,7 @@ module NSCA
attr_reader :service, :hostname, :perfdatas attr_reader :service, :hostname, :perfdatas
def init service, hostname = nil, perfdatas = nil def init service, hostname = nil, perfdatas = nil
@service, @hostname, @perfdatas = service, hostname || `hostname -f`, {} @service, @hostname, @perfdatas = service, hostname || `hostname -f`, {}
perfdatas.each {|pd| @perfdatas[pd.label] = pd } perfdatas.each {|pd| @perfdatas[pd.label.to_sym] = pd }
self self
end end