Reporting: Merge new reporting data

Move reporting data to a new schema Use south for django migrations Add bcfg2-report-collector daemon Conflicts: doc/development/index.txt doc/server/plugins/connectors/properties.txt doc/server/plugins/generators/packages.txt setup.py src/lib/Bcfg2/Client/Tools/SELinux.py src/lib/Bcfg2/Compat.py src/lib/Bcfg2/Encryption.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Server/Admin/Init.py src/lib/Bcfg2/Server/Admin/Reports.py src/lib/Bcfg2/Server/BuiltinCore.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/FileMonitor/Inotify.py src/lib/Bcfg2/Server/Plugin/base.py src/lib/Bcfg2/Server/Plugin/interfaces.py src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py src/lib/Bcfg2/Server/Plugins/FileProbes.py src/lib/Bcfg2/Server/Plugins/Ohai.py src/lib/Bcfg2/Server/Plugins/Packages/Collection.py src/lib/Bcfg2/Server/Plugins/Packages/Source.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/Server/Plugins/Packages/__init__.py src/lib/Bcfg2/Server/Plugins/Probes.py src/lib/Bcfg2/Server/Plugins/Properties.py src/lib/Bcfg2/Server/Reports/backends.py src/lib/Bcfg2/Server/Reports/manage.py src/lib/Bcfg2/Server/Reports/nisauth.py src/lib/Bcfg2/settings.py src/sbin/bcfg2-crypt src/sbin/bcfg2-yum-helper testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py
author: Tim Laszlo <tim.laszlo@gmail.com> 2012-10-08 10:38:02 -0500
committer: Tim Laszlo <tim.laszlo@gmail.com> 2012-10-08 10:38:02 -0500
commit: 44638176067df5231bf0be30801e36863391cd1f (patch)
tree: 6aaba73d03f9a5532047518b9a3e8ef3e63d3f9f /src/lib/Bcfg2/Server/Reports/reports
parent: 1a3ced3f45423d79e08ca7d861e8118e8618d3b2 (diff)
download: bcfg2-44638176067df5231bf0be30801e36863391cd1f.tar.gz
bcfg2-44638176067df5231bf0be30801e36863391cd1f.tar.bz2
bcfg2-44638176067df5231bf0be30801e36863391cd1f.zip
23 files changed, 0 insertions, 1921 deletions
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/404.html b/src/lib/Bcfg2/Server/Reports/reports/templates/404.html
deleted file mode 100644
index 168bd9fec..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/404.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'base.html' %}
-{% block title %}Bcfg2 - Page not found{% endblock %}
-{% block fullcontent %}
-<h2>Page not found</h2>
-<p>
-The page or object requested could not be found.
-</p>
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/base-timeview.html b/src/lib/Bcfg2/Server/Reports/reports/templates/base-timeview.html
deleted file mode 100644
index 9a5ef651c..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/base-timeview.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-
-{% block timepiece %}
-<script type="text/javascript">
-function showCalendar() {
-    var cal = new CalendarPopup("calendar_div");
-    cal.showYearNavigation();
-    cal.select(document.forms['cal_form'].cal_date,'cal_link',
-        'yyyy/MM/dd' {% if timestamp %}, '{{ timestamp|date:"Y/m/d" }}'{% endif %} );
-    return false;
-}
-function bcfg2_check_date() {
-    var new_date = document.getElementById('cal_date').value;
-    if(new_date) {
-        document.cal_form.submit();
-    }
-}
-document.write(getCalendarStyles());
-</script>
-{% if not timestamp %}Rendered at {% now "Y-m-d H:i" %} | {% else %}View as of {{ timestamp|date:"Y-m-d H:i" }} | {% endif %}{% spaceless %}
-  <a id='cal_link' name='cal_link' href='#' onclick='showCalendar(); return false;'
-      >[change]</a>
-  <form method='post' action='{{ path }}' id='cal_form' name='cal_form'>
-    <input id='cal_date' name='cal_date' type='hidden' value=''/>
-    <input name='op' type='hidden' value='timeview'/>
-  </form>
-{% endspaceless %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/base.html b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
deleted file mode 100644
index 6d20f86d9..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{% load bcfg2_tags %}
-
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>{% block title %}Bcfg2 Reporting System{% endblock %}</title>
-
-<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-language" content="en" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-<meta name="robots" content="noindex, nofollow" />
-<meta http-equiv="cache-control" content="no-cache" />
-
-<link rel="stylesheet" type="text/css" href="{% to_media_url bcfg2_base.css %}" media="all" />
-<script type="text/javascript" src="{% to_media_url bcfg2.js %}"></script>
-<script type="text/javascript" src="{% to_media_url date.js %}"></script>
-<script type="text/javascript" src="{% to_media_url AnchorPosition.js %}"></script>
-<script type="text/javascript" src="{% to_media_url CalendarPopup.js %}"></script>
-<script type="text/javascript" src="{% to_media_url PopupWindow.js %}"></script>
-{% block extra_header_info %}{% endblock %}
-
-</head>
-<body onload="{% block body_onload %}{% endblock %}">
-
-  <div id="header">
-    <a href="http://bcfg2.org"><img src='{% to_media_url bcfg2_logo.png %}'
-		height='115' width='300' alt='Bcfg2' style='float:left; height: 115px' /></a>
-	</div>
-
-<div id="document">
-  <div id="content"><div id="contentwrapper">
-    {% block fullcontent %}
-    <div class='page_name'>
-        <h1>{% block pagebanner %}Page Banner{% endblock %}</h1>
-    <div id="timepiece">{% block timepiece %}Rendered at {% now "Y-m-d H:i" %}{% endblock %}</div>
-  </div>
-        <div class='detail_wrapper'>
-            {% block content %}{% endblock %}
-        </div>
-    {% endblock %}
-  </div></div><!-- content -->
-  <div id="sidemenucontainer"><div id="sidemenu">
-   {% block sidemenu %}
-    <ul class='menu-level1'>
-      <li>Overview</li>
-    </ul>
-    <ul class='menu-level2'>
-      <li><a href="{% url reports_summary %}">Summary</a></li>
-      <li><a href="{% url reports_history %}">Recent Interactions</a></li>
-      <li><a href="{% url reports_timing %}">Timing</a></li>
-    </ul>
-    <ul class='menu-level1'>
-      <li>Clients</li>
-    </ul>
-    <ul class='menu-level2'>
-      <li><a href="{% url reports_grid_view %}">Grid View</a></li>
-      <li><a href="{% url reports_detailed_list %}">Detailed List</a></li>
-      <li><a href="{% url reports_client_manage %}">Manage</a></li>
-    </ul>
-    <ul class='menu-level1'>
-      <li>Entries Configured</li>
-    </ul>
-    <ul class='menu-level2'>
-      <li><a href="{% url reports_common_problems %}">Common problems</a></li>
-      <li><a href="{% url reports_item_list "bad" %}">Bad</a></li>
-      <li><a href="{% url reports_item_list "modified" %}">Modified</a></li>
-      <li><a href="{% url reports_item_list "extra" %}">Extra</a></li>
-    </ul>
-{% comment %}
- TODO
-    <ul class='menu-level1'>
-      <li>Entry Types</li>
-    </ul>
-    <ul class='menu-level2'>
-      <li><a href="#">Action</a></li>
-      <li><a href="#">Package</a></li>
-      <li><a href="#">Path</a></li>
-      <li><a href="#">Service</a></li>
-    </ul>
-{% endcomment %}
-    <ul class='menu-level1'>
-      <li><a href="http://bcfg2.org">Homepage</a></li>
-      <li><a href="http://docs.bcfg2.org">Documentation</a></li>
-        </ul>
-        {% endblock %}
-  </div></div><!-- sidemenu -->
-  <div style='clear:both'></div>
-</div><!-- document -->
-  <div id="footer">
-    <span>Bcfg2 Version 1.3.0pre1</span>
-    </div>
-
-<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
-</body>
-</html>
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html
deleted file mode 100644
index 9b86b609f..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html
+++ /dev/null
@@ -1,129 +0,0 @@
-{% extends "base.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Client {{client.name}}{% endblock %}
-
-{% block extra_header_info %}
-<style type="text/css">
-.node_data {
-	border: 1px solid #98DBCC;
-	margin: 10px;
-	padding-left: 18px;
-}
-.node_data td {
-	padding: 1px 20px 1px 2px;
-}
-span.history_links {
-	font-size: 90%;
-	margin-left: 50px;
-}
-span.history_links a {
-	font-size: 90%;
-}
-</style>
-{% endblock %}
-
-{% block body_onload %}javascript:clientdetailload(){% endblock %}
-
-{% block pagebanner %}Client Details{% endblock %}
-
-{% block content %}
-  <div class='detail_header'>
-    <h2>{{client.name}}</h2>
-    <a href='{% url reports_client_manage %}#{{ client.name }}'>[manage]</a>
-  <span class='history_links'><a href="{% url reports_client_history client.name %}">View History</a> | Jump to&nbsp;
-    <select id="quick" name="quick" onchange="javascript:pageJump('quick');">
-    <option value="" selected="selected">--- Time ---</option>
-    {% for i in client.interactions.all|slice:":25" %}
-        <option value="{% url reports_client_detail_pk hostname=client.name, pk=i.id %}">{{i.timestamp}}</option>
-    {% endfor %}
-  </select></span>
-  </div>
-
-  {% if interaction.isstale %}
-  <div class="warningbox">
-    This node did not run within the last 24 hours &#8212; it may be out of date.
-  </div>
-  {% endif %}
-  <table class='node_data'>
-    <tr><td>Timestamp</td><td>{{interaction.timestamp}}</td></tr>
-    {% if interaction.server %}
-    <tr><td>Served by</td><td>{{interaction.server}}</td></tr>
-    {% endif %}
-    {% if interaction.metadata %}
-    <tr><td>Profile</td><td>{{interaction.metadata.profile}}</td></tr>
-    {% endif %}
-    {% if interaction.repo_rev_code %}
-    <tr><td>Revision</td><td>{{interaction.repo_rev_code}}</td></tr>
-    {% endif %}
-    <tr><td>State</td><td class='{{interaction.state}}-lineitem'>{{interaction.state|capfirst}}</td></tr>
-    <tr><td>Managed entries</td><td>{{interaction.totalcount}}</td></tr>
-    {% if not interaction.isclean %}
-    <tr><td>Deviation</td><td>{{interaction.percentbad|floatformat:"3"}}%</td></tr>
-    {% endif %}
-  </table>
-
-  {% if interaction.metadata.groups.count %}
-  <div class='entry_list'>
-    <div class='entry_list_head' onclick='javascript:toggleMe("groups_table");'>
-      <h3>Group membership</h3>
-      <div class='entry_expand_tab' id='plusminus_groups_table'>[+]</div>
-    </div>
-    <table id='groups_table' class='entry_list' style='display: none'>
-      {% for group in interaction.metadata.groups.all %}
-        <tr class='{% cycle listview,listview_alt %}'>
-          <td class='entry_list_type'>{{group}}</td>
-        </tr>
-      {% endfor %}
-    </table>
-  </div>
-  {% endif %}
-
-  {% if interaction.metadata.bundles.count %}
-  <div class='entry_list'>
-    <div class='entry_list_head' onclick='javascript:toggleMe("bundles_table");'>
-      <h3>Bundle membership</h3>
-      <div class='entry_expand_tab' id='plusminus_bundless_table'>[+]</div>
-    </div>
-    <table id='bundles_table' class='entry_list' style='display: none'>
-      {% for bundle in interaction.metadata.bundles.all %}
-        <tr class='{% cycle listview,listview_alt %}'>
-          <td class='entry_list_type'>{{bundle}}</td>
-        </tr>
-      {% endfor %}
-    </table>
-  </div>
-  {% endif %}
-
-  {% for type, ei_list in ei_lists %}
-  {% if ei_list %}
-  <div class='entry_list'>
-    <div class='entry_list_head {{type}}-lineitem' onclick='javascript:toggleMe("{{type}}_table");'>
-      <h3>{{ type|capfirst }} Entries &#8212; {{ ei_list|length }}</h3>
-      <div class='entry_expand_tab' id='plusminus_{{type}}_table'>[+]</div>
-    </div>
-    <table id='{{type}}_table' class='entry_list'>
-      {% for ei in ei_list %}
-        <tr class='{% cycle listview,listview_alt %}'>
-          <td class='entry_list_type'>{{ei.entry.kind}}</td>
-          <td><a href="{% url reports_item type ei.id %}">
-              {{ei.entry.name}}</a></td>
-        </tr>
-      {% endfor %}
-    </table>
-  </div>
-  {% endif %}
-  {% endfor %}
-
-  {% if entry_list %}
-  <div class="entry_list recent_history_wrapper">
-    <div class="entry_list_head" style="border-bottom: 2px solid #98DBCC;">
-      <h4 style="display: inline"><a href="{% url reports_client_history client.name %}">Recent Interactions</a></h4>
-    </div>
-    <div class='recent_history_box'>
-      {% include "widgets/interaction_list.inc" %}
-      <div style='padding-left: 5px'><a href="{% url reports_client_history client.name %}">more...</a></div>
-    </div>
-  </div>
-  {% endif %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html
deleted file mode 100644
index 9be59e7d2..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Detailed Client Listing{% endblock %}
-{% block pagebanner %}Clients - Detailed View{% endblock %}
-
-{% block content %}
-<div class='client_list_box'>
-  {% filter_navigator %}
-{% if entry_list %}
-  <table cellpadding="3">
-  <tr id='table_list_header' class='listview'>
-    <td class='left_column'>{% sort_link 'client' 'Node' %}</td>
-    <td class='right_column' style='width:75px'>{% sort_link 'state' 'State' %}</td>
-    <td class='right_column_narrow'>{% sort_link '-good' 'Good' %}</td>
-    <td class='right_column_narrow'>{% sort_link '-bad' 'Bad' %}</td>
-    <td class='right_column_narrow'>{% sort_link '-modified' 'Modified' %}</td>
-    <td class='right_column_narrow'>{% sort_link '-extra' 'Extra' %}</td>
-    <td class='right_column'>{% sort_link 'timestamp' 'Last Run' %}</td>
-    <td class='right_column_wide'>{% sort_link 'server' 'Server' %}</td>
-  </tr>
-  {% for entry in entry_list %}
-  <tr class='{% cycle listview,listview_alt %}'>
-    <td class='left_column'><a href='{% url Bcfg2.Server.Reports.reports.views.client_detail hostname=entry.client.name, pk=entry.id %}'>{{ entry.client.name }}</a></td>
-    <td class='right_column' style='width:75px'><a href='{% add_url_filter state=entry.state %}'
-      class='{{entry|determine_client_state}}'>{{ entry.state }}</a></td>
-    <td class='right_column_narrow'>{{ entry.goodcount }}</td>
-    <td class='right_column_narrow'>{{ entry.bad_entry_count }}</td>
-    <td class='right_column_narrow'>{{ entry.modified_entry_count }}</td>
-    <td class='right_column_narrow'>{{ entry.extra_entry_count }}</td>
-    <td class='right_column'><span {% if entry.timestamp|isstale:entry_max %}class='dirty-lineitem'{% endif %}>{{ entry.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe }}</span></td>
-    <td class='right_column_wide'>
-       {% if entry.server %}
-         <a href='{% add_url_filter server=entry.server %}'>{{ entry.server }}</a>
-       {% else %}
-         &nbsp;
-       {% endif %}
-    </td>
-  </tr>
-  {% endfor %}
-  </table>
-{% else %}
-    <p>No client records are available.</p>
-{% endif %}
-</div>
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html
deleted file mode 100644
index 01d4ec2f4..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Interaction History{% endblock %}
-{% block pagebanner %}Interaction history{% if client %} for {{ client.name }}{% endif %}{% endblock %}
-
-{% block extra_header_info %}
-{% endblock %}
-
-{% block content %}
-<div class='client_list_box'>
-{% if entry_list %}
-    {% filter_navigator %}
-    {% include "widgets/interaction_list.inc" %}
-{% else %}
-    <p>No client records are available.</p>
-{% endif %}
-</div>
-{% page_navigator %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html
deleted file mode 100644
index 45ba20b86..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block extra_header_info %}
-{% endblock%}
-
-{% block title %}Bcfg2 - Client Grid View{% endblock %}
-
-{% block pagebanner %}Clients - Grid View{% endblock %}
-
-{% block content %}
-{% filter_navigator %}
-{% if inter_list %}
-  <table class='grid-view' align='center'>
-  {% for inter in inter_list %}
-    {% if forloop.first %}<tr>{% endif %}
-      <td class='{{ inter|determine_client_state }}'>
-          <a href="{% spaceless %}
-              {% if not timestamp %}
-                  {% url reports_client_detail inter.client.name %}
-              {% else %}
-                  {% url reports_client_detail_pk inter.client.name,inter.id %}
-              {% endif %}
-              {% endspaceless %}">{{ inter.client.name }}</a>
-      </td>
-    {% if forloop.last %}
-      </tr>
-    {% else %}
-      {% if forloop.counter|divisibleby:"4" %}</tr><tr>{% endif %}
-    {% endif %}
-  {% endfor %}
-  </table>
-{% else %}<p>No client records are available.</p>
-{% endif %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html
deleted file mode 100644
index 443ec8ccb..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "base.html" %}
-
-{% block extra_header_info %}
-{% endblock%}
-
-{% block title %}Bcfg2 - Manage Clients{% endblock %}
-
-{% block pagebanner %}Clients - Manage{% endblock %}
-
-{% block content %}
-<div class='client_list_box'>
-  {% if message %}
-    <div class="warningbox">{{ message }}</div>
-  {% endif %}
-{% if clients %}
-  <table cellpadding="3">
-    <tr id='table_list_header' class='listview'>
-      <td class='left_column'>Node</td>
-      <td class='right_column'>Expiration</td>
-      <td class='right_column_narrow'>Manage</td>
-    </tr>
-  {% for client in clients %}
-    <tr class='{% cycle listview,listview_alt %}'>
-      <td><span id="{{ client.name }}"> </span>
-          <span id="ttag-{{ client.name }}"> </span>
-          <span id="s-ttag-{{ client.name }}"> </span>
-          <a href="{% url reports_client_detail client.name %}">{{ client.name }}</a></td>
-      <td>{% firstof client.expiration 'Active' %}</td>
-      <td>
-          <form method="post" action="{% url reports_client_manage %}">
-            <div> {# here for no reason other then to validate #}
-              <input type="hidden" name="client_name" value="{{ client.name }}" />
-              <input type="hidden" name="client_action" value="{% if client.expiration %}unexpire{% else %}expire{% endif %}" />
-              <input type="submit" value="{% if client.expiration %}Activate{% else %}Expire Now{% endif %}" />
-            </div>
-          </form>
-      </td>
-    </tr>
-  {% endfor %}
-  </table>
-{% else %}
-  <p>No client records are available.</p>
-{% endif %}
-  </div>
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/common.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/common.html
deleted file mode 100644
index d6ad303fc..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/common.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Common Problems{% endblock %}
-
-{% block extra_header_info %}
-{% endblock%}
-
-{% block pagebanner %}Common configuration problems{% endblock %}
-
-{% block content %}
-  <div id='threshold_box'>
-    <form method='post' action='{{ request.path }}'>
-    <span>Showing items with more then {{ threshold }} entries</span>
-    <input type='text' name='threshold' value='{{ threshold }}' maxlength='5' size='5' />
-    <input type='submit' value='Change' />
-    </form>
-  </div>
-  {% for type_name, type_list in lists %}
-    <div class='entry_list'>
-      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ type_name }}");'>
-        <h3>{{ type_name|capfirst }} entries</h3>
-        <div class='entry_expand_tab' id='plusminus_table_{{ type_name }}'>[&ndash;]</div>
-      </div>
-    {% if type_list %}
-      <table id='table_{{ type_name }}' class='entry_list'>
-      <tr style='text-align: left'><th>Type</th><th>Name</th><th>Count</th><th>Reason</th></tr>
-      {% for entry, reason, interaction in type_list %}
-        <tr class='{% cycle listview,listview_alt %}'>
-          <td>{{ entry.kind }}</td>
-          <td><a href="{% url reports_entry eid=entry.pk %}">{{ entry.name }}</a></td>
-          <td>{{ interaction|length }}</td>
-          <td><a href="{% url reports_item type=type_name pk=interaction.0 %}">{{ reason.short_list|join:"," }}</a></td>
-        </tr>
-      {% endfor %}
-      </table>
-    {% else %}
-    <p>There are currently no inconsistent {{ type_name }} configuration entries.</p>
-    {% endif %}
-    </div>
-  {% endfor %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/entry_status.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/entry_status.html
deleted file mode 100644
index 5f7579eb9..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/entry_status.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Entry Status{% endblock %}
-
-{% block extra_header_info %}
-{% endblock%}
-
-{% block pagebanner %}{{ entry.kind }} entry {{ entry.name }} status{% endblock %}
-
-{% block content %}
-{% filter_navigator %}
-{% if item_data %}
-    <div class='entry_list'>
-      <table class='entry_list'>
-          <tr style='text-align: left' ><th>Name</th><th>Timestamp</th><th>State</th><th>Reason</th></tr>
-        {% for ei, inter, reason in item_data %}
-          <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href='{% url Bcfg2.Server.Reports.reports.views.client_detail hostname=inter.client.name, pk=inter.id %}'>{{ inter.client.name }}</a></td>
-            <td style='white-space: nowrap'><a href='{% url Bcfg2.Server.Reports.reports.views.client_detail hostname=inter.client.name, pk=inter.id %}'>{{ inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe }}</a></td>
-            <td>{{ ei.get_type_display }}</td>
-            <td style='white-space: nowrap'><a href="{% url reports_item type=ei.get_type_display pk=ei.pk %}">{{ reason.short_list|join:"," }}</a></td>
-          </tr>
-        {% endfor %}
-      </table>
-    </div>
-{% else %}
-    <p>There are currently no hosts with this configuration entry.</p>
-{% endif %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html
deleted file mode 100644
index cadc178a7..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html
+++ /dev/null
@@ -1,130 +0,0 @@
-{% extends "base.html" %}
-{% load split %}
-{% load syntax_coloring %}
-
-
-{% block title %}Bcfg2 - Element Details{% endblock %}
-
-
-{% block extra_header_info %}
-<style type="text/css">
-#table_list_header {
-	font-size: 100%;
-}
-table.entry_list {
-        width: auto;
-}
-div.information_wrapper {
-	margin: 15px;
-}
-div.diff_wrapper {
-	overflow: auto;
-}
-div.entry_list h3 {
-	font-size: 90%;
-	padding: 5px;
-}
-</style>
-{% endblock%}
-
-{% block pagebanner %}Element Details{% endblock %}
-
-{% block content %}
-    <div class='detail_header'>
-      <h3>{{mod_or_bad|capfirst}} {{item.entry.kind}}: {{item.entry.name}}</h3>
-    </div>
-
-  <div class="information_wrapper">
-
-  {% if isextra %}
-  <p>This item exists on the host but is not defined in the configuration.</p>
-  {% endif %}
-
-  {% if not item.reason.current_exists %}
-  <div class="warning">This item does not currently exist on the host but is specified to exist in the configuration.</div>
-  {% endif %}
-
-  {% if item.reason.current_owner or item.reason.current_group or item.reason.current_perms or item.reason.current_status or item.reason.current_status or item.reason.current_to or item.reason.current_version %}
-  <table class='entry_list'>
-      <tr id='table_list_header'>
-          <td style='text-align: right;'>Problem Type</td><td>Expected</td><td style='border-bottom: 1px solid #98DBCC;'>Found</td></tr>
-    {% if item.reason.current_owner %}
-      <tr><td style='text-align: right'><b>Owner</b></td><td>{{item.reason.owner}}</td>
-          <td>{{item.reason.current_owner}}</td></tr>
-    {% endif %}
-    {% if item.reason.current_group %}
-      <tr><td style='text-align: right'><b>Group</b></td><td>{{item.reason.group}}</td>
-          <td>{{item.reason.current_group}}</td></tr>
-    {% endif %}
-    {% if item.reason.current_perms %}
-      <tr><td style='text-align: right'><b>Permissions</b></td><td>{{item.reason.perms}}</td>
-          <td>{{item.reason.current_perms}}</td></tr>
-    {% endif %}
-    {% if item.reason.current_status %}
-      <tr><td style='text-align: right'><b>Status</b></td><td>{{item.reason.status}}</td>
-          <td>{{item.reason.current_status}}</td></tr>
-    {% endif %}
-    {% if item.reason.current_to %}
-      <tr><td style='text-align: right'><b>Symlink Target</b></td><td>{{item.reason.to}}</td>
-          <td>{{item.reason.current_to}}</td></tr>
-    {% endif %}
-    {% if item.reason.current_version %}
-      <tr><td style='text-align: right'><b>Package Version</b></td><td>{{item.reason.version|cut:"("|cut:")"}}</td>
-          <td>{{item.reason.current_version|cut:"("|cut:")"}}</td></tr>
-    {% endif %}
-  </table>
-  {% endif %}
-
-  {% if item.reason.current_diff or item.reason.is_sensitive %}
-    <div class='entry_list'>
-      <div class='entry_list_head'>
-        {% if item.reason.is_sensitive %}
-          <h3>File contents unavailable, as they might contain sensitive data.</h3>
-        {% else %}
-          <h3>Incorrect file contents</h3>
-        {% endif %}
-      </div>
-      {% if not item.reason.is_sensitive %}
-        <div class='diff_wrapper'>
-          {{ item.reason.current_diff|syntaxhilight }}
-        </div>
-      {% endif %}
-    </div>
-  {% endif %}
-
-  <!-- display extra directory entries -->
-  {% if item.reason.unpruned %}
-    <div class='entry_list'>
-      <div class='entry_list_head'>
-          <h3>Extra entries found</h3>
-      </div>
-      <table class='entry_list' cellpadding='3'>
-        {% for unpruned_item in item.reason.unpruned|split %}
-          <tr><td>{{ unpruned_item }}</td></tr>
-        {% endfor %}
-      </table>
-    </div>
-  {% endif %}
-
-
-  <div class='entry_list'>
-    <div class='entry_list_head'>
-      <h3>Occurences on {{ timestamp|date:"Y-m-d" }}</h3>
-    </div>
-    {% if associated_list %}
-      <table class="entry_list" cellpadding="3">
-        {% for inter in associated_list %}
-          <tr><td><a href="{% url reports_client_detail inter.client.name %}"
-              >{{inter.client.name}}</a></td>
-          <td><a href="{% url reports_client_detail_pk hostname=inter.client.name,pk=inter.id %}"
-              >{{inter.timestamp}}</a></td>
-          </tr>
-        {% endfor %}
-      </table>
-    {% else %}
-      <p>Missing client list</p>
-    {% endif %}
-  </div>
-
-  </div><!-- information_wrapper -->
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html
deleted file mode 100644
index 0a92e7fc0..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Element Listing{% endblock %}
-
-{% block extra_header_info %}
-{% endblock%}
-
-{% block pagebanner %}{{mod_or_bad|capfirst}} Element Listing{% endblock %}
-
-{% block content %}
-{% filter_navigator %}
-{% if item_list %}
-  {% for type_name, type_data in item_list %}
-    <div class='entry_list'>
-      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ type_name }}");'>
-        <h3>{{ type_name }} &#8212; {{ type_data|length }}</h3>
-        <div class='entry_expand_tab' id='plusminus_table_{{ type_name }}'>[&ndash;]</div>
-  </div>
-      <table id='table_{{ type_name }}' class='entry_list'>
-          <tr style='text-align: left' ><th>Name</th><th>Count</th><th>Reason</th></tr>
-        {% for entry, reason, eis in type_data %}
-          <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href="{% url reports_entry eid=entry.pk %}">{{entry.name}}</a></td>
-            <td>{{ eis|length }}</td>
-            <td><a href="{% url reports_item type=mod_or_bad,pk=eis.0 %}">{{ reason.short_list|join:"," }}</a></td>
-          </tr>
-        {% endfor %}
-      </table>
-    </div>
-  {% endfor %}
-{% else %}
-    <p>There are currently no inconsistent configuration entries.</p>
-{% endif %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/displays/summary.html b/src/lib/Bcfg2/Server/Reports/reports/templates/displays/summary.html
deleted file mode 100644
index b9847cf96..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/displays/summary.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Client Summary{% endblock %}
-{% block pagebanner %}Clients - Summary{% endblock %}
-
-{% block body_onload %}javascript:hide_table_array(hide_tables){% endblock %}
-
-{% block extra_header_info %}
-<script type="text/javascript">
-var hide_tables = new Array({{ summary_data|length }});
-{% for summary in summary_data %}
-hide_tables[{{ forloop.counter0 }}] = "table_{{ summary.name }}";
-{% endfor %}
-</script>
-{% endblock%}
-
-{% block content %}
-  <div class='detail_header'>
-    <h2>{{ node_count }} nodes reporting in</h2>
-  </div>
-{% if summary_data %}
-  {% for summary in summary_data  %}
-    <div class='entry_list'>
-      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ summary.name }}");'>
-        <h3>{{ summary.nodes|length }} {{ summary.label }}</h3>
-        <div class='entry_expand_tab' id='plusminus_table_{{ summary.name }}'>[+]</div>
-      </div>
-
-      <table id='table_{{ summary.name }}' class='entry_list'>
-        {% for node in summary.nodes|sort_interactions_by_name %}
-          <tr class='{% cycle listview,listview_alt %}'>
-              <td><a href="{% url reports_client_detail_pk hostname=node.client.name,pk=node.id %}">{{ node.client.name }}</a></td>
-          </tr>
-        {% endfor %}
-      </table>
-    </div>
-  {% endfor %}
-{% else %}
-    <p>No data to report on</p>
-{% endif %}
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/displays/timing.html b/src/lib/Bcfg2/Server/Reports/reports/templates/displays/timing.html
deleted file mode 100644
index ff775ded5..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/displays/timing.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends "base-timeview.html" %}
-{% load bcfg2_tags %}
-
-{% block title %}Bcfg2 - Performance Metrics{% endblock %}
-{% block pagebanner %}Performance Metrics{% endblock %}
-
-
-{% block extra_header_info %}
-{% endblock%}
-
-{% block content %}
-<div class='client_list_box'>
-  {% if metrics %}
-      <table cellpadding="3">
-	  <tr id='table_list_header' class='listview'>
-              <td>Name</td>
-              <td>Parse</td>
-              <td>Probe</td>
-              <td>Inventory</td>
-              <td>Install</td>
-              <td>Config</td>
-              <td>Total</td>
-          </tr>
-	  {% for metric in metrics|dictsort:"name" %}
-          <tr class='{% cycle listview,listview_alt %}'>
-              <td><a style='font-size: 100%'
-                   href="{% url reports_client_detail hostname=metric.name %}">{{ metric.name }}</a></td>
-              {% for mitem in metric|build_metric_list %}
-              <td>{{ mitem }}</td>
-              {% endfor %}
-	  </tr>
-	  {% endfor %}
-      </table>
-  {% else %}
-    <p>No metric data available</p>
-  {% endif %}
-</div>
-{% endblock %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html
deleted file mode 100644
index 759415507..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% spaceless %}
-<div class="filter_bar">
-<form name='filter_form'>
-{% if filters %}
-{% for filter, filter_url in filters %}
-  {% if forloop.first %}
-    Active filters (click to remove):
-  {% endif %}
-       <a href='{{ filter_url }}'>{{ filter|capfirst }}</a>{% if not forloop.last %}, {% endif %}
-  {% if forloop.last %}
-    {% if groups %}|{% endif %}
-  {% endif %}
-{% endfor %}
-{% endif %}
-{% if groups %}
-<label for="id_group">Group filter:</label>
-<select id="id_group" name="group" onchange="javascript:url=document.forms['filter_form'].group.value; if(url) { location.href=url }">
-  {% for group, group_url, selected in groups %}
-    <option label="{{group}}" value="{{group_url}}" {% if selected %}selected {% endif %}/>
-  {% endfor %}
-</select>
-{% endif %}
-</form>
-</div>
-{% endspaceless %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/interaction_list.inc b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/interaction_list.inc
deleted file mode 100644
index 6fe7e6547..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/interaction_list.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-{% load bcfg2_tags %}
-<div class='interaction_history_widget'>
-  <table cellpadding="3">
-  <tr id='table_list_header' class='listview'>
-    <td class='left_column'>Timestamp</td>
-    {% if not client %}
-    <td class='right_column_wide'>Client</td>
-    {% endif %}
-    <td class='right_column' style='width:75px'>State</td>
-    <td class='right_column_narrow'>Good</td>
-    <td class='right_column_narrow'>Bad</td>
-    <td class='right_column_narrow'>Modified</td>
-    <td class='right_column_narrow'>Extra</td>
-    <td class='right_column_wide'>Server</td>
-  </tr>
-  {% for entry in entry_list %}
-  <tr class='{% cycle listview,listview_alt %}'>
-    <td class='left_column'><a href='{% url reports_client_detail_pk hostname=entry.client.name, pk=entry.id %}'>{{ entry.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe }}</a></td>
-    {% if not client %}
-    <td class='right_column_wide'><a href='{% add_url_filter hostname=entry.client.name %}'>{{ entry.client.name }}</a></td>
-    {% endif %}
-    <td class='right_column' style='width:75px'><a href='{% add_url_filter state=entry.state %}'
-        class='{{entry|determine_client_state}}'>{{ entry.state }}</a></td>
-    <td class='right_column_narrow'>{{ entry.goodcount }}</td>
-    <td class='right_column_narrow'>{{ entry.bad_entry_count }}</td>
-    <td class='right_column_narrow'>{{ entry.modified_entry_count }}</td>
-    <td class='right_column_narrow'>{{ entry.extra_entry_count }}</td>
-    <td class='right_column_wide'>
-       {% if entry.server %}
-         <a href='{% add_url_filter server=entry.server %}'>{{ entry.server }}</a>
-       {% else %}
-         &nbsp;
-       {% endif %}
-    </td>
-  </tr>
-  {% endfor %}
-  </table>
-</div>
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/page_bar.html b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/page_bar.html
deleted file mode 100644
index aa0def83e..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/page_bar.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% spaceless %}
-{% for page, page_url in pager %}
-  {% if forloop.first %}
-    <div class="page_bar">
-       {% if prev_page %}<a href="{{ prev_page }}">&lt; Prev</a><span>&nbsp;</span>{% endif %}
-       {% if first_page %}<a href="{{ first_page }}">1</a><span>&nbsp;...&nbsp;</span>{% endif %}
-  {% endif %}
-       {% ifequal page current_page %}
-           <span class='nav_bar_current'>{{ page }}</span>
-       {% else %}
-           <a href="{{ page_url }}">{{ page }}</a>
-       {% endifequal %}
-  {% if forloop.last %}
-    {% if last_page %}<span>&nbsp;...&nbsp;</span><a href="{{ last_page }}">{{ total_pages }}</a><span>&nbsp;</span>{% endif %}
-    {% if next_page %}<a href="{{ next_page }}">Next &gt;</a><span>&nbsp;</span>{% endif %}
-    |{% for limit, limit_url in page_limits %}&nbsp;<a href="{{ limit_url }}">{{ limit }}</a>{% endfor %}
-    </div>
-  {% else %}
-    <span>&nbsp;</span>
-  {% endif %}
-{% endfor %}
-{% endspaceless %}
-<!-- {{ path }} -->
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/__init__.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/__init__.py
+++ /dev/null
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py
deleted file mode 100644
index 736d6448a..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py
+++ /dev/null
@@ -1,415 +0,0 @@
-import sys
-from copy import copy
-
-from django import template
-from django.conf import settings
-from django.core.urlresolvers import resolve, reverse, \
-                                     Resolver404, NoReverseMatch
-from django.template.loader import get_template, \
-        get_template_from_string,TemplateDoesNotExist
-from django.utils.encoding import smart_unicode, smart_str
-from django.utils.safestring import mark_safe
-from datetime import datetime, timedelta
-from Bcfg2.Server.Reports.utils import filter_list
-from Bcfg2.Server.Reports.reports.models import Group
-
-register = template.Library()
-
-__PAGE_NAV_LIMITS__ = (10, 25, 50, 100)
-
-
-@register.inclusion_tag('widgets/page_bar.html', takes_context=True)
-def page_navigator(context):
-    """
-    Creates paginated links.
-
-    Expects the context to be a RequestContext and
-    views.prepare_paginated_list() to have populated page information.
-    """
-    fragment = dict()
-    try:
-        path = context['request'].META['PATH_INFO']
-        total_pages = int(context['total_pages'])
-        records_per_page = int(context['records_per_page'])
-    except KeyError:
-        return fragment
-    except ValueError:
-        return fragment
-
-    if total_pages < 2:
-        return {}
-
-    try:
-        view, args, kwargs = resolve(path)
-        current_page = int(kwargs.get('page_number', 1))
-        fragment['current_page'] = current_page
-        fragment['page_number'] = current_page
-        fragment['total_pages'] = total_pages
-        fragment['records_per_page'] = records_per_page
-        if current_page > 1:
-            kwargs['page_number'] = current_page - 1
-            fragment['prev_page'] = reverse(view, args=args, kwargs=kwargs)
-        if current_page < total_pages:
-            kwargs['page_number'] = current_page + 1
-            fragment['next_page'] = reverse(view, args=args, kwargs=kwargs)
-
-        view_range = 5
-        if total_pages > view_range:
-            pager_start = current_page - 2
-            pager_end = current_page + 2
-            if pager_start < 1:
-                pager_end += (1 - pager_start)
-                pager_start = 1
-            if pager_end > total_pages:
-                pager_start -= (pager_end - total_pages)
-                pager_end = total_pages
-        else:
-            pager_start = 1
-            pager_end = total_pages
-
-        if pager_start > 1:
-            kwargs['page_number'] = 1
-            fragment['first_page'] = reverse(view, args=args, kwargs=kwargs)
-        if pager_end < total_pages:
-            kwargs['page_number'] = total_pages
-            fragment['last_page'] = reverse(view, args=args, kwargs=kwargs)
-
-        pager = []
-        for page in range(pager_start, int(pager_end) + 1):
-            kwargs['page_number'] = page
-            pager.append((page, reverse(view, args=args, kwargs=kwargs)))
-
-        kwargs['page_number'] = 1
-        page_limits = []
-        for limit in __PAGE_NAV_LIMITS__:
-            kwargs['page_limit'] = limit
-            page_limits.append((limit,
-                                reverse(view, args=args, kwargs=kwargs)))
-        # resolver doesn't like this
-        del kwargs['page_number']
-        del kwargs['page_limit']
-        page_limits.append(('all',
-                           reverse(view, args=args, kwargs=kwargs) + "|all"))
-
-        fragment['pager'] = pager
-        fragment['page_limits'] = page_limits
-
-    except Resolver404:
-        path = "404"
-    except NoReverseMatch:
-        nr = sys.exc_info()[1]
-        path = "NoReverseMatch: %s" % nr
-    except ValueError:
-        path = "ValueError"
-    #FIXME - Handle these
-
-    fragment['path'] = path
-    return fragment
-
-
-@register.inclusion_tag('widgets/filter_bar.html', takes_context=True)
-def filter_navigator(context):
-    try:
-        path = context['request'].META['PATH_INFO']
-        view, args, kwargs = resolve(path)
-
-        # Strip any page limits and numbers
-        if 'page_number' in kwargs:
-            del kwargs['page_number']
-        if 'page_limit' in kwargs:
-            del kwargs['page_limit']
-
-        filters = []
-        for filter in filter_list:
-            if filter == 'group':
-                continue
-            if filter in kwargs:
-                myargs = kwargs.copy()
-                del myargs[filter]
-                filters.append((filter,
-                                reverse(view, args=args, kwargs=myargs)))
-        filters.sort(lambda x, y: cmp(x[0], y[0]))
-
-        myargs = kwargs.copy()
-        selected=True
-        if 'group' in myargs:
-            del myargs['group']
-            selected=False
-        groups = [('---', reverse(view, args=args, kwargs=myargs), selected)]
-        for group in Group.objects.values('name'):
-            myargs['group'] = group['name']
-            groups.append((group['name'], reverse(view, args=args, kwargs=myargs), 
-                group['name'] == kwargs.get('group', '')))
-            
-        return {'filters': filters, 'groups': groups}
-    except (Resolver404, NoReverseMatch, ValueError, KeyError):
-        pass
-    return dict()
-
-
-def _subtract_or_na(mdict, x, y):
-    """
-    Shortcut for build_metric_list
-    """
-    try:
-        return round(mdict[x] - mdict[y], 4)
-    except:
-        return "n/a"
-
-
-@register.filter
-def build_metric_list(mdict):
-    """
-    Create a list of metric table entries
-
-    Moving this here to simplify the view.
-    Should really handle the case where these are missing...
-    """
-    td_list = []
-    # parse
-    td_list.append(_subtract_or_na(mdict, 'config_parse', 'config_download'))
-    #probe
-    td_list.append(_subtract_or_na(mdict, 'probe_upload', 'start'))
-    #inventory
-    td_list.append(_subtract_or_na(mdict, 'inventory', 'initialization'))
-    #install
-    td_list.append(_subtract_or_na(mdict, 'install', 'inventory'))
-    #cfg download & parse
-    td_list.append(_subtract_or_na(mdict, 'config_parse', 'probe_upload'))
-    #total
-    td_list.append(_subtract_or_na(mdict, 'finished', 'start'))
-    return td_list
-
-
-@register.filter
-def isstale(timestamp, entry_max=None):
-    """
-    Check for a stale timestamp
-
-    Compares two timestamps and returns True if the
-    difference is greater then 24 hours.
-    """
-    if not entry_max:
-        entry_max = datetime.now()
-    return entry_max - timestamp > timedelta(hours=24)
-
-
-@register.filter
-def sort_interactions_by_name(value):
-    """
-    Sort an interaction list by client name
-    """
-    inters = list(value)
-    inters.sort(lambda a, b: cmp(a.client.name, b.client.name))
-    return inters
-
-
-class AddUrlFilter(template.Node):
-    def __init__(self, filter_name, filter_value):
-        self.filter_name = filter_name
-        self.filter_value = filter_value
-        self.fallback_view = 'Bcfg2.Server.Reports.reports.views.render_history_view'
-
-    def render(self, context):
-        link = '#'
-        try:
-            path = context['request'].META['PATH_INFO']
-            view, args, kwargs = resolve(path)
-            filter_value = self.filter_value.resolve(context, True)
-            if filter_value:
-                filter_name = smart_str(self.filter_name)
-                filter_value = smart_unicode(filter_value)
-                kwargs[filter_name] = filter_value
-                # These two don't make sense
-                if filter_name == 'server' and 'hostname' in kwargs:
-                    del kwargs['hostname']
-                elif filter_name == 'hostname' and 'server' in kwargs:
-                    del kwargs['server']
-                try:
-                    link = reverse(view, args=args, kwargs=kwargs)
-                except NoReverseMatch:
-                    link = reverse(self.fallback_view, args=None,
-                        kwargs={filter_name: filter_value})
-        except NoReverseMatch:
-            rm = sys.exc_info()[1]
-            raise rm
-        except (Resolver404, ValueError):
-            pass
-        return link
-
-
-@register.tag
-def add_url_filter(parser, token):
-    """
-    Return a url with the filter added to the current view.
-
-    Takes a new filter and resolves the current view with the new filter
-    applied.  Resolves to Bcfg2.Server.Reports.reports.views.client_history
-    by default.
-
-    {% add_url_filter server=interaction.server %}
-    """
-    try:
-        tag_name, filter_pair = token.split_contents()
-        filter_name, filter_value = filter_pair.split('=', 1)
-        filter_name = filter_name.strip()
-        filter_value = parser.compile_filter(filter_value)
-    except ValueError:
-        raise template.TemplateSyntaxError("%r tag requires exactly one argument" % token.contents.split()[0])
-    if not filter_name or not filter_value:
-        raise template.TemplateSyntaxError("argument should be a filter=value pair")
-
-    return AddUrlFilter(filter_name, filter_value)
-
-
-class MediaTag(template.Node):
-    def __init__(self, filter_value):
-        self.filter_value = filter_value
-
-    def render(self, context):
-        base = context['MEDIA_URL']
-        try:
-            request = context['request']
-            try:
-                base = request.environ['bcfg2.media_url']
-            except:
-                if request.path != request.META['PATH_INFO']:
-                    offset = request.path.find(request.META['PATH_INFO'])
-                    if offset > 0:
-                        base = "%s/%s" % (request.path[:offset], \
-                                context['MEDIA_URL'].strip('/'))
-        except:
-            pass
-        return "%s/%s" % (base, self.filter_value)
-
-
-@register.tag
-def to_media_url(parser, token):
-    """
-    Return a url relative to the media_url.
-
-    {% to_media_url /bcfg2.css %}
-    """
-    try:
-        filter_value = token.split_contents()[1]
-        filter_value = parser.compile_filter(filter_value)
-    except ValueError:
-        raise template.TemplateSyntaxError("%r tag requires exactly one argument" % token.contents.split()[0])
-
-    return MediaTag(filter_value)
-
-@register.filter
-def determine_client_state(entry):
-    """
-    Determine client state.
-
-    This is used to determine whether a client is reporting clean or
-    dirty. If the client is reporting dirty, this will figure out just
-    _how_ dirty and adjust the color accordingly.
-    """
-    if entry.state == 'clean':
-        return "clean-lineitem"
-
-    bad_percentage = 100 * (float(entry.badcount()) / entry.totalcount)
-    if bad_percentage < 33:
-        thisdirty = "slightly-dirty-lineitem"
-    elif bad_percentage < 66:
-        thisdirty = "dirty-lineitem"
-    else:
-        thisdirty = "very-dirty-lineitem"
-    return thisdirty
-
-
-@register.tag(name='qs')
-def do_qs(parser, token):
-    """
-    qs tag
-
-    accepts a name value pair and inserts or replaces it in the query string
-    """
-    try:
-        tag, name, value = token.split_contents()
-    except ValueError:
-        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" \
-            % token.contents.split()[0]
-    return QsNode(name, value)
-
-class QsNode(template.Node):
-    def __init__(self, name, value):
-        self.name = template.Variable(name)
-        self.value = template.Variable(value)
-
-    def render(self, context):
-        try:
-            name = self.name.resolve(context)
-            value = self.value.resolve(context)
-            request = context['request']
-            qs = copy(request.GET)
-            qs[name] = value
-            return "?%s" % qs.urlencode()
-        except template.VariableDoesNotExist:
-            return ''
-        except KeyError:
-            if settings.TEMPLATE_DEBUG:
-                raise Exception,  "'qs' tag requires context['request']"
-            return ''
-        except:
-            return ''
-
-
-@register.tag
-def sort_link(parser, token):
-    '''
-    Create a sort anchor tag.  Reverse it if active.
-
-    {% sort_link sort_key text %}
-    '''
-    try:
-        tag, sort_key, text = token.split_contents()
-    except ValueError:
-        raise template.TemplateSyntaxError("%r tag requires at least four arguments" \
-            % token.split_contents()[0])
-
-    return SortLinkNode(sort_key, text)
-
-class SortLinkNode(template.Node):
-    __TMPL__ = "{% load bcfg2_tags %}<a href='{% qs 'sort' key %}'>{{ text }}</a>"
-
-    def __init__(self, sort_key, text):
-        self.sort_key = template.Variable(sort_key)
-        self.text = template.Variable(text)
-
-    def render(self, context):
-        try:
-            try:
-                sort = context['request'].GET['sort']
-            except KeyError:
-                #fall back on this
-                sort = context.get('sort', '')
-            sort_key = self.sort_key.resolve(context)
-            text = self.text.resolve(context)
-
-            # add arrows
-            try:
-                sort_base = sort_key.lstrip('-')
-                if sort[0] == '-' and sort[1:] == sort_base:
-                    text = text + '&#x25BC;'
-                    sort_key = sort_base
-                elif sort_base == sort:
-                    text = text + '&#x25B2;'
-                    sort_key = '-' + sort_base
-            except IndexError:
-                pass
-
-            context.push()
-            context['key'] = sort_key
-            context['text'] = mark_safe(text)
-            output = get_template_from_string(self.__TMPL__).render(context)
-            context.pop()
-            return output
-        except:
-            if settings.DEBUG:
-                raise
-            raise
-            return ''
-
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/split.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/split.py
deleted file mode 100644
index a9b4f0371..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/split.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django import template
-register = template.Library()
-
-
-@register.filter
-def split(s):
-    """split by newlines"""
-    return s.split('\n')
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
deleted file mode 100644
index bd379b98d..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import sys
-from django import template
-from django.utils.encoding import smart_unicode
-from django.utils.html import conditional_escape
-from django.utils.safestring import mark_safe
-
-from Bcfg2.Compat import u_str
-
-register = template.Library()
-
-# pylint: disable=E0611
-try:
-    from pygments import highlight
-    from pygments.lexers import get_lexer_by_name
-    from pygments.formatters import HtmlFormatter
-    colorize = True
-except:
-    colorize = False
-# pylint: enable=E0611
-
-
-@register.filter
-def syntaxhilight(value, arg="diff", autoescape=None):
-    """
-    Returns a syntax-hilighted version of Code;
-    requires code/language arguments
-    """
-
-    if autoescape:
-        value = conditional_escape(value)
-        arg = conditional_escape(arg)
-
-    if colorize:
-        try:
-            output = u_str('<style  type="text/css">') \
-                + smart_unicode(HtmlFormatter().get_style_defs('.highlight')) \
-                + u_str('</style>')
-
-            lexer = get_lexer_by_name(arg)
-            output += highlight(value, lexer, HtmlFormatter())
-            return mark_safe(output)
-        except:
-            return value
-    else:
-        return mark_safe(u_str('<div class="note-box">Tip: Install pygments '
-                               'for highlighting</div><pre>%s</pre>') % value)
-syntaxhilight.needs_autoescape = True
diff --git a/src/lib/Bcfg2/Server/Reports/reports/urls.py b/src/lib/Bcfg2/Server/Reports/reports/urls.py
deleted file mode 100644
index 1cfe725c2..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/urls.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from django.conf.urls.defaults import *
-from django.core.urlresolvers import reverse, NoReverseMatch
-from django.http import HttpResponsePermanentRedirect
-from Bcfg2.Server.Reports.utils import filteredUrls, paginatedUrls, timeviewUrls
-
-def newRoot(request):
-    try:
-        grid_view = reverse('reports_grid_view')
-    except NoReverseMatch:
-        grid_view = '/grid'
-    return HttpResponsePermanentRedirect(grid_view)
-
-urlpatterns = patterns('Bcfg2.Server.Reports.reports',
-    (r'^$', newRoot),
-
-    url(r'^manage/?$', 'views.client_manage', name='reports_client_manage'),
-    url(r'^client/(?P<hostname>[^/]+)/(?P<pk>\d+)/?$', 'views.client_detail', name='reports_client_detail_pk'),
-    url(r'^client/(?P<hostname>[^/]+)/?$', 'views.client_detail', name='reports_client_detail'),
-    url(r'^elements/(?P<type>\w+)/(?P<pk>\d+)/?$', 'views.config_item', name='reports_item'),
-    url(r'^entry/(?P<eid>\w+)/?$', 'views.entry_status', name='reports_entry'),
-)
-
-urlpatterns += patterns('Bcfg2.Server.Reports.reports',
-    *timeviewUrls(
-        (r'^summary/?$', 'views.display_summary', None, 'reports_summary'),
-        (r'^timing/?$', 'views.display_timing', None, 'reports_timing'),
-        (r'^common/(?P<threshold>\d+)/?$', 'views.common_problems', None, 'reports_common_problems'),
-        (r'^common/?$', 'views.common_problems', None, 'reports_common_problems'),
-))
-
-urlpatterns += patterns('Bcfg2.Server.Reports.reports',
-    *filteredUrls(*timeviewUrls(
-        (r'^grid/?$', 'views.client_index', None, 'reports_grid_view'),
-        (r'^detailed/?$',
-            'views.client_detailed_list', None, 'reports_detailed_list'),
-        (r'^elements/(?P<type>\w+)/?$', 'views.config_item_list', None, 'reports_item_list'),
-)))
-
-urlpatterns += patterns('Bcfg2.Server.Reports.reports',
-    *paginatedUrls( *filteredUrls(
-        (r'^history/?$',
-            'views.render_history_view', None, 'reports_history'),
-        (r'^history/(?P<hostname>[^/|]+)/?$',
-            'views.render_history_view', None, 'reports_client_history'),
-)))
-
-    # Uncomment this for admin:
-    #(r'^admin/', include('django.contrib.admin.urls')),
-
-
-## Uncomment this section if using authentication
-#urlpatterns += patterns('',
-#                        (r'^login/$', 'django.contrib.auth.views.login',
-#                         {'template_name': 'auth/login.html'}),
-#                        (r'^logout/$', 'django.contrib.auth.views.logout',
-#                         {'template_name': 'auth/logout.html'})
-#                        )
-
diff --git a/src/lib/Bcfg2/Server/Reports/reports/views.py b/src/lib/Bcfg2/Server/Reports/reports/views.py
deleted file mode 100644
index ca9e5f1f9..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/views.py
+++ /dev/null
@@ -1,583 +0,0 @@
-"""
-Report views
-
-Functions to handle all of the reporting views.
-"""
-from datetime import datetime, timedelta
-import sys
-from time import strptime
-
-from django.template import Context, RequestContext
-from django.http import \
-        HttpResponse, HttpResponseRedirect, HttpResponseServerError, Http404
-from django.shortcuts import render_to_response, get_object_or_404
-from django.core.urlresolvers import \
-        resolve, reverse, Resolver404, NoReverseMatch
-from django.db import connection, DatabaseError
-from django.db.models import Q
-
-from Bcfg2.Server.Reports.reports.models import *
-
-
-__SORT_FIELDS__ = ( 'client', 'state', 'good', 'bad', 'modified', 'extra', \
-            'timestamp', 'server' )
-
-class PaginationError(Exception):
-    """This error is raised when pagination cannot be completed."""
-    pass
-
-
-def _in_bulk(model, ids):
-    """
-    Short cut to fetch in bulk and trap database errors.  sqlite will raise
-    a "too many SQL variables" exception if this list is too long.  Try using
-    django and fetch manually if an error occurs
-
-    returns a dict of this form { id: <model instance> }
-    """
-
-    try:
-        return model.objects.in_bulk(ids)
-    except DatabaseError:
-        pass
-
-    # if objects.in_bulk fails so will obejcts.filter(pk__in=ids)
-    bulk_dict = {}
-    [bulk_dict.__setitem__(i.id, i) \
-        for i in model.objects.all() if i.id in ids]
-    return bulk_dict
-
-
-def server_error(request):
-    """
-    500 error handler.
-
-    For now always return the debug response.  Mailing isn't appropriate here.
-
-    """
-    from django.views import debug
-    return debug.technical_500_response(request, *sys.exc_info())
-
-
-def timeview(fn):
-    """
-    Setup a timeview view
-
-    Handles backend posts from the calendar and converts date pieces
-    into a 'timestamp' parameter
-
-    """
-    def _handle_timeview(request, **kwargs):
-        """Send any posts back."""
-        if request.method == 'POST' and request.POST.get('op', '') == 'timeview':
-            cal_date = request.POST['cal_date']
-            try:
-                fmt = "%Y/%m/%d"
-                if cal_date.find(' ') > -1:
-                    fmt += " %H:%M"
-                timestamp = datetime(*strptime(cal_date, fmt)[0:6])
-                view, args, kw = resolve(request.META['PATH_INFO'])
-                kw['year'] = "%0.4d" % timestamp.year
-                kw['month'] = "%02.d" % timestamp.month
-                kw['day'] = "%02.d" % timestamp.day
-                if cal_date.find(' ') > -1:
-                    kw['hour'] = timestamp.hour
-                    kw['minute'] = timestamp.minute
-                return HttpResponseRedirect(reverse(view,
-                                                    args=args,
-                                                    kwargs=kw))
-            except KeyError:
-                pass
-            except:
-                pass
-                # FIXME - Handle this
-
-        """Extract timestamp from args."""
-        timestamp = None
-        try:
-            timestamp = datetime(int(kwargs.pop('year')),
-                                 int(kwargs.pop('month')),
-                int(kwargs.pop('day')), int(kwargs.pop('hour', 0)),
-                int(kwargs.pop('minute', 0)), 0)
-            kwargs['timestamp'] = timestamp
-        except KeyError:
-            pass
-        except:
-            raise
-        return fn(request, **kwargs)
-
-    return _handle_timeview
-
-
-def _handle_filters(query, **kwargs):
-    """
-    Applies standard filters to a query object
-
-    Returns an updated query object
-
-    query - query object to filter
-
-    server -- Filter interactions by server
-    state -- Filter interactions by state
-    group -- Filter interactions by group
-
-    """
-    if 'state' in kwargs and kwargs['state']:
-        query = query.filter(state__exact=kwargs['state'])
-    if 'server' in kwargs and kwargs['server']:
-        query = query.filter(server__exact=kwargs['server'])
-
-    if 'group' in kwargs and kwargs['group']:
-        group = get_object_or_404(Group, name=kwargs['group'])
-        query = query.filter(metadata__groups__id=group.pk)
-    return query
-
-
-def config_item(request, pk, type="bad"):
-    """
-    Display a single entry.
-
-    Dispalys information about a single entry.
-
-    """
-    item = get_object_or_404(Entries_interactions, id=pk)
-    timestamp = item.interaction.timestamp
-    time_start = item.interaction.timestamp.replace(hour=0,
-                                                    minute=0,
-                                                    second=0,
-                                                    microsecond=0)
-    time_end = time_start + timedelta(days=1)
-
-    todays_data = Interaction.objects.filter(timestamp__gte=time_start,
-                                             timestamp__lt=time_end)
-    shared_entries = Entries_interactions.objects.filter(entry=item.entry,
-                                                         reason=item.reason,
-                                                         type=item.type,
-                                                         interaction__in=[x['id']\
-                                                                          for x in todays_data.values('id')])
-
-    associated_list = Interaction.objects.filter(id__in=[x['interaction']\
-        for x in shared_entries.values('interaction')])\
-        .order_by('client__name', 'timestamp').select_related().all()
-
-    return render_to_response('config_items/item.html',
-                              {'item': item,
-                               'isextra': item.type == TYPE_EXTRA,
-                               'mod_or_bad': type,
-                               'associated_list': associated_list,
-                               'timestamp': timestamp},
-                              context_instance=RequestContext(request))
-
-
-@timeview
-def config_item_list(request, type, timestamp=None, **kwargs):
-    """Render a listing of affected elements"""
-    mod_or_bad = type.lower()
-    type = convert_entry_type_to_id(type)
-    if type < 0:
-        raise Http404
-
-    current_clients = Interaction.objects.interaction_per_client(timestamp)
-    current_clients = [q['id'] for q in _handle_filters(current_clients, **kwargs).values('id')]
-
-    ldata = list(Entries_interactions.objects.filter(
-            interaction__in=current_clients, type=type).values())
-    entry_ids = set([x['entry_id'] for x in ldata])
-    reason_ids = set([x['reason_id'] for x in ldata])
-
-    entries = _in_bulk(Entries, entry_ids)
-    reasons = _in_bulk(Reason, reason_ids)
-
-    kind_list = {}
-    [kind_list.__setitem__(kind, {}) for kind in set([e.kind for e in entries.values()])]
-    for x in ldata:
-        kind = entries[x['entry_id']].kind
-        data_key = (x['entry_id'], x['reason_id'])
-        try:
-            kind_list[kind][data_key].append(x['id'])
-        except KeyError:
-            kind_list[kind][data_key] = [x['id']]
-
-    lists = []
-    for kind in kind_list.keys():
-        lists.append((kind, [(entries[e[0][0]], reasons[e[0][1]], e[1])
-            for e in sorted(kind_list[kind].iteritems(), key=lambda x: entries[x[0][0]].name)]))
-
-    return render_to_response('config_items/listing.html',
-                              {'item_list': lists,
-                               'mod_or_bad': mod_or_bad,
-                               'timestamp': timestamp},
-        context_instance=RequestContext(request))
-
-
-@timeview
-def entry_status(request, eid, timestamp=None, **kwargs):
-    """Render a listing of affected elements"""
-    entry = get_object_or_404(Entries, pk=eid)
-
-    current_clients = Interaction.objects.interaction_per_client(timestamp)
-    inters = {}
-    [inters.__setitem__(i.id, i) \
-        for i in _handle_filters(current_clients, **kwargs).select_related('client')]
-
-    eis = Entries_interactions.objects.filter(
-            interaction__in=inters.keys(), entry=entry)
-
-    reasons = _in_bulk(Reason, set([x.reason_id for x in eis]))
-
-    item_data = []
-    for ei in eis:
-        item_data.append((ei, inters[ei.interaction_id], reasons[ei.reason_id]))
-
-    return render_to_response('config_items/entry_status.html',
-                              {'entry': entry,
-                               'item_data': item_data,
-                               'timestamp': timestamp},
-        context_instance=RequestContext(request))
-
-
-@timeview
-def common_problems(request, timestamp=None, threshold=None):
-    """Mine config entries"""
-
-    if request.method == 'POST':
-        try:
-            threshold = int(request.POST['threshold'])
-            view, args, kw = resolve(request.META['PATH_INFO'])
-            kw['threshold'] = threshold
-            return HttpResponseRedirect(reverse(view,
-                                                args=args,
-                                                kwargs=kw))
-        except:
-            pass
-
-    try:
-        threshold = int(threshold)
-    except:
-        threshold = 10
-
-    c_intr = Interaction.objects.get_interaction_per_client_ids(timestamp)
-    data_list = {}
-    [data_list.__setitem__(t_id, {}) \
-            for t_id, t_label in TYPE_CHOICES if t_id != TYPE_GOOD]
-    ldata = list(Entries_interactions.objects.filter(
-            interaction__in=c_intr).exclude(type=TYPE_GOOD).values())
-
-    entry_ids = set([x['entry_id'] for x in ldata])
-    reason_ids = set([x['reason_id'] for x in ldata])
-    for x in ldata:
-        type = x['type']
-        data_key = (x['entry_id'], x['reason_id'])
-        try:
-            data_list[type][data_key].append(x['id'])
-        except KeyError:
-            data_list[type][data_key] = [x['id']]
-
-    entries = _in_bulk(Entries, entry_ids)
-    reasons = _in_bulk(Reason, reason_ids)
-
-    lists = []
-    for type, type_name in TYPE_CHOICES:
-        if type == TYPE_GOOD:
-            continue
-        lists.append([type_name.lower(), [(entries[e[0][0]], reasons[e[0][1]], e[1])
-            for e in sorted(data_list[type].items(), key=lambda x: len(x[1]), reverse=True)
-            if len(e[1]) > threshold]])
-
-    return render_to_response('config_items/common.html',
-                              {'lists': lists,
-                               'timestamp': timestamp,
-                               'threshold': threshold},
-        context_instance=RequestContext(request))
-
-
-@timeview
-def client_index(request, timestamp=None, **kwargs):
-    """
-    Render a grid view of active clients.
-
-    Keyword parameters:
-      timestamp -- datetime object to render from
-
-    """
-    list = _handle_filters(Interaction.objects.interaction_per_client(timestamp), **kwargs).\
-           select_related().order_by("client__name").all()
-
-    return render_to_response('clients/index.html',
-                              {'inter_list': list,
-                               'timestamp': timestamp},
-                              context_instance=RequestContext(request))
-
-
-@timeview
-def client_detailed_list(request, timestamp=None, **kwargs):
-    """
-    Provides a more detailed list view of the clients.  Allows for extra
-    filters to be passed in.
-
-    """
-
-    try:
-        sort = request.GET['sort']
-        if sort[0] == '-':
-            sort_key = sort[1:]
-        else:
-            sort_key = sort
-        if not sort_key in __SORT_FIELDS__:
-            raise ValueError
-
-        if sort_key == "client":
-            kwargs['orderby'] = "%s__name" % sort
-        elif sort_key == "good":
-            kwargs['orderby'] = "%scount" % sort
-        elif sort_key in ["bad", "modified", "extra"]:
-            kwargs['orderby'] = "%s_entries" % sort
-        else:
-            kwargs['orderby'] = sort
-        kwargs['sort'] = sort
-    except (ValueError, KeyError):
-        kwargs['orderby'] = "client__name"
-        kwargs['sort'] = "client"
-
-    kwargs['interaction_base'] = Interaction.objects.interaction_per_client(timestamp).select_related()
-    kwargs['page_limit'] = 0
-    return render_history_view(request, 'clients/detailed-list.html', **kwargs)
-
-
-def client_detail(request, hostname=None, pk=None):
-    context = dict()
-    client = get_object_or_404(Client, name=hostname)
-    if(pk == None):
-        inter = client.current_interaction
-        maxdate = None
-    else:
-        inter = client.interactions.get(pk=pk)
-        maxdate = inter.timestamp
-
-    ei = Entries_interactions.objects.filter(interaction=inter).select_related('entry').order_by('entry__kind', 'entry__name')
-    #ei = Entries_interactions.objects.filter(interaction=inter).select_related('entry')
-    #ei = sorted(Entries_interactions.objects.filter(interaction=inter).select_related('entry'),
-    #    key=lambda x: (x.entry.kind, x.entry.name))
-    context['ei_lists'] = (
-        ('bad', [x for x in ei if x.type == TYPE_BAD]),
-        ('modified', [x for x in ei if x.type == TYPE_MODIFIED]),
-        ('extra', [x for x in ei if x.type == TYPE_EXTRA])
-    )
-
-    context['interaction']=inter
-    return render_history_view(request, 'clients/detail.html', page_limit=5,
-        client=client, maxdate=maxdate, context=context)
-
-
-def client_manage(request):
-    """Manage client expiration"""
-    message = ''
-    if request.method == 'POST':
-        try:
-            client_name = request.POST.get('client_name', None)
-            client_action = request.POST.get('client_action', None)
-            client = Client.objects.get(name=client_name)
-            if client_action == 'expire':
-                client.expiration = datetime.now()
-                client.save()
-                message = "Expiration for %s set to %s." % \
-                    (client_name, client.expiration.strftime("%Y-%m-%d %H:%M:%S"))
-            elif client_action == 'unexpire':
-                client.expiration = None
-                client.save()
-                message = "%s is now active." % client_name
-            else:
-                message = "Missing action"
-        except Client.DoesNotExist:
-            if not client_name:
-                client_name = "<none>"
-            message = "Couldn't find client \"%s\"" % client_name
-
-    return render_to_response('clients/manage.html',
-        {'clients': Client.objects.order_by('name').all(), 'message': message},
-        context_instance=RequestContext(request))
-
-
-@timeview
-def display_summary(request, timestamp=None):
-    """
-    Display a summary of the bcfg2 world
-    """
-    recent_data = Interaction.objects.interaction_per_client(timestamp) \
-        .select_related().all()
-    node_count = len(recent_data)
-    if not timestamp:
-        timestamp = datetime.now()
-
-    collected_data = dict(clean=[],
-                          bad=[],
-                          modified=[],
-                          extra=[],
-                          stale=[])
-    for node in recent_data:
-        if timestamp - node.timestamp > timedelta(hours=24):
-            collected_data['stale'].append(node)
-            # If stale check for uptime
-        if node.bad_entry_count() > 0:
-            collected_data['bad'].append(node)
-        else:
-            collected_data['clean'].append(node)
-        if node.modified_entry_count() > 0:
-            collected_data['modified'].append(node)
-        if node.extra_entry_count() > 0:
-            collected_data['extra'].append(node)
-
-    # label, header_text, node_list
-    summary_data = []
-    get_dict = lambda name, label: {'name': name,
-                                    'nodes': collected_data[name],
-                                    'label': label}
-    if len(collected_data['clean']) > 0:
-        summary_data.append(get_dict('clean',
-                                     'nodes are clean.'))
-    if len(collected_data['bad']) > 0:
-        summary_data.append(get_dict('bad',
-                                     'nodes are bad.'))
-    if len(collected_data['modified']) > 0:
-        summary_data.append(get_dict('modified',
-                                     'nodes were modified.'))
-    if len(collected_data['extra']) > 0:
-        summary_data.append(get_dict('extra',
-                                     'nodes have extra configurations.'))
-    if len(collected_data['stale']) > 0:
-        summary_data.append(get_dict('stale',
-                                     'nodes did not run within the last 24 hours.'))
-
-    return render_to_response('displays/summary.html',
-        {'summary_data': summary_data, 'node_count': node_count,
-         'timestamp': timestamp},
-        context_instance=RequestContext(request))
-
-
-@timeview
-def display_timing(request, timestamp=None):
-    mdict = dict()
-    inters = Interaction.objects.interaction_per_client(timestamp).select_related().all()
-    [mdict.__setitem__(inter, {'name': inter.client.name}) \
-        for inter in inters]
-    for metric in Performance.objects.filter(interaction__in=list(mdict.keys())).all():
-        for i in metric.interaction.all():
-            try:
-                mdict[i][metric.metric] = metric.value
-            except KeyError:
-                #In the unlikely event two interactions share a metric, ignore it
-                pass
-    return render_to_response('displays/timing.html',
-                              {'metrics': list(mdict.values()),
-                               'timestamp': timestamp},
-                              context_instance=RequestContext(request))
-
-
-def render_history_view(request, template='clients/history.html', **kwargs):
-    """
-    Provides a detailed history of a clients interactions.
-
-    Renders a detailed history of a clients interactions. Allows for various
-    filters and settings.  Automatically sets pagination data into the context.
-
-    Keyword arguments:
-    interaction_base -- Interaction QuerySet to build on
-                        (default Interaction.objects)
-    context -- Additional context data to render with
-    page_number -- Page to display (default 1)
-    page_limit -- Number of results per page, if 0 show all (default 25)
-    client -- Client object to render
-    hostname -- Client hostname to lookup and render.  Returns a 404 if
-                not found
-    server -- Filter interactions by server
-    state -- Filter interactions by state
-    group -- Filter interactions by group
-    entry_max -- Most recent interaction to display
-    orderby -- Sort results using this field
-
-    """
-
-    context = kwargs.get('context', dict())
-    max_results = int(kwargs.get('page_limit', 25))
-    page = int(kwargs.get('page_number', 1))
-
-    client = kwargs.get('client', None)
-    if not client and 'hostname' in kwargs:
-        client = get_object_or_404(Client, name=kwargs['hostname'])
-    if client:
-        context['client'] = client
-
-    entry_max = kwargs.get('maxdate', None)
-    context['entry_max'] = entry_max
-
-    # Either filter by client or limit by clients
-    iquery = kwargs.get('interaction_base', Interaction.objects)
-    if client:
-        iquery = iquery.filter(client__exact=client)
-    iquery = iquery.select_related()
-
-    if 'orderby' in kwargs and kwargs['orderby']:
-        iquery = iquery.order_by(kwargs['orderby'])
-    if 'sort' in kwargs:
-        context['sort'] = kwargs['sort']
-
-    iquery = _handle_filters(iquery, **kwargs)
-
-    if entry_max:
-        iquery = iquery.filter(timestamp__lte=entry_max)
-
-    if max_results < 0:
-        max_results = 1
-    entry_list = []
-    if max_results > 0:
-        try:
-            rec_start, rec_end = prepare_paginated_list(request,
-                                                        context,
-                                                        iquery,
-                                                        page,
-                                                        max_results)
-        except PaginationError:
-            page_error = sys.exc_info()[1]
-            if isinstance(page_error[0], HttpResponse):
-                return page_error[0]
-            return HttpResponseServerError(page_error)
-        context['entry_list'] = iquery.all()[rec_start:rec_end]
-    else:
-        context['entry_list'] = iquery.all()
-
-    return render_to_response(template, context,
-                context_instance=RequestContext(request))
-
-
-def prepare_paginated_list(request, context, paged_list, page=1, max_results=25):
-    """
-    Prepare context and slice an object for pagination.
-    """
-    if max_results < 1:
-        raise PaginationError("Max results less then 1")
-    if paged_list == None:
-        raise PaginationError("Invalid object")
-
-    try:
-        nitems = paged_list.count()
-    except TypeError:
-        nitems = len(paged_list)
-
-    rec_start = (page - 1) * int(max_results)
-    try:
-        total_pages = (nitems / int(max_results)) + 1
-    except:
-        total_pages = 1
-    if page > total_pages:
-        # If we passed beyond the end send back
-        try:
-            view, args, kwargs = resolve(request.META['PATH_INFO'])
-            kwargs['page_number'] = total_pages
-            raise PaginationError(HttpResponseRedirect(reverse(view,
-                                                               kwargs=kwargs)))
-        except (Resolver404, NoReverseMatch, ValueError):
-            raise "Accessing beyond last page.  Unable to resolve redirect."
-
-    context['total_pages'] = total_pages
-    context['records_per_page'] = max_results
-    return (rec_start, rec_start + int(max_results))
author	Tim Laszlo <tim.laszlo@gmail.com>	2012-10-08 10:38:02 -0500
committer	Tim Laszlo <tim.laszlo@gmail.com>	2012-10-08 10:38:02 -0500
commit	44638176067df5231bf0be30801e36863391cd1f (patch)
tree	6aaba73d03f9a5532047518b9a3e8ef3e63d3f9f /src/lib/Bcfg2/Server/Reports/reports
parent	1a3ced3f45423d79e08ca7d861e8118e8618d3b2 (diff)
download	bcfg2-44638176067df5231bf0be30801e36863391cd1f.tar.gz bcfg2-44638176067df5231bf0be30801e36863391cd1f.tar.bz2 bcfg2-44638176067df5231bf0be30801e36863391cd1f.zip