Skip to content

Commit

Permalink
Merge pull request #284 from alessiosavi/development
Browse files Browse the repository at this point in the history
Static check
  • Loading branch information
mircealungu committed Dec 11, 2019
2 parents 401e2d5 + 7539030 commit 9e5563c
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 19 deletions.
6 changes: 3 additions & 3 deletions docs/contact.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion flask_monitoringdashboard/database/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Contains all functions that access a Request object.
"""
import time
from random import sample

from sqlalchemy import and_, func

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<tr>
<td><b>Monitoring-level</b></td>
<td ng-click="$event.stopPropagation()">
<monitorlevel name="endpoint.info.endpoint" value="endpoint.info['monitor-level']" />
<monitorlevel name="endpoint.info.endpoint" value="endpoint.info['monitor-level']"></monitorlevel>
</td>
</tr>
<tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@
</div>
</div>

<endpointdetails/>
<endpointdetails></endpointdetails>
</div>
6 changes: 3 additions & 3 deletions flask_monitoringdashboard/static/pages/outliers.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="card-header"><h4>Outliers data</h4></div>
<div class="card-body">

<pagination/>
<pagination></pagination>

<div class="card" ng-repeat="row in table" style="margin-bottom: 10px;">
<div class="row">
Expand Down Expand Up @@ -73,9 +73,9 @@
</div>
</div>

<pagination/>
<pagination></pagination>

</div>
</div>
<endpointdetails/>
<endpointdetails></endpointdetails>
</div>
2 changes: 1 addition & 1 deletion flask_monitoringdashboard/static/pages/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<td ng-show="isHits==false" style="text-align: right;">{{ row['median-overall'] | duration_ms }}</td>
<td style="text-align: center;">{{ row['last-accessed'] | dateDifference }}</td>
<td ng-click="$event.stopPropagation()">
<monitorlevel name="row.name" value="row.monitor" />
<monitorlevel name="row.name" value="row.monitor"></monitorlevel>
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion flask_monitoringdashboard/static/pages/plotly_graph.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@
</div>
</div>

<endpointdetails/>
<endpointdetails></endpointdetails>
</div>
6 changes: 3 additions & 3 deletions flask_monitoringdashboard/static/pages/profiler.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="rect5"></div>
</div>

<pagination/>
<pagination></pagination>
<div class="card" ng-repeat="request in table" style="margin-bottom: 10px;">
<div class="card-header">
<div class="row align-items-end">
Expand Down Expand Up @@ -50,9 +50,9 @@
</table>
</div>

<pagination/>
<pagination></pagination>
</div>
</div>

<endpointdetails/>
<endpointdetails></endpointdetails>
</div>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import unittest
from time import sleep

from flask import Flask, json, jsonify
from flask import Flask, jsonify
from flask_monitoringdashboard.core.cache import EndpointInfo
from flask_monitoringdashboard.database import session_scope, Request

Expand Down
2 changes: 1 addition & 1 deletion flask_monitoringdashboard/views/reporting.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def make_report():
compared_to_interval = DateInterval(datetime.fromtimestamp(int(arguments['compared_to_interval']['from'])),
datetime.fromtimestamp(int(arguments['compared_to_interval']['to'])))

except Exception as err:
except Exception:
return 'Invalid payload', 422

endpoint_summaries = []
Expand Down
2 changes: 1 addition & 1 deletion migration/migrate_v2_to_v3.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker, joinedload
from sqlalchemy.orm import sessionmaker

from sqlalchemy.ext.declarative import declarative_base

Expand Down

0 comments on commit 9e5563c

Please sign in to comment.