From fdd61e4f27be5e8f4762c48be399706ed403a473 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Fri, 17 May 2019 16:36:21 +0200 Subject: [PATCH 01/12] Fixed agent searh box --- pandora_console/include/functions_ui.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index eac317863b..6568ced804 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -3845,7 +3845,7 @@ function ui_print_agent_autocomplete_input($parameters) function '.$javascript_on_blur_function_name.'() { input_value = $("#'.$input_id.'").val(); - if (input_value.length == 0) { + if (input_value.length < 2) { if (('.((int) $print_hidden_input_idagent).') || ('.((int) $use_hidden_input_idagent).')) { $("#'.$hidden_input_idagent_id.'").val(0); @@ -3896,7 +3896,7 @@ function ui_print_agent_autocomplete_input($parameters) url: action="'.$javascript_ajax_page.'", dataType: "json", success: function (data) { - if (data.length == 0) { + if (data.length < 2) { //Set icon $("#'.$input_id.'") .css("background", From 445cc8aab079b93cd85a54d6d8771073999d0919 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Thu, 30 May 2019 10:58:59 +0200 Subject: [PATCH 02/12] New styles for Services table view - #3614 --- .../groups_small_white/application_osx.png | Bin 0 -> 241 bytes .../application_osx_terminal.png | Bin 0 -> 274 bytes .../groups_small_white/applications.png | Bin 0 -> 371 bytes .../images/groups_small_white/bricks.png | Bin 0 -> 460 bytes .../groups_small_white/chart_organisation.png | Bin 0 -> 403 bytes .../images/groups_small_white/clock.png | Bin 0 -> 529 bytes .../images/groups_small_white/computer.png | Bin 0 -> 309 bytes .../images/groups_small_white/database.png | Bin 0 -> 363 bytes .../groups_small_white/database_gear.png | Bin 0 -> 362 bytes .../groups_small_white/drive_network.png | Bin 0 -> 437 bytes .../images/groups_small_white/email.png | Bin 0 -> 331 bytes .../images/groups_small_white/eye.png | Bin 0 -> 396 bytes .../images/groups_small_white/firewall.png | Bin 0 -> 391 bytes .../images/groups_small_white/heart.png | Bin 0 -> 340 bytes .../images/groups_small_white/house.png | Bin 0 -> 349 bytes .../images/groups_small_white/images.png | Bin 0 -> 444 bytes .../images/groups_small_white/lightning.png | Bin 0 -> 281 bytes .../images/groups_small_white/lock.png | Bin 0 -> 424 bytes .../images/groups_small_white/network.png | Bin 0 -> 382 bytes .../images/groups_small_white/plugin.png | Bin 0 -> 382 bytes .../images/groups_small_white/printer.png | Bin 0 -> 347 bytes .../groups_small_white/server_database.png | Bin 0 -> 429 bytes .../images/groups_small_white/transmit.png | Bin 0 -> 447 bytes .../groups_small_white/without_group.png | Bin 0 -> 335 bytes .../images/groups_small_white/world.png | Bin 0 -> 450 bytes pandora_console/include/styles/pandora.css | 27 ++++++++++++++++++ 26 files changed, 27 insertions(+) create mode 100644 pandora_console/images/groups_small_white/application_osx.png create mode 100644 pandora_console/images/groups_small_white/application_osx_terminal.png create mode 100644 pandora_console/images/groups_small_white/applications.png create mode 100644 pandora_console/images/groups_small_white/bricks.png create mode 100644 pandora_console/images/groups_small_white/chart_organisation.png create mode 100644 pandora_console/images/groups_small_white/clock.png create mode 100644 pandora_console/images/groups_small_white/computer.png create mode 100644 pandora_console/images/groups_small_white/database.png create mode 100644 pandora_console/images/groups_small_white/database_gear.png create mode 100644 pandora_console/images/groups_small_white/drive_network.png create mode 100644 pandora_console/images/groups_small_white/email.png create mode 100644 pandora_console/images/groups_small_white/eye.png create mode 100644 pandora_console/images/groups_small_white/firewall.png create mode 100644 pandora_console/images/groups_small_white/heart.png create mode 100644 pandora_console/images/groups_small_white/house.png create mode 100644 pandora_console/images/groups_small_white/images.png create mode 100644 pandora_console/images/groups_small_white/lightning.png create mode 100644 pandora_console/images/groups_small_white/lock.png create mode 100644 pandora_console/images/groups_small_white/network.png create mode 100644 pandora_console/images/groups_small_white/plugin.png create mode 100644 pandora_console/images/groups_small_white/printer.png create mode 100644 pandora_console/images/groups_small_white/server_database.png create mode 100644 pandora_console/images/groups_small_white/transmit.png create mode 100644 pandora_console/images/groups_small_white/without_group.png create mode 100644 pandora_console/images/groups_small_white/world.png diff --git a/pandora_console/images/groups_small_white/application_osx.png b/pandora_console/images/groups_small_white/application_osx.png new file mode 100644 index 0000000000000000000000000000000000000000..409d9742d2d4f0941f996cc8bc8ce2316fb85768 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz2!N$PAxXO8t29P6J;u=vBoS#-wo>-L1;Fyx1 zl&avFo0y&&l$w}QS$Hzl2B>JVr;B4q#jT_S2c{l{NA>~+3z!=ioHPzjVB=6=Te0lt z|A`D?lNp#gDwt<(SecTfAjZHVaB-Wm^iPHk>6KYZaSQ?uN0b+={rz8<;YC=z!nI!E zm3gM6P3^xPatI`B(8ys3`X(ZM?8J)`OsUO0#S7ZFH~y5Iq9x8ysI+wwe^pJ>rd$Sr p{pxD-I{ieBFwAoK{J>m*;qNon9aZnHm;#;0;OXk;vd$@?2>|PFQ*QtO literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/application_osx_terminal.png b/pandora_console/images/groups_small_white/application_osx_terminal.png new file mode 100644 index 0000000000000000000000000000000000000000..3deb76aa3423f0675222e5687db6f4a42de8a079 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz2!N$PAxXO8t29P6J;u=vBoS#-wo>-L1;Fyx1 zl&avFo0y&&l$w}QS$Hzl2B>I@r;B4q#jT_S2e$wJ|Cj&ZXVnm5U}SOckq81(m#_Sn z=Ugy@g_(iTWlbXw`-}}MQ<4D5J_Qs&47J6|%0p0VOkV$imF V?)M~3Bpc{{22WQ%mvv4FO#raUTBiU2 literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/applications.png b/pandora_console/images/groups_small_white/applications.png new file mode 100644 index 0000000000000000000000000000000000000000..362ed8b98d05ffdae054ff7e0d1783504f0515bc GIT binary patch literal 371 zcmV-(0gV2MP)!2zhKrxCSGB^Mb zK*&y?0K^}$SQ`&Ag#}5#fPoNzSp{+!$dzbf4RDtufe#Fn0)PM_8ZkoM1oFs49BS$r zfdCdU`w4jz7Ca946eCCVd9)zuM;Bwl5iB3k#b8z&AO$ptRsdoF6z3p&20b=#dFDTQ z!o!)E@d1DUL$;n$upc>e5DA$?0MyfnYycCr(-;dH-+}yq!|uWZNM3QoBG!mU45tgv zLsORlmh_BI3~Ma!M-p?uBGy1i4BdqaAcJ78z#=A(MNA)?3+GcI9nJ@t1puatkWP~P RmqY*n002ovPDHLkV1nbvf|vjR literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/bricks.png b/pandora_console/images/groups_small_white/bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..b68255b88b7dfbcbfd210de2bdf081ae6170dcca GIT binary patch literal 460 zcmV;-0WdH@0l#(59K{ZRIOkR&6rR=9OQ01!Y7I01?U2utrX0oejjfd-HO zRDJ^^hD*@xfEoc;01!Y7NX8%okn;tAct4U@0I~)HsG{{a99{r203M=968E8w7k~{A6M|;4?H{oAb?0mP!I1%3nfsfB_Q$lqidQEi!zV_Na6`-206ea`e6wR ziwi*UQGhOp?4O_L5?s6G;ug!LSi2vCx``LPQV(R_;Lv@ zIe-AeWlI1wZeW2hAC_9NL^?=rJv@$Z7&!kwVQ?QBH3HC-^PYg(1bh}Ykm7BS>!INa zbA$o9f&e_O!5TbB`qpD9JsNQ7fw|^B7ES-5t|JsQ1q6MM$AJAP)T~AOS@nRsah!G9Ca3AO^hPKLj*jSO{Y?L2WkxvJIe; z1&l~G2Lka2Aod3cAZ%vu|BnDDb}(Ua%Lg26h~JR>=LqG3+;ag%A<(}}XbM50TMtz@ zAF2-II|G#9BnAKk5J`v;TSz0hlaWwp-~>z*yA9bX$bbbs^06d{{V=zK5{3XQQJ^KX z2N)Vb@ejlSKs+DHzYk4Wur%TTa~8~l3b14h1p*X%93a4m37Pf(v4a9i<3xZ&aVkYN z6@tV8SArp0Gnv4FU{Ek(0k9GRha66q7GQG%mVyihKw<{?T+W0X!$>Y@M6>$P5H$+{n#HUJ|^Oh1yS*E#?I002ovPDHLkV1jNKi!=ZL literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/clock.png b/pandora_console/images/groups_small_white/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..dc16f557733cceeb0b730b79bda5569d740c3764 GIT binary patch literal 529 zcmV+s0`C2ZP)ti7$9B`V*Cd)&{Y0Mrcn(? zk^l%GxN4AvAhUsZKh*4gkei`$`(X+ju(}zGiTjb*1|ZYW6g$A(15$t-R9HbAV2ta*xAIhE&^Ci^B^Wj!QIR-Gr$l(Z$)&^w3_c&||K=!c%)Dr^O zdG^O2K_LXh7l2q0iu0ig&qI?cDBKgE&b|-zdps~OL246$ z7!*hf*b>-%s38I*xNtsl_Gdy;14=pzfwmfgTntr=Gm!$-U4Xg}lorja8x-z|FmV<%FB(F_svcVIfV^=4h%Z8wC_oJXi6=sXgSG$wejW1p TxT%w)00000NkvXXu0mjf*lEV0 literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/computer.png b/pandora_console/images/groups_small_white/computer.png new file mode 100644 index 0000000000000000000000000000000000000000..5eab00e255df92f710077dfde6834ff7d9c0f3fd GIT binary patch literal 309 zcmV-50m}Y~P)PB4P12BLtfUJH`z}ERNhyEwz z5&Qv3bcoYjAt-nXfV2QgbfJbJDE%}b`>p|&5TNvaWW@jh22!B#pE{r)o?D;-4h&=h zWS25AP#KIs1Cb+zQm~$s82nEt_o0*!SPTguP#B=5b|e4*(>53_A2aj;00000NkvXX Hu0mjf#1v{~ literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/database.png b/pandora_console/images/groups_small_white/database.png new file mode 100644 index 0000000000000000000000000000000000000000..397f3fa5d3daabca10e63695fed5ab7c50c619af GIT binary patch literal 363 zcmV-x0hIoUP)XmI|0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz4M{{nRCwBAU_b(lAmTp|0I35^ND>bK z0tlf5D$M|w1_&TzO)zkP5yk?FJ3yHZ00G2+4j9q2F)*R4010dWVn-+z1R1#hKN0{4 zAei;K;=QSKT0O2rq@6LHvz?T;sD6C2a&x7 za%KT~cEq7s0g7Q>wMRAx8*m`SX^dF1l>-q5U4W$}U^)Uv1^{tnO7bDFe`Wvx002ov JPDHLkV1kyzd^7+6 literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/database_gear.png b/pandora_console/images/groups_small_white/database_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..72a6b63d0f841e4e5f640a3e29bff47c862a7f99 GIT binary patch literal 362 zcmV-w0hRuVP)N%fFBTT9Y~P?5UIr{^U+6ct*Kz1OC z9I{uSARZh{3=EA(VhaEQ2;@cqs2g#C4=Bg6K^BCY zf&^I5_!pqjA&;(*360+f_4Pw+QS~36Phidg1y2Ex7C?zE)G!1^L<72S!3hCM??+Y) z5MWH8p!iQ6&=2!8ENmSa$pp|4HNX~%=mC=eO`Q%<{2qt{@abW~V;CsO+k?^=5IaCI zD1P(FG7y}TA;IwhiXR{)8k~RypCr&wM>L@Y1Tq4Of%^%hH9}wmQL2#A98tD0;xHtD fKw*HI+K~VNoje#C4GCR700000NkvXXu0mjfH0Kuda{v!cKsNjDF1h@bYK#V9R0s$i<;{k^Mr~s^h1*#wsN`ow7 zgu4L-Kr#RU1hc*1KW&A7Cc!$Kf`x zhZxX}M^o?~T@kVe;0n+c!6Y1@^n7$h{W#o|08@l7P{F|i5MZ#d>PL?n5&%fwdR#Fy zp9Di3;30*@Fl0j$h%p3Ll0XL_#R||g^d1_~0=Qg`%dqv(z?0^5Gi0k d%wh&=0{|nk1I$g)7196z002ovPDHLkV1m8>bgcjY literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/eye.png b/pandora_console/images/groups_small_white/eye.png new file mode 100644 index 0000000000000000000000000000000000000000..f5c8a4e9401e9c079e47f0ea02c88895d4ee16b7 GIT binary patch literal 396 zcmV;70dxL|P)eUu=>%j!0U(|a(*h7cxDm)sDE*%SnE^GT0mNrw1Oli;01(@Q_*jht z2p~o*<~Kl@8-SWFU|5c19}Ix(JP&0Hz!WAx1q^_AKTHy)gMkzP5I{sDMl`pAylw!* zAAla2fGs2ypw0(|mMy&WGtn zVjD2f3;+ZeeGoLH-ot_s8oVHUA1P2A2pM94WC%Qnky7P-SdxYY;D00w1<-Tg`TwY( z0Xf-2ErUhVdnAjH!G4f9C<}f7(hJcXEDxm*K^@RCwBAU_b(lAmTp|fM^z|U?YeC z2q0AS9|~Z~0)f~7!~qB(n5@HpBmfd)V!#0a0th=o(%k?z22H>LSrA1fBZvbv=>ZTc zfEWM)glw(@HeJZhg#`r6lmkHQfaJafK%4+p$jI1$)5Ykvk?oBAgu)Bx3`c+fA}Mq+ ztOMDC=H>>XBMlVb4roDy4IE&BDyk=BBGFdkQg{G~?MRY|ENHr6-~$jJgt7%-o&hB- zdpw4Llq`b)51^(CV3C9Ac>s*=2iRiL;XiiJfEK&hQfC8lo_~N8 z1|M*Q2S^P+4sXNsJRp?j8vf%4*nHGLMu9?PI))WrNNE`!=qLpVW<()JD2#mo7*Pjk l5>YhqKE8+|2Q<*kkpQTkI+@GMNkjku002ovPDHLkV1kcXiOK)~ literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/heart.png b/pandora_console/images/groups_small_white/heart.png new file mode 100644 index 0000000000000000000000000000000000000000..6bfec0298ad5f5e155f412f3719a5775f582691f GIT binary patch literal 340 zcmV-a0jvIrP)?2J#HLXF-bA|0fLg zgF^cQ0}+4`Y%BxAdjjed;W2{8+WF`n>L;iONpS#@q5y&phq@aD00bC{B*-c()`P;- z0G1`NB&h#TF#&V~6Nm`+`$VWIz?YoK1^Z!H3Oaeuv!}G9BIk0000zYoaf55{d7C5`OS-WMuq+CIsdK1Q2-$WG&RX^Ta5Ef%nLs#2U3| zZf3+4-RL$Ypd=rB0Awl?)aXVe@d-GsMw2K+i3#K+Nep1Z5&9Uh0T5tJL_~rCH0gn` z0;REe9!u&3i8&xgATfrm|4#zI>19}^0Wt%~^%)a#ZU-_G$PAwUuoQ+a(eR&i;6Q4+ vX@sUmMPf276A|gZ0ZKmrQWq#TaKHfo((H4O&8uU900000NkvXXu0mjf&2N3~ literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/images.png b/pandora_console/images/groups_small_white/images.png new file mode 100644 index 0000000000000000000000000000000000000000..195c7e222b63413005dde75ee96de2b2c51c0ed1 GIT binary patch literal 444 zcmV;t0YmX+YP`0>t(p>yac5VAHvu3E6hME&vE1n2*l` zsf|eD^^8D(tPo}-NKrk=Awc{9pYu@wlDGm88^9gOhy-A+hibSF#13#b5)q~c00M~U z&}D?0(1;|a55yCJt~h|xDj;({H1-|PO=Lk*`~Y9jus~@?D6Ig*`=OcZ0t{>F!2=u!nT71cMn*IM6iWo+4Ol{r zC<9@EV}KNK3xGI~6yKsp3r1>yf5fG0mc09yWlk;roA0$QF&2l*g1Km#3#jg$r~ z5t#s$D}d(g{qQhk!~u{a16CYB(|ZFn!#Dz!O~4n1xBx#iKO968cYubL01$s5CVe`P mkVf|t-L1;Fyx1 zl&avFo0y&&l$w}QS$Hzl2B>Jar;B4q#jT_S2e$u>4Cfd*6j}s?C)hCvIB0Oqm@t)r zMWC&XZHMLmg$$A3?ApW{7@AIU{BdvieM0E{!lvIFUp6r^?ui5HTGJsItEw!p;P+d` zwp0T}Bd5Hlp^Re@cU*(vj0qu_3ACPb{-XA%npD;}3h-V&qB`ycETbO2{Q2TzFnkVjuelHNK3d dkOQjx45A{e*7x_fMFG9R;OXk;vd$@?2>>(9VZHzW literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/lock.png b/pandora_console/images/groups_small_white/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..522ff71bd6923b1bd9ea3788c5c6f8661deec288 GIT binary patch literal 424 zcmV;Z0ayNsP)P000>X1^@s7v+lL^0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzN=ZaPRCwBAV890cLjj1*#6SoD1Q0n0 zAb>EeL*_GLlVAh_g6;tbAfoJg55fc$GGcWZ5THBY0lNA9{}Et6UONB+h-$$H@{$0Q zEr88?ENB`OfD}l>dL$2mG#UUscmX3Gu*C(oxWOAgK=lr!_{jhie9&M#k4-Z`01W^F zI->z8b_yojr`AeacD5)+Vw79cAo3jhQdT@WJ)=@OI(43NBhfLOguL>OKG z4fOL!mKZ?OGjSP#fCUavgZl9~00sp S#L&(F00005FIlB z0mg`w^ZFSm1E6fu2z2rVn19YA<(rLU7?=-D4FbqT2@E(ekeBrvp!)Y?jdWP4L;`Ri zJ0+0<=wm1-!9lYbp)>@`q8RE}@Dv%2IEt48$k_oKKsPiVOGa?S7MW;5{`isvCEz^} c2Y}220EOBxxwTU1Bme*a07*qoM6N<$g2(TLc>n+a literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/plugin.png b/pandora_console/images/groups_small_white/plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..051ec05d6b05054081cf2b52cd40d851ef09a60e GIT binary patch literal 382 zcmV-^0fGLBP)W@fB-^w zYXbuz0JX{hU7Q7~+a5`*ALbWEMn*^UsKfv;T}%w50HDV6xJ+b$rWjCU8eq|@h|Nv& zvAGFF5qi8Lhx$YyK8R#RBf6ac0fx^b_mK=WV4wsb`-4=C`~Q;;9MH{SVxS^`CFcv! zxI6%jPX{9O<^x?952Qg^{{k=_7Q(!#01IRgO@^028Bc(2VU`GVI;fm5BsR?O8RieA c1Bf*Y0QS1pZ&q99HUIzs07*qoM6N<$g3~mP1ONa4 literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/printer.png b/pandora_console/images/groups_small_white/printer.png new file mode 100644 index 0000000000000000000000000000000000000000..4187e87a004fce81ee79d7f0d186b132b78ae383 GIT binary patch literal 347 zcmV-h0i^zkP)4+KTmTX$+T#ELL^(o_0HQrZnnGys|Hqa_VB#!Dfw}-az=7Za5G%lR z&Hqmr7%;(g;0FSr1h5c@4-!!L03g6v@PuPOkTSrdxsZ{O@d7EqXaLmUh@3t^e5lw# zw6uegmWc%h&`@58PZ0}}7X{F~C_sb-F!l!&?}H4(7H9aDG2kjJr;$e0+25qm>32-004N3(O+q$y{`ZO002ovPDHLkV1jtCeW?Hd literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/server_database.png b/pandora_console/images/groups_small_white/server_database.png new file mode 100644 index 0000000000000000000000000000000000000000..864e3cb7cb9f2ef61646aa88703dabf5562b8afa GIT binary patch literal 429 zcmV;e0aE^nP)={_K+b-E0Aj!f7@@Aq|3++zz;1=Q*AR&1K~|!NiUSfG1t9yr0m*cJsG~vP1JLk5 zfB<432!JLi{Ko_W$O`^r(X=1NX2GK90J35hDD8+O_5g_Ijn)T9v;dUGFa+fH`9K@;kql8l3MU0LS^(J)kcsP25)MK!zVso$KrH|O Xx87~?0)?b900000NkvXXu0mjfAZ@3_ literal 0 HcmV?d00001 diff --git a/pandora_console/images/groups_small_white/transmit.png b/pandora_console/images/groups_small_white/transmit.png new file mode 100644 index 0000000000000000000000000000000000000000..d27f5c377d0069d8b2b509b67a10faaae41945e5 GIT binary patch literal 447 zcmV;w0YLtVP)mkvapg8HTKQJ=B%RUWIwn0Z&+g^{sWi< zKmfrJBS;EJC&CyE00D%e30X4+000J`gOd3-;*06+jy7C_kCO>~%}D@+99K&X!&VE7UZyhj(uub3*ev{yVKJ64fq?=jZ9qt|0GjxG!iQ8}6ey zsR3CYAb`jU`txWe3Sd*T9!*gKHbn_Y3hqNqo=+%D4WMEH&|vBZMFuz>f_#T9*+Dhz zM+pHW6G0ODv3Sq`YZzin;IM@K0h_f@rXfDx|A%@)faC}P2rxovc0JT&P{=qy=>T#J zYk(Sr4)#Oi!GV%AgbW-=2?r*afj|mdE(66#ArLztY`I|4{ygbg%c sF$^Pu83| Date: Thu, 30 May 2019 16:58:36 +0200 Subject: [PATCH 03/12] Unified SNMP version 3 code. --- .../include/functions_snmp_browser.php | 246 ++++-------------- 1 file changed, 51 insertions(+), 195 deletions(-) diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index d20daecb46..f4297a49e9 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -261,138 +261,47 @@ function snmp_browser_get_tree( ) { global $config; - if ($target_ip == '') { - return __('Target IP cannot be blank.'); - } + $output = get_snmpwalk( + $target_ip, + $version, + $community, + $snmp3_auth_user, + $snmp3_security_level, + $snmp3_auth_method, + $snmp3_auth_pass, + $snmp3_privacy_method, + $snmp3_privacy_pass, + 0, + $starting_oid, + '', + $server_to_exec, + '', + '' + ); - // Call snmpwalk - if (empty($config['snmpwalk'])) { - switch (PHP_OS) { - case 'FreeBSD': - $snmpwalk_bin = '/usr/local/bin/snmpwalk'; - break; - - case 'NetBSD': - $snmpwalk_bin = '/usr/pkg/bin/snmpwalk'; - break; - - default: - $snmpwalk_bin = 'snmpwalk'; - break; - } - } else { - $snmpwalk_bin = $config['snmpwalk']; - } - - switch (PHP_OS) { - case 'WIN32': - case 'WINNT': - case 'Windows': - $error_redir_dir = 'NUL'; - break; - - default: - $error_redir_dir = '/dev/null'; - break; - } - - if ($server_to_exec != 0) { - $sql = sprintf('SELECT ip_address FROM tserver WHERE id_server = %d', $server_to_exec); - $server_data = db_get_row_sql($sql); - - if (enterprise_installed()) { - enterprise_include_once('include/functions_satellite.php'); - - $oid_tree = ['__LEAVES__' => []]; - if ($version == '3') { - switch ($snmp3_security_level) { - case 'authPriv': - $command = $snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir; - break; - - case 'authNoPriv': - $command = $snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir; - break; - - case 'noAuthNoPriv': - $command = $snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir; - break; - } - } else { - $command = $snmpwalk_bin.' -m ALL -M +'.escapeshellarg($config['homedir'].'/attachment/mibs').' -Cc -c '.escapeshellarg(io_safe_output($community)).' -v '.escapeshellarg($version).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir; - } - - exec('ssh pandora_exec_proxy@'.$server_data['ip_address'].' "'.$command.'"', $output, $rc); - } else { - $oid_tree = ['__LEAVES__' => []]; - if ($version == '3') { - switch ($snmp3_security_level) { - case 'authPriv': - exec($snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - break; - - case 'authNoPriv': - exec($snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - break; - - case 'noAuthNoPriv': - exec($snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - break; - } - } else { - exec($snmpwalk_bin.' -m ALL -M +'.escapeshellarg($config['homedir'].'/attachment/mibs').' -Cc -c '.escapeshellarg(io_safe_output($community)).' -v '.escapeshellarg($version).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - } - } - } else { - $oid_tree = ['__LEAVES__' => []]; - if ($version == '3') { - switch ($snmp3_security_level) { - case 'authPriv': - exec($snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - break; - - case 'authNoPriv': - exec($snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - break; - - case 'noAuthNoPriv': - exec($snmpwalk_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - break; - } - } else { - exec($snmpwalk_bin.' -m ALL -M +'.escapeshellarg($config['homedir'].'/attachment/mibs').' -Cc -c '.escapeshellarg(io_safe_output($community)).' -v '.escapeshellarg($version).' '.escapeshellarg($target_ip).' '.escapeshellarg($starting_oid).' 2> '.$error_redir_dir, $output, $rc); - } - } - - foreach ($output as $line) { - // Separate the OID from the value - $full_oid = explode('=', $line); - if (! isset($full_oid[1])) { - continue; - } - - $oid = trim($full_oid[0]); - $value = trim($full_oid[1]); - - // Parse the OID + // Build the tree. + $oid_tree = ['__LEAVES__' => []]; + foreach ($output as $oid => $value) { + // Parse the OID. + $oid_len = strlen($oid); $group = 0; $sub_oid = ''; $ptr = &$oid_tree['__LEAVES__']; - for ($i = 0; $i < strlen($oid); $i++) { + for ($i = 0; $i < $oid_len; $i++) { // "X.Y.Z" if ($oid[$i] == '"') { $group = ($group ^ 1); } - // Move to the next element of the OID + // Move to the next element of the OID. if ($group == 0 && ($oid[$i] == '.' || ($oid[$i] == ':' && $oid[($i + 1)] == ':'))) { - // Skip the next : + // Skip the next ":". if ($oid[$i] == ':') { $i++; } - // Starting dot + // Starting dot. if ($sub_oid == '') { continue; } @@ -410,7 +319,7 @@ function snmp_browser_get_tree( } } - // The last element will contain the full OID + // The last element will contain the full OID. $ptr[$sub_oid] = [ '__OID__' => $oid, '__VALUE__' => $value, @@ -459,83 +368,27 @@ function snmp_browser_get_oid( return; } + $output = get_snmpwalk( + $target_ip, + $version, + $community, + $snmp3_auth_user, + $snmp3_security_level, + $snmp3_auth_method, + $snmp3_auth_pass, + $snmp3_privacy_method, + $snmp3_privacy_pass, + 0, + $target_oid, + '', + $server_to_exec, + '', + '-On' + ); + $oid_data['oid'] = $target_oid; - if (empty($config['snmpget'])) { - switch (PHP_OS) { - case 'FreeBSD': - $snmpget_bin = '/usr/local/bin/snmpget'; - break; - - case 'NetBSD': - $snmpget_bin = '/usr/pkg/bin/snmpget'; - break; - - default: - $snmpget_bin = 'snmpget'; - break; - } - } else { - $snmpget_bin = $config['snmpget']; - } - - switch (PHP_OS) { - case 'WIN32': - case 'WINNT': - case 'Windows': - $error_redir_dir = 'NUL'; - break; - - default: - $error_redir_dir = '/dev/null'; - break; - } - - if ($server_to_exec != 0) { - $sql = sprintf( - 'SELECT ip_address FROM tserver WHERE id_server = %d', - $server_to_exec - ); - $server_data = db_get_row_sql($sql); - - if ($version == '3') { - $command = $snmpget_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($target_ip).' '.escapeshellarg($target_oid).' 2> '.$error_redir_dir; - } else { - $command = $snmpget_bin.' -m ALL -M +'.escapeshellarg($config['homedir'].'/attachment/mibs').' -On -c '.escapeshellarg(io_safe_output($community)).' -v '.escapeshellarg($version).' '.escapeshellarg($target_ip).' '.escapeshellarg($target_oid).' 2> '.$error_redir_dir; - } - - exec( - 'ssh pandora_exec_proxy@'.$server_data['ip_address'].' "'.$command.'"', - $output, - $rc - ); - } else { - if ($version == '3') { - exec( - $snmpget_bin.' -m ALL -v 3 -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($target_ip).' '.escapeshellarg($target_oid).' 2> '.$error_redir_dir, - $output, - $rc - ); - } else { - exec( - $snmpget_bin.' -m ALL -M +'.escapeshellarg($config['homedir'].'/attachment/mibs').' -On -c '.escapeshellarg(io_safe_output($community)).' -v '.escapeshellarg($version).' '.escapeshellarg($target_ip).' '.escapeshellarg($target_oid).' 2> '.$error_redir_dir, - $output, - $rc - ); - } - } - - if ($rc != 0) { - return $oid_data; - } - - foreach ($output as $line) { - // Separate the OID from the value. - $full_oid = explode('=', $line); - if (! isset($full_oid[1])) { - break; - } - - $oid = trim($full_oid[0]); + foreach ($output as $oid => $value) { + $oid = trim($oid); $oid_data['numeric_oid'] = $oid; // Translate the OID. @@ -602,8 +455,11 @@ function snmp_browser_get_oid( $oid_data['value'] = trim($full_value[1]); } - return $oid_data; + // There should only be one OID. + break; } + + return $oid_data; } From cdbd5b34876b21f8cec56cd5ee2ed5aced6f5452 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 30 May 2019 17:23:32 +0200 Subject: [PATCH 04/12] Fixed bug in meta user_edir form url --- pandora_console/operation/users/user_edit.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 205c2206a1..9e267c5c2d 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -616,7 +616,11 @@ foreach ($timezones as $timezone_name => $tz) { } } -echo '
'; +if (is_metaconsole()) { + echo ''; +} else { + echo ''; +} echo '
From 841d176aa0063e67014c0bb7dfa79715eb871f64 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 31 May 2019 15:39:22 +0200 Subject: [PATCH 05/12] Fix the regexp for IPv4 addresses. --- pandora_agents/unix/pandora_agent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 6106928cd7..c16f5e57a0 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -3038,10 +3038,10 @@ while (1) { my @address_list; if( -x "/bin/ip" || -x "/sbin/ip" || -x "/usr/sbin/ip" ) { - @address_list = `ip addr show 2>$DevNull | sed -e '/127.0.0/d' -e '/[0-9]*\\.[0-9]*\\.[0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/\\/.*//'`; + @address_list = `ip addr show 2>$DevNull | sed -e '/127.0.0/d' -e '/\\([0-9][0-9]*\\.\\)\\{3\\}[0-9][0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/\\/.*//'`; } else { - @address_list = `ifconfig -a 2>$DevNull | sed -e '/127.0.0/d' -e '/[0-9]*\\.[0-9]*\\.[0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/.*://'`; + @address_list = `ifconfig -a 2>$DevNull | sed -e '/127.0.0/d' -e '/\\([0-9][0-9]*\\.\\)\\{3\\}[0-9][0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/.*://'`; } for (my $i = 0; $i <= $#address_list; $i++) { From 5ba2ba1ef324ad310d91c514aa1f8f2b414122cd Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 3 Jun 2019 15:37:05 +0200 Subject: [PATCH 06/12] Fixed bug in time comparison graphs --- pandora_console/include/functions_graph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 86de873965..cde59c52bb 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -289,7 +289,7 @@ function grafico_modulo_sparse_data( } } - if ($array_data === false || (!$params['graph_combined'] + if ($array_data === false && (!$params['graph_combined'] && !isset($array_data['sum1']['data'][0][1]) && !$params['baseline']) ) { return false; From 23e631f7d84883c6a915333bf8635ee57860768d Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Tue, 4 Jun 2019 08:52:25 +0200 Subject: [PATCH 07/12] Added missing create table to migrate 6 to 7 --- .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 4261fdf88b..2c9ff7e7de 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1989,6 +1989,33 @@ CREATE TABLE IF NOT EXISTS `tnetwork_matrix` ( UNIQUE (`source`, `destination`, `utimestamp`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8 ; +-- --------------------------------------------------------------------- +-- Table `user_task` +-- --------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tuser_task` ( + `id` int(20) unsigned NOT NULL auto_increment, + `function_name` varchar(80) NOT NULL default '', + `parameters` text NOT NULL default '', + `name` varchar(60) NOT NULL default '', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- --------------------------------------------------------------------- +-- Table `user_task_scheduled` +-- --------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( + `id` int(20) unsigned NOT NULL auto_increment, + `id_usuario` varchar(60) NOT NULL default '0', + `id_user_task` int(20) unsigned NOT NULL default '0', + `args` TEXT NOT NULL, + `scheduled` enum('no','hourly','daily','weekly','monthly','yearly','custom') default 'no', + `last_run` int(20) unsigned default '0', + `custom_data` int(10) NULL default '0', + `flag_delete` tinyint(1) UNSIGNED NOT NULL default 0, + `id_grupo` int(10) unsigned NOT NULL default 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + -- ----------------------------------------------------- -- Table `tnotification_source` -- ----------------------------------------------------- From b7c14d49fd76417ed53f30a92df5448841b6ff94 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 4 Jun 2019 15:10:05 +0200 Subject: [PATCH 08/12] threads-shared returns --- pandora_server/lib/PandoraFMS/Core.pm | 48 ++++++++++++++------------ pandora_server/lib/PandoraFMS/Tools.pm | 3 +- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 0dbc8f963a..548ddafd06 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -4859,32 +4859,36 @@ sub pandora_process_policy_queue ($) { logger($pa_config, "Starting policy queue patrol process.", 1); while($THRRUN == 1) { + eval {{ + local $SIG{__DIE__}; - # If we are not the master server sleep and check again. - if (pandora_is_master($pa_config) == 0) { - sleep ($pa_config->{'server_threshold'}); - next; - } + # If we are not the master server sleep and check again. + if (pandora_is_master($pa_config) == 0) { + sleep ($pa_config->{'server_threshold'}); + next; + } + + my $operation = enterprise_hook('get_first_policy_queue', [$dbh]); + next unless (defined ($operation) && $operation ne ''); + + if($operation->{'operation'} eq 'apply' || $operation->{'operation'} eq 'apply_db') { + enterprise_hook('pandora_apply_policy', [$dbh, $pa_config, $operation->{'id_policy'}, $operation->{'id_agent'}, $operation->{'id'}, $operation->{'operation'}]); + } + elsif($operation->{'operation'} eq 'delete') { + if($operation->{'id_agent'} == 0) { + enterprise_hook('pandora_purge_policy_agents', [$dbh, $pa_config, $operation->{'id_policy'}]); + } + else { + enterprise_hook('pandora_delete_agent_from_policy', [$dbh, $pa_config, $operation->{'id_policy'}, $operation->{'id_agent'}]); + } + } + + enterprise_hook('pandora_finish_queue_operation', [$dbh, $operation->{'id'}]); + }}; # Check the queue each 5 seconds - sleep (5); + sleep(5); - my $operation = enterprise_hook('get_first_policy_queue', [$dbh]); - next unless (defined ($operation) && $operation ne ''); - - if($operation->{'operation'} eq 'apply' || $operation->{'operation'} eq 'apply_db') { - enterprise_hook('pandora_apply_policy', [$dbh, $pa_config, $operation->{'id_policy'}, $operation->{'id_agent'}, $operation->{'id'}, $operation->{'operation'}]); - } - elsif($operation->{'operation'} eq 'delete') { - if($operation->{'id_agent'} == 0) { - enterprise_hook('pandora_purge_policy_agents', [$dbh, $pa_config, $operation->{'id_policy'}]); - } - else { - enterprise_hook('pandora_delete_agent_from_policy', [$dbh, $pa_config, $operation->{'id_policy'}, $operation->{'id_agent'}]); - } - } - - enterprise_hook('pandora_finish_queue_operation', [$dbh, $operation->{'id'}]); } db_disconnect($dbh); diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index 02bb9f05ea..6271698c03 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -29,6 +29,7 @@ use Sys::Syslog; use Scalar::Util qw(looks_like_number); use LWP::UserAgent; use threads; +use threads::shared; # New in 3.2. Used to sendmail internally, without external scripts # use Module::Loaded; @@ -1864,7 +1865,7 @@ sub stop_server_threads { $THRRUN = 0; foreach my $thr (@ServerThreads) { - $thr->detach(); + $thr->join(); } @ServerThreads = (); From 51f57e9247fe56d3942ab0350d7fca55e50a0bbb Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 4 Jun 2019 15:54:32 +0200 Subject: [PATCH 09/12] Fix a typo. --- pandora_console/include/functions_snmp_browser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index f4297a49e9..ca2b2d055b 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -447,9 +447,9 @@ function snmp_browser_get_oid( $oid_data['description'] = $custom_data['description']; } - $full_value = explode(':', trim($full_oid[1])); + $full_value = explode(':', trim($value)); if (! isset($full_value[1])) { - $oid_data['value'] = trim($full_oid[1]); + $oid_data['value'] = trim($value); } else { $oid_data['type'] = trim($full_value[0]); $oid_data['value'] = trim($full_value[1]); From 95574adf80c6beece0c387f45510e10d47bfac02 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 5 Jun 2019 00:01:08 +0200 Subject: [PATCH 10/12] 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 41321b7837..84194913b7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.735-190604 +Version: 7.0NG.735-190605 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 dcd6e1773d..c5aa33342d 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.735-190604" +pandora_version="7.0NG.735-190605" 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 54f76969c7..8fefec9ec8 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.735'; -use constant AGENT_BUILD => '190604'; +use constant AGENT_BUILD => '190605'; # 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 432fb23bcc..0ca9923632 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.735 -%define release 190604 +%define release 190605 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 b60141796d..a4fc651f2d 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.735 -%define release 190604 +%define release 190605 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 b8bae000eb..ff2c1c7d80 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.735" -PI_BUILD="190604" +PI_BUILD="190605" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 2755e2bdea..a195ab96ee 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190604} +{190605} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0686c724f8..54994bfa82 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.735(Build 190604)") +#define PANDORA_VERSION ("7.0NG.735(Build 190605)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8650b54e46..fd912eae71 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.735(Build 190604))" + VALUE "ProductVersion", "(7.0NG.735(Build 190605))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6d045e7ee0..00e162ac2f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.735-190604 +Version: 7.0NG.735-190605 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 13cc28aa57..0e4d3c1331 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.735-190604" +pandora_version="7.0NG.735-190605" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a91ee7173c..3bbde1736a 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 = 'PC190604'; +$build_version = 'PC190605'; $pandora_version = 'v7.0NG.735'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 074e1e2960..9f646c86b8 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 86e0cd9036..73deb40880 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.735 -%define release 190604 +%define release 190605 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index fa2d8a0fbf..f0a73adbad 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.735 -%define release 190604 +%define release 190605 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index c104051082..a892f488c9 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.735" -PI_BUILD="190604" +PI_BUILD="190605" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c37bdc6a3e..465b86dbb0 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.735 PS190604"; +my $version = "7.0NG.735 PS190605"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index dc410bc5b6..d992deb676 100644 --- 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.735 PS190604"; +my $version = "7.0NG.735 PS190605"; # save program name for logging my $progname = basename($0); From 034a9100007a94afb55fb216a650f1e7054adbdd Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 6 Jun 2019 00:01:07 +0200 Subject: [PATCH 11/12] 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 84194913b7..3c0d3b213b 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.735-190605 +Version: 7.0NG.735-190606 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 c5aa33342d..5c5dc360d7 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.735-190605" +pandora_version="7.0NG.735-190606" 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 4a9f451e7e..715f9b732c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.735'; -use constant AGENT_BUILD => '190605'; +use constant AGENT_BUILD => '190606'; # 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 0ca9923632..ccc4adaa93 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.735 -%define release 190605 +%define release 190606 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 a4fc651f2d..250b1680e8 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.735 -%define release 190605 +%define release 190606 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 ff2c1c7d80..e3ded295d9 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.735" -PI_BUILD="190605" +PI_BUILD="190606" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index a195ab96ee..996467652e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190605} +{190606} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 54994bfa82..2ec76d3caa 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.735(Build 190605)") +#define PANDORA_VERSION ("7.0NG.735(Build 190606)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index fd912eae71..4fe3bfa1ab 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.735(Build 190605))" + VALUE "ProductVersion", "(7.0NG.735(Build 190606))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 00e162ac2f..a9798d9ae7 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.735-190605 +Version: 7.0NG.735-190606 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 0e4d3c1331..9c9491ea28 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.735-190605" +pandora_version="7.0NG.735-190606" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3bbde1736a..022278237a 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 = 'PC190605'; +$build_version = 'PC190606'; $pandora_version = 'v7.0NG.735'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9f646c86b8..3be39a4b63 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 73deb40880..c2687af73f 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.735 -%define release 190605 +%define release 190606 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index f0a73adbad..8b32b2a36e 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.735 -%define release 190605 +%define release 190606 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index a892f488c9..24c2167cff 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.735" -PI_BUILD="190605" +PI_BUILD="190606" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 465b86dbb0..ea856750f2 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.735 PS190605"; +my $version = "7.0NG.735 PS190606"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index d992deb676..b380959e56 100644 --- 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.735 PS190605"; +my $version = "7.0NG.735 PS190606"; # save program name for logging my $progname = basename($0); From 2d84081ca75bfe22bb81a411c7e9dfc4836b0795 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Thu, 6 Jun 2019 12:09:35 +0200 Subject: [PATCH 12/12] Add styles for metaconsole - #3614 --- pandora_console/include/styles/pandora.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 67ea6d74e0..126f5c02a7 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -6105,7 +6105,7 @@ div#status_pie { #table_services { display: grid; grid-gap: 20px; - grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); grid-template-rows: 1fr; margin-bottom: 30px; }