Merge lp:~lucio.torre/graphite/add-events into lp:~graphite-dev/graphite/main

[Lucio Torre]

Add events to graphite.

Events are instantaneous occurrences that we want to track and correlate with our current metrics. Sample events are rollouts, reboots, errors, etc.

Events store the following information: summary, date, tags and "extra data", where you can store whatever you might need. This can all be edited from the admin: http://ubuntuone.com/p/16CJ/

You can add events from the command line using curl:
$ curl -X POST http://localhost:8000/events/ -d '{"what": "Something Interesting"}'

So its very easy to integrate with other tools.

You can see the list of events from: http://localhost:8000/events/ and get to the event details by clicking on its line. (eg, http://localhost:8000/events/4)

Then, using the graphlot ui you can overlay events into a graph by selecting tags that would filter the events or just '*' to select all.

Events get overlayed in the graph, you get a tooltip with the summary when hovering over it and when you click on it you go to the details page.

In order to make developing/testing this easier, there are also some new functions that generate data, so you can see a plot for whatever date you want without having real data.

See: http://ubuntuone.com/p/16CY/

[lp:~lucio.torre/graphite/add-events]

306. By Lucio Torre on 2011-07-25

merged with trunk

307. By Lucio Torre on 2011-07-25

removed dirt.

[Sidnei da Silva (sidnei)]

Looks pretty ok to me. A few comments, but none of them blockers:

[1] arrays_equal has a few issues the way it's implemented, but should work given how it's used. There's a really nice array comparison implementation here: http://www.breakingpar.com/bkp/home.nsf/0/87256B280015193F87256BFB0077DFFD

[2] I'm worried about the use of 'autoescape off' here, since basically you could inject some javascript through post_event handler and have it rendered unsanitized into the template, but Lucio pointed out there's more templates already using 'autoescape off' in the tree. Probably deserves some checking all around. It doesn't seem like removing it from those newly introduced templates would break them though.

review: Approve

[Aman Gupta (tmm1)]

I really like the new test functions. Can you add some docs for http://readthedocs.org/docs/graphite/en/latest/functions.html

Also we should document the new dependency on django.tagging in requirements.txt and in the docs somewhere.

[Aman Gupta (tmm1)]

As discussed on IRC, it would be nice to expose these new events to the server-side graphing api as well. Probably as a new function: events(tag, tag, ...), which could query the Events model and generate a TimeSeries to graph.

[Lucio Torre (lucio.torre)]

updated js array comparison to include the one in the link
removed the autoescape for all event related templates
documented test functions
added django-tagging to requirements
added events(*tags) function for use with drawAsInfinite
fixed bug on events tooltips.

[lp:~lucio.torre/graphite/add-events]

308. By Lucio Torre on 2011-08-23

merged with trunk

309. By Lucio Torre on 2011-08-23

fixes, documentation and new events functions

310. By Lucio Torre on 2011-08-23

more doc

[chrismd (chrismd)]

Looks great, unfortunately I could not merge it into trunk because we haven't upgraded the repo to 2a format yet. The diff however applied cleanly as a patch, which I just committed to trunk.

review: Approve

[DiegoV (diego-varese)]

Looks like your code does not work with a MySQL backend:

https://bugs.launchpad.net/graphite/+bug/1068861

[Dieter P (dieter-plaetinck)]

