Simplified GraceDB reports page.

gracedb/management/commands/make_histograms.py

@@ -20,7 +20,7 @@ WEB_PAGE_FILE_PATH = settings.LATENCY_REPORT_WEB_PAGE_FILE_PATH
 URL_PREFIX = settings.REPORT_INFO_URL_PREFIX
 
 # XXX Branson introduced during ER6 to clean things up a bit.
-PIPELINE_EXCLUDE_LIST = ['HardwareInjection', 'X', 'Q', 'Omega', 'Ringdown', 'LIB',]
+PIPELINE_EXCLUDE_LIST = ['HardwareInjection', 'X', 'Q', 'Omega', 'Ringdown', 'LIB', 'SNEWS', 'pycbc', 'CWB2G']
 
 class Command(NoArgsCommand):
     help = "I am the HISTOGRAM MAKER!"

gracedb/reports.py

 
-from django.http import HttpResponse
 from django.http import HttpResponseForbidden
 from django.template import RequestContext
 from django.shortcuts import render_to_response
@@ -10,11 +9,9 @@ from gracedb.permission_utils import filter_events_for_user
 from gracedb.permission_utils import internal_user_required
 from django.db.models import Q
 
-import os, json
-
 from django.core.urlresolvers import reverse
 
-from models import CoincInspiralEvent ,SingleInspiral
+from models import CoincInspiralEvent
 from forms import SimpleSearchForm
 from query import parseQuery
 
@@ -40,22 +37,23 @@ def histo(request):
     except IOError:
         table = None
 
-    # IFAR tables.
-
-    files = [ f for (_,_,_,f) in settings.REPORTS_IFAR ]
-
-    ifar = []
-    for name in files:
-        fname = os.path.join(settings.REPORT_IFAR_IMAGE_DIR, name)
-        if os.access(fname, os.R_OK):
-            ifar.append(name)
+    # XXX Getting rid of the IFAR calculation here. The dynamic CBC reports page is more
+    # relevant anyway.
+    #files = [ f for (_,_,_,f) in settings.REPORTS_IFAR ]
 
-    # Uptime table.
-    try:
-        uptime = open(settings.UPTIME_REPORT_DIR + "/ytd.html", "r").read()
-    except IOError:
-        uptime = None
+    #ifar = []
+    #for name in files:
+    #    fname = os.path.join(settings.REPORT_IFAR_IMAGE_DIR, name)
+    #    if os.access(fname, os.R_OK):
+    #        ifar.append(name)
 
+    # XXX The old nagios scraping code no longer works. It scrapes sentry anyway, instead
+    # of dashboard.ligo.org. Anyway, the reports page here isn't really the place for this
+    # kind of information.
+    #try:
+    #    uptime = open(settings.UPTIME_REPORT_DIR + "/ytd.html", "r").read()
+    #except IOError:
+    #    uptime = None
 
     # Rate information
     try:
@@ -66,8 +64,8 @@ def histo(request):
     return render_to_response(
             'gracedb/histogram.html',
             {'table': table,
-             'ifar' : ifar,
-             'uptime' : uptime,
+             #'ifar' : ifar,
+             #'uptime' : uptime,
              #'rate' : json.dumps(rate_data(request)),
              'rate' : rate_info,
              'url_prefix' : settings.REPORT_INFO_URL_PREFIX,
@@ -228,7 +226,7 @@ def cbc_report(request, format=""):
         eN = numpy.linspace(1, 1000 * len(ifars), 1000 * len(ifars)) / 1000.
         expected_ifars = lt / eN
 
-        up = eN + eN**.5
+        #up = eN + eN**.5
         down = eN - eN**.5
         down[down < 0.9] = 0.9
 

templates/gracedb/histogram.html

@@ -99,33 +99,37 @@ function toggle(id) {
 <br/>
 <br/>
 
+<!-- XXX Commenting out the IFAR stuff 
 <a name="ifar" href="javascript:toggle('ifar');"><h3>CBC IFAR</h3></a>
 
 <div id="ifar" style="display:none;">
-{% if ifar %}
-    {% for chart in ifar %}
+{# if ifar #}
+    {# for chart in ifar #}
         <img src="{{url_prefix}}{{ chart }}"><br/>
-    {% endfor %}
-{% else %}
+    {# endfor #}
+{# else #}
      No IFAR charts.
-{% endif %}
+{# endif #}
 </div>
 
 <br/>
 <br/>
+-->
 
+<!-- XXX Commenting out the uptime stuff 
 <a name="uptime" href="javascript:toggle('uptime');"><h3>Gracedb Uptime</h3></a>
 
 <div id="uptime" style="display: none;">
-{% if uptime %}
+{# if uptime #}
     {{ uptime|safe }}
-{% else %}
+{# else #}
      No uptime charts.
-{% endif %}
+{# endif #}
 </div>
 
 <br/>
 <br/>
+-->
 
 <a name="rate" href="javascript:toggle('rate');"><h3>Submission Rates</h3></a>