Merge lp:~cjohnston/qa-dashboard/hide-memory-test-framework-data into lp:qa-dashboard

[Chris Johnston]

Hides test framework results by default from memory graphs and tables, adding the ability to see the test framework results

In order to display proper results for memory testing, we should not be displaying the memory usage caused by the testing frame work. To fix this, we will add a set of blacklist processes, and exclude those from the results. Just for the ability to follow the usage by the testing framework, we added an option to display the data including the testing framework data.

The aggregated data will need to be reformulated after this branch lands in order to provide consistency.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:496
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cjohnston/qa-dashboard/hide-memory-test-framework-data/+merge/174325/+edit-commit-message

http://s-jenkins:8080/job/dashboard-ci/78/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/78/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cjohnston/qa-dashboard/hide-memory-test-framework-data]

497. By Chris Johnston on 2013-07-12

Fix tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:497
http://s-jenkins:8080/job/dashboard-ci/79/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/79/rebuild

review: Approve (continuous-integration)

[Joe Talbott (joetalbott)]

LGTM.

review: Approve

[lp:~cjohnston/qa-dashboard/hide-memory-test-framework-data]

498. By Chris Johnston on 2013-07-12

Change exclude to be in agg script

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:498
http://s-jenkins:8080/job/dashboard-ci/80/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/80/rebuild

review: Approve (continuous-integration)

Unmerged revisions

498. By Chris Johnston on 2013-07-12

Change exclude to be in agg script

497. By Chris Johnston on 2013-07-12

Fix tests

496. By Chris Johnston on 2013-07-12

Add the ability to exclude test framework data

495. By Chris Johnston on 2013-07-11

commit

=== modified file 'common/templates/layout.html'
--- common/templates/layout.html	2013-07-11 15:30:27 +0000
+++ common/templates/layout.html	2013-07-12 13:44:34 +0000
@@ -28,7 +28,8 @@
               <li {% ifequal url.0 'bootspeed' %}class="active" {% endifequal %}id="main-nav"><a class="main-nav-item" href="{% url bootspeed_arch_overview %}">Bootspeed</a></li>
               <li {% ifequal url.0 'power' %}class="active" {% endifequal %}id="main-nav"><a class="main-nav-item" href="{% url power_overview %}">Power</a></li>
               <li {% ifequal url.0 'memory' %}class="active" {% endifequal %}id="main-nav"><a class="main-nav-item" href="{% url memory_arch_overview %}">Memory</a></li>
-              <li id="main-nav"><a class="main-nav-item" href="https://jenkins.qa.ubuntu.com/view/Saucy/view/AutoPkgTest/">Autopackage</a></li> 
+              <li id="main-nav"><a class="main-nav-item" href="https://jenkins.qa.ubuntu.com/view/Saucy/view/AutoPkgTest/">Autopackage</a></li>
+              {% if user.is_staff %}<li id="main-nav"><a class="main-nav-item" href="/admin">Admin</a></li>{% endif %}
         </ul>
         </nav>
         <a href='{% url index %}' class="logo-ubuntu">

=== modified file 'memory/admin.py'
--- memory/admin.py	2013-03-21 18:59:36 +0000
+++ memory/admin.py	2013-07-12 13:44:34 +0000
@@ -22,6 +22,8 @@
     MemoryResult,
     MemoryMetric,
     MemoryBuild,
+    MemoryConfig,
+    MemoryProcess,
 )
 
 from django.contrib import admin
@@ -131,6 +133,14 @@
     )
 
 
+class MemoryConfigAdmin(admin.ModelAdmin):
+    list_display = ('blacklist_process', )
+
+
+class MemoryProcessAdmin(admin.ModelAdmin):
+    list_display = ('image', 'upgrade', 'machine', 'process',)
+
+admin.site.register(MemoryConfig, MemoryConfigAdmin)
 admin.site.register(MemoryUpgrade, MemoryUpgradeAdmin)
 admin.site.register(MemoryMachine, MemoryMachineAdmin)
 admin.site.register(MemoryLog, MemoryLogAdmin)
@@ -139,3 +149,4 @@
 admin.site.register(MemoryDetail, MemoryDetailAdmin)
 admin.site.register(MemoryResult, MemoryResultAdmin)
 admin.site.register(MemoryBuild, MemoryBuildAdmin)
+admin.site.register(MemoryProcess, MemoryProcessAdmin)

=== modified file 'memory/api.py'
--- memory/api.py	2013-06-09 23:59:45 +0000
+++ memory/api.py	2013-07-12 13:44:34 +0000
@@ -32,6 +32,7 @@
     MemoryProcess,
     MemoryResult,
     MemoryUpgrade,
+    MemoryConfig,
 )
 
 MAX_RESULTS = 180
