Yuvipanda has submitted this change and it was merged.
Change subject: diamond: Don't choke on puppet syntax error failures
......................................................................
diamond: Don't choke on puppet syntax error failures
Change-Id: Ie6b2b025889269f58694387cdd5843c485b75b8e
---
M modules/diamond/files/collector/minimalpuppetagent.py
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/diamond/files/collector/minimalpuppetagent.py
b/modules/diamond/files/collector/minimalpuppetagent.py
index 7a2d101..ac15338 100644
--- a/modules/diamond/files/collector/minimalpuppetagent.py
+++ b/modules/diamond/files/collector/minimalpuppetagent.py
@@ -84,10 +84,15 @@
summary = self._get_summary()
# Only publish total executed time and 'time since last puppet run'
- total_time = summary['time']['total']
+ if 'total' in summary['time']:
+ total_time = summary['time']['total']
+ self.publish('total_time', total_time)
time_since = int(time.time()) - int(summary['time']['last_run'])
- failed_events = summary['events']['failure']
- self.publish('total_time', total_time)
+ if 'events' in summary and 'failure' in summary['events']:
+ failed_events = summary['events']['failure']
+ else:
+ failed_events = 1 # This means that there was a syntax error
+
self.publish('time_since_last_run', time_since)
self.publish('failed_events', failed_events)
--
To view, visit https://gerrit.wikimedia.org/r/172592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6b2b025889269f58694387cdd5843c485b75b8e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
