From 44638176067df5231bf0be30801e36863391cd1f Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Mon, 8 Oct 2012 10:38:02 -0500
Subject: 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
---
 .../reports/templates/config_items/common.html     | 42 ----------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/templates/config_items/common.html

(limited to 'src/lib/Bcfg2/Server/Reports/reports/templates/config_items/common.html')

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 %}
-- 
cgit v1.2.3-1-g7c22