From ed18649fad0e03c219b4232b380646a57645c9d8 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Sat, 17 Jul 2010 23:22:44 +0000 Subject: [PATCH] now really add drac polling support + clean up duplicate icons git-svn-id: http://www.observium.org/svn/observer/trunk@1393 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/images/os/{airport.png => apple.png} | Bin html/images/os/{axiscam.png => axis.png} | Bin html/images/os/axisdocserver.png | Bin 2138 -> 0 bytes html/images/os/iosxe.png | Bin 850 -> 0 bytes html/images/os/iosxr.png | Bin 850 -> 0 bytes html/images/os/junose.png | Bin 1089 -> 0 bytes includes/polling/device-drac.inc.php | 7 +++++++ includes/static-config.php | 6 ++++++ 8 files changed, 13 insertions(+) rename html/images/os/{airport.png => apple.png} (100%) rename html/images/os/{axiscam.png => axis.png} (100%) delete mode 100644 html/images/os/axisdocserver.png delete mode 100644 html/images/os/iosxe.png delete mode 100644 html/images/os/iosxr.png delete mode 100644 html/images/os/junose.png create mode 100644 includes/polling/device-drac.inc.php diff --git a/html/images/os/airport.png b/html/images/os/apple.png similarity index 100% rename from html/images/os/airport.png rename to html/images/os/apple.png diff --git a/html/images/os/axiscam.png b/html/images/os/axis.png similarity index 100% rename from html/images/os/axiscam.png rename to html/images/os/axis.png diff --git a/html/images/os/axisdocserver.png b/html/images/os/axisdocserver.png deleted file mode 100644 index dba70a171638db91236ccc16b134dcd4b93fc980..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2138 zcmV-g2&MOlP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY@ z7B?rjl#?<500-JhL_t(o!>yNV$YoU-$A8aSd!Ngk^S-}jw!_CDwA z%Ub_F?DL)(r$!lQ!{Th#TIad`pa1i0lcdpT#Q8juFdVV~whX!elOYVVGjAFY0C!GV zj`MsZVP-@p;57<91@T~`3r&?WRSe*#`~N2cFarrwhnD{ewzMDfpGE3n7Ld+XtalW5 z-UgUNuokI)PceLg3uI{WI@q^C^I#5$EAe_)dFP)39I2fo58omdEv(zZ6)o!edw8A# z(y87!6(7$?%Xt}~sr{P13nZ{ER@_6Ueu<=8GL9Aal1?>7;XZI6^V7fCREC{18t&Zc z4I?59$u%f9!|AUOe}vN*Cotj+`3jHV>tA3BL}$oqOdbeGc76sJLP{`%SpW=k6BO?! zh7&Wt%$kK7;7i{H3S9J9^i3e-Fw^;Cz-DQ1hy;s&g5t+`>AwOh11|`Zmq0raEwBJi z?}&qQr$E*Sh(K7Y{fUC;AT2~$d;`yN`I=4um5&m_H^DlX3=}YDNDX6}B#raY6zS6>nW5kr zKm0ku;Fly0Qs$^IYB!=wWbg7u4sCdo&+JHWnt%^<#%n3s13Wb?845=2BGIoVcK2cN z{TP9$)9jc)gWTyZ<_zZ(7JvRY#f>jwqb)c;!QvKb2H@VJV1YxeMRuk~X|J8*^PiqD z{x@jN1gD5$)UgFI#cYHRr2P<0Gjr3fxdOr{u$4}0REG`|cRxfrDo89~p@$gZ zwM;9t=!Hc-(VKAfV4i#Le3MsRn`705>yS!(6q2Z|ph_py7{P&6PvF?wkXl?BT-<34 zm?BaHIhKC?OWUv6(^_bzzq4;$#NH)ILET@xk=E_N^=RTr-|u6zdK9!#C7-=P8FC?8^$A_ZRE z@^QkkL(J2onhh3bc1f7Wkx+BI+h;vF*NzYK%7-!zKE0MsXG{nwV!8RX8W-0h-U6WL zbV=NAFuM{cS5n}K-4@5cbTbznTVg(G)54RIkeYwnYFR>Qkz;1KafOv7H+DbFtN)7J za{Cx-8^dfF2PD+A;wnr790{pGIxdL%I%X%4R*1;K_^H3pdHe}7Cgh=}b~T<7uj;H- zGVnF?)@408gOKvks^&Yr5Au_TQvUI>n7hy@O9v7$q_}nk1T3~_TLQ&?LVUF03xHS@ zyt(TEmKKkb8CcpOvk4;t`B`g3AezI+j1vrr&U3Ur!Y2ncn+|!tfBTqWHV+9%T`F=$ zb%XlSRuj{bB-E(-Azm*xJTQ6iSG4y&%X>Co#BkzhS4P=SAhsL!Itv5qN?4pPn5#BY z)+gz=HgL*3H<0kvC+9i1zvSxe8R4xtI{lNB#b#1XsJ%z!d+9QvobB-RCNtCS-FK?4gR*R*JR9rCk)yM- zty?cumSsA5a#2h_&2-?v0d3f@L4dYz->#x4l;^p!EK{E6D$7#WTyu>8rD>`iJ9cO^ z8qMwuheN&a!VB8E^#j_rZJUlBJ)+ULInVQvvMiIC%^b+GOiN2knoUFp4<6*$v14Re z#{T{LdH(t5r(;&rrmL#rjyvvP_3G8sb_`?=v?yHVtFB^sd6|9t_92~~rP{3)yLa#A)TvVd zeC?*2Xti2r4v`E7116J#$z;OP(jv|qMlzH0+;h)y>#etP@x>Rjq8CYe(QFAo#Es QaR2}S07*qoM6N<$f>k5<{{R30 diff --git a/html/images/os/iosxe.png b/html/images/os/iosxe.png deleted file mode 100644 index 19a35e0c07128afbb3760e50b825ea50068e3ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 850 zcmV-Y1FigtP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@Gd8K`;w1n80>eo}K~z{r?UXxcQ&AYl?;}Y~)YJ#4wTky9 zX`?N4tcsvFsZV_LCJx$4afqOxbP*hVY~r9$ba!y<_CniPcAeh?mFii zMd$nEpQ`o*#Kwr7VHY}8ul>ZnsK20&>#BEaYj~4YAdS4A;T$;DY;GYwIB+yVp@CKl zaO)I^w3`2K@`Mp<7n-#f>;$IA0=WZhSYRX!JIVQw(5;?gmgII}KPYs2^I~kw;Jgj{ zKJwb@-in~z;4_$4kbg+%-@yf`>((&(FYpFT6&h*Q80R^a_gKc#kn@wGdY{m%KdA^O z4VFs(Kg|lfbc7 z6&WpemP|miwsU?fZ>!sPM7Uc=KQD95_^Og8(X2`A4~nLgQ$5yI5-?){oFBch3NyBx z_l%$i%O@bup+tz=T#?0eI}Qf(x-}}Iy*f8usq$`N|3bY!Y)jGafe#{>2vpq#3XKpj z3w|nDxdWQz6&2t;cnLxx5I2!`)$P6^AE|xmM1Q61Ufo%G3@dU`^zO<@7`C^`r@=|4 zApd~Sj{~{!$gSWk7@Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@Gd8K`;w1n80>eo}K~z{r?UXxcQ&AYl?;}Y~)YJ#4wTky9 zX`?N4tcsvFsZV_LCJx$4afqOxbP*hVY~r9$ba!y<_CniPcAeh?mFii zMd$nEpQ`o*#Kwr7VHY}8ul>ZnsK20&>#BEaYj~4YAdS4A;T$;DY;GYwIB+yVp@CKl zaO)I^w3`2K@`Mp<7n-#f>;$IA0=WZhSYRX!JIVQw(5;?gmgII}KPYs2^I~kw;Jgj{ zKJwb@-in~z;4_$4kbg+%-@yf`>((&(FYpFT6&h*Q80R^a_gKc#kn@wGdY{m%KdA^O z4VFs(Kg|lfbc7 z6&WpemP|miwsU?fZ>!sPM7Uc=KQD95_^Og8(X2`A4~nLgQ$5yI5-?){oFBch3NyBx z_l%$i%O@bup+tz=T#?0eI}Qf(x-}}Iy*f8usq$`N|3bY!Y)jGafe#{>2vpq#3XKpj z3w|nDxdWQz6&2t;cnLxx5I2!`)$P6^AE|xmM1Q61Ufo%G3@dU`^zO<@7`C^`r@=|4 zApd~Sj{~{!$gSWk7@Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@Gd8K`;w1n81F}g(K~z{r&6jD2PEi=gXT~yvkS)eCrD*KQ zu_w$2LSrpLllh=*Wyw}(ltc;%QKxKU$&$5%NIpzTWdER~Y>|BzF_!;t=3H~<&il@s z_ch8}zwW)~p6A^EdCqg5=e#K?|J~2nIw{6p6i=#|qZ%)@>iHU*sg5W95w(2<9G8Gt z>{k1vm@_dpP3<{iR~%c$^AgZb9e+jmuIE)ETig*%pE z4n}NRsBNJe(`yL=4-{5#t+9M48lXJC5j)(wq8N7P^v>G@fq?uN1CbwM2?)1cQ6E0o zF%&y15)lwAK`R-tuZN0;ZjE`aNIhiFGAS1waH$)e=meKtkOVC~Q?JY7& z;>g&^iFkm$ep?I^&BP}+Ym!lL@8gB@>iKD0R-$EL4pcm!#fcLd4O~rFhlqEJVo%KxnfqxJ{ZR< z6;lm;wppTm@QTM0l-B(Pf~{DcTT znx2=IH5vOs4b*#z5b3jq=po4I@ZM zEfnuWaYe6{d7v@@46;p79q~?Bz%f0iIw2d}$MFzn0Y19Y3HYdMc6jC-r7-*~Sc0$s z4j^Fr^uAaom^Ew85?qf8n5st3dhx{D)%WkJB6q_(3B znJup4-zy*E2+jXIYB_6&xb1>{OZ0O_To9D(qy_v2iPg0P@cMw700000NkvXX Hu0mjfJhtoI diff --git a/includes/polling/device-drac.inc.php b/includes/polling/device-drac.inc.php new file mode 100644 index 000000000..a54974523 --- /dev/null +++ b/includes/polling/device-drac.inc.php @@ -0,0 +1,7 @@ + diff --git a/includes/static-config.php b/includes/static-config.php index 441509556..977d97846 100644 --- a/includes/static-config.php +++ b/includes/static-config.php @@ -53,11 +53,13 @@ $config['os']['iosxe']['group'] = "ios"; $config['os']['iosxe']['text'] = "Cisco IOS-XE"; $config['os']['iosxe']['type'] = "network"; $config['os']['iosxe']['ifXmcbc'] = 1; +$config['os']['iosxe']['icon'] = "ios"; $config['os']['iosxr']['group'] = "ios"; $config['os']['iosxr']['text'] = "Cisco IOS-XR"; $config['os']['iosxr']['type'] = "network"; $config['os']['iosxr']['ifXmcbc'] = 1; +$config['os']['iosxr']['icon'] = "ios"; $config['os']['asa']['group'] = "ios"; $config['os']['asa']['text'] = "Cisco ASA"; @@ -90,6 +92,7 @@ $config['os']['routeros']['nobulk'] = 1; $config['os']['junose']['text'] = "Juniper JunOSe"; $config['os']['junose']['type'] = "network"; +$config['os']['junose']['icon'] = "junos"; $config['os']['generic']['text'] = "Generic Device"; @@ -126,14 +129,17 @@ $config['os']['dlinkap']['type'] = "network"; $config['os']['dlinkap']['icon'] = "dlink"; $config['os']['axiscam']['text'] = "AXIS Network Camera"; +$config['os']['axiscam']['icon'] = "axis"; $config['os']['axisdocserver']['text'] = "AXIS Network Document Server"; +$config['os']['axisdocserver']['icon'] = "axis"; $config['os']['gamatronicups']['text'] = "Gamatronic UPS Stack"; $config['os']['gamatronicups']['type'] = "power"; $config['os']['airport']['type'] = "network"; $config['os']['airport']['text'] = "Apple AirPort"; +$config['os']['airport']['icon'] = "apple"; $config['os']['windows']['text'] = "Microsoft Windows"; $config['os']['windows']['ifname'] = 1;