From 1ca95491f89dba960dc67f324738959d30b977e0 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 11 Mar 2011 12:01:13 +0000
Subject: [PATCH] add missing icon and ipsec flowstats graph changes

git-svn-id: http://www.observium.org/svn/observer/trunk@1819 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/icons/arrow_updown.png                | Bin 0 -> 764 bytes
 .../graphs/device/cipsec_flow_stats.inc.php       |  10 +++++-----
 html/includes/graphs/generic_multi_line.inc.php   |   8 +++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100755 html/images/icons/arrow_updown.png

diff --git a/html/images/icons/arrow_updown.png b/html/images/icons/arrow_updown.png
new file mode 100755
index 0000000000000000000000000000000000000000..20628c0d0cedfaac4b1d860d5a3eb14914ad4180
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB9600009a7bBm000id000id0mpBsWB>pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE;UJt{NMlp0(nV9K~y+Tjg#F^l2IJT+58`><+PTXrOXyt&ewdMk@<omt})9;
zM3@S)k&0rbAchcvfT)3hsncFuY_(`JokNtM)TFkqy>o8fI`6(6-M~$3<GDNgeV@;B
zKF{|Y8tu%(?pTSd6n&9AXkK&|*3ax^)lN`nGyh$4I#)BR+P}J523OIcUqeov^(ei<
z5FMbd%M({ES#tH5{TP|sfpYQ(?y<~=w@TH~0cxbn67jGXqw~L^ac-eo@5ODV<{-78
zKMZL5)}Y~k<_?~#K)l^AEPkkLo9H$Az<8wFr57obcRJHf0HT#flhWIb-eoE3W-1I3
zkcWbg`x@sq)b=f~TNjX4qS76Qq#J@5@hZ=u^2ss(*AB;y1!7k-n4<-@{GrU4FsPWf
z0PUM!C+@@>p@GEHByU-I8XWL+VfK#|wrw+n?<f?ivx8ZE>9Q~&pX<cX)E4^2{2<<8
zKq&C!JsXbTI4qlb6l-%M<}}hb6cYi+3_c`f$sz*88?U#G7!7EUr_4B=7d6buNZ&z@
z_${8BzeB2B$9;|wv1!8Kg&U3X&<<EuCdPj1p!KPcA!nQd@*YpckiKm!;S4%ntwXHx
zAiGM3iz!Wxcy8>;PpYw(=~_SVU<jx&u+js@Gx~l+3&h({%(Wo5T8~SqeA97&cvH30
z<;rqP$*y)y35BNzZHs)+Mak}S&q6$-eeg0}pa~6$H&r=VdN8sv1ik+yRNg+YjAck}
zPLM=(KZrL)`aabA)fnDTfHzx@o5Dm_0(B)WDnOa3h$4L-b$)6GXS@n2t=C<NysMc}
uy?h)ZeN#F8clXF~b`x(&68~Dnm;V8hFEc8v76GUL0000<MNUMnLSTZRjbF|H

literal 0
HcmV?d00001

diff --git a/html/includes/graphs/device/cipsec_flow_stats.inc.php b/html/includes/graphs/device/cipsec_flow_stats.inc.php
index 26e310e82..0005c5d84 100755
--- a/html/includes/graphs/device/cipsec_flow_stats.inc.php
+++ b/html/includes/graphs/device/cipsec_flow_stats.inc.php
@@ -13,7 +13,7 @@ $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "OutAuths";
 $rrd_list[$i]['rra'] = "OutAuths";
-$rra_list[$i]['invert'] = 1;
+$rra_list[$i]['invert'] = "1";
 
 $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
@@ -23,7 +23,7 @@ $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "OutEncrypts";
 $rrd_list[$i]['rra'] = "OutEncrypts";
-$rra_list[$i]['invert'] = 1;
+$rra_list[$i]['invert'] = "1";
 
 $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
@@ -37,7 +37,7 @@ $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "OutDrops";
 $rrd_list[$i]['rra'] = "OutDrops";
-$rra_list[$i]['invert'] = 1;
+$rra_list[$i]['invert'] = "1";
 
 
 
@@ -49,7 +49,7 @@ $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "OutAuthFail";
 $rrd_list[$i]['rra'] = "OutAuthFails";
-$rra_list[$i]['invert'] = 1;
+$rra_list[$i]['invert'] = "1";
 
 $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
@@ -59,7 +59,7 @@ $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "OutEncryptFails";
 $rrd_list[$i]['rra'] = "OutEncryptFails";
-$rra_list[$i]['invert'] = 1;
+$rra_list[$i]['invert'] = "1";
 
 $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
diff --git a/html/includes/graphs/generic_multi_line.inc.php b/html/includes/graphs/generic_multi_line.inc.php
index a813dd766..3349c290d 100644
--- a/html/includes/graphs/generic_multi_line.inc.php
+++ b/html/includes/graphs/generic_multi_line.inc.php
@@ -27,7 +27,13 @@
       $rrd_options .= " DEF:".$id."=$filename:$rra:AVERAGE";
       $rrd_options .= " DEF:".$id."min=$filename:$rra:MIN";
       $rrd_options .= " DEF:".$id."max=$filename:$rra:MAX";
-      $rrd_options .= " LINE1.25:".$id."#".$colour.":'$descr'";
+      if($rrd['invert'] == "1") {
+        $rrd_options .= " CDEF:".$id."graph=".$id.",-1,*";
+        $rrd_options .= " LINE1.25:".$id."graph#".$colour.":'$descr'";
+      } else {
+        $rrd_options .= " LINE1.25:".$id."#".$colour.":'$descr'";
+      }
+
       $rrd_options .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
       $rrd_options .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:%5.2lf%s\\\\n";