Merge "Filter raw_report only with log events for noop_run"
This commit is contained in:
commit
c33fe77e77
@ -117,6 +117,7 @@ module Astute
|
|||||||
|
|
||||||
def puppet_status
|
def puppet_status
|
||||||
puppetd.last_run_summary(
|
puppetd.last_run_summary(
|
||||||
|
:puppet_noop_run => @options[:puppet_noop_run],
|
||||||
:raw_report => @options[:raw_report]
|
:raw_report => @options[:raw_report]
|
||||||
).first[:data]
|
).first[:data]
|
||||||
end
|
end
|
||||||
|
@ -35,6 +35,7 @@ module Astute
|
|||||||
:timeout => @task['parameters']['timeout'],
|
:timeout => @task['parameters']['timeout'],
|
||||||
:puppet_debug => @task['parameters']['debug'],
|
:puppet_debug => @task['parameters']['debug'],
|
||||||
:puppet_noop_run => true,
|
:puppet_noop_run => true,
|
||||||
|
:raw_report => true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -127,9 +127,13 @@ module MCollective
|
|||||||
}.merge(reply[:resources])
|
}.merge(reply[:resources])
|
||||||
|
|
||||||
if valid_report?(report) && request.fetch(:raw_report, false)
|
if valid_report?(report) && request.fetch(:raw_report, false)
|
||||||
|
if request[:puppet_noop_run]
|
||||||
|
reply[:raw_report] = get_noop_report_only(report)
|
||||||
|
else
|
||||||
reply[:raw_report] = File.read(@last_report)
|
reply[:raw_report] = File.read(@last_report)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def set_status
|
def set_status
|
||||||
reply[:status] = puppet_daemon_status
|
reply[:status] = puppet_daemon_status
|
||||||
@ -277,6 +281,21 @@ module MCollective
|
|||||||
report.is_a?(Puppet::Transaction::Report) && report.resource_statuses
|
report.is_a?(Puppet::Transaction::Report) && report.resource_statuses
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_noop_report_only(report)
|
||||||
|
noop_report = []
|
||||||
|
report.logs.each do |log|
|
||||||
|
# skip info level reports
|
||||||
|
next if log.level == :info
|
||||||
|
resource_report = {}
|
||||||
|
resource_report['source'] = log.source
|
||||||
|
resource_report['message'] = log.message
|
||||||
|
resource_report['file'] = log.file unless log.file.nil?
|
||||||
|
resource_report['line'] = log.line unless log.line.nil?
|
||||||
|
noop_report.push(resource_report)
|
||||||
|
end
|
||||||
|
noop_report
|
||||||
|
end
|
||||||
|
|
||||||
def kill_process
|
def kill_process
|
||||||
return if ['stopped', 'disabled'].include? puppet_daemon_status
|
return if ['stopped', 'disabled'].include? puppet_daemon_status
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user