@@ -353,7 +354,14 @@
 def result_processes(request, result_id):
     result = get_object_or_404(MemoryResult, id=result_id)
 
-    procs = result.memorydetail_set.filter(publish=True).order_by('-pss')
+    exclude = MemoryConfig.objects.all().values_list(
+        'blacklist_process',
+        flat=True,
+    )
+
+    procs = result.memorydetail_set.exclude(
+        command__in=exclude,
+    ).filter(publish=True).order_by('-pss')
 
     data = []
     for p in procs:

=== modified file 'memory/management/commands/agg_results.py'
--- memory/management/commands/agg_results.py	2013-03-22 21:10:26 +0000
+++ memory/management/commands/agg_results.py	2013-07-12 13:44:34 +0000
@@ -22,17 +22,20 @@
 from memory.models import (
     MemoryDetail,
     MemoryResult,
+    MemoryConfig,
 )
 
 
 class Command(BaseCommand):
     help = "Do result calculations."
 
-    def _aggregate(self, result):
+    def _aggregate(self, result, exclude):
         """ Aggregate values by name. """
 
         details = MemoryDetail.objects.filter(
             result=result,
+        ).exclude(
+            command__in=exclude,
         )
 
         if details.count() == 0:
@@ -49,7 +52,6 @@
         return result
 
     def handle(self, *args, **options):
-
         verbosity = int(options.get('verbosity'))
 
         log_level = logging.WARN
@@ -64,9 +66,14 @@
             name='pss',
         )
 
+        exclude = MemoryConfig.objects.all().values_list(
+            'blacklist_process',
+            flat=True,
+        )
+
         logging.info("results: {}".format(results))
         for result in results.iterator():
             logging.info("name: {}".format(result.name))
-            res = self._aggregate(result)
+            res = self._aggregate(result, exclude)
 
             logging.info("result: {}".format(res))

