Skip to content

Commit d0f4a0d

Browse files
committed
feature: added exception type to 'Mamonsu plugin errors' metric
1 parent f895ab3 commit d0f4a0d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

mamonsu/lib/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def keys_and_queries(self, template_zabbix):
158158
return None
159159

160160
def _log_exception(self, e, trace):
161-
self.last_error_text = 'catch error: {0}'.format(e)
161+
self.last_error_text = 'plugin {0} caught error: {1} {2}'.format(self.__class__.__name__.lower(), repr(e), e)
162162
self.log.error(self.last_error_text)
163163
self.log.info('hint: enable debug level to full exception trace')
164164
self.log.debug(trace)

mamonsu/lib/supervisor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,12 @@ def _loop(self):
5252
last_error = plugin.last_error_text
5353
plugin_errors += 1
5454
time.sleep(10)
55-
# error counts
5655
plugin_probes += 1
5756
if plugin_probes >= 60:
5857
if plugin_errors > 0:
5958
self._sender.send(
6059
'mamonsu.plugin.errors[]',
61-
'Last: {0}. Total count: {1}.'.format(last_error, plugin_errors))
60+
'Last {0} Total count of errors: {1}.'.format(last_error, plugin_errors))
6261
else:
6362
self._sender.send('mamonsu.plugin.errors[]', '')
6463
plugin_errors, plugin_probes = 0, 0

0 commit comments

Comments
 (0)