v3.0.7 - Merge pull request #301 from flask-dashboard/development

Author: mircealungu

docs/changelog.rst

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`_.
 Please note that the changes before version 1.10.0 have not been documented.
 
+v3.0.7 
+----------
+Changed
+- Added a first version of the Reporting functionality
+- Improved usability of the overview table
+- Fixed issue #`295` <https://github.com/flask-dashboard/Flask-MonitoringDashboard/issues/295>`_.
+
+
 v3.0.6
 ----------
 Changed

docs/configuration.rst

@@ -39,9 +39,9 @@ The line should then be:
 
 .. code-block:: python
 
-   dashboard.config.init_from(envvar='DASHBOARD_CONFIG')
+   dashboard.config.init_from(envvar='FLASK_MONITORING_DASHBOARD_CONFIG')
 
-This will configure the Dashboard based on the file provided in the environment variable called `DASHBOARD_CONFIG`.
+This will configure the Dashboard based on the file provided in the environment variable called `FLASK_MONITORING_DASHBOARD_CONFIG`.
 
 The content of the configuration file
 -------------------------------------

docs/contact.rst

@@ -26,13 +26,13 @@ Currently, the team consists of three active developers:
    +------------+----------------------------------------------------------------------+
 
 .. |Picture1| image:: https://avatars2.githubusercontent.com/u/17162650?s=460&v=4
-              ..:width: 100px
+			  ..:width: 100px
 
 .. |Picture2| image:: https://avatars2.githubusercontent.com/u/7281856?s=400&v=4
-              ..:width: 100px
+			  ..:width: 100px
 
 .. |Picture3| image:: https://avatars3.githubusercontent.com/u/17165311?s=400&v=4
-              ..:width: 100px
+			  ..:width: 100px
 
 
 Found a bug?

docs/functionality.rst

@@ -214,6 +214,10 @@ at least 1) in the application can be found under the **Dashboard** menu:
    requests for that endpoint. This provides information whether certain endpoints perform better (in terms of
    execution time) than other endpoints.
 
+6. **Reporting:** A more experimental feature which aims to automatically
+   detect and report changes in performance for various intervals
+   (e.g. today vs. yesterday, this week vs. last week, etc).
+
 Endpoint
 ~~~~~~~~~~~~~~
 

flask_monitoringdashboard/constants.json

@@ -1,5 +1,5 @@
 {
-    "version": "3.0.6",
+    "version": "3.0.7",
     "author": "Patrick Vogel, Bogdan Petre",
     "email": "flask.monitoringdashboard@gmail.com"
 }

flask_monitoringdashboard/core/config/parser.py

@@ -23,9 +23,14 @@ def parse_version(parser, header, version):
             # The file is specified by: 'ref: <location>'
             git_file = (open(os.path.join(git, 'HEAD')).read().rsplit(': ', 1)[1]).rstrip()
             # read the git-version
-            version = open(git + '/' + git_file).read()
-            # cut version to at most 6 chars
-            return version[:6]
+            version_file = os.path.join(git , git_file)
+            if os.path.exists(version_file):
+                version = open(version_file).read()
+                # cut version to at most 6 chars
+                return version[:6]
+            else:
+                # Return "dummy" version in case of no git version file found
+                return version
         except IOError:
             log("Error reading one of the files to retrieve the current git-version.")
             raise

flask_monitoringdashboard/core/profiler/stacktraceProfiler.py

@@ -37,6 +37,7 @@ def __init__(self, thread_to_monitor, endpoint, ip, group_by, outlier_profiler=N
         self._lines_body = []
         self._total = 0
         self._outlier_profiler = outlier_profiler
+        self._status_code = 404
 
     def run(self):
         """

flask_monitoringdashboard/core/reporting/questions/status_code_distribution.py

@@ -1,5 +1,3 @@
-from collections import defaultdict
-
 from flask_monitoringdashboard.controllers.requests import get_status_code_frequencies_in_interval
 from flask_monitoringdashboard.core.reporting.questions.report_question import Answer, ReportQuestion
 from flask_monitoringdashboard.database import session_scope

flask_monitoringdashboard/database/request.py

@@ -2,7 +2,6 @@
 Contains all functions that access a Request object.
 """
 import time
-from random import sample
 
 from sqlalchemy import and_, func
 
@@ -56,7 +55,7 @@ def add_request(db_session, duration, endpoint_id, ip, group_by, status_code):
         status_code=status_code,
     )
     db_session.add(request)
-    db_session.flush()
+    db_session.commit()
     return request.id
 
 

flask_monitoringdashboard/static/css/custom.css

@@ -497,4 +497,14 @@ footer.sticky-footer {
         transform: scaleY(1.0);
         -webkit-transform: scaleY(1.0);
     }
+}
+
+.greenText {color:green;}
+.redText {color:red;}
+
+.table_cell_with_error_count:after {
+    content:attr(error-count);
+    color: red;
+    vertical-align: super;
+    font-size: small;
 }