=== added file 'memory/migrations/0002_add_memory_config.py'
--- memory/migrations/0002_add_memory_config.py	1970-01-01 00:00:00 +0000
+++ memory/migrations/0002_add_memory_config.py	2013-07-12 13:44:34 +0000
@@ -0,0 +1,213 @@
+# -*- 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 'MemoryConfig'
+        db.create_table('memory_memoryconfig', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+            ('internal', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('publish', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('blacklist_process', self.gf('django.db.models.fields.CharField')(max_length=4096)),
+        ))
+        db.send_create_signal('memory', ['MemoryConfig'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'MemoryConfig'
+        db.delete_table('memory_memoryconfig')
+
+
+    models = {
+        'common.bug': {
+            'Meta': {'object_name': 'Bug', 'db_table': "'bugs'"},
+            'assignee': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
+            'bug_no': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'importance': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '4096'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'project': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '4096'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'common.jenkinsbuild': {
+            'Meta': {'unique_together': "(('job', 'build_number'),)", 'object_name': 'JenkinsBuild', 'db_table': "'jenkins_builds'"},
+            'bugs': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'build_bugs'", 'symmetrical': 'False', 'to': "orm['common.Bug']"}),
+            'build_description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024'}),
+            'build_number': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'failed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['common.JenkinsJob']"}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'common.jenkinsjob': {
+            'Meta': {'object_name': 'JenkinsJob', 'db_table': "'jenkins_jobs'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'memory.memorybuild': {
+            'Meta': {'object_name': 'MemoryBuild', 'db_table': "'memory_builds'"},
+            'build': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['common.JenkinsBuild']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryImage']", 'null': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'machine': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryMachine']"}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'upgrade': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryUpgrade']", 'null': 'True'})
+        },
+        'memory.memoryconfig': {
+            'Meta': {'object_name': 'MemoryConfig'},
+            'blacklist_process': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'memory.memorydetail': {
+            'Meta': {'object_name': 'MemoryDetail', 'db_table': "'memory_details'"},
+            'command': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryImage']", 'null': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'machine': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryMachine']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'pss': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'result': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryResult']"}),
+            'rss': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'upgrade': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryUpgrade']", 'null': 'True'}),
+            'uss': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'vss': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'memory.memoryimage': {
+            'Meta': {'object_name': 'MemoryImage', 'db_table': "'memory_images'"},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'build_number': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image_type': ('django.db.models.fields.CharField', [], {'default': "u'daily'", 'max_length': '10'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'md5': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'release': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'variant': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'memory.memorylog': {
+            'Meta': {'object_name': 'MemoryLog', 'db_table': "'memory_logs'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'memory.memorymachine': {
+            'Meta': {'object_name': 'MemoryMachine', 'db_table': "'memory_machines'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'mac_address': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'memory.memorymetric': {
+            'Meta': {'object_name': 'MemoryMetric', 'db_table': "'memory_metrics'"},
+            'average': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryImage']", 'null': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'jenkins_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}),
+            'kernel': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'machine': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryMachine']"}),
+            'maximum': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'minimum': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'stddev': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'upgrade': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryUpgrade']", 'null': 'True'})
+        },
+        'memory.memoryprocess': {
+            'Meta': {'object_name': 'MemoryProcess', 'db_table': "'memory_processes'"},
+            'average': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'command': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryImage']", 'null': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'jenkins_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}),
+            'machine': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryMachine']"}),
+            'maximum': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'minimum': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'process': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'stddev': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'upgrade': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryUpgrade']", 'null': 'True'})
+        },
+        'memory.memoryresult': {
+            'Meta': {'object_name': 'MemoryResult', 'db_table': "'memory_results'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryImage']", 'null': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'jenkins_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}),
+            'kernel': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'log': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryLog']"}),
+            'machine': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryMachine']"}),
+            'metric': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryMetric']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'upgrade': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['memory.MemoryUpgrade']", 'null': 'True'}),
+            'value': ('django.db.models.fields.FloatField', [], {})
+        },
+        'memory.memoryupgrade': {
+            'Meta': {'object_name': 'MemoryUpgrade', 'db_table': "'memory_upgrades'"},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date': ('django.db.models.fields.DateTimeField', [], {}),
+            'from_release': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'release': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'variant': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['memory']
\ No newline at end of file

=== modified file 'memory/models.py'
--- memory/models.py	2013-05-06 21:18:46 +0000
+++ memory/models.py	2013-07-12 13:44:34 +0000
@@ -351,3 +351,7 @@
             return 0
 
         return self.average - prev.average
+
+
+class MemoryConfig(DashboardBaseModel):
+    blacklist_process = models.CharField(max_length=4096)

=== modified file 'memory/templates/memory/machine_details.html'
--- memory/templates/memory/machine_details.html	2013-07-10 19:05:25 +0000
+++ memory/templates/memory/machine_details.html	2013-07-12 13:44:34 +0000
@@ -12,7 +12,20 @@
 {% block content %}
 
 <div class="grid_15">
-  <h2>Memory consumption details for {{ build }} on {{ result.machine.name|display_name }} using {{ arch }}</h2>
+    <h2>Memory consumption details for {{ result.machine.name|display_name }}</h2>
+    <p>
+    <strong>Build #:</strong> {{ build }}<br />
+    <strong>Arch:</strong> {{ arch }}<br />
+    {% if all %}
+        <a href="{% url memory_machine_image_details arch result.machine.id result.id %}">
+            Hide test framework data
+        </a>
+    {% else %}
+        <a href="?all">
+            Show test framework data
+        </a>
+    {% endif %}
+    </p>
 </div>
 <div class="grid_15">
    <div id="stackedchart">

=== modified file 'memory/tests.py'
--- memory/tests.py	2013-05-31 20:07:19 +0000
+++ memory/tests.py	2013-07-12 13:44:34 +0000
@@ -173,9 +173,9 @@
 
     self.assert_(self.detail2)
 
+    call_command('agg_processes')
     call_command('agg_results')
     call_command('agg_metrics')
-    call_command('agg_processes')
 
     # get updated instances from the DB
     self.result = MemoryResult.objects.get(id=self.result.id)

=== modified file 'memory/views.py'
--- memory/views.py	2013-07-10 19:05:25 +0000
+++ memory/views.py	2013-07-12 13:44:34 +0000
@@ -39,6 +39,7 @@
     MemoryMetric,
     MemoryProcess,
     MemoryResult,
+    MemoryConfig,
 )
 
 from memory.tables import (
@@ -292,7 +293,21 @@
 @require_GET
 def machine_image_details(request, arch, machine_id, result_id):
     result = get_object_or_404(MemoryResult, id=result_id)
-    details = result.memorydetail_set.all().select_related('image', 'machine')
+    exclude = MemoryConfig.objects.all().values_list(
+        'blacklist_process',
+        flat=True,
+    )
+
+    all = request.GET.get('all')
+
+    if all is None:
+        all = False
+        details = result.memorydetail_set.exclude(
+            command__in=exclude,
+        ).select_related('image', 'machine')
+    else:
+        all = True
+        details = result.memorydetail_set.select_related('image', 'machine')
 
     chart_api = reverse(
         'memory_api_result_processes',
@@ -354,6 +369,7 @@
         'table': table,
         'totals': totals,
         'chart_api': chart_api,
+        'all': all,
         'bread_crumb_trail': BreadCrumbTrail.leading_to(
             machine_image_details,
             arch=arch,