Merge branch 'development'

CHANGELOG.rst

@@ -13,6 +13,7 @@ Changed
 
 - Updated functionality to retrieve the stacktrace of an Outlier
 
+- Fixed bug with white colors from the config option
 
 v1.10.0
 ----------

TODO.rst

@@ -21,6 +21,8 @@ Features to be implemented
   - Page '/result/<endpoint>/time_per_version' - Max 10 versions per plot.
   - Page '/result/<endpoint>/outliers' - Max 20 results per table.
 
+[ ] Refactor all measurement-endpoints in a Blueprint
+
 Work in progress
 ----------------
 *Use this section if someone is already working on an item above.*

flask_monitoringdashboard/__init__.py

@@ -15,7 +15,6 @@
 import os
 from flask import Blueprint
 from flask_monitoringdashboard.config import Config
-from unittest import TestLoader
 
 config = Config()
 user_app = None
@@ -41,6 +40,11 @@ def bind(app, blue_print=None):
     global user_app, blueprint
     user_app = app
 
+    # Provide a secret-key for using WTF-forms
+    if not user_app.secret_key:
+        print('WARNING: You should provide a security key.')
+        user_app.secret_key = 'my-secret-key'
+
     if blue_print:
         import os
         import datetime

flask_monitoringdashboard/colors.py

@@ -1,5 +1,6 @@
 from colorhash import ColorHash
 from flask_monitoringdashboard import config
+import re
 
 
 def get_color(hash):
@@ -10,7 +11,7 @@ def get_color(hash):
     :return: a color (as string)
     """
     if hash in config.colors:
-        rgb = config.colors[hash]
+        rgb = re.findall(r'\d+', config.colors[hash])
     else:
         rgb = ColorHash(hash).rgb
     return 'rgb({0}, {1}, {2})'.format(rgb[0], rgb[1], rgb[2])

flask_monitoringdashboard/main.py

@@ -4,27 +4,26 @@
 """
 
 from flask import Flask, redirect, url_for
-import flask_monitoringdashboard as dashboard
-import os
 
-user_app = Flask(__name__)
-here = os.path.abspath(os.path.dirname(__file__))
-dashboard.config.init_from(file=here + '/config.cfg')
 
+def create_app():
+    import flask_monitoringdashboard as dashboard
 
-def get_session_id():
-    # implement here your own custom function
-    return '12345'
+    app = Flask(__name__)
 
+    def get_session_id():
+        # implement here your own custom function
+        return '12345'
 
-dashboard.config.get_group_by = get_session_id
-dashboard.bind(app=user_app)
+    dashboard.config.get_group_by = get_session_id
+    dashboard.bind(app=app)
 
+    @app.route('/')
+    def main():
+        return redirect(url_for('dashboard.index'))
 
-@user_app.route('/')
-def main():
-    return redirect(url_for('dashboard.index'))
+    return app
 
 
 if __name__ == '__main__':
-    user_app.run(debug=True, host='0.0.0.0')
+    create_app().run(debug=True, host='0.0.0.0')

flask_monitoringdashboard/outlier.py

@@ -11,8 +11,6 @@
 import sys
 import psutil
 
-LOG_FILE = 'stacktrace.log'
-
 
 class StackInfo(object):
     def __init__(self, average):

flask_monitoringdashboard/routings/__init__.py

@@ -2,7 +2,7 @@
     Main class for adding all route-functions to user_app.
     Setup requires only to import this file. All other imports are done in this file
 """
-from flask_monitoringdashboard import blueprint, loc, user_app
+from flask_monitoringdashboard import blueprint, loc
 from flask.helpers import send_from_directory
 from flask import redirect, url_for
 
@@ -13,10 +13,6 @@
 import flask_monitoringdashboard.routings.export_data
 import flask_monitoringdashboard.routings.measurements
 
-# Provide a secret-key for using WTF-forms
-if user_app.secret_key is None:
-    user_app.secret_key = 'my-secret-key'
-
 
 # Rule for serving static files
 @blueprint.route('/static/<path:filename>')