IMHO managing annotated events has nothing do with time series data; I feel like trying to bolt that logic onto graphite is a bit awkward and requires a lot of code additions/changes precisely because this is a different problem domain.
Based on that realization I wrote a small tool for annotated event management (with similar input/output API's as graphite): http://dieter.plaetinck.be/anthracite-event-database-enrich-monitoring-dashboards-visual-numerical-analysis-events-business-impact.html

=== modified file 'docs/install.rst'
--- docs/install.rst	2011-03-21 20:22:09 +0000
+++ docs/install.rst	2011-08-23 21:18:40 +0000
@@ -14,11 +14,13 @@
 * Python 2.4 or greater (2.6+ recommended)
 * `Pycairo <http://www.cairographics.org/pycairo/>`_
 * `Django <http://www.djangoproject.com/>`_ 1.0 or greater
+* `django-tagging <http://code.google.com/p/django-tagging/>`_ 0.3.1
 * A json module, if you're using Python2.6 this comes standard. With 2.4 you should
   install `simplejson <http://pypi.python.org/pypi/simplejson/>`_
 * A Django-supported database module (sqlite comes standard with Python 2.6)
 * `Twisted <http://twistedmatrix.com/>`_ 8.0 or greater (10.0+ recommended)
 
+
 Also both the Graphite webapp and Carbon require the whisper database library.
 
 There are also several optional dependencies, some of which are necessary for

=== modified file 'docs/who-is-using.rst'
--- docs/who-is-using.rst	2011-03-28 17:30:25 +0000
+++ docs/who-is-using.rst	2011-08-23 21:18:40 +0000
@@ -8,5 +8,6 @@
 * `Etsy <http://www.etsy.com/>`_ (see http://codeascraft.etsy.com/2010/12/08/track-every-release/)
 * `Google <http://google-opensource.blogspot.com/2010/09/get-ready-to-rocksteady.html>`_ (opensource Rocksteady project)
 * `Media Temple <http://mediatemple.net/>`_
+* `Canonical <http://www.canonical.com>`_
 
 And many more, I still need to collect some links...

=== modified file 'requirements.txt'
--- requirements.txt	2011-08-04 22:49:45 +0000
+++ requirements.txt	2011-08-23 21:18:40 +0000
@@ -31,5 +31,6 @@
 python-memcached==1.47
 txAMQP==0.4
 simplejson==2.1.6
+django-tagging==0.3.1
 http://cairographics.org/releases/py2cairo-1.8.10.tar.gz
 ./whisper

=== modified file 'setup.py'
--- setup.py	2011-08-20 05:25:28 +0000
+++ setup.py	2011-08-23 21:18:40 +0000
@@ -51,10 +51,13 @@
     'graphite.metrics',
     'graphite.dashboard',
     'graphite.graphlot',
+    'graphite.events',
     'graphite.thirdparty',
     'graphite.thirdparty.pytz',
   ],
-  package_data={'graphite' : ['templates/*', 'local_settings.py.example', 'render/graphTemplates.conf']},
+  package_data={'graphite' : 
+    ['templates/*', 'local_settings.py.example', 
+    'render/graphTemplates.conf']},
   scripts=glob('bin/*'),
   data_files=webapp_content.items() + storage_dirs + conf_files,
   **setup_kwargs

=== modified file 'webapp/content/js/jquery.graphite.js'
--- webapp/content/js/jquery.graphite.js	2011-07-10 23:30:06 +0000
+++ webapp/content/js/jquery.graphite.js	2011-08-23 21:18:40 +0000
@@ -1,4 +1,38 @@
 (function( $ ) {
+    
+    function arrays_equal(array1, array2) {
+        if (array1 == null || array2 == null) {
+            return false;
+        }
+        var temp = new Array();
+        if ( (!array1[0]) || (!array2[0]) ) { // If either is not an array
+           return false;
+        }
+        if (array1.length != array2.length) {
+           return false;
+        }
+        // Put all the elements from array1 into a "tagged" array
+        for (var i=0; i<array1.length; i++) {
+           key = (typeof array1[i]) + "~" + array1[i];
+        // Use "typeof" so a number 1 isn't equal to a string "1".
+           if (temp[key]) { temp[key]++; } else { temp[key] = 1; }
+        // temp[key] = # of occurrences of the value (so an element could appear multiple times)
+        }
+        // Go through array2 - if same tag missing in "tagged" array, not equal
+        for (var i=0; i<array2.length; i++) {
+           key = (typeof array2[i]) + "~" + array2[i];
+           if (temp[key]) {
+              if (temp[key] == 0) { return false; } else { temp[key]--; }
+           // Subtract to keep track of # of appearances in array2
+           } else { // Key didn't appear in array1, arrays are not equal.
+              return false;
+           }
+        }
+        // If we get to this point, then every generated key in array1 showed up the exact same
+        // number of times in array2, so the arrays are equal.
+        return true;
+    }
+
     $.fn.editable_in_place = function(callback) {
         var editable = $(this);
         if (editable.length > 1) {
@@ -6,14 +40,14 @@
         }
 
         var editing = false;
-        
+
         editable.bind('click', function () {
             var $element = this;
 
             if (editing == true) return;
 
             editing = true;
-            
+
             var $edit = $('<input type="text" class="edit_in_place" value="' + editable.text() + '"/>');
 
             $edit.css({'height' : editable.height(), 'width' : editable.width()});
@@ -57,9 +91,10 @@
             var latestPosition = null;
             var autocompleteoptions = {
                         minChars: 0,
-                        selectFirst: false,
-                    };
-                    
+                        selectFirst: false
+            };
+            var markings = [];
+
             var parse_incoming = function(incoming_data) {
                 var result = [];
                 var start = incoming_data.start;
@@ -77,7 +112,7 @@
                 };
             };
 
-            
+
             var render = function () {
                 var lines = []
                 for (i in graph_lines) {
@@ -94,20 +129,20 @@
 
                 $.extend(xaxismode, xaxisranges);
                 $.extend(yaxismode, yaxisranges);
-                
+
                 plot = $.plot($("#graph"),
                     lines,
                     {
                         xaxis: xaxismode,
                         yaxis: yaxismode,
-                        grid: { hoverable: true, },
+                        grid: { hoverable: true, markings: markings },
                         selection: { mode: "xy" },
                         legend: { show: true, container: graph.find("#legend") },
                         crosshair: { mode: "x" },
                     }
                 );
 
-                
+
                 for (i in lines) {
                     lines[i] = $.extend({}, lines[i]);
                     lines[i].label = null;
@@ -174,7 +209,7 @@
                 if (!updateLegendTimeout)
                     updateLegendTimeout = setTimeout(updateLegend, 50);
             });
-            
+
             function showTooltip(x, y, contents) {
                 $('<div id="tooltip">' + contents + '</div>').css( {
                     position: 'absolute',
@@ -191,7 +226,7 @@
             var previousPoint = null;
             $("#graph").bind("plothover", function (event, pos, item) {
                 if (item) {
-                    if (previousPoint != item.datapoint) {
+                    if ( !arrays_equal(previousPoint, item.datapoint)) {
                         previousPoint = item.datapoint;
 
                         $("#tooltip").remove();
@@ -201,13 +236,38 @@
                         showTooltip(item.pageX, item.pageY,
                                     item.series.label + " = " + y);
                     }
-                }
-                else {
-                    $("#tooltip").remove();
-                    previousPoint = null;
+                } else {
+                    calc_distance = function(mark, event) {
+                        mark_where = plot.pointOffset({ x: mark.xaxis.from, y: 0});
+                        d = plot.offset().left + mark_where.left - event.pageX - plot.getPlotOffset().left;
+                        return d*d;
+                    }
+                    distance = undefined;
+                    winner = null;
+                    for (marki in markings) {
+                        mark = markings[marki];
+                        dist = calc_distance(mark, pos);
+                        if (distance == undefined || distance > dist) {
+                            distance = dist;
+                            winner = mark;
+                        }
+                    }
+                    if (distance < 20) {
+                        if (!arrays_equal(previousPoint,[winner])) {
+                            previousPoint = [winner]
+                            $("#tooltip").remove();
+                            showTooltip(pos.pageX-20, pos.pageY-20, winner.text);
+                        }
+                    } else {
+                        if (previousPoint != null) {
+                            previousPoint = null;
+                            $("#tooltip").remove();
+                        }
+
+                    }
                 }
             });
-            
+
             $("#overview").bind("plotselected", function (event, ranges) {
                 xaxisranges = { min: ranges.xaxis.from, max: ranges.xaxis.to };
                 yaxisranges = { min: ranges.yaxis.from, max: ranges.yaxis.to };
@@ -231,6 +291,7 @@
                     var metric = $(this);
                     update_metric_row(metric);
                 });
+                get_events(graph.find("#eventdesc"))
                 render();
             }
 
@@ -245,9 +306,14 @@
                         url = url + '&target=' + series;
                     }
                 }
+                events = graph.find("#eventdesc").val();
+                if (events != "") {
+                    url = url + "&events=" + events;
+                }
+
                 return url;
             }
-                
+
             var build_when = function () {
                 var when = '';
                 var from  = graph.find("#from").text();
@@ -265,6 +331,15 @@
                 return 'rawdata?'+when+'&target='+series;
             }
 
+            var build_url_events = function (tags) {
+                when = build_when()
+                if (tags == "*") {
+                    return '/events/get_data?'+when
+                } else {
+                    return '/events/get_data?'+when+'&tags='+tags;
+                }
+            }
+
             var update_metric_row = function(metric_row) {
                 var metric = $(metric_row);
                 var metric_name = metric.find(".metricname").text();
@@ -290,9 +365,45 @@
                     }
                 });
 
-                
-            }
-            
+
+            }
+
+            var get_events = function(events_text) {
+                if (events_text.val() == "") {
+                    events_text.removeClass("ajaxworking");
+                    events_text.removeClass("ajaxerror");
+                    markings = [];
+                    render();
+                } else {
+                    events_text.addClass("ajaxworking");
+                    $.ajax({
+                        url: build_url_events(events_text.val()),
+                        success: function(req_data) {
+                            events_text.removeClass("ajaxerror");
+                            events_text.removeClass("ajaxworking");
+                            markings = [];
+                            for (i in req_data) {
+                                row = req_data[i];
+                                markings.push({
+                                    color: '#000',
+                                    lineWidth: 1,
+                                    xaxis: { from: row.when*1000, to: row.when*1000 },
+                                    text:'<a href="/events/'+row.id+'/">'+row.what+'<a>'
+                                });
+                            }
+                            render();
+                        },
+                        error: function(req, status, err) {
+                            events_text.removeClass("ajaxworking");
+                            events_text.addClass("ajaxerror");
+                            render();
+                        }
+                    });
+                }
+
+            }
+
+
             // configure the date boxes
             graph.find('#from').editable_in_place(
                 function(editable, value) {
@@ -300,7 +411,7 @@
                     recalculate_all();
                 }
             );
-            
+
 
             graph.find('#until').editable_in_place(
                 function(editable, value) {
@@ -309,7 +420,7 @@
                 }
             );
 
-            graph.find('#update').bind('click', 
+            graph.find('#update').bind('click',
                 function() {
                     recalculate_all();
                 }
@@ -318,11 +429,11 @@
             graph.find('#clearzoom').bind('click',
                 clear_zoom
             );
-            
+
             // configure metricrows
             var setup_row = function (metric) {
                 var metric_name = metric.find('.metricname').text();
-                
+
                 metric.find('.metricname').editable_in_place(
                     function(editable, value) {
                         delete graph_lines[$(editable).text()];
@@ -335,7 +446,7 @@
                     metric.remove();
                     render();
                 });
-                
+
                 metric.find('.yaxis').bind('click', function() {
                     if ($(this).text() == "one") {
                         $(this).text("two");
@@ -346,7 +457,7 @@
                     render();
                 });
             }
-            
+
             graph.find('.metricrow').each(function() {
                 setup_row($(this));
             });
@@ -375,9 +486,23 @@
                 });
             });
 
