From a9cac94659745757720eaebc37fdc033828792cc Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Wed, 21 Sep 2011 11:59:59 +0000 Subject: [PATCH] rra? no. you mean ds. also make multi_bits_separated prettier git-svn-id: http://www.observium.org/svn/observer/trunk@2534 61d68cd4-352d-0410-923a-c4978735b2b8 --- .../graphs/application/apache_bytes.inc.php | 2 +- .../graphs/application/apache_cpu.inc.php | 2 +- .../graphs/application/apache_hits.inc.php | 2 +- .../application/apache_scoreboard.inc.php | 2 +- html/includes/graphs/atmvp/bits.inc.php | 4 +- html/includes/graphs/atmvp/cells.inc.php | 4 +- html/includes/graphs/atmvp/errors.inc.php | 4 +- html/includes/graphs/atmvp/packets.inc.php | 4 +- html/includes/graphs/bgp/prefixes.inc.php | 2 +- html/includes/graphs/bgp/updates.inc.php | 4 +- html/includes/graphs/bill/bits.inc.php | 4 +- .../graphs/cefswitching/graph.inc.php | 4 +- html/includes/graphs/customer/bits.inc.php | 4 +- html/includes/graphs/device/bits.inc.php | 10 ++-- .../graphs/device/cipsec_flow_bits.inc.php | 4 +- .../graphs/device/cipsec_flow_pkts.inc.php | 4 +- .../graphs/device/cipsec_flow_stats.inc.php | 38 +++++++------- .../graphs/device/cipsec_flow_tunnels.inc.php | 2 +- html/includes/graphs/device/collectd.inc.php | 2 +- .../graphs/device/diskio_bits.inc.php | 4 +- .../graphs/device/diskio_common.inc.php | 4 +- .../includes/graphs/device/diskio_ops.inc.php | 4 +- .../graphs/device/netstat_icmp.inc.php | 2 +- .../graphs/device/netstat_icmp_info.inc.php | 2 +- .../includes/graphs/device/netstat_ip.inc.php | 2 +- .../graphs/device/netstat_snmp.inc.php | 2 +- .../graphs/device/netstat_snmp_pkt.inc.php | 2 +- .../graphs/device/netstat_tcp.inc.php | 2 +- .../graphs/device/netstat_udp.inc.php | 2 +- .../graphs/device/nfsen_common.inc.php | 6 +-- .../graphs/device/nfsen_flows.inc.php | 4 +- .../graphs/device/nfsen_packets.inc.php | 4 +- .../graphs/device/nfsen_traffic.inc.php | 4 +- .../graphs/device/processor_separate.inc.php | 2 +- .../graphs/device/processor_stack.inc.php | 2 +- .../graphs/device/screenos_sessions.inc.php | 6 +-- .../graphs/device/ucd_contexts.inc.php | 2 +- .../graphs/device/ucd_interrupts.inc.php | 2 +- html/includes/graphs/device/ucd_io.inc.php | 4 +- .../graphs/device/ucd_swap_io.inc.php | 4 +- html/includes/graphs/diskio/bits.inc.php | 4 +- html/includes/graphs/diskio/ops.inc.php | 4 +- html/includes/graphs/generic_bits.inc.php | 18 +++---- html/includes/graphs/generic_bytes.inc.php | 20 ++++---- html/includes/graphs/generic_duplex.inc.php | 12 ++--- .../graphs/generic_multi_bits.inc.php | 6 +-- .../generic_multi_bits_separated.inc.php | 51 +++++++++++++------ .../graphs/generic_multi_line.inc.php | 8 +-- .../graphs/generic_multi_seperated.inc.php | 6 +-- .../generic_multi_simplex_seperated.inc.php | 26 +++++----- html/includes/graphs/generic_simplex.inc.php | 28 +++++----- html/includes/graphs/ipsectunnel/bits.inc.php | 4 +- html/includes/graphs/ipsectunnel/pkts.inc.php | 4 +- .../graphs/macaccounting/bits.inc.php | 4 +- .../graphs/macaccounting/pkts.inc.php | 4 +- html/includes/graphs/multiport/bits.inc.php | 4 +- .../graphs/multiport/bits_separate.inc.php | 4 +- .../graphs/port/adsl_attainable.inc.php | 4 +- .../graphs/port/adsl_attenuation.inc.php | 4 +- html/includes/graphs/port/adsl_power.inc.php | 4 +- html/includes/graphs/port/adsl_snr.inc.php | 4 +- html/includes/graphs/port/adsl_speed.inc.php | 4 +- html/includes/graphs/port/bits.inc.php | 4 +- html/includes/graphs/port/errors.inc.php | 8 +-- html/includes/graphs/port/etherlike.inc.php | 4 +- html/includes/graphs/port/nupkts.inc.php | 16 +++--- html/includes/graphs/port/pagp_bits.inc.php | 4 +- html/includes/graphs/port/upkts.inc.php | 4 +- .../includes/graphs/screenos_sessions.inc.php | 6 +-- 69 files changed, 231 insertions(+), 210 deletions(-) diff --git a/html/includes/graphs/application/apache_bytes.inc.php b/html/includes/graphs/application/apache_bytes.inc.php index cd9b96609..e54ab78db 100755 --- a/html/includes/graphs/application/apache_bytes.inc.php +++ b/html/includes/graphs/application/apache_bytes.inc.php @@ -11,7 +11,7 @@ if (is_file($apache_rrd)) $rrd_filename = $apache_rrd; } -$rra = "kbyte"; +$ds = "kbyte"; $colour_area = "CDEB8B"; $colour_line = "006600"; diff --git a/html/includes/graphs/application/apache_cpu.inc.php b/html/includes/graphs/application/apache_cpu.inc.php index 3b597a932..cdf09ee8a 100755 --- a/html/includes/graphs/application/apache_cpu.inc.php +++ b/html/includes/graphs/application/apache_cpu.inc.php @@ -11,7 +11,7 @@ if (is_file($apache_rrd)) $rrd_filename = $apache_rrd; } -$rra = "cpu"; +$ds = "cpu"; $colour_area = "AA66AA"; $colour_line = "FFDD88"; diff --git a/html/includes/graphs/application/apache_hits.inc.php b/html/includes/graphs/application/apache_hits.inc.php index dd6e343f8..f80065b8e 100755 --- a/html/includes/graphs/application/apache_hits.inc.php +++ b/html/includes/graphs/application/apache_hits.inc.php @@ -11,7 +11,7 @@ if (is_file($apache_rrd)) $rrd_filename = $apache_rrd; } -$rra = "access"; +$ds = "access"; $colour_area = "AA66AA"; $colour_line = "FFDD88"; diff --git a/html/includes/graphs/application/apache_scoreboard.inc.php b/html/includes/graphs/application/apache_scoreboard.inc.php index f0a74b2dc..d04243c6c 100755 --- a/html/includes/graphs/application/apache_scoreboard.inc.php +++ b/html/includes/graphs/application/apache_scoreboard.inc.php @@ -27,7 +27,7 @@ if (is_file($rrd_filename)) { $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = $vars['descr']; - $rrd_list[$i]['rra'] = $ds; + $rrd_list[$i]['ds'] = $ds; $rrd_list[$i]['colour'] = $vars['colour']; $i++; } diff --git a/html/includes/graphs/atmvp/bits.inc.php b/html/includes/graphs/atmvp/bits.inc.php index 3ad1ca1da..a0d4671b6 100644 --- a/html/includes/graphs/atmvp/bits.inc.php +++ b/html/includes/graphs/atmvp/bits.inc.php @@ -1,7 +1,7 @@ $colour) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("icmp", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/netstat_icmp_info.inc.php b/html/includes/graphs/device/netstat_icmp_info.inc.php index 1bf7b7dd6..8e919929a 100644 --- a/html/includes/graphs/device/netstat_icmp_info.inc.php +++ b/html/includes/graphs/device/netstat_icmp_info.inc.php @@ -22,7 +22,7 @@ foreach($stats as $stat => $array) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("icmp", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/netstat_ip.inc.php b/html/includes/graphs/device/netstat_ip.inc.php index 4ffa6ac96..3d29d6391 100644 --- a/html/includes/graphs/device/netstat_ip.inc.php +++ b/html/includes/graphs/device/netstat_ip.inc.php @@ -19,7 +19,7 @@ foreach($stats as $stat => $array) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("ip", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/netstat_snmp.inc.php b/html/includes/graphs/device/netstat_snmp.inc.php index 34e82b595..67ac578f6 100644 --- a/html/includes/graphs/device/netstat_snmp.inc.php +++ b/html/includes/graphs/device/netstat_snmp.inc.php @@ -19,7 +19,7 @@ foreach($stats as $stat) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("snmp", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/netstat_snmp_pkt.inc.php b/html/includes/graphs/device/netstat_snmp_pkt.inc.php index 035059108..66313b238 100644 --- a/html/includes/graphs/device/netstat_snmp_pkt.inc.php +++ b/html/includes/graphs/device/netstat_snmp_pkt.inc.php @@ -14,7 +14,7 @@ foreach($stats as $stat) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("snmp", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/netstat_tcp.inc.php b/html/includes/graphs/device/netstat_tcp.inc.php index 2c977115b..99075102f 100644 --- a/html/includes/graphs/device/netstat_tcp.inc.php +++ b/html/includes/graphs/device/netstat_tcp.inc.php @@ -13,7 +13,7 @@ foreach($stats as $stat) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("tcp", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE || strpos($stat, "Retrans") !== FALSE || strpos($stat, "Attempt") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/netstat_udp.inc.php b/html/includes/graphs/device/netstat_udp.inc.php index caa723fe5..73d46eb6e 100644 --- a/html/includes/graphs/device/netstat_udp.inc.php +++ b/html/includes/graphs/device/netstat_udp.inc.php @@ -13,7 +13,7 @@ foreach($stats as $stat) $i++; $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = str_replace("udp", "", $stat); - $rrd_list[$i]['rra'] = $stat; + $rrd_list[$i]['ds'] = $stat; if (strpos($stat, "Out") !== FALSE || strpos($stat, "Retrans") !== FALSE || strpos($stat, "Attempt") !== FALSE) { $rrd_list[$i]['invert'] = TRUE; diff --git a/html/includes/graphs/device/nfsen_common.inc.php b/html/includes/graphs/device/nfsen_common.inc.php index 3e4d59b0f..f06e33e40 100644 --- a/html/includes/graphs/device/nfsen_common.inc.php +++ b/html/includes/graphs/device/nfsen_common.inc.php @@ -27,15 +27,15 @@ foreach ( $config['nfsen_rrds'] as $nfsenrrds ) $rrd_list[$nfsen_iter]['filename'] = $rrd_filename; $rrd_list[$nfsen_iter]['descr'] = $flowtype; - $rrd_list[$nfsen_iter]['rra'] = $rraprefix . $flowtype; + $rrd_list[$nfsen_iter]['ds'] = $dsprefix . $flowtype; # set a multiplier which in turn will create a CDEF if this var is set - if ($rraprefix == "traffic_") { $multiplier = "8"; } + if ($dsprefix == "traffic_") { $multiplier = "8"; } $colours = "blues"; $nototal = 0; $units=""; - $unit_text = $rradescr; + $unit_text = $dsdescr; $scale_min = "0"; if ($_GET['debug']) { print_r($rrd_list); } diff --git a/html/includes/graphs/device/nfsen_flows.inc.php b/html/includes/graphs/device/nfsen_flows.inc.php index 0a2fd8f0c..5efc8c1f2 100644 --- a/html/includes/graphs/device/nfsen_flows.inc.php +++ b/html/includes/graphs/device/nfsen_flows.inc.php @@ -1,5 +1,5 @@ diff --git a/html/includes/graphs/device/nfsen_packets.inc.php b/html/includes/graphs/device/nfsen_packets.inc.php index bf4dad4bb..7ede8a551 100644 --- a/html/includes/graphs/device/nfsen_packets.inc.php +++ b/html/includes/graphs/device/nfsen_packets.inc.php @@ -1,5 +1,5 @@ diff --git a/html/includes/graphs/device/nfsen_traffic.inc.php b/html/includes/graphs/device/nfsen_traffic.inc.php index 735b81d0f..50cf75cdf 100644 --- a/html/includes/graphs/device/nfsen_traffic.inc.php +++ b/html/includes/graphs/device/nfsen_traffic.inc.php @@ -1,5 +1,5 @@ diff --git a/html/includes/graphs/device/processor_separate.inc.php b/html/includes/graphs/device/processor_separate.inc.php index 01507ac07..c5bcb892f 100644 --- a/html/includes/graphs/device/processor_separate.inc.php +++ b/html/includes/graphs/device/processor_separate.inc.php @@ -12,7 +12,7 @@ foreach ($procs as $proc) $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = $descr; - $rrd_list[$i]['rra'] = "usage"; + $rrd_list[$i]['ds'] = "usage"; $rrd_list[$i]['area'] = 1; $i++; } diff --git a/html/includes/graphs/device/processor_stack.inc.php b/html/includes/graphs/device/processor_stack.inc.php index bafc9d9ba..7cdfa0780 100644 --- a/html/includes/graphs/device/processor_stack.inc.php +++ b/html/includes/graphs/device/processor_stack.inc.php @@ -12,7 +12,7 @@ foreach ($procs as $proc) $rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['descr'] = $descr; - $rrd_list[$i]['rra'] = "usage"; + $rrd_list[$i]['ds'] = "usage"; $i++; } } diff --git a/html/includes/graphs/device/screenos_sessions.inc.php b/html/includes/graphs/device/screenos_sessions.inc.php index 0e67d22cb..ed27ae16a 100644 --- a/html/includes/graphs/device/screenos_sessions.inc.php +++ b/html/includes/graphs/device/screenos_sessions.inc.php @@ -8,15 +8,15 @@ $file = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("screeno $rrd_list[0]['filename'] = $file; $rrd_list[0]['descr'] = "Maxiumum"; -$rrd_list[0]['rra'] = "max"; +$rrd_list[0]['ds'] = "max"; $rrd_list[1]['filename'] = $file; $rrd_list[1]['descr'] = "Allocated"; -$rrd_list[1]['rra'] = "allocate"; +$rrd_list[1]['ds'] = "allocate"; $rrd_list[2]['filename'] = $file; $rrd_list[2]['descr'] = "Failed"; -$rrd_list[2]['rra'] = "failed"; +$rrd_list[2]['ds'] = "failed"; if ($_GET['debug']) { print_r($rrd_list); } diff --git a/html/includes/graphs/device/ucd_contexts.inc.php b/html/includes/graphs/device/ucd_contexts.inc.php index 482a5e379..a8a4e9663 100755 --- a/html/includes/graphs/device/ucd_contexts.inc.php +++ b/html/includes/graphs/device/ucd_contexts.inc.php @@ -4,7 +4,7 @@ include("includes/graphs/common.inc.php"); $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawContexts.rrd"; -$rra = "value"; +$ds = "value"; $colour_area = "9999cc"; $colour_line = "0000cc"; diff --git a/html/includes/graphs/device/ucd_interrupts.inc.php b/html/includes/graphs/device/ucd_interrupts.inc.php index 8f2f278c4..e6d151f74 100755 --- a/html/includes/graphs/device/ucd_interrupts.inc.php +++ b/html/includes/graphs/device/ucd_interrupts.inc.php @@ -4,7 +4,7 @@ include("includes/graphs/common.inc.php"); $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawInterrupts.rrd"; -$rra = "value"; +$ds = "value"; $colour_area = "CC9999"; $colour_line = "CC0000"; diff --git a/html/includes/graphs/device/ucd_io.inc.php b/html/includes/graphs/device/ucd_io.inc.php index d6486be66..f44f6f0b4 100644 --- a/html/includes/graphs/device/ucd_io.inc.php +++ b/html/includes/graphs/device/ucd_io.inc.php @@ -2,8 +2,8 @@ $rrd_filename_in = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssIORawReceived.rrd"; $rrd_filename_out = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssIORawSent.rrd"; -$rra_in = "value"; -$rra_out = "value"; +$ds_in = "value"; +$ds_out = "value"; $multiplier = 512; diff --git a/html/includes/graphs/device/ucd_swap_io.inc.php b/html/includes/graphs/device/ucd_swap_io.inc.php index 20f9b8c2c..7fef57615 100644 --- a/html/includes/graphs/device/ucd_swap_io.inc.php +++ b/html/includes/graphs/device/ucd_swap_io.inc.php @@ -2,8 +2,8 @@ $rrd_filename_in = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawSwapIn.rrd"; $rrd_filename_out = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawSwapOut.rrd"; -$rra_in = "value"; -$rra_out = "value"; +$ds_in = "value"; +$ds_out = "value"; $multiplier = 512; diff --git a/html/includes/graphs/diskio/bits.inc.php b/html/includes/graphs/diskio/bits.inc.php index 09db2740b..a38ae877f 100644 --- a/html/includes/graphs/diskio/bits.inc.php +++ b/html/includes/graphs/diskio/bits.inc.php @@ -1,7 +1,7 @@ \ No newline at end of file +?> diff --git a/html/includes/graphs/generic_duplex.inc.php b/html/includes/graphs/generic_duplex.inc.php index f9cb07e25..7c9ce6fe7 100644 --- a/html/includes/graphs/generic_duplex.inc.php +++ b/html/includes/graphs/generic_duplex.inc.php @@ -1,7 +1,7 @@ \ No newline at end of file +?> diff --git a/html/includes/graphs/generic_multi_bits.inc.php b/html/includes/graphs/generic_multi_bits.inc.php index a9d9628cd..f37639866 100644 --- a/html/includes/graphs/generic_multi_bits.inc.php +++ b/html/includes/graphs/generic_multi_bits.inc.php @@ -11,8 +11,8 @@ foreach ($rrd_filenames as $key => $rrd_filename) { if ($rrd_inverted[$key]) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; } - $rrd_options .= " DEF:".$in."octets" . $i . "=".$rrd_filename.":".$rra_in.":AVERAGE"; - $rrd_options .= " DEF:".$out."octets" . $i . "=".$rrd_filename.":".$rra_out.":AVERAGE"; + $rrd_options .= " DEF:".$in."octets" . $i . "=".$rrd_filename.":".$ds_in.":AVERAGE"; + $rrd_options .= " DEF:".$out."octets" . $i . "=".$rrd_filename.":".$ds_out.":AVERAGE"; $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF"; $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF"; $pluses .= $plus; @@ -62,4 +62,4 @@ if ($i) #$rrd_options .= " HRULE:0#999999"; -?> \ No newline at end of file +?> diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php index 1cabbc462..2b1964fb4 100644 --- a/html/includes/graphs/generic_multi_bits_separated.inc.php +++ b/html/includes/graphs/generic_multi_bits_separated.inc.php @@ -3,12 +3,29 @@ include("includes/graphs/common.inc.php"); $i = 0; +if($width > "500") +{ + $descr_len=18; +} else { + $descr_len=8; + $descr_len += round(($width - 250) / 8); +} + +$unit_text = "Bits/sec"; +$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."'"; + +if($width > "500") +{ + $rrd_options .= " COMMENT:'In\: Current Maximum '"; + if (!$nototal) { $rrd_options .= " COMMENT:'Total '"; } + $rrd_options .= " COMMENT:'Out\: Current Maximum'"; + if (!$nototal) { $rrd_options .= " COMMENT:' Total'"; } + $rrd_options .= " COMMENT:'\l'"; +} else { + $rrd_options .= " COMMENT:' Now Ave Max\l'"; + +} -$rrd_options .= " COMMENT:' In\: Current Maximum '"; -if (!$nototal) { $rrd_options .= " COMMENT:'Total '"; } -$rrd_options .= " COMMENT:'Out\: Current Maximum'"; -if (!$nototal) { $rrd_options .= " COMMENT:' Total'"; } -$rrd_options .= " COMMENT:'\\n'"; if(!isset($multiplier)) { $multiplier = "8"; } foreach ($rrd_list as $rrd) @@ -18,10 +35,15 @@ foreach ($rrd_list as $rrd) $colour_in=$config['graph_colours'][$colours_in][$iter]; $colour_out=$config['graph_colours'][$colours_out][$iter]; - $descr = str_replace(":", "\:", substr(str_pad($rrd['descr'], 18),0,18)); + $descr = str_replace(":", "\:", substr(str_pad($rrd['descr'], $descr_len),0,$descr_len)) . " In"; + if(isset($rrd['descr_in'])) + { + $descr = str_replace(":", "\:", substr(str_pad($rrd['descr_in'], $descr_len),0,$descr_len)) . " In"; + } + $descr_out = str_replace(":", "\:", substr(str_pad($rrd['descr_out'], $descr_len),0,$descr_len)). " Out"; - $rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$rra_in.":AVERAGE "; - $rrd_options .= " DEF:".$out.$i."=".$rrd['filename'].":".$rra_out.":AVERAGE "; + $rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$ds_in.":AVERAGE "; + $rrd_options .= " DEF:".$out.$i."=".$rrd['filename'].":".$ds_out.":AVERAGE "; $rrd_options .= " CDEF:inB".$i."=in".$i.",$multiplier,* "; $rrd_options .= " CDEF:outB".$i."=out".$i.",$multiplier,*"; $rrd_options .= " CDEF:outB".$i."_neg=outB".$i.",-1,*"; @@ -34,24 +56,23 @@ foreach ($rrd_list as $rrd) $rrd_options .= " VDEF:tot".$i."=octets".$i.",TOTAL"; } - $rrd_options .= " HRULE:999999999999999#" . $colour_out . ":\\\s:"; - if ($i) { $stack="STACK"; } $rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . $descr . "':$stack"; - $rrd_optionsb .= " AREA:outB".$i."_neg#" . $colour_out . "::$stack"; $rrd_options .= " GPRINT:inB".$i.":LAST:%6.2lf%s$units"; - $rrd_options .= " GPRINT:inB".$i.":MAX:%6.2lf%s$units"; + $rrd_options .= " GPRINT:inB".$i.":AVERAGE:%6.2lf%s$units"; + $rrd_options .= " GPRINT:inB".$i.":MAX:%6.2lf%s$units\l"; if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; } - $rrd_options .= " COMMENT:' '"; + $rrd_options .= " 'AREA:outB".$i."_neg#" . $colour_out . ":".$descr_out.":$stack'"; $rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units"; - $rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units"; + $rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s$units"; + $rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units\l"; if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; } - $rrd_options .= " COMMENT:\\\\n"; + $rrd_options .= " 'COMMENT:\l'"; $i++; $iter++; } diff --git a/html/includes/graphs/generic_multi_line.inc.php b/html/includes/graphs/generic_multi_line.inc.php index 37886d499..ac73664a1 100644 --- a/html/includes/graphs/generic_multi_line.inc.php +++ b/html/includes/graphs/generic_multi_line.inc.php @@ -17,7 +17,7 @@ foreach ($rrd_list as $rrd) $colour=$config['graph_colours'][$colours][$iter]; - $rra = $rrd['rra']; + $ds = $rrd['ds']; $filename = $rrd['filename']; $descr = $rrd['descr']; $descr = substr(str_pad($descr, 10),0,10); @@ -25,12 +25,12 @@ foreach ($rrd_list as $rrd) $id = "ds".$i; - $rrd_options .= " DEF:".$id."=$filename:$rra:AVERAGE"; + $rrd_options .= " DEF:".$id."=$filename:$ds:AVERAGE"; if (!$basicrrd) { - $rrd_options .= " DEF:".$id."min=$filename:$rra:MIN"; - $rrd_options .= " DEF:".$id."max=$filename:$rra:MAX"; + $rrd_options .= " DEF:".$id."min=$filename:$ds:MIN"; + $rrd_options .= " DEF:".$id."max=$filename:$ds:MAX"; } if ($rrd['invert']) diff --git a/html/includes/graphs/generic_multi_seperated.inc.php b/html/includes/graphs/generic_multi_seperated.inc.php index 5cc8d81a7..d25b0f083 100644 --- a/html/includes/graphs/generic_multi_seperated.inc.php +++ b/html/includes/graphs/generic_multi_seperated.inc.php @@ -19,8 +19,8 @@ foreach ($rrd_list as $rrd) if ($rrd['colour_area_in']) { $colour_in = $rrd['colour_area_in']; } if ($rrd['colour_area_out']) { $colour_out = $rrd['colour_area_out']; } - $rrd_options .= " DEF:in".$i."=".$rrd['filename'].":".$rrd['rra_in'].":AVERAGE "; - $rrd_options .= " DEF:out".$i."=".$rrd['filename'].":".$rrd['rra_out'].":AVERAGE "; + $rrd_options .= " DEF:in".$i."=".$rrd['filename'].":".$rrd['ds_in'].":AVERAGE "; + $rrd_options .= " DEF:out".$i."=".$rrd['filename'].":".$rrd['ds_out'].":AVERAGE "; $rrd_options .= " CDEF:inB".$i."=in".$i.",$multiplier,* "; $rrd_options .= " CDEF:outB".$i."=out".$i.",$multiplier,*"; $rrd_options .= " CDEF:outB".$i."_neg=outB".$i.",-1,*"; @@ -57,4 +57,4 @@ foreach ($rrd_list as $rrd) $rrd_options .= $rrd_optionsb; $rrd_options .= " HRULE:0#999999"; -?> \ No newline at end of file +?> diff --git a/html/includes/graphs/generic_multi_simplex_seperated.inc.php b/html/includes/graphs/generic_multi_simplex_seperated.inc.php index 90bdc306d..7db8550c7 100644 --- a/html/includes/graphs/generic_multi_simplex_seperated.inc.php +++ b/html/includes/graphs/generic_multi_simplex_seperated.inc.php @@ -23,39 +23,39 @@ foreach ($rrd_list as $i => $rrd) $colour_iter++; } - $rrd_options .= " DEF:".$rrd['rra'].$i."=".$rrd['filename'].":".$rrd['rra'].":AVERAGE "; - $rrd_options .= " DEF:".$rrd['rra'].$i."min=".$rrd['filename'].":".$rrd['rra'].":MIN "; - $rrd_options .= " DEF:".$rrd['rra'].$i."max=".$rrd['filename'].":".$rrd['rra'].":MAX "; + $rrd_options .= " DEF:".$rrd['ds'].$i."=".$rrd['filename'].":".$rrd['ds'].":AVERAGE "; + $rrd_options .= " DEF:".$rrd['ds'].$i."min=".$rrd['filename'].":".$rrd['ds'].":MIN "; + $rrd_options .= " DEF:".$rrd['ds'].$i."max=".$rrd['filename'].":".$rrd['ds'].":MAX "; ## Suppress totalling? if (!$nototal) { - $rrd_options .= " VDEF:tot".$rrd['rra'].$i."=".$rrd['rra'].$i.",TOTAL"; + $rrd_options .= " VDEF:tot".$rrd['ds'].$i."=".$rrd['ds'].$i.",TOTAL"; } ## This this not the first entry? if ($i) { $stack="STACK"; } # if we've been passed a multiplier we must make a CDEF based on it! - $g_defname = $rrd['rra']; + $g_defname = $rrd['ds']; if (is_numeric($multiplier)) { - $g_defname = $rrd['rra'] . "_cdef"; - $rrd_options .= " CDEF:" . $g_defname . $i . "=" . $rrd['rra'] . $i . "," . $multiplier . ",*"; - $rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['rra'] . $i . "max," . $multiplier . ",*"; + $g_defname = $rrd['ds'] . "_cdef"; + $rrd_options .= " CDEF:" . $g_defname . $i . "=" . $rrd['ds'] . $i . "," . $multiplier . ",*"; + $rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['ds'] . $i . "max," . $multiplier . ",*"; ## If we've been passed a divider (divisor!) we make a CDEF for it. } elseif (is_numeric($divider)) { - $g_defname = $rrd['rra'] . "_cdef"; - $rrd_options .= " CDEF:" . $g_defname . $i . "=" . $rrd['rra'] . $i . "," . $divider . ",/"; - $rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['rra'] . $i . "max," . $divider . ",/"; + $g_defname = $rrd['ds'] . "_cdef"; + $rrd_options .= " CDEF:" . $g_defname . $i . "=" . $rrd['ds'] . $i . "," . $divider . ",/"; + $rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['ds'] . $i . "max," . $divider . ",/"; } ## Are our text values related to te multiplier/divisor or not? if (isset($text_orig) && $text_orig) { - $t_defname = $rrd['rra']; + $t_defname = $rrd['ds']; } else { $t_defname = $g_defname; } @@ -65,7 +65,7 @@ foreach ($rrd_list as $i => $rrd) $rrd_options .= " GPRINT:".$t_defname.$i.":LAST:%6.2lf%s".str_replace("%", "%%", $units).""; $rrd_options .= " GPRINT:".$t_defname.$i."max:MAX:%6.2lf%s".str_replace("%", "%%", $units).""; - if (!$nototal) { $rrd_options .= " GPRINT:tot".$rrd['rra'].$i.":%6.2lf%s".str_replace("%", "%%", $total_units).""; } + if (!$nototal) { $rrd_options .= " GPRINT:tot".$rrd['ds'].$i.":%6.2lf%s".str_replace("%", "%%", $total_units).""; } $rrd_options .= " COMMENT:'\\n'"; } diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php index 5046f85d4..936cc82a2 100644 --- a/html/includes/graphs/generic_simplex.inc.php +++ b/html/includes/graphs/generic_simplex.inc.php @@ -1,31 +1,31 @@ \ No newline at end of file diff --git a/html/includes/graphs/ipsectunnel/bits.inc.php b/html/includes/graphs/ipsectunnel/bits.inc.php index 4dec3cc5e..7db9c0afc 100644 --- a/html/includes/graphs/ipsectunnel/bits.inc.php +++ b/html/includes/graphs/ipsectunnel/bits.inc.php @@ -1,7 +1,7 @@