github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v3.5.1

pull/161/head
Pavel Loginov 2019-10-06 10:43:22 +03:00
parent a86c7a0d25
commit 5f8cd37f7c
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/sql.py
View File

@ -797,7 +797,7 @@ def select_waf_servers_metrics(uuid, **kwargs):
def select_waf_metrics(serv, **kwargs): def select_waf_metrics(serv, **kwargs):
con, cur = create_db.get_cur() con, cur = create_db.get_cur()
sql = """ select * from waf_metrics where serv = '%s' order by `date` desc """ % serv sql = """ select * from (select * from waf_metrics where serv = '%s' order by `date` desc limit 30) order by `date`""" % serv
try: try:
cur.execute(sql) cur.execute(sql)
except sqltool.Error as e: except sqltool.Error as e:

3
app/templates/metrics.html
View File

@ -16,6 +16,9 @@ th, tr, td {
<script src="/inc/metrics.js"></script> <script src="/inc/metrics.js"></script>
<script src="/inc/chart.min.js"></script> <script src="/inc/chart.min.js"></script>
<div id="table_metrics"></div> <div id="table_metrics"></div>
<div id="refresh" style="text-align: right;margin-top: 20px;margin-right: 10px;" title="Refresh metrics" onclick="showMetrics()">
<img src="/inc/images/update.png" alt="Refresh" class="icon">
</div>
{% for s in servers %} {% for s in servers %}
<div class="chart-container"> <div class="chart-container">
<canvas id="{{s.0}}" role="img"></canvas> <canvas id="{{s.0}}" role="img"></canvas>

6
app/templates/waf.html
View File

@ -28,10 +28,12 @@
<link href="/inc/chart.min.css" rel="stylesheet"> <link href="/inc/chart.min.css" rel="stylesheet">
<script src="/inc/metrics.js"></script> <script src="/inc/metrics.js"></script>
<script src="/inc/chart.min.js"></script> <script src="/inc/chart.min.js"></script>
<div id="refresh" style="text-align: right;margin-top: 20px;margin-right: 20px;" title="Refresh metrics" onclick="showWafMetrics()">
<img src="/inc/images/update.png" alt="Refresh" class="icon">
</div>
{% for s in servers %} {% for s in servers %}
<div class="chart-container"> <div class="chart-container">
<canvas id="{{s.0}}" role="img"></canvas> <canvas id="s_{{s.0}}" role="img"></canvas>
</div> </div>
{% endfor %} {% endfor %}

5
inc/metrics.js
View File

@ -82,9 +82,7 @@ function getWafChartData(server) {
}, },
type: "GET", type: "GET",
success: function (result) { success: function (result) {
var data = []; var data = [];
data.push(result.chartData.curr_con); data.push(result.chartData.curr_con);
data.push(result.chartData.server); data.push(result.chartData.server);
var labels = result.chartData.labels; var labels = result.chartData.labels;
@ -93,7 +91,8 @@ function getWafChartData(server) {
}); });
} }
function renderWafChart(data, labels, server) { function renderWafChart(data, labels, server) {
var ctx = document.getElementById(server) console.log(server)
var ctx = 's_'+server
var myChart = new Chart(ctx, { var myChart = new Chart(ctx, {
type: 'line', type: 'line',
data: { data: {

2
inc/script.js
View File

@ -150,7 +150,7 @@ function startSetInterval(interval) {
if(interval < 60000) { if(interval < 60000) {
interval = 60000; interval = 60000;
} }
intervalId = setInterval('showMetrics()', interval); intervalId = setInterval('showOverviewWaf()', interval);
showOverviewWaf(); showOverviewWaf();
showWafMetrics(); showWafMetrics();
} }