From 8c6c4d99a092a480c6fcaf857751f5bd9906e1a6 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Tue, 13 Oct 2020 09:32:28 +0200 Subject: [PATCH 1/8] fixed sql graph pie --- pandora_console/include/functions_graph.php | 98 +++++++++++---------- 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 55ef41ef31..4ac74e9637 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -3737,14 +3737,18 @@ function graph_custom_sql_graph( global $config; $SQL_GRAPH_MAX_LABEL_SIZE = 20; - - if (is_metaconsole() && $content['server_name'] !== '0') { - $server = metaconsole_get_connection_names(); - $connection = metaconsole_get_connection($server); + if (is_metaconsole() === true + && empty($content['server_name']) === false + ) { + $connection = metaconsole_get_connection($content['server_name']); metaconsole_connect($connection); } - $report_content = db_get_row('treport_content', 'id_rc', $content['id_rc']); + $report_content = db_get_row( + 'treport_content', + 'id_rc', + $content['id_rc'] + ); if ($report_content == false || $report_content == '') { $report_content = db_get_row( @@ -3755,7 +3759,9 @@ function graph_custom_sql_graph( } if ($report_content == false || $report_content == '') { - if (is_metaconsole() && $content['server_name'] !== '0') { + if (is_metaconsole() === true + && empty($content['server_name']) === false + ) { enterprise_hook('metaconsole_restore_db'); } @@ -3772,9 +3778,10 @@ function graph_custom_sql_graph( ); } - if ((is_metaconsole() & $content['server_name']) !== '0') { - $server = metaconsole_get_connection_names(); - $connection = metaconsole_get_connection($server); + if (is_metaconsole() === true + && empty($content['server_name']) === false + ) { + $connection = metaconsole_get_connection($content['server_name']); metaconsole_connect($connection); } } @@ -3800,7 +3807,7 @@ function graph_custom_sql_graph( $data_result = db_get_all_rows_sql($sql, $historical_db); - if ((is_metaconsole() & $content['server_name']) !== '0') { + if (is_metaconsole() === true && empty($content['server_name']) === false) { enterprise_hook('metaconsole_restore_db'); } @@ -3908,6 +3915,7 @@ function graph_custom_sql_graph( ]; } + $output = ''; switch ($type) { case 'sql_graph_vbar': default: @@ -3936,48 +3944,48 @@ function graph_custom_sql_graph( $output .= vbar_graph($data, $options, $ttl); $output .= ''; } - return $output; + break; - break; case 'sql_graph_hbar': // Horizontal bar. - return hbar_graph( - $data, - $width, - $height, - [], - [], - '', - '', - '', - '', - $water_mark, - $config['fontpath'], - $config['font_size'], - false, - $ttl, - $homeurl, - 'white', - '#c1c1c1' - ); + $output .= hbar_graph( + $data, + $width, + $height, + [], + [], + '', + '', + '', + '', + $water_mark, + $config['fontpath'], + $config['font_size'], + false, + $ttl, + $homeurl, + 'white', + '#c1c1c1' + ); + break; - break; case 'sql_graph_pie': // Pie. - return pie_graph( - $data, - $width, - $height, - __('other'), - $homeurl, - $water_mark, - $config['fontpath'], - $config['font_size'], - $ttl - ); - - break; + $output .= pie_graph( + $data, + $width, + $height, + __('other'), + $homeurl, + $water_mark, + $config['fontpath'], + $config['font_size'], + $ttl + ); + break; } + + return $output; } From b97e8697f9f5550d9227492d530182724149f990 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 14 Oct 2020 10:31:46 +0200 Subject: [PATCH 2/8] Include SAML in pandora standard session handler (php) --- pandora_console/include/load_session.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php index 7d06cea88d..3575310141 100644 --- a/pandora_console/include/load_session.php +++ b/pandora_console/include/load_session.php @@ -198,14 +198,11 @@ function pandora_session_gc($max_lifetime=300) } -// TODO: SAML should work with pandora session handlers. -if (db_get_value('value', 'tconfig', 'token', 'auth') != 'saml') { - $result_handler = session_set_save_handler( - 'pandora_session_open', - 'pandora_session_close', - 'pandora_session_read', - 'pandora_session_write', - 'pandora_session_destroy', - 'pandora_session_gc' - ); -} +$result_handler = session_set_save_handler( + 'pandora_session_open', + 'pandora_session_close', + 'pandora_session_read', + 'pandora_session_write', + 'pandora_session_destroy', + 'pandora_session_gc' +); From 510a96af8f68ee9fbd2bd27977ad758aefa28155 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 14 Oct 2020 11:17:05 +0200 Subject: [PATCH 3/8] fixed sql grph --- .../images/image_problem_area_150.png | Bin 0 -> 14298 bytes pandora_console/include/functions_graph.php | 9 +++------ pandora_console/include/functions_reporting.php | 2 +- pandora_console/include/graphs/fgraph.php | 9 ++++++++- 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 pandora_console/images/image_problem_area_150.png diff --git a/pandora_console/images/image_problem_area_150.png b/pandora_console/images/image_problem_area_150.png new file mode 100644 index 0000000000000000000000000000000000000000..b1e8e3668306cae131f401b79db6471e97590e9b GIT binary patch literal 14298 zcmeHtby$?$y7v%*bc(b?h=6p@&?%sFBOn6|Ffi1>&`3#(5(3gK4Igo0l^j4EID>gFv3sWhn^v+4?x8OUoNA z*aKat0GY+Kd0E~zrvQ%kiL2fdI!5^eTx=>JeqSv1g3F_}o^z5*Rr~SP58ezl-WRK} z_tJdVE>1*u>~~LE=lyeATM612J%rm@!|7F<3%>fFZU*hTOPtkr?2DY}K5o=Xn!LF= z$@|Ve;FI($yOdL(wN>WPrqT*Jmok&La}#IZD6t~9E;H%%4=;by%O`=4YOc1V8Iw?# z|M&rZ@SGq$?qeeB^Sz7pJxwWk|GAMl(n}#!++@M==3Z&GugTEN4y38c^@q{iKtjyK zWX^n|r?kuRvi`c6{t4oYN~-Qu@Ob^%#trS(mgDZ{Pso@@rJ2GQti@z^ny_J!5IbaZ z4?F*yrDTm*j^Tt{{~?7s5|Nh_3K}laf%I$YZ5a!!7Sf$I~6WM49A)UyzGdJ%!|} zqP(js8(xL@ICAYl2(4qo<>-X91wXJF(3s~wHs1a?!d3KHTa~-)hd_U6(HCR8vNGD^ z!9-)n{P786r`*8|@9q4_d2bKDACP6`081Kl^=J>ZtH9dlq4<(JcLo}kRqs~3*|00A zsC=a<6_>A^z&6(x)3BmWm-Y!=H+S?&CsjgX9dXFcKI?8Bx^!*F!LVtew;g_`h?S`A6nfo!dGAN_dgT^Pl0-u+oLDS~G^E*P{qD6Oa<|eO>UG*NzR#Qjy{x6( z?AN-T7FC1D-*ZFPo|@B{B!1ehA}+Fx zak>vB(K&Nqw%QQBv6I=iJA|C|N*$Qdl}Zm!Kikx8zT{8#sXgVRxlDO>+4V$9;fo~S zwoj}V$(Kx|I!q0%i}-$oW`$-1;cP3G`!Hx?Q%J0Q@ezXxN+#=Lt&5Vt`}(ygyDVWH$}_dj3L~{#)Sbjc z9=1!g{ON2R=8eHaAq&ewGVJf^_JIW9^TFoS6eI^9*tdD#J{Wxn3Peq&VbKn2k|op; ziho6%k#Jiav(&Yn&FhoJy$|6s4$^o$wW>f*qjFilPI!}s_+d-uJ*oU?7$hFa6 z!cFLAFM{0SY3?|$1%8Lp6i@pw|I2Yd9(w}J7ZY}_6CyEgHkM!ksaHAcWNxPYa|ATD zl~Q&}voR6_a$Vl-_E^!kKo*otlDeCm6BN|+YJNS&dFk11XlPbhZ%PPpiA*7OOdLoE zRmsrboGBpQ7!LnD>tVkp{~F|3Fs9Fp8_DoJ3gbR87Ow1Nr|J_X)oYLux{$Jr1@GPQ*{(@Yn#Q)ropkh?=5`F6U%u4J_N@8QGhLhFgDZW6fnU^w5j-?w z`tU^8pxm0iqL#;l9dvGPY%d%d6|4E%*mvgU^@J+6spe0Vn6fjkr> zox;VdPjTLE#tXiE`Z(pEvaV4>9TBp+^AN?7SL(-JjBnFBPggia&G)?W3EN#=5Up6^EVY`d6|M%)??e=bXI8nm zuBEy5QBd=}k#*35sPl2vi=!S$AjC>ZNdq9F?}$7!IthaM;)xtF%j3D9z3tWfLFvp^ zJ?>1gY44awov&sd*T-ogUoff^@Zb%%`I)IOwpt3OI|sdeMgYsgQyr?(tr$0mD+!4r zh}?#S4nsTpCGXeTIh(eJYP)8MQUN)Bh15)MK6wn#MWlvk^TSnK_yoY#CYc`G&J0ZVWDnsWN8jR=TZN zxal#%$Hh-?njMMjydz*#%|STL)qvW;j%GzAu8RuZ3NJU&G2z!|b=y$PX5H-(8LD}? zmr1~%DNoDRa&6j~0dA(1%KWs{kCTVBuClw@7O%Eo)SHOWabj#z<^T_hPSno5_xYvt z>p8YMT?sR0wq3Hvs__?2h~zJV4CN)71?HZj7ggMaW~stAhy)DEtV2O1oXtOPCaFap?dqGj0QHbb$;VMQ)NgrZ$_Ex)a7bYg0<6-U2n}gDlT@E@u%;eF9y4SOrF7dKG4JK5 z&3tDMRi~R73m%NQ=JnM6{mnw= z-9L#bll2zJD@BdK8uPZ{%gsZMy2D%}w}lGdO7Nt_qVH;h%7ts ztT_3G(bI;}f~0E~#@gHFxa>6&Iqwr=wRXt7oqG1N)B;9W}b!9544+Jqmnqa9)B2M z?D*Osg#F>&(ZfB?{OjyGANLGrlf#l<1mC8$YMVy8PgS2k6r(Tt+Qi~T$w8=GlV3DD zoO>A1uk_KG=u2p_@LU?Qy}o-aBYpmX=~?pggVFWFi-!)E!;4=p%w{eHj~gyax3-v; z-ycsLCVK~|;<_m;?v;&)({)Q%?8=p~APVcA#mf_U&h%QtUeFL~T#m%bcKG&%?MT2L;6(mD{7SO7r&xqRj{fl=sY7Dv2^-u()KILNbCIxFOhD z6(=0X9e2eAu-@`J-a=+AnQPv&Y_`KS-KP!s7{mj1y2n%m0Q(Zb|VVp z+piG@VQ@HDClX?Vm1bL0M)$%u7lC8GRWlc^D7XI zp@zMr_SUzC;r8%kd+gwbHy!cq)^y+)$@f;py0?Y#4ygf_mbjyZlsM#@83ypH<=XNbEe!2QmKg;gw>Hm=xOi_XWecRj@)!VGb+ z2*PTg#Zt$eS-~UO?3M1{_8-h^ly3T1k*s@Ulcc%~4UxgArb|j!eX?)Gpb8Kr(Z^`N4kw%YOp~t$q)0dsOUBfS@{1Q?Y zl20J<6+1j-O*7R;S`KpZ$QQ&dx{>EgPe>?Csr_~iJw&i>SZYS6jY^QxHBQgX1U-mN z8d~T{+idg9`nlP3`q(XFvEIOK1Zid8j^X3BKc%wlH;W{}7r|t=en1}7@Tu#5^HW?8 zFi#-VmMOmH2R5Ui$Y~V0k8Un*y8T1a)Yr>p;3JDv|8Xo|XF3V0yXnN!Wy(KfWvpae z$qzd|(z$=K)H-|Fz|Dsj*|Uj%GKPOIpRwaXsnq8>@d-HVr@VVr&Ys>bpEmf5YPf{w zY$#~N8lK1MVtufxRt=ONwviNZ&OWas5R`Jn@Pd;hAnRVu%v(!#GjhrzeoEZ+Ht}zJ zZo;Q~2*wk(9xltkwe={GJL2npKob-*`|c3`czNs7Dbq~ga^Y6;t(hq7Tn&=pfw-*+ zmbT0Sv+7;}okg_`nkvD%!@jp={5u^!y={!KA(@G;b=i;ZdQa?6*`1jV_l%#tp*|8V zVbZV7$TW!WGL4kH`^|&>2qt;!Rfg2VF9qu^kA{c8{`;Q`hJ(C+8+B54dWW#XAuDyF zQ{|Okc`Z`AKXYmI7XF77dY|A3p%gj!X`YVj8L#WM!kuQ=GT9BO>s7<&%XpNdYe_Od z8j%xvI5nm&^BHY?K{QmH4vMjdXMKC;n`(KP=ZYyvc3vJEx~X%8(if%G`r(J7%C%Kd z7GgFeN0$t=kjnzPlME0D;|W4uUQORr`+ zS9qkD-Hk|1rjPh#(3j0WNK%AYIe4B0*>`kgb{7XnRh1K$2Z4{VmOroMtuf!8Pogw_ zd%XBvYRKoS^MYT%NFm?g1}(18oXA+;lb3^Kk&+eHndF4Svj(^<)#J2xO&=Xy-#zCU zsyf>_Z(z2Yw~&!x&47m@D4a+&oThQU`Yp5H?c>~o?7dVWB9}&)?j1+Fj=}?Nlm;Jo zXNakCQHdL_o9hb*FLNxvEM9-XYbB`6*xL^=6)-@|ag=kM!rCw^1CQIfG*@G4yO>Or?)+on@5iy-eGU>%_}C?RJq;3dk_c zGV(~>th|Isl|L}eo#em^A)837KsB;+bp22*vFGg)DAxKv)8`PXR zD!LkQ@eo}7Wv~qWYz!AHU!^(+!VPP;jeRreH$OK6sq^2d{&Iwcxrp+%y?aRw0+B=^ zfGbBswFgj3CkGywm6HXW$J4!)+1D-YB?^x4N#Sx4k9Aidk9;U&0d#064(iU|>%Nq@yd;Q>*nSR<>mG8 z@Zj+fv*77 zP3@1-j;_C35wIt(C(N0bpNEgv!QpQsT-_Ai|D5lij&RilZhm>S;jT_-lqFoz9q#DH z^4Ce7k!aVy&WUz~Up4*G8);?D3n=w#=D&`)r=q6$$CxWK+8`X9e~q}3{;Q;wSwKv`P~i-=kY!?*?cAp+b&mN0&9F)<-gZec+oYY{Psm6(`? z;4i4FeSpepsz@>m@bLZFqKSmLSv#Q|B$*!|9MPVCcIYA;;5u%wE2Hs?@CgV5prT>| zg2MbFVt)$h!%?mP$*(Z^`FI2be)U*cLX`kS7(h0J1Iz}_>+ERrtK({0pul1P!@{n7 z13>=O4y*+#kAlP8oKU(>PDtRO4Co5Jg8b!DV2R(I1^U3r^4Gv$!f>lAfBW6zdv|U&jAV%KvHjU&VeKE$`&)1vss( zn}&zuznuP`2>yof0AUGtbanbys{d8wH?#aD?*Kag)&}G=AU*Q_ksp7j#g*s$FTQ@K z+yCMW0Q7$*`M2!*A9MZ3T>q8@{w?AEu} z`Swru0pRS7V{!kU!mm>}=tREBANYpntZd{80ufMLy)i&3X~5|ngzKiFril9)ANa>2 z^14rwL?94_sfvQEuIKbtdY=;=!uy@SUbh-02hTFIU6oZ|t+8WWlg+y)Hr~_ehuJ;> z;AB?8c5o7Q2R*8n9}lIB>SdJ)V13C|NB^DVGap@?3ayd%ySaCufkKB*iO8}SHJTHh zrn8Zy#q^(x*=j1x+Hm>Isro7+A4z&29dVNaFVC%5WmX)Dh__CW>7J5InM>3DSZDIg zv9>p7xWduKA2zTS>jEAxK7T9H_BduJKvx8e(Y*gd6R)2BdC#q=Eh_R&)?>*X~c2!$MZWYaFb3M)DP;=^_|bL{KiD%IbvyQw<0p0K@Xj<0Zab^ zrtOjY*Sq*^g=k;AhksZXnnF%AC*dv50Q2q1SllL$plff#$`~3_|M~OhKull&2$Y~2 za&qD&A}Wf(h_&NzC#gDG_q?4q&{;!+WNvQG;^wtO-RM56xCd-qIzzsajL#?CJwqZC zqO z{E+~y-je_RBj%^ES53v4p!ylrAn0K~Gd;cQDbYklf!`eTwphQUw4y>fK1!c5M444i zjGhYHXFLMlx#hlcbUOUmV)FnRA{S^}_O8Dl|HL<=qeC{9+mj)D71a=~z-;5*QEB)z zIhm$^RbUmBY$eb)G7_VlMzC`J)8Hzf4Ysd3n(U06N(#v~O&1K4+B7$;}P+n4hA(%rE8?6co(U<|rQL z6iJN+cALkf-q{*a2aG^rKyS zIH;DUe&?3&F2-cVqpx2EQ{6l~ayOwK+q1G`LfQC_YGdTNsJi%`QZ*@!2?2a7(l7aF zCrowoCJjBk!~~>siErI4MVGUtYek5#OFIb*3#)$4@%>?w=Uz@et!qQtR5x?@!5h-| z&B;wnnZx_XdzRl%B&LvuhI99%GM{U*zwHVmY4E?4>gwv^jw{ulu{%5PZV@k6i(@71 z603z$74KdP8U9+;*pQTz^t_BbEHo5gf-dI`wmWwoHfvYiGjD3N&lvdL$kz90{n6ai zRK(2It5I8e@z#8He5aO!#8nKDTSq6gwElG!>3vpQ2eYH2OyLK`vT>{yl`r#YpGP^1 zJ$UqJ;n~X9;Y?g}1R?_9hH5^!y}kWxlLyHs)tAx?@f^rf10rknO8pWT^}EW4vr6~w zd42zkci=q-otT-qU!-dR7;;1{0IE$LZQdR{8O)Di&5&Pk{I}F*#WVLV!uZl=v+Zekr`z zm9)_~Q^-VLDUBlC=~yZ)%4^Sif){przV4?t$kJcOc0XVa?l9j^!z3`P@CdUxZtOa2 z&L5kerUh2O-oWKRQ02xW{Vvf=c9QOFzv3}X#kU-tJ#uc`h|ieS5RC`l_v9Y~OPj_GnNS32zWPG>owtajyFhB@mVPP?8bi)gnnwp~0a1qDB z!KwE~+kYRPolQ%K|F*MJSA0i-ev_1sFgPUS+UM~bzL)!5ma+W`b0hVpzU|)pe%1-O z>ILx^7mt}^uLI!~;DO^@<9OVwQK4vH#O6U~XVC2}AfT;pZ@+44no*U8q^obfq>&Il z>Q>-Pu*0*z9)Sh{j+uaZw&Z$wZ#5|TXIH#~*`V#N7b4~GKqROG?BL)~;N3EaHb_lP zoo)3?MKufn^elMqF`h>%x^2*QRr^rj9>Fp1`B~MCu zNic?nhH^z%yqluBS@$kAQ`}>yUyX;Gn*rglzYkPD6-v)kz$@beC1Kf@W!$Pz~LTXjCHn6*XmQn{uFRzo4;s;|wQE5Qd zNqjQ%=~I>o4}k@Pt@BNMPkJvTDqrs=F8#586Wx($5crmccm4*=hId!-x7ls4Wb*yI zgSA%$a*i4PTBOUV9H)>wDprj>2LS4qFsYCOVcDWGe9*d!k5Iel z#p_C9mde?oZ`+P_%%hA)E7Z2R$MNXukE4vlud;PURA0Pb_1hfKkmJ(RQ(=n-xuMb7 z?2-B902h(S($#$e0s`(~hgpJG)dGaU;vU=8%|}370<2`#Khh=0qF<)ZvN$De27fMw zcjicv|Hz7cZeD`crN;Qa(R)Pu1HO{t{_o!f#_ettjPCsMAYisL4PqhZWMHOd@_d#(&YN>w7)9C2Rh6WX$Bp;4@dD4PFbQtayx04KR55AT`$oK}6!wq@ygNeIiSWn8b;9OKI-&fxQA(m0n z8ymSwl6s4Tf)FP;ElojBPrFF>{`k84%i`*?vgnJ8i$ufOA3uZujq>wv%a)#l0V~EO z{R}-dCmG1FX5WP@(2EVH6z{XQ^yy|twvxE0>zERfkhpHoHt-T^83CSEt8jdJdb+;8 zKE=PTln9^qzw{GQvp;EWu-@N|vlZ$eOce#lD300u=zPPVXmXR+;o62EOJdiO%$r-Y zmE_Jm{A;HeZ*&zAAMu)It~UkyHk9+nbMJw5az1`aW^?HyR<~DgdB19xOjJpCsN>Sq zQa6)wn*Nn<5**$=A!tB(bg}LF@jTpYr;VvnkzTQE%-P|ZSk2Aqb-^BU z#3HUtX>Y#j>cSdKYN44P!DH*y&2>P`6iLko@FW>1#l_lORCNPU zGVO21fgBmFl)LKjGM;>J_{+Z6T`7-Q%y%|QTtPgle5UlhlWoxLb!s zb8Wd3#D^ln;?b(Oe!&HTihK#G48_baN5^Lo5fONL^L-M@by$Zbyd zbj`FVrOtNcfzqO?s_ID>to5*_!e~cBO|7!JTH(>7TaSKzNGi3AkB{euL*iKZB_syu zoRA5Weuq;wpxJttU>R^g`Q}v|^KJo_u=p;TZo;Y6=ZFUgqtB&&h6A3Z$wdVLN{PzN z!%PG@l%6=g&uYZm^|jSkxy5^82`#zr`oGW{QQuUX)-DrnV)y8@umswxRdFNiM$=n`>2&r1}O3Q2!U!KIX!)~GlYOUJ6tZ?e9ALc z`E7AJNr)UFAtC)wHrh~_@DMQ}A)kPNMOiL_7O?XJ4Gq_eGq0S{!h_i_K#?dSB4Rwz zXI-VhOtx7M5ua#Ij2}SzeF=HY_<&Rf>uTOR;$AuH>gwLo~X?#4F6;juwZTb_F&K zE%fq10o&vz`tBVB+tbt)?Uj|4wMO-9P21$D#RKm$)rn!L)2FqyB68WJvC2;jxh8U; zW9ve<{Ld;68X>uwMY^SFa07$MXZsrJ>c*4Q#9=@j1r9`nUFK-?jZYhL#%5-0>FO&0 zlvSNqO94=#-v7Z(O^9+d52$IMk-%$y{_2}lkLm~X3x^v7-d!EmjdW#H7Phu)GL{XH zS!Y@^SnlZSi7EB9FLaeHAFgWP5`zlk1t9cu@$d+Uh`cL%SZDl=M~5N#GDT$)Ip)x| zH&`L8#zIX9>}Y~&cM5FD4cg$mg!x){=RLjl*8^|vu7wx6ya{gwmX1zc8cevj8>>)PW&xomwlY$hJYaxx4<_W# zyibCaSOaBRj~)7>woIhR zd!PnsEFT*mSG;!*mnSL8qSCgEE?UWh^hZ8xB8@2{BjYPWt~ZrrRt;hS*`lxQ^(b?R zsXr1p*j~eZgY4QlqSzov_s(C76&bK*p(n0tZ0tWflK`?ad!z-Ck6>`eOgf$pQL@Iz z>tS7l#KhmnGB188vjAIgr^7tv0h_!)a`neT7%p&O>POnBEJxH~EFBuC1*twj9k{`ue6tM-u^+W-KdS+rluNQ*-5J zJml=L^r-C%H>d*|1e~n7s4U&wD3jiY z0tZz=2k-}AHDKw+hzfJQ@UEqHKEfbids|+r7XT;SJNRPvK@keen0%}IC-t6t%av5B z1!Dj)$q8}F8nAoTO9H8^QkPlSN5293(YEaX0CC8U(=;ADn*3Cw<6`HZ*I`_%}u~3 zqL$#8pb2n1P`^|SZS}N!EbnHdmk$h 'width:150px;'] - ) + $config['homedir'].'/images/image_problem_area_150.png' ); return base64_encode($dataImg); } diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 10a1992e18..0bfe96e864 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -8608,7 +8608,7 @@ function reporting_set_conf_charts( $ttl = 2; $only_image = true; $height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : 230; - $width = 780; + $width = 650; break; case 'data': diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 6f341381c5..6637f5729a 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -535,7 +535,14 @@ function vbar_graph( ]; if (empty($params['data']) === true) { - return graph_nodata_image(0, 0, 'vbar', '', true); + return graph_nodata_image( + 0, + 0, + 'vbar', + '', + true, + ($ttl === 2) ? true : false + ); } if ((int) $ttl === 2) { From 7cd56b6f940daeb75bc993c12dea3d3eb712088c Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 14 Oct 2020 11:48:34 +0200 Subject: [PATCH 4/8] Ent 6466 borrado de eventos con pandora db --- pandora_server/util/pandora_db.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index eeccd870fd..60280f164f 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -1011,7 +1011,7 @@ sub pandoradb_main ($$$) { # Move old data to the history DB if (defined ($history_dbh)) { undef ($history_dbh) unless defined (enterprise_hook ('pandora_historydb', [$dbh, $history_dbh, $conf->{'_history_db_days'}, $conf->{'_history_db_step'}, $conf->{'_history_db_delay'}])); - if (defined($conf{'_history_event_enabled'})) { + if (defined($conf{'_history_event_enabled'}) && $conf->{'_history_event_enabled'} ne "" && $conf->{'_history_event_enabled'} == 1) { undef ($history_dbh) unless defined (enterprise_hook ('pandora_history_event', [$dbh, $history_dbh, $conf->{'_history_event_days'}, $conf->{'_history_db_step'}, $conf->{'_history_db_delay'}])); } } From 6aaa4802e5be67211bfff4c8aab00978e04b61fe Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 15 Oct 2020 01:00:18 +0200 Subject: [PATCH 5/8] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index dbf6ebb817..0bcf6686f9 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.749-201014 +Version: 7.0NG.749-201015 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 14d168f35c..5d7e59fab3 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.749-201014" +pandora_version="7.0NG.749-201015" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 27f71c6c2a..8d22e4a60a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.749'; -use constant AGENT_BUILD => '201014'; +use constant AGENT_BUILD => '201015'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 87059ce3d2..c2d504b6c8 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.749 -%define release 201014 +%define release 201015 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index a94381724f..2b265f0c3c 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.749 -%define release 201014 +%define release 201015 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 754cc379a5..c7dc691c73 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.749" -PI_BUILD="201014" +PI_BUILD="201015" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9d349bbec6..572964e2fd 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{201014} +{201015} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8a4d2ec0a4..39b36eb7b8 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.749(Build 201014)") +#define PANDORA_VERSION ("7.0NG.749(Build 201015)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e549088dc5..d19d05cf77 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.749(Build 201014))" + VALUE "ProductVersion", "(7.0NG.749(Build 201015))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ed5cdbe487..af6d734ef8 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.749-201014 +Version: 7.0NG.749-201015 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 77a36857de..d69ab9ef05 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.749-201014" +pandora_version="7.0NG.749-201015" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index aaeb151a33..a4f9e897ca 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC201014'; +$build_version = 'PC201015'; $pandora_version = 'v7.0NG.749'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 85f07f7acf..95c485a93e 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 79476360db..d0492bcd9e 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.749 -%define release 201014 +%define release 201015 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 675ab09a83..cbed3d6108 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.749 -%define release 201014 +%define release 201015 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 306aef3aee..27ccf4c8b6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.749" -PI_BUILD="201014" +PI_BUILD="201015" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 60280f164f..057655db8f 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.749 PS201014"; +my $version = "7.0NG.749 PS201015"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a60f2e5942..a78dc52f9c 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.749 PS201014"; +my $version = "7.0NG.749 PS201015"; # save program name for logging my $progname = basename($0); From 3a890dc8b81ec15c905194cad58a2d2066877cbd Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 15 Oct 2020 10:19:42 +0200 Subject: [PATCH 6/8] Updated version and build strings. --- pandora_agents/pc/AIX/pandora_agent.conf | 2 +- pandora_agents/pc/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/pc/HP-UX/pandora_agent.conf | 2 +- pandora_agents/pc/Linux/pandora_agent.conf | 2 +- pandora_agents/pc/NT4/pandora_agent.conf | 2 +- pandora_agents/pc/SunOS/pandora_agent.conf | 2 +- pandora_agents/pc/Win32/pandora_agent.conf | 2 +- pandora_agents/shellscript/aix/pandora_agent.conf | 2 +- pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +- pandora_agents/shellscript/hp-ux/pandora_agent.conf | 2 +- pandora_agents/shellscript/linux/pandora_agent.conf | 2 +- pandora_agents/shellscript/mac_osx/pandora_agent.conf | 2 +- pandora_agents/shellscript/openWRT/pandora_agent.conf | 2 +- pandora_agents/shellscript/solaris/pandora_agent.conf | 2 +- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh | 4 ++-- pandora_agents/unix/Darwin/dmg/extras/distribution.xml | 4 ++-- .../PandoraFMS agent uninstaller.app/Contents/Info.plist | 6 +++--- pandora_agents/unix/Darwin/pandora_agent.conf | 2 +- pandora_agents/unix/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/unix/HP-UX/pandora_agent.conf | 2 +- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/NT4/pandora_agent.conf | 2 +- pandora_agents/unix/NetBSD/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 4 ++-- pandora_agents/unix/pandora_agent.spec | 4 ++-- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/bin/pandora_agent.conf | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 4 ++-- pandora_console/pandora_console.rhel7.spec | 4 ++-- pandora_console/pandora_console.spec | 4 ++-- pandora_console/pandora_console_install | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/conf/pandora_server.conf.new | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 4 ++-- pandora_server/pandora_server.spec | 4 ++-- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 53 files changed, 65 insertions(+), 65 deletions(-) diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index a8976d5b1d..cd13d53c4e 100644 --- a/pandora_agents/pc/AIX/pandora_agent.conf +++ b/pandora_agents/pc/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, AIX version +# Version 7.0NG.750, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf index db354ce74e..07fc99958f 100644 --- a/pandora_agents/pc/FreeBSD/pandora_agent.conf +++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, FreeBSD Version +# Version 7.0NG.750, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf index 35ab968b83..9848b081b0 100644 --- a/pandora_agents/pc/HP-UX/pandora_agent.conf +++ b/pandora_agents/pc/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, HP-UX Version +# Version 7.0NG.750, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index d01aedfcb6..e2f3b686a4 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, GNU/Linux +# Version 7.0NG.750, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf index d3d6bbe3ad..7ba414f284 100644 --- a/pandora_agents/pc/NT4/pandora_agent.conf +++ b/pandora_agents/pc/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, GNU/Linux +# Version 7.0NG.750, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf index a1c0730d7d..f2dd07f5e7 100644 --- a/pandora_agents/pc/SunOS/pandora_agent.conf +++ b/pandora_agents/pc/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, Solaris Version +# Version 7.0NG.750, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 58f0273c5f..76f75a08b2 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2010 Artica Soluciones Tecnologicas -# Version 7.0NG.749 +# Version 7.0NG.750 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf index 0a03ed9406..fea0ce1041 100644 --- a/pandora_agents/shellscript/aix/pandora_agent.conf +++ b/pandora_agents/shellscript/aix/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.749, AIX version +# Version 7.0NG.750, AIX version # General Parameters # ================== diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf index 960b5c6571..aa89b138b6 100644 --- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf +++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.749 +# Version 7.0NG.750 # FreeBSD/IPSO version # Licenced under GPL licence, 2003-2007 Sancho Lerena diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf index 06f9dad4e7..0401702d44 100644 --- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf +++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.749, HPUX Version +# Version 7.0NG.750, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index c648bdbc26..b0704ea7fd 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749 +# Version 7.0NG.750 # Licensed under GPL license v2, # (c) 2003-2010 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index c8806e32c8..219df052e2 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749 +# Version 7.0NG.750 # Licensed under GPL license v2, # (c) 2003-2009 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf index c11692b728..7a655da9fc 100644 --- a/pandora_agents/shellscript/openWRT/pandora_agent.conf +++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749 +# Version 7.0NG.750 # Licensed under GPL license v2, # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf index 59db4e115a..c6ee8fddeb 100644 --- a/pandora_agents/shellscript/solaris/pandora_agent.conf +++ b/pandora_agents/shellscript/solaris/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.749, Solaris version +# Version 7.0NG.750, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 52c9ac9686..0b32587052 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.749, AIX version +# Version 7.0NG.750, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 0bcf6686f9..727847ab44 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.749-201015 +Version: 7.0NG.750 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 5d7e59fab3..62105af82f 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.749-201015" +pandora_version="7.0NG.750" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh index d1bfdb860a..325d149578 100644 --- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh +++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh @@ -22,9 +22,9 @@ fi # DMG package version if [ "$#" -ge 2 ]; then - VERSION="7.0NG.749" + VERSION="7.0NG.750" else - VERSION="7.0NG.749" + VERSION="7.0NG.750" fi # Path for the generated DMG file diff --git a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml index 18a2823e8d..90ce4baef9 100644 --- a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml +++ b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml @@ -19,11 +19,11 @@ - pandorafms_src.pdk + pandorafms_src.pdk - pandorafms_uninstall.pdk + pandorafms_uninstall.pdk