diff options
| 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/templates | |
| parent | 1a3ced3f45423d79e08ca7d861e8118e8618d3b2 (diff) | |
| download | bcfg2-44638176067df5231bf0be30801e36863391cd1f.tar.gz bcfg2-44638176067df5231bf0be30801e36863391cd1f.tar.bz2 bcfg2-44638176067df5231bf0be30801e36863391cd1f.zip | |
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
Diffstat (limited to 'src/lib/Bcfg2/Server/Reports/reports/templates')
17 files changed, 0 insertions, 810 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 - <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 — 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 — {{ 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 %} - - {% 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 }}'>[–]</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 }} — {{ type_data|length }}</h3> - <div class='entry_expand_tab' id='plusminus_table_{{ type_name }}'>[–]</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 %} - - {% 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 }}">< Prev</a><span> </span>{% endif %} - {% if first_page %}<a href="{{ first_page }}">1</a><span> ... </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> ... </span><a href="{{ last_page }}">{{ total_pages }}</a><span> </span>{% endif %} - {% if next_page %}<a href="{{ next_page }}">Next ></a><span> </span>{% endif %} - |{% for limit, limit_url in page_limits %} <a href="{{ limit_url }}">{{ limit }}</a>{% endfor %} - </div> - {% else %} - <span> </span> - {% endif %} -{% endfor %} -{% endspaceless %} -<!-- {{ path }} --> |