minor fixes
paulfantom committed
Jul 13, 2016 at 18:51 UTC
b063bfacd6cba9e51825b143303d158a835e95ce
2 files changed
+2
-5
plugins.d/python.d.plugin
-1
@@ -485,7 +485,6 @@ 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']
488
msg.info("MODULES_DIR='" + MODULES_DIR +
489
"', CONFIG_DIR='" + CONFIG_DIR +
490
"', UPDATE_EVERY=" + str(BASE_CONFIG['update_every']) +
python.d/python_modules/base.py
+2
-4
@@ -207,8 +207,6 @@ class BaseService(threading.Thread):
207
p = self._format(type_id, name, title, units, family, category, charttype, priority, update_every)
208
self._line("CHART", *p)
209
210
-
211
-
210
def dimension(self, id, name=None, algorithm="absolute", multiplier=1, divisor=1, hidden=False):
211
"""
212
Defines a new dimension for the chart
@@ -235,7 +233,7 @@ class BaseService(threading.Thread):
233
if algorithm not in ("absolute", "incremental", "percentage-of-absolute-row", "percentage-of-incremental-row"):
234
algorithm = "absolute"
235
238
- self._dimensions.append(id)
236
+ self._dimensions.append(str(id))
237
if hidden:
238
p = self._format(id, name, algorithm, multiplier, divisor, "hidden")
239
#self._line("DIMENSION", id, name, algorithm, str(multiplier), str(divisor), "hidden")
@@ -272,7 +270,7 @@ class BaseService(threading.Thread):
270
:return: boolean
271
"""
272
if id not in self._dimensions:
275
- self.error("wrong dimension id:", id)
273
+ self.error("wrong dimension id:", id, "Available dimensions are:", *self._dimensions)
274
return False
275
try:
276
value = str(int(value))