Skip to content

Commit 095b607

Browse files
authored
Merge pull request #59 from flask-dashboard/typos
Typos
2 parents b1fab06 + a0530d2 commit 095b607

File tree

8 files changed

+93
-21
lines changed

8 files changed

+93
-21
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ The Flask Monitoring Dashboard provides 4 main functionalities:
66
This Flask extensions finds all your endpoints.
77
You can choose which endpoints you want to monitor and which not.
88
Monitoring and endpoint allows you to see which endpoints are being processed quickly, and which are not.
9-
Additionally, it provides information about the performance of the endpoint throughout different versions.
9+
Additionally, it provides information about the performance of the endpoint throughout different versions and different users.
1010
- **Monitor your test coverage:**
1111
Find out what endpoints are covered by unittest.
12-
For more information, see Section 'TravisCI unit testing'.
12+
For more information, see [this file](http://flask-monitoringdashboard.readthedocs.io/en/latest/functionality.html#test-coverage-monitoring).
1313
- **Collect extra information about outliers:**
1414
Outliers are requests that take way longer to process than regular requests.
1515
The dashboard stores more information about outliers, such as:
@@ -24,7 +24,7 @@ When running your app, the dashboard van be viewed by default in the route:
2424
[/dashboard](http://localhost:5000/dashboard)
2525

2626
### Status
27-
[![Build Status](https://travis-ci.org/flask-dashboard/Flask-Monitoring-Dashboard.svg?branch=master)](https://travis-ci.org/flask-dashboard/Flask-Monitoring-Dashboard.svg?branch=master)
27+
[![Build Status](https://travis-ci.org/flask-dashboard/Flask-MonitoringDashboard.svg?branch=master)](https://travis-ci.org/flask-dashboard/Flask-MonitoringDashboard.svg?branch=master)
2828
[![Documentation Status](https://readthedocs.org/projects/flask-monitoringdashboard/badge/?version=latest)](http://flask-monitoringdashboard.readthedocs.io/en/latest/?badge=latest)
2929

3030
## Installation
@@ -37,17 +37,17 @@ Or install with pip:
3737
pip install flask_monitoringdashboard
3838

3939
### Setup
40-
Adding the extension to your flask app is simple:
40+
Adding the extension to your Flask app is simple:
4141

4242
from flask import Flask
4343
import flask_monitoringdashboard as dashboard
4444

4545
app = Flask(__name__)
4646
dashboard.bind(app)
47-
47+
48+
## Documentation
49+
For a more advanced documentation, see [this site](http://flask-monitoringdashboard.readthedocs.io).
50+
4851
## Screenshots
4952
![Screenshot 1](/docs/img/screenshot1.png)
5053
![Screenshot 2](/docs/img/screenshot2.png)
51-
52-
## Documentation
53-
For a more advanced documentation, see [this site](http://flask-monitoringdashboard.readthedocs.io).

docs/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import os
1616
import sys
17-
sys.path.insert(0, os.path.abspath('..'))
17+
sys.path.insert(0, os.path.abspath('../flask-monitoringdashboard'))
1818

1919

2020
# -- Project information -----------------------------------------------------
@@ -91,6 +91,8 @@
9191
'github_fork': 'https://github.com/flask-dashboard/Flask-MonitoringDashboard'
9292
}
9393

94+
html_sidebars = {'**': ['globaltoc.html', 'searchbox.html', 'sourcelink.html']}
95+
9496
# Add any paths that contain custom static files (such as style sheets) here,
9597
# relative to this directory. They are copied after the builtin static files,
9698
# so a file named "default.css" will overwrite the builtin "default.css".

docs/configuration.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ you can use the advanced features by correctly configuration the dashboard.
55

66
Using a configuration file
77
--------------------------
8-
You can use a configuration file for all options.
9-
This is explained in the section below.
8+
You can use a configuration file for all options below.
9+
This is explained in the following section.
1010
In order to configure the dashboard with the configuration-file, you can use the following function:
1111

1212
.. code-block:: python
@@ -22,6 +22,7 @@ Thus, it becomes:
2222
2323
app = Flask(__name__)
2424
dashboard.config.init_from(file='/<path to file>/config.cfg')
25+
# Make sure that you first configure the dashboard, before binding it to your Flask application
2526
dashboard.bind(app)
2627
...
2728
@@ -32,7 +33,7 @@ Thus, it becomes:
3233
if __name__ == '__main__':
3334
app.run(debug=True)
3435
35-
Instead of having a hardcoded string containing the location of the config file in the code above, it is also possible
36+
Instead of having a hard-coded string containing the location of the config file in the code above, it is also possible
3637
to define an environment variable that specifies the location of this config file.
3738
The line should then be:
3839

@@ -107,3 +108,7 @@ This might look a bit overwhelming, but the following list explains everything i
107108
108109
COLORS={'main':[0,97,255], 'static':[255,153,0]}
109110
111+
What have you configured?
112+
-------------------------
113+
A lot of configuration options, but you might wonder what functionality is now supported in your Flask Monitoring Dashboard?
114+
Have a look at `this file <functionality.html>`_ to find the answer.

docs/contact.rst

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
Contact
2+
=======
3+
In this file, you can find information to find us.
4+
5+
Found a bug?
6+
------------
7+
Post an `issue on Github <https://github.com/flask-dashboard/Flask-MonitoringDashboard/issues>`_.
8+
You can use the template below for the right formatting:
9+
10+
.. topic:: Issue Template
11+
12+
- Expected Behavior
13+
14+
*Tell us what should happen*
15+
16+
- Current Behavior
17+
18+
*Tell us what happens instead of the expected behavior*
19+
20+
- Possible Solution
21+
22+
*Not obligatory, but suggest a fix/reason for the bug*
23+
24+
- Steps to Reproduce
25+
26+
*Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant*
27+
28+
1.
29+
30+
2.
31+
32+
3.
33+
34+
4.
35+
36+
- Context (Environment)
37+
38+
*How has this issue affected you? What are you trying to accomplish?
39+
Providing context helps us come up with a solution that is most useful in the real world*
40+
41+
- Detailed Description
42+
43+
*Provide a detailed description of the change or addition you are proposing*
44+
45+
- Possible Implementation
46+
47+
*Not obligatory, but suggest an idea for implementing addition or change*
48+

docs/functionality.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ To enable Travis to run your unit tests and send the results to the dashboard, f
110110
111111
dependency_links=["https://github.com/flask-dashboard/Flask-MonitoringDashboard/tarball/master#egg=flask_monitoringdashboard"]
112112
113-
install_requires=('flask_monitoring_dashboard')
113+
install_requires=('flask_monitoringdashboard')
114114
115115
3. In your `.travis.yml` file, three script commands should be added:
116116

117117
.. code-block:: bash
118118
119119
export DASHBOARD_CONFIG=./config.cfg
120120
export DASHBOARD_LOG_DIR=./logs/
121-
python -m dashboard.collect_performance
121+
python -m flask_monitoringdashboard.collect_performance
122122
123123
The config environment variable specifies where the performance collection process can find the config file.
124124
The log directory environment variable specifies where the performance collection process should place the logs it uses.
@@ -217,4 +217,9 @@ The 'Measurements'-tab contains the following content:
217217
- **Time per user:** A horizontal box plot with the execution time per user. In this graph, it is possible
218218
to detect if there is a difference in the execution time between users.
219219

220-
- **Outliers:** See Section (Outliers) above.
220+
- **Outliers:** See Section (Outliers) above.
221+
222+
Need more information?
223+
----------------------
224+
See the `contact page <contact.html>`_ to see how you can contribute on the project.
225+
Furthermore you can request this page for questions, bugs, or other information.

docs/index.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ The Flask Monitoring Dashboard provides 4 main functionalities:
2121
- **Monitor the Flask application:**
2222
This Flask extensions finds all your endpoints.
2323
You can choose which endpoints you want to monitor and which not.
24+
Monitoring and endpoint allows you to see which endpoints are being processed quickly, and which are not.
25+
Additionally, it provides information about the performance of the endpoint throughout different versions and different users.
2426

2527
- **Monitor your test coverage:**
2628
Find out what endpoints are covered by unittest.
27-
For more information, see Section 'TravisCI unit testing'.
29+
For more information, `see this file <http://flask-monitoringdashboard.readthedocs.io/en/latest/functionality.html#test-coverage-monitoring>`_.
2830

2931
- **Collect extra information about outliers:**
3032
Outliers are requests that take way longer to process than regular requests.
@@ -51,12 +53,16 @@ If you are interested in the Flask Monitoring Dashboard, you can find more infor
5153
:maxdepth: 2
5254

5355
installation
56+
5457
configuration
58+
5559
functionality
5660

5761
Developer information
5862
---------------------
5963
.. toctree::
60-
:maxdepth: 1
64+
:maxdepth: 2
6165

66+
contact
67+
6268
changelog

docs/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ In the former case, you're ok. In the latter, you can follow
1919

2020
Installing a Virtual Environment (Optional)
2121
-------------------------------------------
22-
Although you don't explicitly need a Virtual Environment, it is highly recommend.
22+
Although you don't need a Virtual Environment, it is highly recommend.
2323
See `this page <https://virtualenv.pypa.io/en/stable/installation/>`_ to install a Virtual Environment.
2424

2525
Configuring the Virtual Environment (Optional)
2626
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
27-
If you have skipped the previous section, you can also skip this one.
27+
If you have skipped the previous section, you can also skip this one (since it's optional).
2828
Once you've installed the Virtual Environment, you need to configure it.
2929
This can be done by the following command:
3030

setup.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def desc():
1313

1414
setuptools.setup(
1515
name="Flask-MonitoringDashboard",
16-
version="1.10.2",
16+
version="1.10.3",
1717
packages=setuptools.find_packages(),
1818
include_package_data=True,
1919
platforms='Any',
@@ -36,5 +36,11 @@ def desc():
3636
'Programming Language :: Python :: 3.3',
3737
'Programming Language :: Python :: 3.4',
3838
'Programming Language :: Python :: 3.5',
39-
'Programming Language :: Python :: 3.6']
39+
'Programming Language :: Python :: 3.6'],
40+
project_urls={
41+
'Bug Reports': 'https://github.com/flask-dashboard/Flask-MonitoringDashboard/issues',
42+
'PyPi': 'https://pypi.org/project/Flask-MonitoringDashboard/',
43+
'Documentation': 'http://flask-monitoringdashboard.readthedocs.io/',
44+
'Source': 'https://github.com/flask-dashboard/Flask-MonitoringDashboard/',
45+
},
4046
)

0 commit comments

Comments
 (0)