Merge e18a272 into 2dd93b0

ocadotechnology · Oct 31, 2018 · 6e53ae7 · 6e53ae7
2 parents 2dd93b0 + e18a272
commit 6e53ae7
Show file tree

Hide file tree

Showing 13 changed files with 6,389 additions and 45 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/aimmo-game/Pipfile b/aimmo-game/Pipfile
@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 kubernetes = "*"
 aimmo-game = {editable = true, path = "."}
+prometheus-client = "*"
 
 [requires]
 python_version = "2.7"
diff --git a/aimmo-game/Pipfile.lock b/aimmo-game/Pipfile.lock
diff --git a/aimmo-game/service.py b/aimmo-game/service.py
@@ -146,6 +146,5 @@ def run_game(port):
     host, port = sys.argv[1], int(sys.argv[2])
     socket_app = socketio.Middleware(socketio_server, flask_app,
                                      socketio_path=os.environ.get('SOCKETIO_RESOURCE', 'socket.io'))
-
     run_game(port)
     eventlet.wsgi.server(eventlet.listen((host, port)), socket_app, debug=False)
diff --git a/monitoring/0manifests/00namespace-namespace.yaml b/monitoring/0manifests/00namespace-namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring