Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/mon 160365 2 #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/mon 160365 2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd30e9
a new input_target field should reflect input target
Feb 12, 2017
e2af88f
MON-160365: adding unit test for new field
Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions webapp/graphite/render/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ def renderView(request):
else:
cachedData = None

new_old_target_map = {}

if cachedData is not None:
requestContext['data'] = data = cachedData
else: # Have to actually retrieve the data now
Expand All @@ -114,6 +116,12 @@ def renderView(request):
log.rendering("Retrieval of %s took %.6f" % (target, time() - t))
data.extend(seriesList)

if type(seriesList) is list:
if seriesList:
new_old_target_map[seriesList[0].name] = target
else:
new_old_target_map[seriesList.name] = target

if useCache:
cache.add(dataKey, data, cacheTimeout)

Expand Down Expand Up @@ -154,7 +162,7 @@ def renderView(request):
else:
timestamps = range(int(series.start), int(series.end) + 1, int(series.step))
datapoints = zip(series, timestamps)
series_data.append(dict(target=series.name, datapoints=datapoints))
series_data.append(dict(target=series.name, datapoints=datapoints, input_target=new_old_target_map[series.name]))
elif 'noNullPoints' in requestOptions and any(data):
for series in data:
values = []
Expand All @@ -163,12 +171,12 @@ def renderView(request):
timestamp = series.start + (index * series.step)
values.append((v,timestamp))
if len(values) > 0:
series_data.append(dict(target=series.name, datapoints=values))
series_data.append(dict(target=series.name, datapoints=values, input_target=new_old_target_map[series.name]))
else:
for series in data:
timestamps = range(int(series.start), int(series.end) + 1, int(series.step))
datapoints = zip(series, timestamps)
series_data.append(dict(target=series.name, datapoints=datapoints))
series_data.append(dict(target=series.name, datapoints=datapoints, input_target=new_old_target_map[series.name]))

if 'jsonp' in requestOptions:
response = HttpResponse(
Expand Down Expand Up @@ -213,7 +221,7 @@ def renderView(request):
for series in data:
timestamps = range(series.start, series.end, series.step)
datapoints = [{'x' : x, 'y' : y} for x, y in zip(timestamps, series)]
series_data.append( dict(target=series.name, datapoints=datapoints) )
series_data.append( dict(target=series.name, datapoints=datapoints, input_target=new_old_target_map[series.name]) )
if 'jsonp' in requestOptions:
response = HttpResponse(
content="%s(%s)" % (requestOptions['jsonp'], json.dumps(series_data)),
Expand Down
20 changes: 20 additions & 0 deletions webapp/tests/test_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ def test_template_string_variables(self):
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], 'nameOfSeries')
self.assertEqual(data['input_target'], 'template(time($1),"nameOfSeries")')

url = reverse('graphite.render.views.renderView')
response = self.client.get(url, {
Expand All @@ -261,6 +262,7 @@ def test_template_string_variables(self):
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], 'nameOfSeries')
self.assertEqual(data['input_target'], 'template(time($name),name="nameOfSeries")')

url = reverse('graphite.render.views.renderView')
response = self.client.get(url, {
Expand All @@ -272,6 +274,21 @@ def test_template_string_variables(self):
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], 'nameOfSeries')
self.assertEqual(data['input_target'], 'template(time($name))')


def test_render_input_target(self):
url = reverse('graphite.render.views.renderView')
response = self.client.get(url, {
'target': 'constantLine(12)',
'format': 'json',
'from': '07:01_20140226',
'until': '08:01_20140226',
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], '12')
self.assertEqual(data['input_target'], 'constantLine(12)')


def test_template_pathExpression_variables(self):
self.create_whisper_hosts()
Expand All @@ -284,6 +301,7 @@ def test_template_pathExpression_variables(self):
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], 'sumSeries(hosts.worker1.cpu)')
self.assertEqual(data['input_target'], 'template(sumSeries(hosts.$1.cpu),"worker1")')

response = self.client.get(url, {
'target': 'template(sumSeries(hosts.$1.cpu),"worker1")',
Expand All @@ -292,6 +310,7 @@ def test_template_pathExpression_variables(self):
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], 'sumSeries(hosts.worker*.cpu)')
self.assertEqual(data['input_target'], 'template(sumSeries(hosts.$1.cpu),"worker1")')

response = self.client.get(url, {
'target': 'template(sumSeries(hosts.$hostname.cpu))',
Expand All @@ -300,6 +319,7 @@ def test_template_pathExpression_variables(self):
})
data = json.loads(response.content)[0]
self.assertEqual(data['target'], 'sumSeries(hosts.worker*.cpu)')
self.assertEqual(data['input_target'], 'template(sumSeries(hosts.$hostname.cpu))')

class ConsistentHashRingTest(TestCase):
def test_chr_compute_ring_position(self):
Expand Down