From c4ca16d1e3a92d997cdd651527bfa5d4903b3aa5 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 21 Jun 2010 15:05:07 +0000 Subject: [PATCH] more icons more info in about page git-svn-id: http://www.observium.org/svn/observer/trunk@1230 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/images/icons/current.png | Bin 585 -> 703 bytes html/images/icons/eventlog.png | Bin 0 -> 649 bytes html/images/icons/frequencies.png | Bin 562 -> 722 bytes html/images/icons/inventory.png | Bin 0 -> 825 bytes html/images/icons/ipv4.png | Bin 0 -> 745 bytes html/images/icons/ipv6.png | Bin 0 -> 762 bytes html/images/icons/port.png | Bin 0 -> 748 bytes html/images/icons/syslog.png | Bin 0 -> 731 bytes html/images/icons/toner.png | Bin 0 -> 434 bytes html/images/icons/voltages.png | Bin 577 -> 703 bytes html/includes/print-event-short.inc | 9 +-- html/pages/about.php | 113 ++++++++++++++++++++++++++-- 12 files changed, 110 insertions(+), 12 deletions(-) create mode 100755 html/images/icons/eventlog.png create mode 100755 html/images/icons/inventory.png create mode 100644 html/images/icons/ipv4.png create mode 100644 html/images/icons/ipv6.png create mode 100755 html/images/icons/port.png create mode 100755 html/images/icons/syslog.png create mode 100755 html/images/icons/toner.png diff --git a/html/images/icons/current.png b/html/images/icons/current.png index d79c3191c33351dc80337f268f18583482cecc2f..5bab62bb445b43aa7bd2d78cf18fb14901b5a6bd 100644 GIT binary patch delta 622 zcmV-!0+Id61iuB4Bn<>-K}|sb0I$e51&ZmBK0JQ{JV``BR5(wql3hqsaTvx2MOR)I zML}RCv2;X~Wv$tVBqNZZB4vV@dA|*3&l@tZ#F1pa@oArT>K9oj8Yi>^Qqd9lj zcARdWoz0!?oRj|})zf>H7gAdi^oN)K;c$M>`@YX}42J)CQvT`=(Pu%@yAy(E2L$(a zOnrZ>LgK?##9do3*|QlF?=~U!dLv)3FTvku({^ZLJG80WV3W5nGkybKBW+MaS0K9U zbyzM2H)n&#Fe}=jjMhRP+Ka5;0_k%VRPHL$-lIDFt?0(dUbChNH!;JXggjh>oPQT2 zT0`Y*$P6^l=w|S*Or-?{k{h5pRQ-zqcRq{zm|=4mI`@Mib=?gou=-ze~cWDUd!*ThHOv*mysK~NTPp@ zkbLKm@tj4hs}=;Sqjy*T@`Ey#C}Tz$Gs>8e(`?*nVshXTM5hUHToQ4VBmBe&a@sbpiw?Y} zYNfJMbrzg}Vj7{C1cFO``#=Xw^WFvNdF3A>+`}?`$A3CM0h|nZAv2&2m;e9(07*qo IM6N<$f(r#C9{>OV delta 503 zcmV)%Y-8drxg-^u2%H@6`Vv8~^|Nx&nxo|NsAU>;HGpC%@mdn0fEv z)l3FB4LH7zk?F*G#%W*Q&3^mqW&QtOFYEsQe%JT^?bCj+W+29`8D#2_HH>DL59lBG z`F`gAFOQ4qT~beck`>-QBeRpP#q<2a0V$$2k4Jdog47?b9K*zP{@E|LJKR z6xV|3_mAs-99}E3Z_g4&dz=ProyUA&%`~RNOZ%9PE$m`Earb^G-Uk@#*FiO)b78y zVf+8+2B|ARe$B>NjEqDZuxc{H!bcZ1KAqk!aSzCzxOOT7E1G89u2|B`AiZW9%ZUqn z#GeA$iQ(4a~=wjTosGC6oO*674?5>#I!q5xEyXUkr tD5F_{t^vCN(;FF1&uC&WCm7OD1pwpB{lp)ABW?fy002ovPDHLkV1nbB2de-8 diff --git a/html/images/icons/eventlog.png b/html/images/icons/eventlog.png new file mode 100755 index 0000000000000000000000000000000000000000..779ad58efc5776825ef81064a042eceba274a928 GIT binary patch literal 649 zcmV;40(Sk0P)sm$HQ(N)Ek< zrc#vXMLdW}TWpphCZsGREkUZr{Mg;M&b;luZ0IGA9rnH1`DVU1->eh_0hG(-dw<@) z-1S-xc+D!@wd^?Z=a`M%%phe@J_EnT0QpH7V3 jcG~XA#&PRl)Zh6(yXt(^KFGF}00000NkvXXu0mjfDwr>g literal 0 HcmV?d00001 diff --git a/html/images/icons/frequencies.png b/html/images/icons/frequencies.png index 2e09e08a943ef7ac552b574d891f26f141fc0a64..970c3f79d3c0b9a3b0253fd4a079c6aa54f41198 100644 GIT binary patch delta 641 zcmV-{0)G9n1kweNBn<>-K}|sb0I$e51&ZmBK0JQ{Pf0{UR5(wql3hqsaTvy>3$F%s z)lJX`D~2o^A?c>AnKhC@cu_=TH;FgiNJL%qK?-@%tfWZLnRQ`M_JL)Y6&Z|(wmF^R zG~EYobIy6T**?xr{*PEs?^#|LZrMc#9yt8Z`+MI1`#vWx?|(iqM|oFtNQa31065!z zaF%~E%zrLL_>&rQ=3<0C?!)YdA_U*<4P@<0@Q0(SYQL9*Mzne51{$ zT}BE1>F?dmd_77w{k(vApD38;(JtnGDCaV!6cd+nU!d+Ze~>orzm=I=@H8Vmc^!W# zXA_w=ATe|WaoZ&X`zk@OF!f;j?|o3l3CfsJ#*8v%v}rceuVS{|dURgghS&hz%FzhZ zxXS@2~ss`Ck>9U$z}XUA2bbtC;OK;Iw|DcvK@(uM0~Bz86Zo?mUB2h8?h) z3h>sr^&TBd+DUp$a*;qPT4PA?NO))%Y-8drxg-^u2%H@6`Vv8~^|Nx&nxo|NsAU>;HGpC%@mdn0fEv z)l3FB4LH7zk?F*G#%W*Q&3^mqW&QtOFYEsQe%JT^?bCj+W+29`8D#2_HH>DL59lBG z`F`gAFOQ4qT~beck`>-QBeRpP#q<2a0V$$2k4Jdog47?b9K*zP{@E|LJKR z6xV|3_mAs-99}E3Z_g4&dz=ProyUA&%`~RNOZ%9PE$m`EarbT`=CI)k2LmU9R W5ce1nqZBp(0000wd|HNMlZ|>D)M67h? zOIjz3DJbk0=97q(mSBd~-ilc0Oupt^z$#N6O&at_s8u-PL@9M^gQuq(+UH^IB$&*DHP!HzH+vkEzC?S52tN1$mKhziPkOR=y$ zhl#aO1Xly_M?EkN>tM6E5T&Ht4dh{0oQr6Q1b3J=sM^ACOsvD=TSP81#0oTC1v|Df zgpp-GhL(KrE_8t&(jeFR1W%(osQ12tvSpHp_}~HR_8G{VUO;FILQv(P-b)es=)ZlJM#c>{Wx-rgY3D#Ol9rJl39A<60Xo5cneo(9g5a4q>ayzV-7%Ue2}0_ z&TIets{Cl`n(nefrZ+9F8|N&Kp}^StU2b+&pVj;XvgEdBL3Wlp00000NkvXXu0mjf DwZ3{L literal 0 HcmV?d00001 diff --git a/html/images/icons/ipv4.png b/html/images/icons/ipv4.png new file mode 100644 index 0000000000000000000000000000000000000000..2b29604aa0f61b8908f807ab9e47201afd23e6f1 GIT binary patch literal 745 zcmVpF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0%l1>K~y+T)sp*5lTjGQ-(UJ4g8qac@V9<260?iuU}A(}LU)3G z(5M`yR$iKxI_aWCVGXSy*UG#Ssq@;LPFk+DY;&bsUgoRrb(?$Not^XTY!>8S5IyjL z^Bg!Ip65J|ApG+vc{FCKeC7xgJg|{7^;UXHXQd}}6Ev@OoaWY8XwL01dbHY1v$Y?n zx^k4N%12_ViowXCqIU1jES*WXV{p3VC}mPO1|^0qM0x%P!q0>PF-~xUz`rKbeHw#H zC~mT|b$-#<>4key!D^V{+Y*J_PvH?MW>+YDYYYn#!=A#YI9cC`o2_%0_DN9JjxnL2 z(FTR9-%d(s?DE31q(F+WEf4)chKJpg$f`6T`ARDqdIJzca$Er6oX(mM*nd*ATP5te z(1bT;55fv?_Fgxh4>;kN6OmJG#Q6pb(n{OV@`MQGQ{KP< znDE299E7^Y%!H)87SC!>ram#u0%5`@KoI1FWWql(mSBSuiNlv7jwnT_b=n_EEi}vs z@oh>v-L|&7;C(b%(@#>02TAI+A+rC*5II;rOwzT(B!hFfYLm>W;b?kAUnu4BtJ%aR b{{Qg{Lp>{3T}Zrj00000NkvXXu0mjf^{G~3 literal 0 HcmV?d00001 diff --git a/html/images/icons/ipv6.png b/html/images/icons/ipv6.png new file mode 100644 index 0000000000000000000000000000000000000000..d3e47a2d02b71921fb893d6f2ba04daf282e6ac8 GIT binary patch literal 762 zcmVpF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;UJt{NMlp0(VJ7K~y+T)so*!lTjGQ-fp82`3>%2D_g`domkAJK1lMGE zRzz~Ri2uPAzZ|ElETH@3#LS|E2^%H z0#MbNDOaGgLSpLHF9GPhq(+9)mCVN03uB5*OGP3BLa#;D>xT z^Wq7vwUx6tu%m7dCf#1_tWL)M$64S?wjild4Yz-Fy#m!;Q(Q2~`nJwX_&DlCgVBy{ zntf=t4nqAt9}VqJ?AE5>Rtt}A`zlgj=fPkzLiKK*Dt5t@0X934agZ)1M)G( sam_j>Gy~C$^6pT|4gGw46aWA78*nBg7Iven&;S4c07*qoM6N<$f*H0~zyJUM literal 0 HcmV?d00001 diff --git a/html/images/icons/port.png b/html/images/icons/port.png new file mode 100755 index 0000000000000000000000000000000000000000..024138eb33b9124af6db8149747adbb41c1b8cfc GIT binary patch literal 748 zcmVzR>QH2KN`fNj zBHaWZEgiB#>49kYe(borqx+hj`JS_1d)R}7LjHa+tu+qg(TC+eO4&q(D;ZL8C8o8; zLEfZxiIlQ~iE1b1qBZ2=VhsA0V`*@y@M|Sc2@Wtadv3g0hOc*O(ADVFjPTWAYz(JXS z8MBaa%aCO{h8lvp*ONKIh5Bg|-DNo^;jg=q=uDZ@vodOJXfu;GK`ze`H-VrWK!nUg zje)ufRUJ&ouB2nYB2_pI=gji&GcuBL=+DM-wBZ)fbc7&a9AP1Ztk5)S4Ah03bqXOt zxx}VdK|CIVljyc=oqO1G{;Qew7T~%?tSw{^mi$E(2^Td6>M8+m4H!qrBtj~%w(Y~Q zVrXkVOEN#2&@(U(cX3H&S97B(;-}{)?<>?0)RjVZqrJ&ONChgCgE9%PC}CSBp!+d1 z`bkAqacXYz!94aLsJZ!K=3b*?T#ge1nL>bsZNf4&8mt(EkXYZ?MK0YwH2ZOI9{(VN z&%WPH*v6AY+yG?)mZ`CxE@5ZK2lW}4Pr-ctMRE2V`yf8$PurT4&^p3q*2kt>M8OM& zl@MbQ=U&8BS_$dSjo(q&2Pyd!8`}{~Xr#A_DDL|G({Ha$;Xe@?&|@q4QbvV}D#ixB ey}zEqA^Zgf(1+rQ>#k7%0000^msfbTI z9jQ^EwMRD5xNEm*sJPjH^k)@gXT@kl5ii6#6jNXX`Yb0kVgq(zut?ZfbRr+DS= z>q{33dTpWN$tl6c7nxE)4Qur1GCxuUnp5Y z5HK(>u&W4&EXz<>UtfnPivJ`O3Zb4K8yl-}7K;Uh5XR!-B2uXo6E#Dr&Ck!D<$0b5 zXEK?PNF*3;w;Rc15`MqGDN4rSaGd2kJ3GNmOiaM%^D*ppJL2&;mX?;95{t!PwOY^e z?d|R0=pOKTy$qMj1$rk8qtS@b(NQ*LUtb@(y1JlNtJzsS-`3U!Ze(Pn>hXBkfzr6} z{3Vv(2AlG1;RQN6I#_mYZVs)jt>6p>!_3go(6&ye1Mdo>SRyz&A^1T#%t=UROW6Bf zz^9CeqErU&3`3<-Da~6HQ^UW&yCT)$Cu literal 0 HcmV?d00001 diff --git a/html/images/icons/toner.png b/html/images/icons/toner.png new file mode 100755 index 0000000000000000000000000000000000000000..adcc0046f86fa7f52a2956ee0d7d6e5c1431c51f GIT binary patch literal 434 zcmV;j0ZsmiP)@ zcBf_(#ZX_-sEX?*?9!(0{Bl__G*A>pqqyNz-JwmMeLB3br>{{IMX~DC@qV7t3SKP# z`S8;fU;WT=%}r-cOzypXPb*-3Ew8%sb7mA5#*W8%v^9cO0QbA;S*^D+wQoBcTSq`E c0001h|Fw(1Q4#~PfdBvi07*qoM6N<$f=H>olK=n! literal 0 HcmV?d00001 diff --git a/html/images/icons/voltages.png b/html/images/icons/voltages.png index a7e9f7d4572cebf1c6a0268f157f39169cc26278..f100dd82e9f0ebec01dd6e00a909d471ecfa888e 100644 GIT binary patch delta 622 zcmV-!0+Ic}1iuB4Bn<>-K}|sb0I$e51&ZmBK0JQ{JV``BR5(wql3PeqaU92e>dAK_ zdWcquOdSzrS!-rVIs#uRg5IKnUP2-vB68q`TqZ?9DHJp#?Sfq}iBcF*t+_de)27>L z7nhr77k9R^qyHn-x8GSl#f}j4gCB=;_i`5g zL*mRxyPIfrJ;HBvnt~1DcKy-x)Je$k9^`+%9!Az(3&Ej>IDH9 zy((wHK`jeBFJs)3Qs#fWmHGNKe7-5!#AkiYG@b5`km8{m`MV{*89DDYWIb)vv;}{H z^9s`T%ZLosgJ5aq!KOcYkjDaf%*bO#9y3y!%?<0A=IC7)$;34v9VN)z=6zR>1ZkBuHf;Atfu zUfR${)h|~G6FqBHX@VzWBaMi@I|5d&e_P7`Xp1sciBFX4DLs_y3N|3PI5=2=z%wmK zY4cx2XXyPVWxMKhvT2%Z;t4J;P_&W0VO4{|J-C5VMWBC*-_PQAJpoD%mH+?%07*qo IM6N<$g1X`=bpQYW delta 495 zcmV)%Y-8drxg-^u2%H@6`Vv8~^|Nx&nxo|NsAU>;HGpC%@mdn0fEv z)l3FB4LH7zk?F*G#%W*Q&3^mqW&QtOFYEsQe%JT^?bCj+W+29`8D#2_HH>DL59lBG z`F`gAFOQ4qT~beck`>-QBeRpP#q<2a0V$$2k4Jdog47?b9K*zP{@E|LJKR z6xV|3_mAs-99}E3Z_g4&dz=ProyUA&%`~RNOZ%9PE$m`EarbGd-hGtTc(yZ_>b z?f;`2q^5UAhXEZUG6BS)RMF5Xe`M_Sb5zGJp002ovPDHLkV1oY;0HOc@ diff --git a/html/includes/print-event-short.inc b/html/includes/print-event-short.inc index 941310b41..f0f27fba4 100644 --- a/html/includes/print-event-short.inc +++ b/html/includes/print-event-short.inc @@ -16,12 +16,11 @@ if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; } "); - $if = mysql_fetch_array(mysql_query("SELECT * from ports AS I, devices as D where I.device_id = D.device_id AND I.interface_id = '".$entry['interface']."'")); + if($entry['type'] == "interface") { + $entry['link'] = "".generateiflink(getifbyid($entry['reference'])).""; + } - echo(" - " . generateiflink($if) . " - " . - htmlspecialchars($entry['message']) + echo($entry['link'] ." ". htmlspecialchars($entry['message']) . " "); diff --git a/html/pages/about.php b/html/pages/about.php index d277087e9..a86c7b0ab 100644 --- a/html/pages/about.php +++ b/html/pages/about.php @@ -20,8 +20,106 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. + +  + + + + +

