fix
Wing924 committed
Feb 23, 2018 at 11:56 UTC
bc866cce9831da7e0f2a81200a4f7e25a56dbbed
1 file changed
+9
-12
python.d/springboot.chart.py
+9
-12
@@ -96,23 +96,20 @@ class Service(UrlService):
96
return data or None
97
98
def _setup_charts(self):
99
- order = []
100
- definitions = {}
99
+ self.order = []
100
+ self.definitions = {}
101
defaults = self.configuration.get('defaults', {})
102
103
for chart in DEFAULT_ORDER:
104
if defaults.get(chart, True):
105
- order.append(chart)
106
- definitions[chart] = DEFAULT_CHARTS[chart]
105
+ self.order.append(chart)
106
+ self.definitions[chart] = DEFAULT_CHARTS[chart]
107
108
for extra in self.configuration.get('extras', []):
109
- self._add_extra_chart(definitions, extra)
110
- order.append(extra['id'])
109
+ self._add_extra_chart(extra)
110
+ self.order.append(extra['id'])
111
112
- self.order = order
113
- self.definitions = definitions
114
-
115
- def _add_extra_chart(self, charts, chart):
112
+ def _add_extra_chart(self, chart):
113
chart_id = chart.get('id', None) or die('id is not defined in extra chart')
114
options = chart.get('options', None) or die('option is not defined in extra chart: %s' % chart_id)
115
lines = chart.get('lines', None) or die('lines is not defined in extra chart: %s' % chart_id)
@@ -129,14 +126,14 @@ class Service(UrlService):
126
}
127
128
for line in lines:
132
- dimension = line.get('dimension', None) or self.die('dimension is missing: %s' chart_id)
129
+ dimension = line.get('dimension', None) or die('dimension is missing: %s' % chart_id)
130
name = line.get('name', dimension)
131
algorithm = line.get('algorithm', 'absolute')
132
multiplier = line.get('multiplier', 1)
133
divisor = line.get('divisor', 1)
134
result['lines'].append([dimension, name, algorithm, multiplier, divisor])
135
139
- charts[chart_id] = result
136
+ self.definitions[chart_id] = result
137
138
@classmethod
139
def die(error_message):