Skip to content

Commit 94e799f

Browse files
authored
Merge pull request #210 from flask-dashboard/development
Development
2 parents 56922b3 + 17b7317 commit 94e799f

File tree

154 files changed

+3461
-4033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+3461
-4033
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ python:
33
- '2.7'
44
- '3.5'
55
- '3.6'
6+
# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
7+
matrix:
8+
include:
9+
- python: 3.7
10+
dist: xenial
11+
sudo: true
612
install:
713
- pip install codecov
814
script:
@@ -18,4 +24,4 @@ deploy:
1824
distributions: sdist bdist_wheel
1925
repo: flask-dashboard/Flask-MonitoringDashboard
2026
branch: master
21-
python: '3.6'
27+
python: '3.7'

README.md

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
[![Py-version](https://img.shields.io/pypi/pyversions/flask_monitoringdashboard.svg)](https://img.shields.io/pypi/pyversions/flask_monitoringdashboard.svg)
77
[![Downloads](http://pepy.tech/badge/flask-monitoringdashboard)](http://pepy.tech/count/flask-monitoringdashboard)
88

9-
Dashboard for automatic monitoring of Flask web-services.
9+
A dashboard for automatic monitoring of Flask web-services.
1010

11-
The Flask Monitoring Dashboard is an extension that offers four main functionalities with little effort from the Flask developer:
11+
The Flask Monitoring Dashboard is an extension for Flask applications that offers four main functionalities with little effort from the Flask developer:
1212

1313
- **Monitor the performance and utilization:**
1414
The Dashboard allows you to see which endpoints process a lot of requests and how fast.
@@ -20,21 +20,28 @@ The Flask Monitoring Dashboard is an extension that offers four main functionali
2020
endpoint are also merged together, the Dashboard provides an overview of which functions are used in
2121
which endpoint.
2222

23-
- **Monitor your test coverage:**
24-
The Dashboard allows you to find out which endpoints are covered by unit tests, allowing also for integration with Travis for automation purposes.
25-
For more information, see [this file](http://flask-monitoringdashboard.readthedocs.io/en/latest/functionality.html#test-coverage-monitoring)
26-
2723
- **Collect extra information about outliers:**
2824
Outliers are requests that take much longer to process than regular requests.
2925
The Dashboard automatically detects that a request is an outlier and stores extra information about it (stack trace, request values, Request headers, Request environment).
3026

27+
- **Collect additional information about your Flask-application:**
28+
Suppose you have an User-table and you want to know how many users are registered on your Flask-application.
29+
Then, you can run the following query: 'SELECT Count(*) FROM USERS;'. But this is just annoying to do regularly.
30+
Therefore, you can configure this in the Flask-MonitoringDashboard, which will provide you this information per day (or other time interval).
31+
32+
3133
The dashboard is automatically added to your existing Flask application.
3234
You can view the results by default using the default endpoint (this can be configured to another route):
3335

3436
[/dashboard](http://localhost:5000/dashboard)
3537

3638
For more advanced documentation, take a look at the information on [this site](http://flask-monitoringdashboard.readthedocs.io/en/latest/functionality.html).
3739

40+
## Live demo
41+
To view a live deployment of the Flask-MonitoringDashboard, check [this site](https://flask-monitoringdashboard.herokuapp.com/).
42+
Use the credentials u:`admin`, p:`admin` to log in.
43+
44+
3845
## Installation
3946
To install from source, download the source code, then run this:
4047

@@ -52,11 +59,20 @@ Adding the extension to your Flask app is simple:
5259

5360
app = Flask(__name__)
5461
dashboard.bind(app)
62+
63+
## Feedback
64+
In order to improve our Flask-MonitoringDashboard, we would like to hear from you! Therefore, we made a questionnaire
65+
with a few questions. Filling in this form takes less than 3 minutes. You can find the form [here](https://goo.gl/forms/IqRrjGDDXe44q5ZV2).
66+
67+
Alternatively, feel free to write to [our email-address](mailto:flask.monitoringdashboard@gmail.com).
5568

5669
## Documentation
5770
For more advanced documentation, see [this site](http://flask-monitoringdashboard.readthedocs.io).
58-
If you run into trouble migrating from version 1.X.X to version 2.0.0, this site also helps you solve this.
71+
If you run into trouble migrating from version 1.X.X to version 2.0.0, this site will help you solve this too.
5972

6073
## Screenshots
61-
![Screenshot 1](/docs/img/screenshot1.png)
62-
![Screenshot 2](/docs/img/screenshot2.png)
74+
![Screenshot 1](/docs/img/ss1.png)
75+
![Screenshot 2](/docs/img/ss2.png)
76+
![Screenshot 3](/docs/img/ss3.png)
77+
![Screenshot 4](/docs/img/ss4.png)
78+
![Screenshot 5](/docs/img/ss5.png)

docs/changelog.rst

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,19 @@ All notable changes to this project will be documented in this file.
55
This project adheres to `Semantic Versioning <http://semver.org/>`_.
66
Please note that the changes before version 1.10.0 have not been documented.
77

8-
Unreleased
8+
v2.1.0
9+
----------
10+
Changed
11+
12+
- Frontend is now using AngularJS
13+
- Removed TestMonitor
14+
- Added Custom graphs
15+
- Fixed Issue #206
16+
- Added support for Python 3.7
17+
- Updated documentation
18+
- Updated unit tests
19+
20+
v2.0.7
921
----------
1022
Changed
1123

docs/configuration.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Configuration
22
=============
33
Once you have successfully installed the Flask-MonitoringDashboard using the instructions from
4-
`this page <installation.html>`_, you can use the advanced features by correctly configuring the Dashboard.
4+
`the installation page <installation.html>`_, you can use the advanced features by correctly configuring the Dashboard.
55

66
Using a configuration file
77
--------------------------
@@ -13,7 +13,7 @@ In order to configure the Dashboard with a configuration-file, you can use the f
1313
1414
dashboard.config.init_from(file='/<path to file>/config.cfg')
1515
16-
Thus, it becomes:
16+
Your app then becomes:
1717

1818
.. code-block:: python
1919
@@ -94,7 +94,7 @@ Dashboard
9494
- **CUSTOM_LINK:** The Dashboard can be visited at localhost:5000/{{CUSTOM_LINK}}.
9595

9696
- **MONITOR_LEVEL**: The level for monitoring your endpoints. The default value is 3. For more information, see the
97-
Rules page.
97+
Overview page of the Dashboard.
9898

9999
- **OUTLIER_DETECTION_CONSTANT:** When the execution time is greater than :math:`constant * average`,
100100
extra information is logged into the database. A default value for this variable is :math:`2.5`.
@@ -108,8 +108,7 @@ Dashboard
108108
Authentication
109109
~~~~~~~~~~~~~~
110110

111-
- **USERNAME** and **PASSWORD:** Must be used for logging into the Dashboard.
112-
Thus both are required.
111+
- **USERNAME** and **PASSWORD:** Must be used for logging into the Dashboard. Both are required.
113112

114113
- **GUEST_USERNAME** and **GUEST_PASSWORD:** A guest can only see the results, but cannot configure/download any data.
115114

@@ -150,5 +149,6 @@ Visualization
150149
151150
What have you configured?
152151
-------------------------
153-
A lot of configuration options, but you might wonder what functionality is now supported in your Flask application?
154-
Have a look at `this file <functionality.html>`_ to find the answer.
152+
We've shown a bunch of configuration settings, but what features are now supported in your Flask
153+
application and how are they related to the config options?
154+
Have a look at `the detailed functionality page <functionality.html>`_ to find the answer.

0 commit comments

Comments
 (0)