Merge branch 'quark'

endpoints/api/__init__.py

@@ -334,7 +334,11 @@ def validate_json_request(schema_name):
     def wrapped(self, *args, **kwargs):
       schema = self.schemas[schema_name]
       try:
-        validate(request.get_json(), schema)
+        json_data = request.get_json()
+        if json_data is None:
+          raise InvalidRequest('Missing JSON body')
+
+        validate(json_data, schema)
         return func(self, *args, **kwargs)
       except ValidationError as ex:
         raise InvalidRequest(ex.message)

endpoints/api/suconfig.py

@@ -50,6 +50,7 @@ class SuperUserRegistryStatus(ApiResource):
   @verify_not_prod
   def get(self):
     """ Returns the status of the registry. """
+
     # If there is no conf/stack volume, then report that status.
     if not CONFIG_PROVIDER.volume_exists():
       return {

endpoints/realtime.py

@@ -4,13 +4,62 @@ import json
 from flask import request, Blueprint, abort, Response
 from flask.ext.login import current_user
 from auth.auth import require_session_login
-from app import userevents
+from endpoints.common import route_show_if
+from app import app, userevents
+from auth.permissions import SuperUserPermission
+
+import features
+import psutil
+import time
 
 logger = logging.getLogger(__name__)
 
 realtime = Blueprint('realtime', __name__)
 
 
+@realtime.route("/ps")
+@route_show_if(features.SUPER_USERS)
+@require_session_login
+def ps():
+  if not SuperUserPermission().can():
+    abort(403)
+
+  def generator():
+    while True:
+      build_status = {}
+      try:
+        builder_data = app.config['HTTPCLIENT'].get('http://localhost:8686/status', timeout=1)
+        if builder_data.status_code == 200:
+          build_status = json.loads(builder_data.text)
+      except:
+        pass
+
+      try:
+        data = {
+          'count': {
+            'cpu': psutil.cpu_percent(interval=1, percpu=True),
+            'virtual_mem': psutil.virtual_memory(),
+            'swap_mem': psutil.swap_memory(),
+            'connections': len(psutil.net_connections()),
+            'processes': len(psutil.pids()),
+            'network': psutil.net_io_counters()
+          },
+          'build': build_status
+        }
+      except psutil.AccessDenied:
+        data = {}
+
+      json_string = json.dumps(data)
+      yield 'data: %s\n\n' % json_string
+      time.sleep(1)
+
+  try:
+    return Response(generator(), mimetype="text/event-stream")
+  except:
+    pass
+
+
+
 @realtime.route("/user/")
 @require_session_login
 def index():