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/reports/templates/clients/detail.html  | 129 ---------------------
 .../reports/templates/clients/detailed-list.html   |  46 --------
 .../Reports/reports/templates/clients/history.html |  20 ----
 .../Reports/reports/templates/clients/index.html   |  35 ------
 .../Reports/reports/templates/clients/manage.html  |  45 -------
 5 files changed, 275 deletions(-)
 delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html
 delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html
 delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html
 delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html
 delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html

(limited to 'src/lib/Bcfg2/Server/Reports/reports/templates/clients')

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