X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=python.d%2Ffreeradius.chart.py;h=f3de157350f6f09e191d3439a71ce40d86f47c7d;hb=e1fcc1d82f71bc10da02da1e7fa607c5a84fcddf;hp=001147cef06e37c327f6abd30a27a72cef9b2157;hpb=4211a833100444cf86fcabc2a45a2330ab729c89;p=netdata.git diff --git a/python.d/freeradius.chart.py b/python.d/freeradius.chart.py index 001147ce..f3de1573 100644 --- a/python.d/freeradius.chart.py +++ b/python.d/freeradius.chart.py @@ -72,11 +72,11 @@ class Service(SimpleService): if self._get_raw_data(): chart_choice = [True, bool(self.acct), bool(self.proxy_auth), bool(self.proxy_acct)] self.order = [chart for chart, choice in zip(ORDER, chart_choice) if choice] - self.definitions = {k:v for k, v in CHARTS.items() if k in self.order} + self.definitions = dict([chart for chart in CHARTS.items() if chart[0] in self.order]) self.info('Plugin was started succesfully') return True else: - self.error('Request returned no data. Is server alive? Used options: host {}, port {}, secret {}'.format(self.host, self.port, self.secret)) + self.error('Request returned no data. Is server alive? Used options: host {0}, port {1}, secret {2}'.format(self.host, self.port, self.secret)) return False @@ -86,7 +86,7 @@ class Service(SimpleService): :return: dict """ result = self._get_raw_data() - return {k.lower():int(v) for k, v in findall(r'((?<=-)[AP][a-zA-Z-]+) = (\d+)', result)} + return dict([(elem[0].lower(), int(elem[1])) for elem in findall(r'((?<=-)[AP][a-zA-Z-]+) = (\d+)', result)]) def _get_raw_data(self): """