Removing the Matplotlib dependency.

A parser for Yum repo lists.
Small locking improvements.

Author: grrrrrrrrr

grr/gui/admin_ui.py

@@ -13,7 +13,6 @@
 # pylint: disable=unused-import,g-bad-import-order
 from grr.gui import django_lib
 from grr.lib import server_plugins
-from grr.gui import plot_lib
 # pylint: enable=unused-import,g-bad-import-order
 
 from grr.lib import config_lib

grr/gui/plot_lib.py

@@ -2,10 +2,8 @@
 """GUI elements allowing launching and management of flows."""
 
 import os
-import StringIO
 
 
-from grr.gui import plot_lib
 from grr.gui import renderers
 from grr.gui.plugins import crash_view
 from grr.gui.plugins import fileview
@@ -837,46 +835,6 @@ def Layout(self, request, response):
     super(ClientCrashesRenderer, self).Layout(request, response)
 
 
-class ProgressGraphRenderer(renderers.ImageDownloadRenderer):
-
-  def Content(self, request, _):
-    """Generates the actual image to display."""
-    flow_id = request.REQ.get("flow_id")
-    flow_obj = aff4.FACTORY.Open(flow_id, age=aff4.ALL_TIMES,
-                                 token=request.token)
-
-    log = list(flow_obj.GetValuesForAttribute(flow_obj.Schema.LOG))
-
-    create_time = flow_obj.state.context.create_time / 1000000
-
-    plot_data = [(int(x.age) / 1000000, int(str(x).split(" ")[1]))
-                 for x in log if "bytes" in str(x)]
-    plot_data.append((create_time, 0))
-
-    plot_data = sorted([(x - create_time, y) for (x, y) in plot_data])
-
-    x = [a for (a, b) in plot_data]
-    y = [b for (a, b) in plot_data]
-
-    params = {"backend": "png"}
-
-    plot_lib.plt.rcParams.update(params)
-    plot_lib.plt.figure(1)
-    plot_lib.plt.clf()
-
-    plot_lib.plt.plot(x, y)
-    plot_lib.plt.title("Progress for flow %s" % flow_id)
-    plot_lib.plt.xlabel("Time (s)")
-    plot_lib.plt.ylabel("Bytes downloaded")
-    plot_lib.plt.grid(True)
-
-    buf = StringIO.StringIO()
-    plot_lib.plt.savefig(buf)
-    buf.seek(0)
-
-    return buf.read()
-
-
 class GlobalLaunchFlows(renderers.AngularDirectiveRenderer):
   """Launches flows that apply across clients."""
   description = "Start Global Flows"

grr/gui/plugins/flow_management.py

@@ -5,13 +5,11 @@
 
 
 import collections as py_collections
-import StringIO
 import urllib
 
 
 import logging
 
-from grr.gui import plot_lib
 from grr.gui import renderers
 from grr.gui.plugins import fileview
 from grr.gui.plugins import foreman
@@ -637,85 +635,6 @@ def Layout(self, request, response):
                                hunt_id=self.hunt_id)
 
 
-class HuntClientCompletionGraphRenderer(renderers.ImageDownloadRenderer):
-
-  def Content(self, request, _):
-    """Generates the actual image to display."""
-    hunt_id = request.REQ.get("hunt_id")
-    hunt = aff4.FACTORY.Open(hunt_id, aff4_type="GRRHunt", token=request.token)
-    clients_by_status = hunt.GetClientsByStatus()
-
-    cl = clients_by_status["STARTED"]
-    fi = clients_by_status["COMPLETED"]
-
-    cdict = {}
-    for c in cl:
-      cdict.setdefault(c, []).append(c.age)
-
-    fdict = {}
-    for c in fi:
-      fdict.setdefault(c, []).append(c.age)
-
-    cl_age = [int(min(x) / 1e6) for x in cdict.values()]
-    fi_age = [int(min(x) / 1e6) for x in fdict.values()]
-
-    cl_hist = {}
-    fi_hist = {}
-
-    for age in cl_age:
-      cl_hist.setdefault(age, 0)
-      cl_hist[age] += 1
-
-    for age in fi_age:
-      fi_hist.setdefault(age, 0)
-      fi_hist[age] += 1
-
-    t0 = min(cl_age) - 1
-    times = [t0]
-    cl = [0]
-    fi = [0]
-
-    all_times = set(cl_age) | set(fi_age)
-    cl_count = 0
-    fi_count = 0
-
-    for time in sorted(all_times):
-      # Check if there is a datapoint one second earlier, add one if not.
-      if times[-1] != time - 1:
-        times.append(time)
-        cl.append(cl_count)
-        fi.append(fi_count)
-
-      cl_count += cl_hist.get(time, 0)
-      fi_count += fi_hist.get(time, 0)
-
-      times.append(time)
-      cl.append(cl_count)
-      fi.append(fi_count)
-
-    # Convert to hours, starting from 0.
-    times = [(t - t0) / 3600.0 for t in times]
-
-    params = {"backend": "png"}
-
-    plot_lib.plt.rcParams.update(params)
-    plot_lib.plt.figure(1)
-    plot_lib.plt.clf()
-
-    plot_lib.plt.plot(times, cl, label="Agents issued.")
-    plot_lib.plt.plot(times, fi, label="Agents completed.")
-    plot_lib.plt.title("Agent Coverage")
-    plot_lib.plt.xlabel("Time (h)")
-    plot_lib.plt.ylabel(r"Agents")
-    plot_lib.plt.grid(True)
-    plot_lib.plt.legend(loc=4)
-    buf = StringIO.StringIO()
-    plot_lib.plt.savefig(buf)
-    buf.seek(0)
-
-    return buf.read()
-
-
 class HuntHostInformationRenderer(fileview.AFF4Stats):
   """Modified HostInformation that reads from hunt_client variable."""
 

grr/gui/plugins/hunt_view.py

@@ -529,26 +529,6 @@ def Layout(self, request, response, aff4_path=None):
         request, response)
 
 
-class ProgressButtonRenderer(RDFValueRenderer):
-  """Renders a button that shows a progress graph."""
-
-  # This specifies the name of the RDFValue object we will render.
-  classname = "ProgressGraph"
-
-  layout_template = renderers.Template("""
-Open a graph showing the download progress in a new window:
-<button id="{{ unique|escape }}">
- Generate
-</button>
-""")
-
-  def Layout(self, request, response):
-    self.flow_id = request.REQ.get("flow")
-    response = super(ProgressButtonRenderer, self).Layout(request, response)
-    return self.CallJavascript(response, "ProgressButtonRenderer.Layout",
-                               flow_id=self.flow_id)
-
-
 class FlowStateRenderer(DictRenderer):
   """A Flow state is similar to a dict."""
   classname = "FlowState"

grr/gui/plugins/semantic.py

@@ -52,18 +52,6 @@ grr.Renderer('RDFValueArrayRenderer', {
 });
 
 
-grr.Renderer('ProgressButtonRenderer', {
-  Layout: function(state) {
-    var unique = state.unique;
-    var flow_id = state.flow_id;
-
-    var button = $('#' + unique).button();
-    grr.downloadHandler(button, {flow_id: flow_id}, false,
-                        '/render/Download/ProgressGraphRenderer');
-  }
-});
-
-
 grr.Renderer('AES128KeyFormRenderer', {
   Layout: function(state) {
     var prefix = state.prefix;