+            // configure new metric input
+            graph.find('#eventdesc').each(function () {
+                var edit = $(this);
+                edit.keydown(function(e) {
+                    if(e.which===13) { // on enter
+                        // add row
+                        edit.blur();
+                        get_events(edit);
+                    }
+                });
+            });
+
+
             // get data
             recalculate_all();
         });
     };
-    
+
 })( jQuery );
+

=== modified file 'webapp/graphite/browser/urls.py'
--- webapp/graphite/browser/urls.py	2009-10-19 06:20:01 +0000
+++ webapp/graphite/browser/urls.py	2011-08-23 21:18:40 +0000
@@ -19,5 +19,5 @@
   ('^search/?$', 'search'),
   ('^mygraph/?$', 'myGraphLookup'),
   ('^usergraph/?$', 'userGraphLookup'),
-  ('', 'browser'),
+  ('^$', 'browser'),
 )

=== added directory 'webapp/graphite/events'
=== added file 'webapp/graphite/events/__init__.py'
=== added file 'webapp/graphite/events/models.py'
--- webapp/graphite/events/models.py	1970-01-01 00:00:00 +0000
+++ webapp/graphite/events/models.py	2011-08-23 21:18:40 +0000
@@ -0,0 +1,49 @@
+import time
+
+from django.db import models
+from django.contrib import admin
+
+import tagging.fields
+
+    
+class Event(models.Model):
+    class Admin: pass
+    
+    when = models.DateTimeField()
+    what = models.CharField(max_length=255)
+    data = models.TextField(blank=True)
+    tags = tagging.fields.TagField(default="")
+    
+    def get_tags(self):
+        return Tag.objects.get_for_object(self)
+        
+    def __str__(self):
+        return "%s: %s" % (self.when, self.what)
+    
+    @staticmethod
+    def find_events(time_from=None, time_until=None, tags=None):
+        query = Event.objects.all()
+        
+        if time_from is not None:
+            query = query.filter(when__gte=time_from)
+            
+        if time_until is not None:
+            query = query.filter(when__lte=time_until)
+        
+        if tags is not None:
+            for tag in tags:
+                query = query.filter(tags__iregex=r'\b%s\b' % tag)
+        
+        result = list(query.order_by("when"))
+        return result
+    
+    def as_dict(self):
+        return dict(
+            when=self.when,
+            what=self.what,
+            data=self.data,
+            tags=self.tags,
+            id=self.id,
+        )
+    
+admin.site.register(Event)
\ No newline at end of file

