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
---
 src/lib/Bcfg2/Reporting/urls.py | 59 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/lib/Bcfg2/Reporting/urls.py

(limited to 'src/lib/Bcfg2/Reporting/urls.py')

diff --git a/src/lib/Bcfg2/Reporting/urls.py b/src/lib/Bcfg2/Reporting/urls.py
new file mode 100644
index 000000000..4dd343905
--- /dev/null
+++ b/src/lib/Bcfg2/Reporting/urls.py
@@ -0,0 +1,59 @@
+from django.conf.urls.defaults import *
+from django.core.urlresolvers import reverse, NoReverseMatch
+from django.http import HttpResponsePermanentRedirect
+from Bcfg2.Reporting.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.Reporting',
+    (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'^element/(?P<entry_type>\w+)/(?P<pk>\d+)/(?P<interaction>\d+)?/?$', 'views.config_item', name='reports_item'),
+    url(r'^element/(?P<entry_type>\w+)/(?P<pk>\d+)/?$', 'views.config_item', name='reports_item'),
+    url(r'^entry/(?P<entry_type>\w+)/(?P<pk>\w+)/?$', 'views.entry_status', name='reports_entry'),
+)
+
+urlpatterns += patterns('Bcfg2.Reporting',
+    *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.Reporting',
+    *filteredUrls(*timeviewUrls(
+        (r'^grid/?$', 'views.client_index', None, 'reports_grid_view'),
+        (r'^detailed/?$',
+            'views.client_detailed_list', None, 'reports_detailed_list'),
+        (r'^elements/(?P<item_state>\w+)/?$', 'views.config_item_list', None, 'reports_item_list'),
+)))
+
+urlpatterns += patterns('Bcfg2.Reporting',
+    *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'})
+#                        )
+
-- 
cgit v1.2.3-1-g7c22