Merge lp:~shufgy/graphite/graphite into lp:~graphite-dev/graphite/main

[Simon Huggins]

Add new series function to allow people to graph a series based on criteria in another series.

[Jeff Blaine (jblaine-kickflop)]

Looks reasonable and harmless to me. It's just a matter of the Real Graphite Devs making a decision I guess.

[Michael Leinartas (mleinartas)]

Sorry for letting this sit so long without comment.

I've delayed merging this primarily because I'm not sure whether this has broad enough use case. It think providing two separate metrics - one to display, one to test with - *might* make it a bit more broad, but it ruins what I think your use case is (correct me if I'm wrong): to use this as a conditional filter on a wildcard with many matches.

I'm going to think on this a bit more to see if I can come up with another more broad way to do a filter like this. If nothing comes to me, I'll just merge it - as Jeff said, it is harmless.

Anyone else who does think they'd use this, please +1

=== modified file 'webapp/graphite/render/functions.py'
--- webapp/graphite/render/functions.py	2012-03-25 04:54:03 +0000
+++ webapp/graphite/render/functions.py	2012-04-05 13:43:30 +0000
@@ -23,6 +23,7 @@
 from graphite.logger import log
 from graphite.render.datalib import fetchData, TimeSeries, timestamp
 from graphite.render.attime import parseTimeOffset
+from graphite.render.evaluator import evaluateTarget
 
 from graphite.events import models
 
@@ -170,6 +171,27 @@
 
   return [newSeries[name] for name in newNames]
 
+def useSeriesAbove(requestContext, seriesList, min, search, replace):
+  """
+  Given one series, compares it against min and if it is more than min, applies the regular expression against the metric to plot a related metric
+
+  e.g. given ganglia.metric1.reqs,10,'reqs','time' it will plot the response time metric only when the corresponding request/s metric is > 10
+
+  .. code-block:: none
+
+    &target=useSeriesAbove(ganglia.metric1.reqs,10,"reqs","time")
+  """
+  newSeries = []
+
+  for series in seriesList:
+    newname = re.sub(search, replace, series.name)
+    if max(series) > min:
+      n = evaluateTarget(requestContext, newname)
+      if n is not None and len(n) > 0:
+        newSeries.append(n[0])
+
+  return newSeries
+
 def averageSeriesWithWildcards(requestContext, seriesList, *position): #XXX
   """
   Call averageSeries after inserting wildcards at the given position(s).
@@ -2333,6 +2355,7 @@
   'limit' : limit,
   'sortByMaxima' : sortByMaxima,
   'sortByMinima' : sortByMinima,
+  'useSeriesAbove': useSeriesAbove,
 
   # Data Filter functions
   'removeAbovePercentile' : removeAbovePercentile,