fix issues with jobs not showing in dashboard
paulfantom committed
Jul 6, 2016 at 21:33 UTC
6b8d21d2f6fae4ae2cb409e44fe7f5ce5b3f8c92
1 file changed
+3
-10
python.d/python_modules/base.py
+3
-10
@@ -330,11 +330,7 @@ class SimpleService(BaseService):
330
idx = 0
331
for name in self.order:
332
options = self.definitions[name]['options'] + [self.priority + idx, self.update_every]
333
- if self.name == "":
334
- type_id = self.__module__
335
- else:
336
- type_id = self.__module__ + "_" + self.name
337
- self.chart(type_id + "." + name, *options)
333
+ self.chart(self.chart_name + "." + name, *options)
334
# check if server has this datapoint
335
for line in self.definitions[name]['lines']:
336
if line[0] in data:
@@ -356,11 +352,7 @@ class SimpleService(BaseService):
352
353
updated = False
354
for chart in self.order:
359
- if str(self.name) == "":
360
- type_id = self.__module__
361
- else:
362
- type_id = self.__module__ + "_" + self.name
363
- if self.begin(type_id + "." + chart, interval):
355
+ if self.begin(self.chart_name + "." + chart, interval):
356
updated = True
357
for dim in self.definitions[chart]['lines']:
358
try:
@@ -417,6 +409,7 @@ class UrlService(SimpleService):
409
self.name = 'local'
410
else:
411
self.name = str(self.name)
412
+ self.chart_name += "_" + self.name
413
try:
414
self.url = str(self.configuration['url'])
415
except (KeyError, TypeError):