rubocop: autofix

This commit is contained in:
Tim Meusel 2017-04-19 11:27:49 +02:00
parent 22a8abfd11
commit 9c7d45ffa8
No known key found for this signature in database
GPG Key ID: 04D659E6BF1C4CC0
1 changed files with 14 additions and 16 deletions

View File

@ -24,29 +24,29 @@ Puppet::Reports.register_report(:prometheus) do
raise(Puppet::ParseError, "#{configfile}: textfile_directory is not set.") raise(Puppet::ParseError, "#{configfile}: textfile_directory is not set.")
end end
unless REPORT_FILENAME.nil? or REPORT_FILENAME.end_with? '.prom' unless REPORT_FILENAME.nil? || REPORT_FILENAME.end_with?('.prom')
raise(Puppet::ParseError, "#{configfile}: report_filename does not ends with .prom") raise(Puppet::ParseError, "#{configfile}: report_filename does not ends with .prom")
end end
def process def process
if REPORT_FILENAME.nil? namevar = if REPORT_FILENAME.nil?
namevar = self.host host
else else
namevar = REPORT_FILENAME REPORT_FILENAME
end end
yaml_filename = File.join(TEXTFILE_DIRECTORY, '.' + namevar + '.yaml') yaml_filename = File.join(TEXTFILE_DIRECTORY, '.' + namevar + '.yaml')
filename = File.join(TEXTFILE_DIRECTORY, namevar + '.prom') filename = File.join(TEXTFILE_DIRECTORY, namevar + '.prom')
common_values = { common_values = {
environment: self.environment, environment: environment,
host: self.host, host: host
}.reduce([]) { }.reduce([]) do |values, extra|
|values, extra| values + Array("#{extra[0].to_s}=\"#{extra[1].to_s}\"") values + Array("#{extra[0]}=\"#{extra[1]}\"")
} end
new_metrics = Hash.new new_metrics = {}
unless metrics.empty? or metrics['events'].nil? unless metrics.empty? || metrics['events'].nil?
metrics.each do |metric, data| metrics.each do |metric, data|
data.values.each do |val| data.values.each do |val|
new_metrics["puppet_report_#{metric}{name=\"#{val[1]}\",#{common_values.join(',')}}"] = val[2] new_metrics["puppet_report_#{metric}{name=\"#{val[1]}\",#{common_values.join(',')}}"] = val[2]
@ -62,9 +62,7 @@ Puppet::Reports.register_report(:prometheus) do
file.write("# Old metrics\n") file.write("# Old metrics\n")
existing_metrics = YAML.load_file(yaml_filename) existing_metrics = YAML.load_file(yaml_filename)
existing_metrics.each do |k, _v| existing_metrics.each do |k, _v|
unless new_metrics.include?(k) file.write("#{k} -1\n") unless new_metrics.include?(k)
file.write("#{k} -1\n")
end
end end
end end