=== added file 'webapp/graphite/events/urls.py'
--- webapp/graphite/events/urls.py	1970-01-01 00:00:00 +0000
+++ webapp/graphite/events/urls.py	2011-08-23 21:18:40 +0000
@@ -0,0 +1,21 @@
+"""Copyright 2008 Orbitz WorldWide
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License."""
+
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('graphite.events.views',
+  ('^get_data?$', 'get_data'),
+  (r'(?P<event_id>\d+)/$', 'detail'),
+  ('^$', 'view_events'),
+)

=== added file 'webapp/graphite/events/views.py'
--- webapp/graphite/events/views.py	1970-01-01 00:00:00 +0000
+++ webapp/graphite/events/views.py	2011-08-23 21:18:40 +0000
@@ -0,0 +1,77 @@
+import datetime
+import time
+
+import simplejson
+
+from django.http import HttpResponse
+from django.shortcuts import render_to_response, get_object_or_404
+
+from graphite.events import models
+from graphite.render.attime import parseATTime
+
+
+def to_timestamp(dt):
+    return time.mktime(dt.timetuple())
+
+
+class EventEncoder(simplejson.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, datetime.datetime):
+            return to_timestamp(obj)
+        return simplejson.JSONEncoder.default(self, obj)
+
+
+def view_events(request):
+    if request.method == "GET":
+        context = dict(events=fetch(request))
+        return render_to_response("events.html", context)
+    else:
+        return post_event(request)
+
+def detail(request, event_id):
+    e = get_object_or_404(models.Event, pk=event_id)
+    context = dict(event=e)
+    return render_to_response("event.html", context)
+
+
+def post_event(request):
+    if request.method == 'POST':
+        event = simplejson.loads(request.raw_post_data)
+        assert isinstance(event, dict)
+
+        values = {}
+        values["what"] = event["what"]
+        values["tags"] = event.get("tags", None)
+        values["when"] = datetime.datetime.fromtimestamp(
+            event.get("when", time.time()))
+        if "data" in event:
+            values["data"] = event["data"]
+
+        e = models.Event(**values)
+        e.save()
+
+        return HttpResponse(status=200)
+    else:
+        return HttpResponse(status=405)
+
+def get_data(request):
+    return HttpResponse(simplejson.dumps(fetch(request), cls=EventEncoder),
+                        mimetype="application/json")
+
+def fetch(request):
+    if request.GET.get("from", None) is not None:
+        time_from = parseATTime(request.GET["from"])
+    else:
+        time_from = datetime.datetime.fromtimestamp(0)
+
+    if request.GET.get("until", None) is not None:
+        time_until = parseATTime(request.GET["until"])
+    else:
+        time_until = datetime.datetime.now()
+
+    tags = request.GET.get("tags", None)
+    if tags is not None:
+        tags = request.GET.get("tags").split(" ")
+
+    return [x.as_dict() for x in
+            models.Event.find_events(time_from, time_until, tags=tags)]