Statistics

+ + + + Devices$stat_devices + Ports$stat_ports + + + IPv4 Addresses$stat_ipv4_addy + IPv4 Networks$stat_ipv4_nets + + + IPv6 Addresses$stat_ipv6_addy + IPv6 Networks$stat_ipv6_nets + + + Services$stat_services + Applications$stat_apps + + + Processors$stat_processors + Memory$stat_memory + + + Storage$stat_storage + Disk I/O$stat_diskio + + + HR-MIB$stat_hrdev + Entity-MIB$stat_entphys + + + Syslog Entries$stat_syslog + Eventlog Entries$stat_events + + + Temperatures$stat_temp + Fanspeeds$stat_fanspeeds + + + Voltage$stat_volt + Current$stat_amp + + + + Frequency$stat_hz + Toner$stat_toner + + + + +"); + + + +print_optionbar_end(); ?> + + +
+ ve; $netsnmp_version = shell_exec($config['snmpget'] . " --version"); +print_optionbar_start(NULL); echo(" - - - - - - +

Versions

+
ObserverNMS$observer_version
Apache$apache_version
PHP$php_version
MySQL$mysql_version
+ + + +
ObserverNMS$observer_versionApache$apache_version
PHP$php_versionMySQL$mysql_version
"); - +print_optionbar_end(); ?>