From 682ef4f6afa41d5c139d6e7d187c456c39679179 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 6 Jul 2016 19:25:42 +0200 Subject: [PATCH] remove trailing '_' from chart name when configuration doesn't specify job name --- python.d/python_modules/base.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py index a1b28d85..c025f16d 100644 --- a/python.d/python_modules/base.py +++ b/python.d/python_modules/base.py @@ -330,7 +330,11 @@ class SimpleService(BaseService): idx = 0 for name in self.order: options = self.definitions[name]['options'] + [self.priority + idx, self.update_every] - self.chart(self.__module__ + "_" + self.name + "." + name, *options) + if self.name == "": + type_id = self.__module__ + else: + type_id = self.__module__ + "_" + self.name + self.chart(type_id + "." + name, *options) # check if server has this datapoint for line in self.definitions[name]['lines']: if line[0] in data: @@ -352,7 +356,11 @@ class SimpleService(BaseService): updated = False for chart in self.order: - if self.begin(self.__module__ + "_" + str(self.name) + "." + chart, interval): + if str(self.name) == "": + type_id = self.__module__ + else: + type_id = self.__module__ + "_" + self.name + if self.begin(type_id + "." + chart, interval): updated = True for dim in self.definitions[chart]['lines']: try: -- 2.39.2