Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema

update schema for tracking sql logs - larger fields; add hostname

common/djangoapps/track/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'TrackingLog'
+        db.create_table('track_trackinglog', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('dtcreated', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('username', self.gf('django.db.models.fields.CharField')(max_length=32, blank=True)),
+            ('ip', self.gf('django.db.models.fields.CharField')(max_length=32, blank=True)),
+            ('event_source', self.gf('django.db.models.fields.CharField')(max_length=32)),
+            ('event_type', self.gf('django.db.models.fields.CharField')(max_length=32, blank=True)),
+            ('event', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('agent', self.gf('django.db.models.fields.CharField')(max_length=256, blank=True)),
+            ('page', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('time', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('track', ['TrackingLog'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'TrackingLog'
+        db.delete_table('track_trackinglog')
+
+
+    models = {
+        'track.trackinglog': {
+            'Meta': {'object_name': 'TrackingLog'},
+            'agent': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'dtcreated': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'event': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'event_source': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'event_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'page': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['track']
\ No newline at end of file

common/djangoapps/track/migrations/0002_auto__add_field_trackinglog_host__chg_field_trackinglog_event_type__ch.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'TrackingLog.host'
+        db.add_column('track_trackinglog', 'host',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=64, blank=True),
+                      keep_default=False)
+
+
+        # Changing field 'TrackingLog.event_type'
+        db.alter_column('track_trackinglog', 'event_type', self.gf('django.db.models.fields.CharField')(max_length=512))
+
+        # Changing field 'TrackingLog.page'
+        db.alter_column('track_trackinglog', 'page', self.gf('django.db.models.fields.CharField')(max_length=512, null=True))
+
+    def backwards(self, orm):
+        # Deleting field 'TrackingLog.host'
+        db.delete_column('track_trackinglog', 'host')
+
+
+        # Changing field 'TrackingLog.event_type'
+        db.alter_column('track_trackinglog', 'event_type', self.gf('django.db.models.fields.CharField')(max_length=32))
+
+        # Changing field 'TrackingLog.page'
+        db.alter_column('track_trackinglog', 'page', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
+
+    models = {
+        'track.trackinglog': {
+            'Meta': {'object_name': 'TrackingLog'},
+            'agent': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'dtcreated': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'event': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'event_source': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'event_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'host': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'page': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['track']
\ No newline at end of file

common/djangoapps/track/models.py

@@ -7,11 +7,12 @@ class TrackingLog(models.Model):
     username = models.CharField(max_length=32,blank=True)
     ip = models.CharField(max_length=32,blank=True)
     event_source = models.CharField(max_length=32)
-    event_type = models.CharField(max_length=32,blank=True)
+    event_type = models.CharField(max_length=512,blank=True)
     event = models.TextField(blank=True)
     agent = models.CharField(max_length=256,blank=True)
-    page = models.CharField(max_length=32,blank=True,null=True)
+    page = models.CharField(max_length=512,blank=True,null=True)
     time = models.DateTimeField('event time')
+    host = models.CharField(max_length=64,blank=True)
 
     def __unicode__(self):
         s = "[%s] %s@%s: %s | %s | %s | %s" % (self.time, self.username, self.ip, self.event_source,

common/djangoapps/track/views.py

@@ -17,7 +17,7 @@ from track.models import TrackingLog
 
 log = logging.getLogger("tracking")
 
-LOGFIELDS = ['username','ip','event_source','event_type','event','agent','page','time']
+LOGFIELDS = ['username','ip','event_source','event_type','event','agent','page','time','host']
 
 def log_event(event):
     event_str = json.dumps(event)
@@ -58,6 +58,7 @@ def user_track(request):
         "agent": agent,
         "page": request.GET['page'],
         "time": datetime.datetime.utcnow().isoformat(),
+        "host": request.META['SERVER_NAME'],
         }
     log_event(event)
     return HttpResponse('success')
@@ -83,6 +84,7 @@ def server_track(request, event_type, event, page=None):
         "agent": agent,
         "page": page,
         "time": datetime.datetime.utcnow().isoformat(),
+        "host": request.META['SERVER_NAME'],
         }
 
     if event_type.startswith("/event_logs") and request.user.is_staff:	# don't log