updated graph definitions (don't fuck with .svn!)

git-svn-id: http://www.observium.org/svn/observer/trunk@1471 61d68cd4-352d-0410-923a-c4978735b2b8
2024-10-07 16:52:45 +00:00 · 2010-07-24 19:24:07 +00:00
parent ada14bd542
commit 11f8fd3645
49 changed files with 50 additions and 50 deletions
--- a/html/includes/graphs/atmvp/cells.inc.php
+++ b/html/includes/graphs/atmvp/cells.inc.php
@@ -28,6 +28,6 @@ $colour_area_out_max = "FFefaa";
 $graph_max = 1;
 $unit_text = "Cells";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/atmvp/errors.inc.php
+++ b/html/includes/graphs/atmvp/errors.inc.php
@@ -29,6 +29,6 @@ $graph_max = 1;

 $unit_text = "Errors";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/atmvp/packets.inc.php
+++ b/html/includes/graphs/atmvp/packets.inc.php
@@ -28,6 +28,6 @@ $colour_area_out_max = "FFefaa";
 $graph_max = 1;
 $unit_text = "Packets";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/bgp/cbgp_prefixes.inc.php
+++ b/html/includes/graphs/bgp/cbgp_prefixes.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $scale_min = "0";

@@ -19,6 +19,6 @@ $graph_max = 1;

 $unit_text = "Prefixes";

-include("generic_simplex.inc.php");
+include("includes/graphs/generic_simplex.inc.php");

 ?>
--- a/html/includes/graphs/bgp/updates.inc.php
+++ b/html/includes/graphs/bgp/updates.inc.php
@@ -21,6 +21,6 @@ $graph_max = 1;

 $unit_text = "Updates";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/device/current.inc.php
+++ b/html/includes/graphs/device/current.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/fanspeeds.inc.php
+++ b/html/includes/graphs/device/fanspeeds.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $device = device_by_id_cache($id);

--- a/html/includes/graphs/device/frequencies.inc.php
+++ b/html/includes/graphs/device/frequencies.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/hrprocesses.inc.php
+++ b/html/includes/graphs/device/hrprocesses.inc.php
@@ -4,7 +4,7 @@ $device = device_by_id_cache($id);

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $database = $config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd";

--- a/html/includes/graphs/device/hrusers.inc.php
+++ b/html/includes/graphs/device/hrusers.inc.php
@@ -4,7 +4,7 @@ $device = device_by_id_cache($id);

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $database = $config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd";

--- a/html/includes/graphs/device/humidity.inc.php
+++ b/html/includes/graphs/device/humidity.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/icmp.inc.php
+++ b/html/includes/graphs/device/icmp.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");

  $device = device_by_id_cache($id);

--- a/html/includes/graphs/device/ip.inc.php
+++ b/html/includes/graphs/device/ip.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
--- a/html/includes/graphs/device/ipSystemStats.inc.php
+++ b/html/includes/graphs/device/ipSystemStats.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename_4 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
--- a/html/includes/graphs/device/ipSystemStats_v4.inc.php
+++ b/html/includes/graphs/device/ipSystemStats_v4.inc.php
@@ -1,7 +1,7 @@
 <?php


-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
--- a/html/includes/graphs/device/ipSystemStats_v6.inc.php
+++ b/html/includes/graphs/device/ipSystemStats_v6.inc.php
@@ -1,7 +1,7 @@
 <?php


-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
--- a/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
+++ b/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
--- a/html/includes/graphs/device/ip_fragmented.inc.php
+++ b/html/includes/graphs/device/ip_fragmented.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
--- a/html/includes/graphs/device/laload.inc.php
+++ b/html/includes/graphs/device/laload.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_load.rrd";
--- a/html/includes/graphs/device/memory.inc.php
+++ b/html/includes/graphs/device/memory.inc.php
@@ -3,7 +3,7 @@
 $device = device_by_id_cache($id);
 $query = mysql_query("SELECT * FROM `mempools` where `device_id` = '".$id."'");

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " -u 100 -l 0 -E -b 1024 ";

--- a/html/includes/graphs/device/memory_procurve.inc.php
+++ b/html/includes/graphs/device/memory_procurve.inc.php
@@ -2,7 +2,7 @@

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-mem.rrd";
--- a/html/includes/graphs/device/memory_unix.inc.php
+++ b/html/includes/graphs/device/memory_unix.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_mem.rrd";
--- a/html/includes/graphs/device/snmp_packets.inc.php
+++ b/html/includes/graphs/device/snmp_packets.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
--- a/html/includes/graphs/device/snmp_statistics.inc.php
+++ b/html/includes/graphs/device/snmp_statistics.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");

  $device = device_by_id_cache($id);

--- a/html/includes/graphs/device/storage.inc.php
+++ b/html/includes/graphs/device/storage.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "100";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $device = device_by_id_cache($id);

--- a/html/includes/graphs/device/tcp.inc.php
+++ b/html/includes/graphs/device/tcp.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
--- a/html/includes/graphs/device/temperatures.inc.php
+++ b/html/includes/graphs/device/temperatures.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/toner.inc.php
+++ b/html/includes/graphs/device/toner.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/udp.inc.php
+++ b/html/includes/graphs/device/udp.inc.php
@@ -1,6 +1,6 @@
 <?php

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
  $device = device_by_id_cache($id);

  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -2,7 +2,7 @@

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd")) {
--- a/html/includes/graphs/device/voltages.inc.php
+++ b/html/includes/graphs/device/voltages.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/wificlients.inc.php
+++ b/html/includes/graphs/device/wificlients.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/diskio/bits.inc.php
+++ b/html/includes/graphs/diskio/bits.inc.php
@@ -12,6 +12,6 @@ if(is_file($config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safen
 $rra_in = "read";
 $rra_out = "written";

-include("generic_bits.inc.php");
+include("includes/graphs/generic_bits.inc.php");

 ?>
--- a/html/includes/graphs/diskio/ops.inc.php
+++ b/html/includes/graphs/diskio/ops.inc.php
@@ -24,6 +24,6 @@ $graph_max = 1;

 $unit_text = "Ops/s";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/mempool/usage.inc.php
+++ b/html/includes/graphs/mempool/usage.inc.php
@@ -1,6 +1,6 @@
 <?php

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " -u 100 -l 0 -E -b 1024 ";

--- a/html/includes/graphs/port/bits.inc.php
+++ b/html/includes/graphs/port/bits.inc.php
@@ -16,6 +16,6 @@ if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['
 $rra_in = "INOCTETS";
 $rra_out = "OUTOCTETS";

-include("generic_bits.inc.php");
+include("includes/graphs/generic_bits.inc.php");

 ?>
--- a/html/includes/graphs/port/errors.inc.php
+++ b/html/includes/graphs/port/errors.inc.php
@@ -28,6 +28,6 @@ $graph_max = 1;

 $unit_text = "Errors";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/port/fanspeed.inc.php
+++ b/html/includes/graphs/port/fanspeed.inc.php
@@ -2,7 +2,7 @@

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " COMMENT:'                         Last     Max\\n'";

--- a/html/includes/graphs/port/mac_acc_bits.inc.php
+++ b/html/includes/graphs/port/mac_acc_bits.inc.php
@@ -11,6 +11,6 @@ if(is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" .
 $rra_in = "IN";
 $rra_out = "OUT";

-include("generic_bits.inc.php");
+include("includes/graphs/generic_bits.inc.php");

 ?>
--- a/html/includes/graphs/port/mac_acc_pkts.inc.php
+++ b/html/includes/graphs/port/mac_acc_pkts.inc.php
@@ -22,6 +22,6 @@ $colour_area_out_max = "FFEFAA";
 $graph_max = 1;
 $unit_text = "Pkts\ \ \ ";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/port/mac_acc_total.inc.php
+++ b/html/includes/graphs/port/mac_acc_total.inc.php
@@ -6,7 +6,7 @@ $sort      = mres($_GET['sort']);

 if(is_numeric($_GET['topn'])) { $topn = $_GET['topn']; } else { $topn = '10'; }

-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");

  if($stat == "pkts") {
    $units='pps'; $unit = 'p'; $multiplier = '1';
--- a/html/includes/graphs/port/upkts.inc.php
+++ b/html/includes/graphs/port/upkts.inc.php
@@ -27,6 +27,6 @@ $colour_area_out_max = "FFefaa";
 $graph_max = 1;
 $unit_text = "Packets";

-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/processor/usage.inc.php
+++ b/html/includes/graphs/processor/usage.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "100";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $iter = "1";

--- a/html/includes/graphs/sensor/current.inc.php
+++ b/html/includes/graphs/sensor/current.inc.php
@@ -2,7 +2,7 @@

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " COMMENT:'                                 Last   Max\\n'";

--- a/html/includes/graphs/sensor/frequency.inc.php
+++ b/html/includes/graphs/sensor/frequency.inc.php
@@ -2,7 +2,7 @@

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " COMMENT:'                                 Last   Max\\n'";

--- a/html/includes/graphs/sensor/humidity.inc.php
+++ b/html/includes/graphs/sensor/humidity.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "25";
 $scale_max = "40";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " COMMENT:'                                 Last   Max\\n'";

--- a/html/includes/graphs/sensor/temperature.inc.php
+++ b/html/includes/graphs/sensor/temperature.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "25";
 $scale_max = "40";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

  $rrd_options .= " COMMENT:'                                 Last   Min   Max\\n'";

--- a/html/includes/graphs/sensor/voltage.inc.php
+++ b/html/includes/graphs/sensor/voltage.inc.php
@@ -2,7 +2,7 @@

 $scale_min = "0";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $rrd_options .= " -A ";

--- a/html/includes/graphs/storage/usage.inc.php
+++ b/html/includes/graphs/storage/usage.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "100";

-include("common.inc.php");
+include("includes/graphs/common.inc.php");

 $rrd_options .= " -b 1024";