nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

genericify that, use it for mempools also

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1316 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-08 23:30:52 +00:00
parent 8da13537f1
commit b3e2ae50ac
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/functions.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
function rewrite_processor_descr ($descr) { function rewrite_entity_descr ($descr) {
$descr = str_replace("Distributed Forwarding Card", "DFC", $descr); $descr = str_replace("Distributed Forwarding Card", "DFC", $descr);
$descr = preg_replace("/7600 Series SPA Interface Processor-/", "SIP-", $descr); $descr = preg_replace("/7600 Series SPA Interface Processor-/", "SIP-", $descr);
html/pages/device/health/memory.inc.php
+1 -1
View File
@@ -9,7 +9,7 @@
$proc_url = "?page=device/".$device['device_id']."/health/memory/"; $proc_url = "?page=device/".$device['device_id']."/health/memory/";
$text_descr = $mempool['mempool_descr']; $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
$mempool_url = "/device/".$device['device_id']."/health/memory/"; $mempool_url = "/device/".$device['device_id']."/health/memory/";
$mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
html/pages/device/health/processors.inc.php
+1 -1
View File
@@ -12,7 +12,7 @@
$text_descr = $proc['processor_descr']; $text_descr = $proc['processor_descr'];
$text_descr = rewrite_processor_descr($text_descr); $text_descr = rewrite_entity_descr($text_descr);
$proc_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr; $proc_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
$proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>"; $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>";
html/pages/device/overview/mempools.inc.php
+1 -5
View File
@@ -10,11 +10,7 @@ if(mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '"
if(is_integer($mempool_rows/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } if(is_integer($mempool_rows/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$perc = round($mempool['mempool_used'] / ($mempool['mempool_total']) * 100,2); $perc = round($mempool['mempool_used'] / ($mempool['mempool_total']) * 100,2);
$text_descr = $mempool['mempool_descr']; $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
$text_descr = str_replace("Routing Processor", "RP", $text_descr);
$text_descr = str_replace("Switching Processor", "SP", $text_descr);
$text_descr = str_replace("Sub-Module", "Module ", $text_descr);
$text_descr = str_replace("DFC Card", "DFC", $text_descr);
$mempool_url = "/device/".$device['device_id']."/health/memory/"; $mempool_url = "/device/".$device['device_id']."/health/memory/";
$mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
html/pages/device/overview/processors.inc.php
+1 -1
View File
@@ -20,7 +20,7 @@ if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '
## REPLACE THIS SHITTY CODE. IT IS ALSO ELSEWHERE. ## REPLACE THIS SHITTY CODE. IT IS ALSO ELSEWHERE.
$text_descr = rewrite_processor_descr($proc['processor_descr']); $text_descr = rewrite_entity_descr($proc['processor_descr']);
# disable short hrDeviceDescr. need to make this prettier. # disable short hrDeviceDescr. need to make this prettier.
#$text_descr = short_hrDeviceDescr($proc['processor_descr']); #$text_descr = short_hrDeviceDescr($proc['processor_descr']);