=== modified file 'webapp/graphite/graphlot/views.py'
--- webapp/graphite/graphlot/views.py	2011-07-12 07:37:01 +0000
+++ webapp/graphite/graphlot/views.py	2011-08-23 21:18:40 +0000
@@ -20,7 +20,9 @@
 
     untiltime = request.GET.get('until', "-0hour")
     fromtime = request.GET.get('from', "-24hour")
-    context = dict(metric_list=metrics, fromtime=fromtime, untiltime=untiltime)
+    events = request.GET.get('events', "")
+    context = dict(metric_list=metrics, fromtime=fromtime, untiltime=untiltime,
+                   events=events)
     return render_to_response("graphlot.html", context)
 
 def get_data(request):
@@ -45,6 +47,7 @@
         raise Http404
     return HttpResponse(simplejson.dumps(result), mimetype="application/json")
 
+
 def find_metric(request):
     """Autocomplete helper on metric names."""
     try:

=== modified file 'webapp/graphite/render/functions.py'
--- webapp/graphite/render/functions.py	2011-08-10 18:25:01 +0000
+++ webapp/graphite/render/functions.py	2011-08-23 21:18:40 +0000
@@ -17,11 +17,17 @@
 URL parameters to change the data being graphed in some way.
 """
 
-from graphite.render.datalib import TimeSeries, timestamp
-from graphite.render.attime import parseTimeOffset
+import datetime
 from itertools import izip
 import math
 import re
+import random
+import time
+
+from graphite.render.datalib import fetchData, TimeSeries, timestamp
+from graphite.render.attime import parseTimeOffset
+
+from graphite.events import models
 
 #Utility functions
 def safeSum(values):
@@ -1360,6 +1366,141 @@
   return results
 
 
+def timeFunction(requestContext, name):
+  """
+  Short Alias: time()
+  
+  Just returns the timestamp for each X value. T
+
+  Example:
+
+  .. code-block:: none
+
+    &target=time("The.time.series")
+
+  This would create a series named "The.time.series" that contains in Y the same
+  value (in seconds) as X.
+
+  """
+
+  step = 60
+  delta = datetime.timedelta(seconds=step)
+  when = requestContext["startTime"]
+  values = []
+  
+  while when < requestContext["endTime"]:
+    values.append(time.mktime(when.timetuple()))
+    when += delta
+
+  return [TimeSeries(name,
+            time.mktime(requestContext["startTime"].timetuple()),
+            time.mktime(requestContext["endTime"].timetuple()),
+            step, values)]
+  
+
+def sinFunction(requestContext, name, amplitude=1):
+  """
+  Short Alias: sin()
+  
+  Just returns the sine of the current time. he optional amplitude parameter
+  changes the amplitude of the wave.
+
+  Example:
+
+  .. code-block:: none
+
+    &target=sin("The.time.series", 2)
+
+  This would create a series named "The.time.series" that contains sin(x)*2.
+  """
+  step = 60
+  delta = datetime.timedelta(seconds=step)
+  when = requestContext["startTime"]
+  values = []
+  
+  while when < requestContext["endTime"]:
+    values.append(math.sin(time.mktime(when.timetuple()))*amplitude)
+    when += delta
+
+  return [TimeSeries(name,
+            time.mktime(requestContext["startTime"].timetuple()),
+            time.mktime(requestContext["endTime"].timetuple()),
+            step, values)]
+  
+def randomWalkFunction(requestContext, name):
+  """
+  Short Alias: randomWalk()
+  
+  Returns a random walk starting at 0. This is great for testing when there is
+  no real data in whisper.
+
+  Example:
+
+  .. code-block:: none
+
+    &target=randomWalk("The.time.series")
+
+  This would create a series named "The.time.series" that contains points where
+  x(t) == x(t-1)+random()-0.5, and x(0) == 0.
+  """  
+  step = 60
+  delta = datetime.timedelta(seconds=step)
+  when = requestContext["startTime"]
+  values = []
+  current = 0
+  while when < requestContext["endTime"]:
+    values.append(current)
+    current += random.random() - 0.5
+    when += delta
+
+  return [TimeSeries(name,
+            time.mktime(requestContext["startTime"].timetuple()),
+            time.mktime(requestContext["endTime"].timetuple()),
+            step, values)]
+  
+def events(requestContext, *tags):
+  """
+  Returns the number of events at this point in time. Usable with
+  drawAsInfinite.
+
+  Example:
+
+  .. code-block:: none
+
+    &target=events("tag-one", "tag-two")
+    &target=events("*")
+
+  Returns all events tagged as "tag-one" and "tag-two" and the second one
+  returns all events.
+  """
+  step = 60
+  name = "events(" + ", ".join(tags) + ")"
+  delta = datetime.timedelta(seconds=step)
+  when = requestContext["startTime"]
+  values = []
+  current = 0
+  if tags == ("*",):
+    tags = None
+  events = models.Event.find_events(requestContext["startTime"],
+                                    requestContext["endTime"], tags=tags)
+  eventsp = 0
+
+  while when < requestContext["endTime"]:
+    count = 0
+    if events:
+      while eventsp < len(events) and events[eventsp].when >= when \
+          and events[eventsp].when < (when + delta):
+        count += 1
+        eventsp += 1
+        
+    values.append(count)
+    when += delta
+
+  return [TimeSeries(name,
+            time.mktime(requestContext["startTime"].timetuple()),
+            time.mktime(requestContext["endTime"].timetuple()),
+            step, values)]
+  
 def pieAverage(requestContext, series):
   return safeDiv(safeSum(series),safeLen(series))
 
@@ -1437,6 +1578,17 @@
   'exclude' : exclude,
   'constantLine' : constantLine,
   'threshold' : threshold,
+  
+  # test functions
+  'time': timeFunction,
+  "sin": sinFunction,
+  "randomWalk": randomWalkFunction,
+  'timeFunction': timeFunction,
+  "sinFunction": sinFunction,
+  "randomWalkFunction": randomWalkFunction,
+  
+  #events
+  'events': events,
 }
 
 

=== modified file 'webapp/graphite/settings.py'
--- webapp/graphite/settings.py	2011-07-26 05:16:59 +0000
+++ webapp/graphite/settings.py	2011-08-23 21:18:40 +0000
@@ -170,10 +170,12 @@
   'graphite.account',
   'graphite.dashboard',
   'graphite.whitelist',
+  'graphite.events',
   'django.contrib.auth',
   'django.contrib.sessions',
   'django.contrib.admin',
   'django.contrib.contenttypes',
+  'tagging',
 )
 
 AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend']

=== modified file 'webapp/graphite/templates/browserHeader.html'
--- webapp/graphite/templates/browserHeader.html	2011-07-10 23:30:06 +0000
+++ webapp/graphite/templates/browserHeader.html	2011-08-23 21:18:40 +0000
@@ -97,6 +97,7 @@
  <tr><td style='font-size: smaller;'>
   User Interface: <a href="/dashboard/" target="_top">Dashboard</a> |
   <a href="/graphlot/" target="_top">flot (experimental)</a> |
+  <a href="/events/" target="_top">events (experimental)</a> |
   <a href="/cli/" target="_top">Command-Line (deprecated)</a>
  </td></tr>
 

=== added file 'webapp/graphite/templates/event.html'
--- webapp/graphite/templates/event.html	1970-01-01 00:00:00 +0000
+++ webapp/graphite/templates/event.html	2011-08-23 21:18:40 +0000
@@ -0,0 +1,30 @@
+<html>
+  <head>
+    <title>{{event.what}}</title>
+    <link rel="stylesheet" type="text/css" href="/content/css/table.css" />
+    <style type="text/css">
+    body {
+        font-family: sans-serif;
+        font-size: 16px;
+        margin: 50px;
+        max-width: 1200px;
+    }
+    </style>
+
+
+    </head>
+    <body>
+        <div id="title" style="text-align:center">
+            <h1>{{event.what}}</h1>
+        </div>
+        <div class="graphite">
+            <div id="main" >
+              <table class="styledtable" width=100%>
+                <tr><td>when</td><td>{{event.when|date:"H:m:s D d M Y" }}</td></tr>
+                <tr><td>tags</td><td>{{event.tags}}</td></tr>
+                <tr><td>data</td><td>{{event.data}}</td></tr>
+              </table>
+            </div>
+        </div>
+    </body>
+</html>
\ No newline at end of file

=== added file 'webapp/graphite/templates/events.html'
--- webapp/graphite/templates/events.html	1970-01-01 00:00:00 +0000
+++ webapp/graphite/templates/events.html	2011-08-23 21:18:40 +0000
@@ -0,0 +1,42 @@
+<html>
+  <head>
+    <title>Events</title>
+    <link rel="stylesheet" type="text/css" href="../content/css/table.css" />
+    <style type="text/css">
+    body {
+        font-family: sans-serif;
+        font-size: 16px;
+        margin: 50px;
+        max-width: 1200px;
+    }
+    </style>
+
+
+    </head>
+    <body>
+        <div id="title" style="text-align:center">
+            <h1>graphite events</h1>
+        </div>
+        <div class="graphite">
+            <div id="main" >
+              {% if events %}
+                <table class="styledtable" width=100%>
+                  <tr><th>when</th><th>what</th><th>tags</th></tr>
+                  {% for event in events %}
+                      <tr>
+                          <td>{{event.when|date:"H:m:s D d M Y" }}</td>
+                          <td><a href="/events/{{event.id}}/">{{event.what}}</a></td>
+                          <td>{{event.tags}}</td>
+                      </tr>
+                  {% endfor %}
+              {% else %}
+                <br/>No events. Add events using 
+                <a href="/admin/events/event/">the admin interface</a> or by posting
+                (eg, curl -X POST http://localhost:8000/events/ -d
+                '{"what": "Something Interesting"}')
+              {% endif %}
+              </table>
+            </div>
+        </div>
+    </body>
+</html>

=== modified file 'webapp/graphite/templates/graphlot.html'
--- webapp/graphite/templates/graphlot.html	2010-10-30 21:58:12 +0000
+++ webapp/graphite/templates/graphlot.html	2011-08-23 21:18:40 +0000
@@ -1,5 +1,3 @@
-{% autoescape off %}
-
 <html>
   <head>
     <title>Graphlot</title>
@@ -59,6 +57,11 @@
                 <br/>
 
                 <table id="rowlist" class="styledtable"  style="float:left">
+                <tr><th  style="width:750px">events</th></tr>
+                <tr id="eventsrow"><td><input class="event_tags" style="width:600px" type="text" id="eventdesc" value="{{events}}"/></td></tr>
+                </table>
+                
+                <table id="rowlist" class="styledtable"  style="float:left">
                 <tr><th  style="width:750px">metric</th><th>y-axis</th></tr>
                 {% for metric in metric_list %}
                     <tr class="metricrow">
@@ -94,6 +97,4 @@
 
         </div>
     </body>
-</html>
-
-{% endautoescape %}
\ No newline at end of file
+</html>
\ No newline at end of file

=== modified file 'webapp/graphite/urls.py'
--- webapp/graphite/urls.py	2011-07-12 07:37:01 +0000
+++ webapp/graphite/urls.py	2011-08-23 21:18:40 +0000
@@ -35,7 +35,8 @@
   ('^dashboard/?', include('graphite.dashboard.urls')),
   ('^whitelist/?', include('graphite.whitelist.urls')),
   ('^content/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.CONTENT_DIR}),
-  ('^graphlot/?', include('graphite.graphlot.urls')),
+  ('graphlot/', include('graphite.graphlot.urls')),
+  ('^events/', include('graphite.events.urls')),
   ('', 'graphite.browser.views.browser'),
 )