fix issue with multiple autodetected jobs
paulfantom committed
Jul 13, 2016 at 18:33 UTC
b56df9c761830a42ae61125c2ebc3e24b3ae9086
1 file changed
+8
-4
plugins.d/python.d.plugin
+8
-4
@@ -319,10 +319,8 @@ class PythonCharts(object):
319
i = 0
320
overridden = []
321
while i < len(self.jobs):
322
+ msg.error(*overridden)
323
job = self.jobs[i]
323
- if job.name in overridden:
324
- self._stop(job)
325
- msg.error(job.name + " already exists")
324
try:
325
if not job.check():
326
self._stop(job, "failed check")
@@ -331,10 +329,15 @@ class PythonCharts(object):
329
i += 1
330
try:
331
if job.override_name is not None:
332
+ tmp = job.name
333
job.name = job.override_name
334
msg.debug(job.chart_name + " changing chart name to: " + job.__module__ + '_' + job.name)
335
job.chart_name = job.__module__ + '_' + job.name
337
- overridden.append(job.name)
336
+ if job.chart_name in overridden:
337
+ self._stop(job)
338
+ msg.error(job.chart_name + " already exists. Created with '" + tmp + "'")
339
+ else:
340
+ overridden.append(job.chart_name)
341
except Exception:
342
pass
343
except AttributeError:
@@ -482,6 +485,7 @@ def run():
485
# parse passed command line arguments
486
modules = parse_cmdline(MODULES_DIR, *sys.argv)
487
msg.DEBUG_FLAG = DEBUG_FLAG
488
+ modules = ['sensors']
489
msg.info("MODULES_DIR='" + MODULES_DIR +
490
"', CONFIG_DIR='" + CONFIG_DIR +
491
"', UPDATE_EVERY=" + str(BASE_CONFIG['update_every']) +