diff options
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/status_interfaces.php | 21 | ||||
| -rw-r--r-- | usr/local/www/status_rrd_graph_img.php | 19 |
2 files changed, 27 insertions, 13 deletions
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index 56c4b57..dec67bb 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -191,6 +191,27 @@ include("head.inc"); <?=htmlspecialchars($ifinfo['ppp_uptime']);?> <?=htmlspecialchars($ifinfo['ppp_uptime_accumulated']);?> </td> </tr> + <?php endif; if ($ifinfo['cell_rssi']): ?> + <tr> + <td width="22%" class="vncellt"><?=gettext("Cell Signal (RSSI)");?></td> + <td width="78%" class="listr"> + <?=htmlspecialchars($ifinfo['cell_rssi']);?> (0-31) + </td> + </tr> + <?php endif; if ($ifinfo['cell_upstream']): ?> + <tr> + <td width="22%" class="vncellt"><?=gettext("Cell Upstream");?></td> + <td width="78%" class="listr"> + <?=htmlspecialchars($ifinfo['cell_upstream']);?> kbit/s + </td> + </tr> + <?php endif; if ($ifinfo['cell_downstream']): ?> + <tr> + <td width="22%" class="vncellt"><?=gettext("Cell Downstream");?></td> + <td width="78%" class="listr"> + <?=htmlspecialchars($ifinfo['cell_downstream']);?> kbit/s + </td> + </tr> <?php endif; if ($ifinfo['macaddr']): ?> <tr> <td width="22%" class="vncellt"><?=gettext("MAC address");?></td> diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 3756f65..fea016b 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -1031,21 +1031,14 @@ elseif((strstr($curdatabase, "-cellular.rrd")) && (file_exists("$rrddbpath$curda $graphcmd .= "--color SHADEA#eeeeee --color SHADEB#eeeeee "; $graphcmd .= "--title \"`hostname` - {$prettydb} - {$hperiod} - {$havg} average\" "; $graphcmd .= "--height 200 --width 620 "; - $graphcmd .= "DEF:\"$curif-signal1=$rrddbpath$curdatabase:signal1:AVERAGE\" "; - $graphcmd .= "DEF:\"$curif-signal2=$rrddbpath$curdatabase:signal2:AVERAGE\" "; - $graphcmd .= "LINE2:\"$curif-signal1#{$colorwireless[0]}:$curif-signal1\" "; - $graphcmd .= "LINE2:\"$curif-signal2#{$colorwireless[1]}:$curif-signal2\" "; + $graphcmd .= "DEF:\"$curif-rssi=$rrddbpath$curdatabase:rssi:AVERAGE\" "; + $graphcmd .= "LINE2:\"$curif-rssi#{$colorwireless[0]}:$curif-rssi\" "; $graphcmd .= "COMMENT:\"\\n\" "; $graphcmd .= "COMMENT:\"\t\t maximum\t\t average\t current\\n\" "; - $graphcmd .= "COMMENT:\"Signal1\t\t\" "; - $graphcmd .= "GPRINT:\"$curif-signal1:MAX:%7.2lf dBm \" "; - $graphcmd .= "GPRINT:\"$curif-signal1:AVERAGE:%7.2lf dBm \" "; - $graphcmd .= "GPRINT:\"$curif-signal1:LAST:%7.2lf dBm\" "; - $graphcmd .= "COMMENT:\"\\n\" "; - $graphcmd .= "COMMENT:\"Signal2\t\t\" "; - $graphcmd .= "GPRINT:\"$curif-signal2:MAX:%7.2lf dBm \" "; - $graphcmd .= "GPRINT:\"$curif-signal2:AVERAGE:%7.2lf dBm \" "; - $graphcmd .= "GPRINT:\"$curif-signal2:LAST:%7.2lf dBm\" "; + $graphcmd .= "COMMENT:\"RSSI\t\t\" "; + $graphcmd .= "GPRINT:\"$curif-rssi:MAX:%7.2lf \" "; + $graphcmd .= "GPRINT:\"$curif-rssi:AVERAGE:%7.2lf \" "; + $graphcmd .= "GPRINT:\"$curif-rssi:LAST:%7.2lf \" "; $graphcmd .= "COMMENT:\"\\n\" "; $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" "; } |
