Merge in https://github.com/obfuscurity/graphite @b070a4d and @a915ff2

Add function aliasByMetric typo, found by RedKrieg
tmm1 · Apr 22, 2012 · c4a9bd9 · c4a9bd9
1 parent 84f61bd
commit c4a9bd9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/webapp/content/js/composer_widgets.js b/webapp/content/js/composer_widgets.js
@@ -946,6 +946,7 @@ function createFunctionsMenu() {
       text: 'Special',
       menu: [
         {text: 'Set Legend Name', handler: applyFuncToEachWithInput('alias', 'Enter a legend label for this graph target', {quote: true})},
+        {text: 'Set Legend Name By Metric', handler: applyFuncToEach('aliasByMetric')},
         {text: 'Add Value to Legend Name',
 	      	 menu: [
         		{text: "Last Value", handler: applyFuncToEach('legendValue', '"last"')},

diff --git a/webapp/graphite/browser/views.py b/webapp/graphite/browser/views.py
@@ -253,7 +253,7 @@ def json_response(nodes, request=None):
   #json = str(nodes) #poor man's json encoder for simple types
   json_data = json.dumps(nodes)
   if jsonp:
-    response = HttpResponse("%s(%s)" % (jsonp, json_data),mimetype="test/javascript")
+    response = HttpResponse("%s(%s)" % (jsonp, json_data),mimetype="text/javascript")
   else:
     response = HttpResponse(json_data,mimetype="application/json")
   response['Pragma'] = 'no-cache'

diff --git a/webapp/graphite/render/functions.py b/webapp/graphite/render/functions.py
@@ -841,6 +841,19 @@ def aliasByNode(requestContext, seriesList, *nodes):
     series.name = '.'.join(metric_pieces[n] for n in nodes)
   return seriesList
 
+def aliasByMetric(requestContext, seriesList):
+  """
+  Takes a seriesList and applies an alias derived from the base metric name.
+
+  .. code-block:: none
+
+    &target=aliasByMetric(carbon.agents.graphite.creates)
+
+  """
+  for series in seriesList:
+    series.name = series.name.split('.')[-1]
+  return seriesList
+
 def legendValue(requestContext, seriesList, *valueTypes):
   """
   Takes one metric or a wildcard seriesList and a string in quotes.
@@ -2388,6 +2401,7 @@ def pieMinimum(requestContext, series):
   'alias' : alias,
   'aliasSub' : aliasSub,
   'aliasByNode' : aliasByNode,
+  'aliasByMetric' : aliasByMetric,
   'cactiStyle' : cactiStyle,
   'color' : color,
   'alpha' : alpha,