diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-19 22:55:16 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-19 22:55:16 -0600 |
| commit | 8ceb9d3496dcc31f12c6b265f2b57bb34e336847 (patch) | |
| tree | 1299a926ada92e37dac82c6c42e27c1d848b409f | |
| parent | 78b4b127045edb52342386832e1b398ef497c24c (diff) | |
| parent | b90e4de2d8b228dba30a61c5f4cc3a11cdf4ce63 (diff) | |
| download | pfsense-8ceb9d3496dcc31f12c6b265f2b57bb34e336847.zip pfsense-8ceb9d3496dcc31f12c6b265f2b57bb34e336847.tar.gz | |
Merge pull request #2472 from dennypage/master
| -rw-r--r-- | src/etc/inc/gwlb.inc | 1 | ||||
| -rw-r--r-- | src/usr/local/www/status_gateways.php | 10 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/gateways.widget.php | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index 66db240..383d082 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -428,6 +428,7 @@ function return_gateways_status($byname = false) { $status[$target]['srcip'] = $dpinger_status['srcip']; $status[$target]['name'] = $gwname; $status[$target]['delay'] = empty($dpinger_status['latency_avg']) ? "0ms" : $dpinger_status['latency_avg'] . "ms"; + $status[$target]['stddev'] = empty($dpinger_status['latency_stddev']) ? "0ms" : $dpinger_status['latency_stddev'] . "ms"; $status[$target]['loss'] = empty($dpinger_status['loss']) ? "0.0%" : round($dpinger_status['loss'], 1) . "%"; $status[$target]['status'] = $dpinger_status['status']; } diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php index 8cb37e5..6c42513 100644 --- a/src/usr/local/www/status_gateways.php +++ b/src/usr/local/www/status_gateways.php @@ -99,6 +99,7 @@ display_top_tabs($tab_array); <th><?=gettext("Gateway"); ?></th> <th><?=gettext("Monitor"); ?></th> <th><?=gettext("RTT"); ?></th> + <th><?=gettext("RTTsd"); ?></th> <th><?=gettext("Loss"); ?></th> <th><?=gettext("Status"); ?></th> <th><?=gettext("Description"); ?></th> @@ -135,6 +136,15 @@ display_top_tabs($tab_array); <td> <?php if ($gateways_status[$gname]) { + echo $gateways_status[$gname]['stddev']; + } else { + echo gettext("Pending"); + } +?> + </td> + <td> +<?php + if ($gateways_status[$gname]) { echo $gateways_status[$gname]['loss']; } else { echo gettext("Pending"); diff --git a/src/usr/local/www/widgets/widgets/gateways.widget.php b/src/usr/local/www/widgets/widgets/gateways.widget.php index 69aeac0..16cd219 100644 --- a/src/usr/local/www/widgets/widgets/gateways.widget.php +++ b/src/usr/local/www/widgets/widgets/gateways.widget.php @@ -88,6 +88,7 @@ if ($_POST) { <tr> <th><?=gettext("Name")?></th> <th>RTT</th> + <th>RTTsd</th> <th><?=gettext("Loss")?></th> <th><?=gettext("Status")?></th> </tr> @@ -255,10 +256,11 @@ function compose_table_body_contents() { } $rtnstr .= "<td>" . ($gateways_status[$gname] ? htmlspecialchars($gateways_status[$gname]['delay']) : gettext("Pending")) . "</td>\n"; + $rtnstr .= "<td>" . ($gateways_status[$gname] ? htmlspecialchars($gateways_status[$gname]['stddev']) : gettext("Pending")) . "</td>\n"; $rtnstr .= "<td>" . ($gateways_status[$gname] ? htmlspecialchars($gateways_status[$gname]['loss']) : gettext("Pending")) . "</td>\n"; $rtnstr .= '<td class="bg-' . $bgcolor . '">' . $online . "</td>\n"; $rtnstr .= "</tr>\n"; } return($rtnstr); } -?>
\ No newline at end of file +?> |
