From 872363f0c5f4b10de9f376b9340b3f7c7d1d9664 Mon Sep 17 00:00:00 2001 From: Joey Hagedorn Date: Wed, 22 Nov 2006 21:55:29 +0000 Subject: Moved the new reporting system in to Server module. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2525 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Reports/urls.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/lib/Server/Reports/urls.py') diff --git a/src/lib/Server/Reports/urls.py b/src/lib/Server/Reports/urls.py index d6f9ecb3a..0b0593fb9 100644 --- a/src/lib/Server/Reports/urls.py +++ b/src/lib/Server/Reports/urls.py @@ -2,25 +2,25 @@ from django.conf.urls.defaults import * urlpatterns = patterns('', # Example: - # (r'^brpt/', include('brpt.apps.foo.urls.foo')), - (r'^/*$','brpt.reports.views.index'), - (r'^clients/(?P\S+)/(?P\d+)/$', 'brpt.reports.views.client_detail'), - (r'^clients/(?P\S+)/$', 'brpt.reports.views.client_detail'), - (r'^clients/(?P\S+)$', 'brpt.reports.views.client_detail'), + # (r'^Bcfg2.Server.Reports/', include('Bcfg2.Server.Reports.apps.foo.urls.foo')), + (r'^/*$','Bcfg2.Server.Reports.reports.views.index'), + (r'^clients/(?P\S+)/(?P\d+)/$', 'Bcfg2.Server.Reports.reports.views.client_detail'), + (r'^clients/(?P\S+)/$', 'Bcfg2.Server.Reports.reports.views.client_detail'), + (r'^clients/(?P\S+)$', 'Bcfg2.Server.Reports.reports.views.client_detail'), #hack because hostnames have periods and we still want to append slash - (r'^clients/$','brpt.reports.views.client_index'), - (r'^displays/sys-view/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','brpt.reports.views.display_sys_view'), - (r'^displays/sys-view/$','brpt.reports.views.display_sys_view'), - (r'^displays/summary/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','brpt.reports.views.display_summary'), - (r'^displays/summary/$','brpt.reports.views.display_summary'), - (r'^displays/timing/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','brpt.reports.views.display_timing'), - (r'^displays/timing/$','brpt.reports.views.display_timing'), - (r'^displays/$','brpt.reports.views.display_index'), + (r'^clients/$','Bcfg2.Server.Reports.reports.views.client_index'), + (r'^displays/sys-view/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','Bcfg2.Server.Reports.reports.views.display_sys_view'), + (r'^displays/sys-view/$','Bcfg2.Server.Reports.reports.views.display_sys_view'), + (r'^displays/summary/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','Bcfg2.Server.Reports.reports.views.display_summary'), + (r'^displays/summary/$','Bcfg2.Server.Reports.reports.views.display_summary'), + (r'^displays/timing/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','Bcfg2.Server.Reports.reports.views.display_timing'), + (r'^displays/timing/$','Bcfg2.Server.Reports.reports.views.display_timing'), + (r'^displays/$','Bcfg2.Server.Reports.reports.views.display_index'), - (r'^elements/modified/(?P\d+)/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','brpt.reports.views.config_item_modified'), - (r'^elements/modified/(?P\d+)/$','brpt.reports.views.config_item_modified'), - (r'^elements/bad/(?P\d+)/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','brpt.reports.views.config_item_bad'), - (r'^elements/bad/(?P\d+)/$','brpt.reports.views.config_item_bad'), + (r'^elements/modified/(?P\d+)/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','Bcfg2.Server.Reports.reports.views.config_item_modified'), + (r'^elements/modified/(?P\d+)/$','Bcfg2.Server.Reports.reports.views.config_item_modified'), + (r'^elements/bad/(?P\d+)/(?P(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])@([01][0-9]|2[0-3]):([0-5][0-9]|60):([0-5][0-9]|60))/$','Bcfg2.Server.Reports.reports.views.config_item_bad'), + (r'^elements/bad/(?P\d+)/$','Bcfg2.Server.Reports.reports.views.config_item_bad'), ) # Uncomment this for admin: -- cgit v1.2.3-1-g7c22