From a2d9aa81d0932ac601928ad2243a02826694899b Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 19 Jan 2023 14:44:30 +0100 Subject: [PATCH 001/234] #9895 Add description error login ldap --- pandora_console/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_console/index.php b/pandora_console/index.php index c712be0567..fed8053b4a 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -415,6 +415,7 @@ if (isset($config['id_user']) === false) { unset($_POST['auth_code'], $code); if (!$double_auth_success) { + $config['auth_error'] = __('Double auth error'); $login_failed = true; include_once 'general/login_page.php'; db_pandora_audit( @@ -440,6 +441,7 @@ if (isset($config['id_user']) === false) { } else if (($config['auth'] === 'saml') && ($login_button_saml)) { $saml_user_id = enterprise_hook('saml_process_user_login'); if (!$saml_user_id) { + $config['auth_error'] = __('saml error'); $login_failed = true; include_once 'general/login_page.php'; while (ob_get_length() > 0) { @@ -702,6 +704,7 @@ if (isset($config['id_user']) === false) { login_check_failed($nick); } + $config['auth_error'] = __('User is blocked'); $login_failed = true; } From fe507b2530de3f7a63b12b98d3ac7b16b6b3e4ac Mon Sep 17 00:00:00 2001 From: alejandro Date: Mon, 6 Feb 2023 13:32:19 +0100 Subject: [PATCH 002/234] Added log message in case of agent plugin failure --- pandora_agents/unix/pandora_agent | 1 + 1 file changed, 1 insertion(+) diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index f75da86403..806d961606 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -3741,6 +3741,7 @@ sub module_plugin ($) { # Do not save the output if there was an error if ($? != 0) { + log_message ('error', "plugin execution '". $command ."' exited with error code " . $?); return (); } From 971fc84a470b2ebd536c970cfe7bd7f82d264ab6 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 9 Feb 2023 10:12:59 +0100 Subject: [PATCH 003/234] 9680-Create widget ModulesByStatus --- .../images/widgets/ModulesByStatus.png | Bin 0 -> 5875 bytes pandora_console/include/ajax/module.php | 258 ++++++++ pandora_console/include/functions_html.php | 26 + .../include/lib/Dashboard/Widget.php | 1 + .../lib/Dashboard/Widgets/ModulesByStatus.php | 589 ++++++++++++++++++ 5 files changed, 874 insertions(+) create mode 100644 pandora_console/images/widgets/ModulesByStatus.png create mode 100644 pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php diff --git a/pandora_console/images/widgets/ModulesByStatus.png b/pandora_console/images/widgets/ModulesByStatus.png new file mode 100644 index 0000000000000000000000000000000000000000..796ff6382a7ae408cfa6e47897a50bf42f14a969 GIT binary patch literal 5875 zcmVA>GynXv&p&enqGNL2+tHE8O1n^) zgor16=J6?+6)c*7o>jS9??ktmJv-~WpQ}VjuyVEkrry;NJ&j4^Omet zL;t>YdolpM{Fpn)=~9K< zK6Ic8gTMWk_NZ=2gHT6GN{Z%XQ(ANJyb9m{&;r$tAVP|Zl?u6Q)CkoJ_8AO7o_sBn zj`}MCy*wU42A=L5)R$D!k~+NaASu37Ob#E|PAU&x|WRji3W7(q7fs;ztDZ`-TF z;7=ohN{SU0Dr=aw#jgs>$@jYLP?0Mu%A<+&Dl62xj2YupJ1;IDWW&SECRDItfMTBmXMv?v4nQrqBr$;_LM=TYC>!x&_HruTltpVh>Y-7znQ1D z2Mm|kL;$$^vrnI$@#C2o?%1xT-587?*y&>gS`F6#QqskjSN-l5^s_ehxCqOdG?G9A z?LM`(pGP<}Asi?W7L^bN=-Ci4Zx%0GONy&`XtdujA$F8PGT^9l$2PQYBIMkKVztGs zTeg^d@ntTesP>9AM-F-!=CLEa!o&_Zvn3!XOf2~zl+HVW}1n%^)X4TEu(HJwZ=0s}Gb|o-R{!<0N6G8= zZezjZSmx0PKX{_r5dbHS{g>Uz$;qTTsF1=+fH*U&p8vUW`;hMsMk-MdDz%5)mhu;59S zh>$FY1EC~Itdd2sGW-4!wR0szHn4RQ;=3gST3xUp2hYrUXiO0w7?Dss3Gfj^1<0PB zskK}+p`6XTTgkz)9z3!e{)o!JbF$`z1-}Y~LY9*-y^PQXeB|M|&*iXTkXY0(k*b{A zy?>uNiDPk{xQBP|-hJkR#p|?o1jJEY(AcqKNpW$pHlZ_10VjQkgZ^Q|hDFF8Ry6n+Uvq2#6y~4QBckX5h_1u@M6m=P@7Y48we=(PQfBeId6G$GJU5xNy z;J;Es1@EJC1^NR6Lpf`pdV9T5GXvtNGJtHZ)R2g|11#OyU)f*YXVcZ(rZUp7sKZZ} zi@0(^8^ZY&)O-r#xdc309D&f!Q{l&B3^`(}ch|nP3pH5Q0XJwv!aehPMWjFH4Vt00 znGrCU(itWMm{7e*N_%y65JAa!)QB1XKfe-5uhc*U`;t#QCBcx(?lj!dw}-Ol&~X78 z=~>z!gS6Ptplr|v_!GZBhQXTs?A(VVs^U+6Fsxi1H~6-sQMlkp?j#&~I5V?G8=w-A zSg3Wz!JppSQ{Ac15`xUrtrCGQ3GaxP5sz1@er(E!0ydtAgxCO>GzvkbHw!a!i=uKR zd+PU27~vQuWJCaP$b=LQr#qQ0o5jb6L8e0fddE156oORvRzsyI=)96T#E^>{wY5N_SmCQY9X*p+VlB8?>T<_ zILXh?CxZtMCVThpC4K2QclvoWdg_t@BKnFd=;JwE08y!T<*6 z1yaZ_cQrx)cujTXt)-=WV2NBSXz_w{G1Cgz1@h8PKC|)25B->;`y| z^frLl3`$<#X}VqCg@x6JyOQn;6<5_RxG=ryuos=WHt=FP`_ZFfr(bM1zYt&-X}I!0 ze0E)>w?&G0Xu|?RZ<7(jS=%u~EHTdn8-{M!5e3t!LmPEh6ya!hzA=NYcy^#y*M=34 zU1N(OID$cgM=|JU!w?2G9Mzx!oIwM+5&}PJSejXL=aK0(Pm)sZ&`3pO{@|D=7z{8F zeWxvktX5?DQCmYR=)C+)Q5kvZmkUghVMRA{-qX6PI-bxLLp+fkzgZi)f5J$*w_n}xd5a@Ed^ys4gAXWCH zecB^W5&}OHlU+wsuiZAN2b9ouQcf8Xo6$`*lMJ#!mE~n*`ExFI+a3}sV|9Yq#O%6D zsYFV+S^>LIXmD4G^`je@;SU5c4DH&@CF^cG$ty%3z+)t6zq|gWvCCJiSbS5Lt_afX zN;)vY2{P>1*N3_9uAYP*q(tn?vgyJJj<#a8+Fx3`^r@v~rNwu%5!9Dk6vg1Ee|>Ob z|G~pA7^N9;_Jv4^JZ!@>+_q8I1LM^sgaEXymgR`o5H>Ei_0l$Eh)0fBRfmtyiQnk3 zST7FS4CxW`Fm(e`6jQ=V1iI)B+67!5xi6(PoxTYvR6=oA<77$Of{oSRRw}o z-kKZAva<(KouT-RV`g9{b=5oD(uI(mMrcvTp9L-kS`vyR7R{b~cOl&*aWoj%Vg^cG zZe7!j1OqL(q!aJ;CRKyKDWX{Q_|%cLTD5f%L@=}Z zt?dJquxz>u8B4;6q7gh|c-FL$+6qr&W^HcX?IGHQCMw}X#Y@$}?adN=?UiS;>Dr{;+mR$mmHh^OXZ^6z_eY-#*JW7r$``Yzj6SWdM$H(xRCKP{ z+v|S4ot`F$Ua$MZidg|-SZ;3aJxi9%JvC?1E0Yk$+I9IqEv$Ykud5PP+OmPHd+F0N zcbzzKLaUB!Sbe%FL*#=`KAUDFA;BYD_LwmOneEf3k0Q%5S-W;E2?PSFjefB8e&KMK zz>g1e3TNr3PMt~)?)~gXMg<6bSZ;d284H~0Oqw)_R8&-`b{V~PGkNl4!?PZv1bMjL znGTD?hg<0zS~9~%?$pg^2I-C97;a>Tg8rL~!T@f`OhLh65|28eS>k44FvA25L77p0 zp~rxc8e?1pmdy0+e;aYCvdE?3*bCcQu>D)Xoq$XqHSnTYWR}dB5xWug!jk96*>55> z?P0T#RY!XAnWd_tyj6ORnECol5&7zLl*+T31}ZLshd%}}f&o1Li(E2lw&|5IbraFf z344$3y))2hYCB@au4FQY z^^Z!FKd?fCf9&~Ey@~-lrffUGa3{7UGq5|)o)kEV+zxJl>V(3{0)I2c4lR#k$qcB; zChBk(daWwj1xs}1XPFT`=Q@5j;?RlK8U%wO=p4WD;$l*GF0yOpsjum-dHVe$RYu^V zFsSBV*IhG6q?{Ywd1=JrcT~;X=$g~h+eBz{T(@0wxxe<%3MP?g-rjlyopIZil5wkR zuA=H&B?&%#vt-7NuDP0yB{Dr|Z~+&Mj~Y8dz4^hP zOe14(tz=E78_}z4KSochuZdYR+}5ryZ@yp!4USi z;L(|eHkQ?l-n@W{qZS?CH4pnvKXr8H88Olh1ZMfJ8SeSbdBb3OP**zX{WDY-JepJo z(zPTw3NSkf_`kpBYjuF_nsL_=-mKzHpWFNKAnooaACQ}8Z`OSN%qf!AG2>I79{uW( zhTdCChyZr~JBB^7_?bmf%^K!g{PrnJ=ce0VQ%xS9I$D|ZqxpX^iWm4$s~H@l8J(Vu znK)zbfn7Vt4Hjrl2YECy{pdSB+T!Yik4mmuY2V=J*IdVDA)y?T}f@8 zFZZIr|$s@53PRclnJTBFj?YK=S-vHEj%)2e%tG!ILDU)Ue=(J8l&YI6ES zK}>20%_`84k`*~1$bz3p9>2#Y`8^?@pL8Qt*@N8CA$3|-+9bd!p%wn-&4-dMkjt%n z;b5vDds41P4KO1fK{HGd!{uI&x2z>;TRLS*-vpclFf%lxjM#y%*!V%Js3fNe9;KBX z{Kkxp}5mqw&%UqTp9#>Fn&R;U!MF zv?Uyv0j%8gaYr#Mb#$6Q6Mkd~$ez&oIa5cUrz&evEBQ!Fi*5~8231Mk9%0#)Q+qz` zZ?)eel2G$N@VK5LJr;~^%YmmzLe=4(vK-P4N8%$2RN=fx$CegxTypx|vV{u*)fJPsY}q2hgGAqEbMoX#GJgDcIVrj2JCDr!_0m|% zqLNwuEyYpGJvwEq-6qS6AMou50H!0@%^3YvZwCxuoz;3>rg|7 z4)vhcD%?Bi-McqQr5{THL4g53y$+)KX_u$^)6&wk@EDT4=1HJTc7MJvreOl)0dkR) z>OgBExHmL-JRU-ywblv`gweBSPt6b4!C*W>16NewK{@uS3c?VFwK2>tK1+K&xj`-x z{d$Lw(1lE_Cg88`Q&3Pq=FOWIYZQ%=4$1_|CRXM^E>gTZz)8O3g1-F+46pC2MX@p+ zFCDxE10S3KrB2YgGg8EX$Dj`F-Bl24dLWkuIX90r!wpFXdo8R`K-DYJCZWRNb#v@6 zWA@@#UjBiohZ*6b5_`YL4i1|SxFh%8ySXI&>M+O#+jfJd{pfL7>eGU@i7XHkDjZhV z$RZ!Mg5f(tyy0QIAMo{H7!O=t1i@HcEu=u}v{x@Xx%H`z5rZei}h%msz-7~O_278ts-EeOcKG@}^NvLq# z%xI$Gf-j3cwdfgD*%k+UquVHn%7an7t_a7ehQ3i|8UhYiO;w>#8@{RHmVq*f*SI1a zCpQk_&9GbaFck)&gs4D3CK7$e#+AaT%OI3VyvEJ^MCHY7LJ);q2QZr`*qJ6<;lMb8 z-4`q(b6#3ZKK^slRN6=$w&8kHVjjl(A##MVLcuo-VEWrMmF7fX)wY5;8z=bqD1J5wLweDqd;0^QV8uVycSkqLREe#X5-OWje z0>1GJUvsz?jVmqZTA512=44IXjxpS=tB=h|BcV1;rJ0feVN{0{`Zfdo8WcS{^wF7Y zL#m@TO{J+II?#7m1`X*)TMP(?kb->&qrOc6H&XR3a)NB(qVv{2zDWl8nt?ZF1CI=R zcfxd6yGU2MH6xDPo)F-am`(3OVKFIXZlCLYG(-=Eallj>1hdTIT@A!Hvf=fIrd?^B z(s8musY8Cvg08EUb07T-6%P1Do0CS*ffz{ur_zsEynJRvk8pSwCHvdBD-8=r6bk>s z0TxcIcGFZk#*%}nFe?<8Dqks2Z<&6qhf} z8_TYA=g#d(+w?Sb9}G7qF+w}jWIH$*AJ{OJ&fAhphTIG*q}UBS3X?hBJp~Vti$uTo z<5vWa`K!h;=GnW{RP3Sw0H*z@r`VFt;fx& zG{{8~l9Nj48Ery@W7cwTS6V%ZtP=_>BAZNY34mOr^Y;xe?6`4j$5@rweLi1N!J&gN zR%>^Cuz<~44k%H;J8aNWKqz+BDt4yHc5pC%VB=JJ#s~53O2a!=GnuLMi6aMOC>u5{ zyKXwrC?J=(@8_uBEP3_6-|yGIf4iLDZ?x2i2PxtlHuU&xi2^ zy0gY&N-h_X6JH)8TmSdHQ1PY0P{$j)JwNp)PyJ6U{6*bt!${n^6G}7aJ9%_}dS&UA z>um;%Md8S9(dve(ZoLK+wrQ7c@nLi0Xie{gvSdxSsoBy*Iw{2%0koIH%28B4Nv&nH_=H(Ley8IlIW{Z!KPQE8vNC$NYUu~ z;Jvj9`rcZw>Af}m0connect(); + + $sql = sprintf( + 'SELECT + tagente_modulo.nombre, + tagente.alias, + tagente.id_agente, + tagente_estado.last_status_change, + tagente_estado.estado + FROM tagente_modulo + INNER JOIN tagente + ON tagente_modulo.id_agente = tagente.id_agente + INNER JOIN tagente_estado + ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + WHERE %s', + $where + ); + + $res_sql = db_get_all_rows_sql($sql); + + foreach ($res_sql as $row_sql) { + $row_sql['server_name'] = $node->server_name(); + $row_sql['server_url'] = $node->server_url(); + array_push($data, $row_sql); + } + + $node->disconnect(); + } catch (\Exception $e) { + // Unexistent modules. + $node->disconnect(); + } + } + + // Drop temporary table if exist. + db_process_sql('DROP TEMPORARY TABLE IF EXISTS temp_modules_status;'); + + $table_temporary = 'CREATE TEMPORARY TABLE IF NOT EXISTS temp_modules_status ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + nombre VARCHAR(600), + alias VARCHAR(600), + id_agente INT, + last_status_change INT, + estado INT, + server_name VARCHAR(100), + server_url VARCHAR(200), + PRIMARY KEY (`id`), + KEY `nombre` (`nombre`(600)) + )'; + db_process_sql($table_temporary); + + $result = db_process_sql_insert_multiple('temp_modules_status', $data); + + if (empty($result) === false) { + $data = []; + $sql = ''; + $where = ''; + + if (empty($search) === false) { + $where = 'nombre LIKE "%%'.$search.'%%" AND '; + } + + $where .= sprintf( + 'estado IN (%s)', + $status + ); + + $order_by = $order['field'].' '.$order['direction']; + + $sql = sprintf( + 'SELECT + nombre, + alias, + id_agente, + last_status_change, + estado, + server_name, + server_url + FROM temp_modules_status + WHERE %s + ORDER BY %s + LIMIT %d, %d', + $where, + $order_by, + $start, + $length + ); + $data = db_get_all_rows_sql($sql); + + $sql_count = sprintf( + 'SELECT COUNT(*) AS "total" + FROM temp_modules_status' + ); + + $recordsTotal = db_get_value_sql($sql_count); + } + } + + if ($data === false) { + $data = []; + } + + foreach ($data as $key => $row) { + $data[$key]['nombre'] = html_ellipsis_characters($row['nombre'], 35, true); + + if (is_metaconsole() === false) { + $name_link = ''; + $name_link .= ''; + + $data[$key]['alias'] = $name_link; + + $data[$key]['last_status_change'] = ui_print_timestamp( + $row['last_status_change'], + true + ); + + switch ((int) $row['estado']) { + case 0: + $status_img = ui_print_status_image(STATUS_MODULE_OK, __('Normal'), true); + break; + + case 1: + case 6: + $status_img = ui_print_status_image(STATUS_MODULE_CRITICAL, __('Critical'), true); + break; + + case 2: + $status_img = ui_print_status_image(STATUS_MODULE_WARNING, __('Warning'), true); + break; + + case 3: + $status_img = ui_print_status_image(STATUS_MODULE_UNKNOWN, __('Unknown'), true); + break; + + case 5: + $status_img = ui_print_status_image(STATUS_MODULE_NO_DATA, __('Not init'), true); + break; + + default: + $status_img = ''; + break; + } + + $data[$key]['estado'] = $status_img; + } + + echo json_encode( + [ + 'data' => $data, + 'recordsTotal' => $recordsTotal, + 'recordsFiltered' => $recordsTotal, + ] + ); + } + if ($get_children_modules === true) { $parent_modules = get_parameter('parent_modulues', false); $children_selected = []; diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 31c2e5214a..4ace0131ab 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -6361,3 +6361,29 @@ function html_print_extended_select_for_downtime_cron( echo $returnString; } } + + +/** + * Ellipse string to x characters. + * + * @param string $string String to ellipsis. + * @param integer $characters Characters size to show. + * @return string String ellipsed. + */ +function html_ellipsis_characters( + string $string, + int $characters, + bool $return=false +) { + $out = $string; + + if (strlen($string) > $characters) { + $out = substr($string, 0, $characters).'...'; + } + + if ($return === true) { + return $out; + } else { + echo $out; + } +} \ No newline at end of file diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php index 2753b8a55d..3b4e47cb35 100644 --- a/pandora_console/include/lib/Dashboard/Widget.php +++ b/pandora_console/include/lib/Dashboard/Widget.php @@ -420,6 +420,7 @@ class Widget case 'ColorModuleTabs': case 'BlockHistogram': case 'DataMatrix': + case 'ModulesByStatus': $className .= '\\'.$name; break; diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php new file mode 100644 index 0000000000..8191607616 --- /dev/null +++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php @@ -0,0 +1,589 @@ +width = $width; + + // Height. + $this->height = $height; + + // Grid Width. + $this->gridWidth = $gridWidth; + + // Cell Id. + $this->cellId = $cellId; + + // Options. + $this->values = $this->decoders($this->getOptionsWidget()); + + // Positions. + $this->position = $this->getPositionWidget(); + + // Page. + $this->page = basename(__FILE__); + + // ClassName. + $class = new \ReflectionClass($this); + $this->className = $class->getShortName(); + + // Title. + $this->title = __('Module status'); + + // Name. + if (empty($this->name) === true) { + $this->name = 'ModulesByStatus'; + } + + // This forces at least a first configuration. + // This forces at least a first configuration. + $this->configurationRequired = false; + if (empty($this->values['status']) === true) { + $this->configurationRequired = true; + } + + $this->overflow_scrollbars = false; + } + + + /** + * Decoders hack for retrocompability. + * + * @param array $decoder Values. + * + * @return array Returns the values ​​with the correct key. + */ + public function decoders(array $decoder): array + { + $values = []; + // Retrieve global - common inputs. + $values = parent::decoders($decoder); + + if (isset($decoder['search']) === true) { + $values['search'] = $decoder['search']; + } + + if (isset($decoder['status']) === true) { + $values['status'] = $decoder['status']; + } + + if (isset($decoder['limit']) === true) { + $values['limit'] = $decoder['limit']; + } + + if (isset($decoder['nodes']) === true) { + $values['nodes'] = $decoder['nodes']; + } + + return $values; + } + + + /** + * Generates inputs for form (specific). + * + * @return array Of inputs. + * + * @throws Exception On error. + */ + public function getFormInputs(): array + { + global $config; + + $values = $this->values; + + // Retrieve global - common inputs. + $inputs = parent::getFormInputs(); + + // Search. + $inputs[] = [ + 'label' => __('Free search').ui_print_help_tip(__('Search filter by Module name field content'), true), + 'arguments' => [ + 'name' => 'search', + 'type' => 'text', + 'value' => $values['search'], + 'return' => true, + 'size' => 0, + ], + ]; + + // Status fields. + $status_fields = []; + $status_fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal'); + $status_fields[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical'); + $status_fields[AGENT_MODULE_STATUS_WARNING] = __('Warning'); + $status_fields[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown'); + $status_fields[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init'); + $status_fields[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal'); + $status_selected = explode(',', $values['status']); + + (isset($values['status']) === false) ? $status_selected = AGENT_MODULE_STATUS_WARNING : ''; + + $inputs[] = [ + 'label' => __('Status'), + 'arguments' => [ + 'name' => 'status', + 'type' => 'select', + 'fields' => $status_fields, + 'selected' => $status_selected, + 'return' => true, + 'multiple' => true, + 'class' => 'overflow-hidden', + 'size' => count($status_fields), + 'select_all' => false, + 'required' => true, + ], + ]; + + // Limit fields. + $limit_fields = []; + $limit_fields[5] = 5; + $limit_fields[10] = 10; + $limit_fields[25] = 25; + $limit_fields[100] = 100; + $limit_fields[200] = 200; + $limit_fields[500] = 500; + $limit_fields[1000] = 1000; + $limit_selected = explode(',', $values['limit']); + + (isset($values['limit']) === false) ? $limit_selected = 5 : ''; + + $inputs[] = [ + 'label' => __('Limit'), + 'arguments' => [ + 'name' => 'limit', + 'type' => 'select', + 'fields' => $limit_fields, + 'selected' => $limit_selected, + 'return' => true, + 'required' => true, + 'select2_enable' => false, + ], + ]; + + if (is_metaconsole() === true) { + // Nodes fields. + $nodes_fields = []; + $servers_ids = array_column(metaconsole_get_servers(), 'id'); + foreach ($servers_ids as $server_id) { + $nodes_fields[$server_id] = $server_id; + } + + $nodes_selected = explode(',', $values['nodes']); + + (isset($values['nodes']) === false) ? $nodes_selected = '' : ''; + + $inputs[] = [ + 'label' => __('Nodes'), + 'arguments' => [ + 'name' => 'nodes', + 'type' => 'select', + 'fields' => $nodes_fields, + 'selected' => $nodes_selected, + 'return' => true, + 'multiple' => true, + 'class' => 'overflow-hidden', + 'size' => count($nodes_fields), + 'select_all' => false, + 'required' => true, + ], + ]; + } + + return $inputs; + } + + + /** + * Get Post for widget. + * + * @return array + */ + public function getPost():array + { + // Retrieve global - common inputs. + $values = parent::getPost(); + + $values['search'] = \get_parameter('search', ''); + $values['status'] = \get_parameter('status', ''); + $values['limit'] = \get_parameter('limit', ''); + $values['nodes'] = \get_parameter('nodes', ''); + + return $values; + } + + + /** + * Draw widget. + * + * @return string; + */ + public function load() + { + $this->size = parent::getSize(); + + $output = ''; + + if (is_metaconsole() === true) { + $modules = []; + + $servers_ids = array_column(metaconsole_get_servers(), 'id'); + + foreach ($servers_ids as $server_id) { + try { + $node = new Node((int) $server_id); + + $node->connect(); + $modules_tmp = $this->getInfoModules( + $this->values['search'], + $this->values['status'], + $this->values['nodes'] + ); + $modules[$node->id()] = $modules_tmp[0]; + $node->disconnect(); + } catch (\Exception $e) { + // Unexistent modules. + $node->disconnect(); + } + } + } else { + $modules = $this->getInfoModules( + $this->values['search'], + $this->values['status'] + ); + } + + if ($modules !== false && empty($modules) === false) { + // Datatables list. + try { + $info_columns = $this->columns(); + $column_names = $info_columns['column_names']; + $columns = $info_columns['columns']; + + $tableId = 'ModuleByStatus_'.$this->dashboardId.'_'.$this->cellId; + // Load datatables user interface. + ui_print_datatable( + [ + 'id' => $tableId, + 'class' => 'info_table align-left-important', + 'style' => 'width: 100%', + 'columns' => $columns, + 'column_names' => $column_names, + 'ajax_url' => 'include/ajax/module', + 'ajax_data' => [ + 'get_data_ModulesByStatus' => 1, + 'table_id' => $tableId, + 'search' => $this->values['search'], + 'status' => $this->values['status'], + 'nodes' => $this->values['nodes'], + ], + 'default_pagination' => $this->values['limit'], + 'order' => [ + 'field' => 'last_status_change', + 'direction' => 'desc', + ], + 'csv' => 0, + ] + ); + } catch (\Exception $e) { + echo $e->getMessage(); + } + } else { + $output = ''; + $output .= '
'; + $output .= \ui_print_info_message( + __('Not found modules'), + '', + true + ); + $output .= '
'; + + return $output; + } + } + + + /** + * Get info modules. + * + * @param string $search Free search. + * @param string $status Modules status. + * + * @return array Data. + */ + private function getInfoModules(string $search, string $status): array + { + if (empty($search) === false) { + $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND '; + } + + $where .= sprintf( + 'tagente_estado.estado IN (%s) + AND tagente_modulo.delete_pending = 0', + $status + ); + + $sql = sprintf( + 'SELECT + COUNT(*) AS "modules" + FROM tagente_modulo + INNER JOIN tagente + ON tagente_modulo.id_agente = tagente.id_agente + INNER JOIN tagente_estado + ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + WHERE %s', + $where + ); + + $modules = db_get_all_rows_sql($sql); + + if ($modules === false) { + $modules = []; + } + + return $modules; + } + + + /** + * Get columns. + * + * @return array + */ + private function columns() + { + $columns = []; + $column_names = []; + + if (is_metaconsole() === true) { + $column_names = [ + __('Module name'), + __('Agent'), + __('Node'), + __('Last status change'), + __('Status'), + ]; + + $columns = [ + 'nombre', + 'alias', + 'server_name', + 'last_status_change', + 'estado', + ]; + } else { + $column_names = [ + __('Module name'), + __('Agent'), + __('Last status change'), + __('Status'), + ]; + + $columns = [ + 'nombre', + 'alias', + 'last_status_change', + 'estado', + ]; + } + + $data = [ + 'columns' => $columns, + 'column_names' => $column_names, + ]; + + return $data; + } + + + /** + * Get description. + * + * @return string. + */ + public static function getDescription() + { + return __('Modules by status'); + } + + + /** + * Get Name. + * + * @return string. + */ + public static function getName() + { + return 'ModulesByStatus'; + } + + + /** + * Get size Modal Configuration. + * + * @return array + */ + public function getSizeModalConfiguration(): array + { + if (is_metaconsole() === true) { + $nodes_fields = array_column(metaconsole_get_servers(), 'id'); + + $height_counter = (((int) count($nodes_fields)) * 20); + + $size = [ + 'width' => 450, + 'height' => (520 + $height_counter), + ]; + } else { + $size = [ + 'width' => 450, + 'height' => 480, + ]; + } + + return $size; + } + + +} From f35acde8ebb822694f364843b7eb8ca9503019e0 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 9 Feb 2023 10:37:12 +0100 Subject: [PATCH 004/234] 9680-Create widget ModulesByStatus --- .../include/lib/Dashboard/Widgets/ModulesByStatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php index 8191607616..e2c83ca59d 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php +++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php @@ -258,7 +258,7 @@ class ModulesByStatus extends Widget $status_fields[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal'); $status_selected = explode(',', $values['status']); - (isset($values['status']) === false) ? $status_selected = AGENT_MODULE_STATUS_WARNING : ''; + (isset($values['status']) === false) ? $status_selected = AGENT_MODULE_STATUS_CRITICAL_BAD : ''; $inputs[] = [ 'label' => __('Status'), From b439ed684ee04ea181a751aca841dfe864e4ae2b Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Fri, 10 Feb 2023 10:31:41 +0100 Subject: [PATCH 005/234] 9859-Widget AvgSumMaxMinModule --- .../images/widgets/AvgSumMaxMinModule.png | Bin 0 -> 5984 bytes .../include/lib/Dashboard/Widget.php | 1 + .../Dashboard/Widgets/AvgSumMaxMinModule.php | 701 ++++++++++++++++++ 3 files changed, 702 insertions(+) create mode 100644 pandora_console/images/widgets/AvgSumMaxMinModule.png create mode 100644 pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php diff --git a/pandora_console/images/widgets/AvgSumMaxMinModule.png b/pandora_console/images/widgets/AvgSumMaxMinModule.png new file mode 100644 index 0000000000000000000000000000000000000000..19e980f38dda95f64625f15bcbda86269fb91cf0 GIT binary patch literal 5984 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 = $width; + + // Height. + $this->height = $height; + + // Grid Width. + $this->gridWidth = $gridWidth; + + // Cell Id. + $this->cellId = $cellId; + + // Options. + $this->values = $this->decoders($this->getOptionsWidget()); + + // Positions. + $this->position = $this->getPositionWidget(); + + // Page. + $this->page = basename(__FILE__); + + // ClassName. + $class = new \ReflectionClass($this); + $this->className = $class->getShortName(); + + // Title. + $this->title = __('Avg|Sum|Max|Min Module Data'); + + // Name. + if (empty($this->name) === true) { + $this->name = 'AvgSumMaxMinModule'; + } + + // This forces at least a first configuration. + $this->configurationRequired = false; + if (empty($this->values['moduleId']) === true) { + $this->configurationRequired = true; + } else { + try { + if (is_metaconsole() === true + && $this->values['metaconsoleId'] > 0 + ) { + $node = new Node($this->values['metaconsoleId']); + $node->connect(); + } + + $check_exist = db_get_sql( + sprintf( + 'SELECT id_agente_modulo + FROM tagente_modulo + WHERE id_agente_modulo = %s + AND delete_pending = 0', + $this->values['moduleId'] + ) + ); + } catch (\Exception $e) { + // Unexistent agent. + if (is_metaconsole() === true + && $this->values['metaconsoleId'] > 0 + ) { + $node->disconnect(); + } + + $check_exist = false; + } finally { + if (is_metaconsole() === true + && $this->values['metaconsoleId'] > 0 + ) { + $node->disconnect(); + } + } + + if ($check_exist === false) { + $this->loadError = true; + } + } + + $this->overflow_scrollbars = false; + } + + + /** + * Decoders hack for retrocompability. + * + * @param array $decoder Values. + * + * @return array Returns the values ​​with the correct key. + */ + public function decoders(array $decoder): array + { + $values = []; + // Retrieve global - common inputs. + $values = parent::decoders($decoder); + + if (isset($decoder['label_'.$this->cellId]) === true) { + $values['label'] = $decoder['label_'.$this->cellId]; + } + + if (isset($decoder['label']) === true) { + $values['label'] = $decoder['label']; + } + + if (isset($decoder['id_agent_'.$this->cellId]) === true) { + $values['agentId'] = $decoder['id_agent_'.$this->cellId]; + } + + if (isset($decoder['type_'.$this->cellId]) === true) { + $values['type'] = $decoder['type_'.$this->cellId]; + } + + if (isset($decoder['type']) === true) { + $values['type'] = $decoder['type']; + } + + if (isset($decoder['period_'.$this->cellId]) === true) { + $values['period'] = $decoder['period_'.$this->cellId]; + } + + if (isset($decoder['period']) === true) { + $values['period'] = $decoder['period']; + } + + if (isset($decoder['agentId']) === true) { + $values['agentId'] = $decoder['agentId']; + } + + if (isset($decoder['metaconsoleId']) === true) { + $values['metaconsoleId'] = $decoder['metaconsoleId']; + } + + if (isset($decoder['id_module_'.$this->cellId]) === true) { + $values['moduleId'] = $decoder['id_module_'.$this->cellId]; + } + + if (isset($decoder['moduleId']) === true) { + $values['moduleId'] = $decoder['moduleId']; + } + + if (isset($decoder['size_value_'.$this->cellId]) === true) { + $values['sizeValue'] = $decoder['size_value_'.$this->cellId]; + } + + if (isset($decoder['sizeValue']) === true) { + $values['sizeValue'] = $decoder['sizeValue']; + } + + if (isset($decoder['size_label_'.$this->cellId]) === true) { + $values['sizeLabel'] = $decoder['size_label_'.$this->cellId]; + } + + if (isset($decoder['sizeLabel']) === true) { + $values['sizeLabel'] = $decoder['sizeLabel']; + } + + if (isset($decoder['text_color_'.$this->cellId]) === true) { + $values['text_color'] = $decoder['text_color_'.$this->cellId]; + } + + if (isset($decoder['text_color']) === true) { + $values['text_color'] = $decoder['text_color']; + } + + if (isset($decoder['unit_'.$this->cellId]) === true) { + $values['unit'] = $decoder['unit_'.$this->cellId]; + } + + if (isset($decoder['unit']) === true) { + $values['unit'] = $decoder['unit']; + } + + return $values; + } + + + /** + * Generates inputs for form (specific). + * + * @return array Of inputs. + * + * @throws Exception On error. + */ + public function getFormInputs(): array + { + global $config; + + $values = $this->values; + + // Default values. + if (isset($values['sizeLabel']) === false) { + $values['sizeLabel'] = 20; + } + + if (isset($values['sizeValue']) === false) { + $values['sizeValue'] = 20; + } + + // Retrieve global - common inputs. + $inputs = parent::getFormInputs(); + + // Label. + $inputs[] = [ + 'label' => __('Label'), + 'arguments' => [ + 'name' => 'label', + 'type' => 'text', + 'value' => $values['label'], + 'return' => true, + 'size' => 0, + ], + ]; + + // Type. + $type_fields = []; + $type_fields[0] = 'AVG'; + $type_fields[1] = 'SUM'; + $type_fields[2] = 'MAX'; + $type_fields[3] = 'MIN'; + $type_selected = explode(',', $values['type']); + + (isset($values['type']) === false) ? $type_selected = 0 : ''; + + $inputs[] = [ + 'label' => __('Type'), + 'arguments' => [ + 'name' => 'type', + 'type' => 'select', + 'fields' => $type_fields, + 'selected' => $type_selected, + 'return' => true, + 'required' => true, + 'select2_enable' => false, + 'sort' => false, + ], + ]; + + // Period. + $period_fields = []; + $period_fields[0] = __('Last 30 days'); + $period_fields[1] = __('This month'); + $period_fields[2] = __('Last 7 days'); + $period_fields[3] = __('This week'); + $period_fields[4] = __('Last 24 hrs'); + $period_fields[5] = __('Today'); + $period_selected = explode(',', $values['period']); + + (isset($values['period']) === false) ? $period_selected = 0 : ''; + + $inputs[] = [ + 'label' => __('Time period'), + 'arguments' => [ + 'name' => 'period', + 'type' => 'select', + 'fields' => $period_fields, + 'selected' => $period_selected, + 'return' => true, + 'required' => true, + 'select2_enable' => false, + 'sort' => false, + ], + ]; + + // Autocomplete agents. + $inputs[] = [ + 'label' => __('Agent'), + 'arguments' => [ + 'type' => 'autocomplete_agent', + 'name' => 'agentAlias', + 'id_agent_hidden' => $values['agentId'], + 'name_agent_hidden' => 'agentId', + 'server_id_hidden' => $values['metaconsoleId'], + 'name_server_hidden' => 'metaconsoleId', + 'return' => true, + 'module_input' => true, + 'module_name' => 'moduleId', + 'module_none' => false, + 'size' => 0, + ], + ]; + + // Autocomplete module. + $inputs[] = [ + 'label' => __('Module'), + 'arguments' => [ + 'type' => 'autocomplete_module', + 'name' => 'moduleId', + 'selected' => $values['moduleId'], + 'return' => true, + 'sort' => false, + 'agent_id' => $values['agentId'], + 'metaconsole_id' => $values['metaconsoleId'], + 'style' => 'width: inherit;', + 'filter_modules' => (users_access_to_agent($values['agentId']) === false) ? [$values['moduleId']] : [], + 'nothing' => __('None'), + 'nothing_value' => 0, + ], + ]; + + // Text size of value in px. + $inputs[] = [ + 'label' => __('Text size of value in px'), + 'arguments' => [ + 'name' => 'sizeValue', + 'type' => 'number', + 'value' => $values['sizeValue'], + 'return' => true, + 'min' => 0, + ], + ]; + + // Text size of label in px. + $inputs[] = [ + 'label' => __('Text size of label in px'), + 'arguments' => [ + 'name' => 'sizeLabel', + 'type' => 'number', + 'value' => $values['sizeLabel'], + 'return' => true, + 'min' => 0, + ], + ]; + + // Text color. + if (empty($values['text_color']) === true) { + $values['text_color'] = '#000000'; + + if ($config['style'] === 'pandora_black' + && is_metaconsole() === false + ) { + $values['text_color'] = '#eeeeee'; + } + } + + $inputs[] = [ + 'label' => __('Text color'), + 'arguments' => [ + 'wrapper' => 'div', + 'name' => 'text_color', + 'type' => 'color', + 'value' => $values['text_color'], + 'return' => true, + ], + ]; + + // Unit. + $inputs[] = [ + 'label' => __('Unit'), + 'arguments' => [ + 'wrapper' => 'div', + 'name' => 'unit', + 'type' => 'switch', + 'value' => $values['unit'], + 'return' => true, + ], + ]; + + return $inputs; + } + + + /** + * Get Post for widget. + * + * @return array + */ + public function getPost():array + { + // Retrieve global - common inputs. + $values = parent::getPost(); + + $values['label'] = \get_parameter('label', ''); + $values['type'] = \get_parameter('type', 0); + $values['period'] = \get_parameter('period', 0); + $values['agentId'] = \get_parameter('agentId', 0); + $values['metaconsoleId'] = \get_parameter('metaconsoleId', 0); + $values['moduleId'] = \get_parameter('moduleId', 0); + $values['sizeValue'] = \get_parameter('sizeValue', 0); + $values['sizeLabel'] = \get_parameter_switch('sizeLabel'); + $values['text_color'] = \get_parameter('text_color', 0); + $values['unit'] = \get_parameter_switch('unit'); + + return $values; + } + + + /** + * Draw widget. + * + * @return string; + */ + public function load() + { + global $config; + + $output = ''; + $text_color = 'color:'.$this->values['text_color'].' !important;'; + + $id_module = $this->values['moduleId']; + + $to = 0; + $now = time(); + + switch ((int) $this->values['period']) { + case 0: + $to = strtotime('-30 days'); + break; + + case 1: + $to = strtotime(date('Y-m-01 00:00:00')); + break; + + case 2: + $to = strtotime('-7 days'); + break; + + case 3: + $to = strtotime('last Monday'); + break; + + case 4: + $to = strtotime('-1 days'); + break; + + case 5: + $to = strtotime(date('Y-m-d 00:00:00')); + break; + + default: + $to = 0; + break; + } + + $data = 0; + switch ((int) $this->values['type']) { + case 0: + $rows = modules_get_raw_data($id_module, $to, $now); + $count = (int) count($rows); + $sum = 0; + foreach ($rows as $row) { + $sum += (int) $row['datos']; + } + + $data = ($sum / $count); + break; + + case 1: + $rows = modules_get_raw_data($id_module, $to, $now); + $sum = 0; + foreach ($rows as $row) { + $sum += (int) $row['datos']; + } + + $data = $sum; + break; + + case 2: + $rows = modules_get_min_max_data($id_module, $to); + + $data = $rows[0]['max']; + break; + + case 3: + $rows = modules_get_min_max_data($id_module, $to); + + $data = $rows[0]['min']; + break; + + default: + $data = 0; + break; + } + + $label = $this->values['label']; + $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40; + $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40; + + $output .= '
'; + // General div. + $output .= '
'; + // Div value. + $output .= '
'; + + if (is_numeric($data) === true) { + $dataDatos = remove_right_zeros( + number_format( + $data, + $config['graph_precision'], + $config['decimal_separator'], + $config['thousand_separator'] + ) + ); + } else { + $dataDatos = trim($data); + } + + $unit = ''; + if (empty($this->values['unit']) === false) { + $unit = modules_get_unit($id_module); + } + + $output .= $dataDatos.' '.$unit; + + $output .= '
'; + + if (empty($label) === false) { + // Div Label. + $output .= '
'.$label.'
'; + } + + $output .= '
'; + $output .= '
'; + return $output; + } + + + /** + * Get description. + * + * @return string. + */ + public static function getDescription() + { + return __('Avg|Sum|Max|Min Module Data'); + } + + + /** + * Get Name. + * + * @return string. + */ + public static function getName() + { + return 'AvgSumMaxMinModule'; + } + + + /** + * Get size Modal Configuration. + * + * @return array + */ + public function getSizeModalConfiguration(): array + { + $size = [ + 'width' => 550, + 'height' => 710, + ]; + + return $size; + } + + +} From 0125ba742b53269d879f7e3ca295662dc277acef Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 15 Feb 2023 11:42:50 +0100 Subject: [PATCH 006/234] 9680-Create widget ModulesByStatus --- .../lib/Dashboard/Widgets/ModulesByStatus.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php index e2c83ca59d..21fa53d21c 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php +++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php @@ -302,17 +302,23 @@ class ModulesByStatus extends Widget ], ]; + // Nodes. if (is_metaconsole() === true) { - // Nodes fields. $nodes_fields = []; - $servers_ids = array_column(metaconsole_get_servers(), 'id'); - foreach ($servers_ids as $server_id) { - $nodes_fields[$server_id] = $server_id; + $servers_ids = metaconsole_get_servers(); + + foreach ($servers_ids as $server) { + $nodes_fields[$server['id']] = $server['server_name']; } $nodes_selected = explode(',', $values['nodes']); - (isset($values['nodes']) === false) ? $nodes_selected = '' : ''; + (isset($values['nodes']) === false) ? $nodes_selected = $servers_ids : ''; + + $nodes_height = count($nodes_fields); + if (count($nodes_fields) > 5) { + $nodes_height = 5; + } $inputs[] = [ 'label' => __('Nodes'), @@ -324,7 +330,7 @@ class ModulesByStatus extends Widget 'return' => true, 'multiple' => true, 'class' => 'overflow-hidden', - 'size' => count($nodes_fields), + 'size' => $nodes_height, 'select_all' => false, 'required' => true, ], From d447b621dec6055cd4cc1c670da37d3d1bc48875 Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 16 Feb 2023 13:16:41 +0100 Subject: [PATCH 007/234] Fix events comment tags acl --- pandora_console/include/functions_events.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 48ef7b2c30..9d6aa611d5 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3476,7 +3476,7 @@ function events_page_responses($event) // Comments. $data = []; - $data[0] = __('Comment'); + $data[0] = __('Comsssment'); $data[1] = ''; $data[2] = html_print_button( __('Add comment'), @@ -5168,10 +5168,6 @@ function events_page_comments($event, $ajax=false, $groupedComments=[]) true ); $comments_form .= '
'; - } else { - $comments_form = ui_print_message( - __('If event replication is ongoing, it won\'t be possible to enter comments here. This option is only to allow local pandora users to see comments, but not to operate with them. The operation, when event replication is enabled, must be done only in the Metaconsole.') - ); } if ($ajax === true) { @@ -5196,9 +5192,10 @@ function events_clean_tags($tags) } $event_tags = tags_get_tags_formatted($tags, false); + $event_tags = str_replace(' ', '', $event_tags); $event_tags = io_safe_input($event_tags); - return explode(',', str_replace(' ', '', $event_tags)); + return explode(',', $event_tags); } From f70ab4c44d53b429ebbd2240167d5b2530a4f464 Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 16 Feb 2023 16:57:11 +0100 Subject: [PATCH 008/234] Fix misspell --- pandora_console/include/functions_events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 9d6aa611d5..8c6c6fb8e3 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3476,7 +3476,7 @@ function events_page_responses($event) // Comments. $data = []; - $data[0] = __('Comsssment'); + $data[0] = __('Comment'); $data[1] = ''; $data[2] = html_print_button( __('Add comment'), From 6efaa2bbc605747c02e1922ebb326e130addee97 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 21 Feb 2023 15:06:15 +0100 Subject: [PATCH 009/234] #8642 Added heatmap widget --- pandora_console/include/class/Heatmap.class.php | 4 +++- pandora_console/include/lib/Dashboard/Widget.php | 4 ++++ pandora_console/operation/heatmap.php | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php index 8572d6cad1..bab7f8fd85 100644 --- a/pandora_console/include/class/Heatmap.class.php +++ b/pandora_console/include/class/Heatmap.class.php @@ -25,6 +25,8 @@ * GNU General Public License for more details. * ============================================================================ */ + +namespace PandoraFMS; class Heatmap { @@ -159,7 +161,7 @@ class Heatmap ], ]; - echo '
'; + echo '
'; ?> '; $table->data[1][0] = ''.__('Daemon interval').''; $table->data[1][1] = html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true); diff --git a/pandora_console/godmode/setup/setup_sflow.php b/pandora_console/godmode/setup/setup_sflow.php new file mode 100644 index 0000000000..2610bc3361 --- /dev/null +++ b/pandora_console/godmode/setup/setup_sflow.php @@ -0,0 +1,84 @@ +width = '100%'; +$table->border = 0; +$table->cellspacing = 3; +$table->cellpadding = 5; +$table->class = 'databox filters'; + +$table->data = []; + +$table->data[0][0] = ''.__('Data storage path').''; +$table->data[0][1] = html_print_input_text('sflow_name_dir', $config['sflow_name_dir'], false, 50, 200, true); +$table->data[0][1] .= ''; + + +$table->data[1][0] = ''.__('Daemon interval').''; +$table->data[1][1] = html_print_input_text('sflow_interval', $config['sflow_interval'], false, 50, 200, true); + +$table->data[2][0] = ''.__('Daemon binary path').''; +$table->data[2][1] = html_print_input_text('sflow_daemon', $config['sflow_daemon'], false, 50, 200, true); + +$table->data[3][0] = ''.__('Nfdump binary path').''; +$table->data[3][1] = html_print_input_text('sflow_nfdump', $config['sflow_nfdump'], false, 50, 200, true); + +$table->data[4][0] = ''.__('Nfexpire binary path').''; +$table->data[4][1] = html_print_input_text('sflow_nfexpire', $config['sflow_nfexpire'], false, 50, 200, true); + +$table->data[5][0] = ''.__('Maximum chart resolution').''; +$table->data[5][1] = html_print_input_text('sflow_max_resolution', $config['sflow_max_resolution'], false, 50, 200, true); + +$table->data[6][0] = ''.__('Disable custom live view filters').''; +$table->data[6][1] = html_print_checkbox_switch('sflow_disable_custom_lvfilters', 1, $config['sflow_disable_custom_lvfilters'], true); +$table->data[7][0] = ''.__('Max. sflow lifetime').''; +$table->data[7][1] = html_print_input_text('sflow_max_lifetime', $config['sflow_max_lifetime'], false, 50, 200, true); + +$table->data[8][0] = ''.__('Name resolution for IP address').''; +$onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; +$table->data[8][1] = html_print_checkbox_switch_extended('sflow_get_ip_hostname', 1, $config['sflow_get_ip_hostname'], false, $onclick, '', true); + +echo '
'; + +html_print_table($table); + +// Update button. +echo '
'; + html_print_input_hidden('update_config', 1); + html_print_submit_button(__('Update'), 'upd_button', false, 'class="sub upd"'); +echo '
'; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 24d2de537d..66b978a0d2 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -260,6 +260,24 @@ function config_update_config() $error_update[] = __('Enable Netflow'); } + if (config_update_value('activate_sflow', (bool) get_parameter('activate_sflow'), true) === false) { + $error_update[] = __('Enable Sflow'); + } + + if (config_update_value('general_network_path', get_parameter('general_network_path'), true) === false) { + $error_update[] = __('General network path'); + } else { + if (empty($config['netflow_name_dir']) === false && $config['netflow_name_dir'] !== '') { + $path = get_parameter('general_network_path'); + config_update_value('netflow_path', $path.$config['netflow_name_dir']); + } + + if (empty($config['sflow_name_dir']) === false && $config['sflow_name_dir'] !== '') { + $path = get_parameter('general_network_path'); + config_update_value('sflow_path', $path.$config['sflow_name_dir']); + } + } + $timezone = (string) get_parameter('timezone'); if (empty($timezone) === true || config_update_value('timezone', $timezone, true) === false) { $error_update[] = __('Timezone setup'); @@ -1501,8 +1519,13 @@ function config_update_config() break; case 'net': - if (config_update_value('netflow_path', get_parameter('netflow_path'), true) === false) { - $error_update[] = __('Data storage path'); + if (config_update_value('netflow_name_dir', get_parameter('netflow_name_dir'), true) === false) { + $error_update[] = __('Name storage path'); + } else { + if (empty($config['general_network_path']) === false && $config['general_network_path'] !== '') { + $name = get_parameter('netflow_name_dir'); + config_update_value('netflow_path', $config['general_network_path'].$name); + } } if (config_update_value('netflow_interval', (int) get_parameter('netflow_interval'), true) === false) { @@ -1538,6 +1561,49 @@ function config_update_config() } break; + case 'sflow': + if (config_update_value('sflow_name_dir', get_parameter('sflow_name_dir'), true) === false) { + $error_update[] = __('Sflow name dir'); + } else { + if (empty($config['general_network_path']) === false && $config['general_network_path'] !== '') { + $name = get_parameter('sflow_name_dir'); + config_update_value('sflow_path', $config['general_network_path'].$name); + } + } + + if (config_update_value('sflow_interval', (int) get_parameter('sflow_interval'), true) === false) { + $error_update[] = __('Daemon interval'); + } + + if (config_update_value('sflow_daemon', get_parameter('sflow_daemon'), true) === false) { + $error_update[] = __('Daemon binary path'); + } + + if (config_update_value('sflow_nfdump', get_parameter('sflow_nfdump'), true) === false) { + $error_update[] = __('Nfdump binary path'); + } + + if (config_update_value('sflow_nfexpire', get_parameter('sflow_nfexpire'), true) === false) { + $error_update[] = __('Nfexpire binary path'); + } + + if (config_update_value('sflow_max_resolution', (int) get_parameter('sflow_max_resolution'), true) === false) { + $error_update[] = __('Maximum chart resolution'); + } + + if (config_update_value('sflow_disable_custom_lvfilters', get_parameter('sflow_disable_custom_lvfilters'), true) === false) { + $error_update[] = __('Disable custom live view filters'); + } + + if (config_update_value('sflow_max_lifetime', (int) get_parameter('sflow_max_lifetime'), true) === false) { + $error_update[] = __('Sflow max lifetime'); + } + + if (config_update_value('sflow_get_ip_hostname', (int) get_parameter('sflow_get_ip_hostname'), true) === false) { + $error_update[] = __('Name resolution for IP address'); + } + break; + case 'log': if (config_update_value('elasticsearch_ip', get_parameter('elasticsearch_ip'), true) === false) { $error_update[] = __('IP ElasticSearch server'); @@ -2768,6 +2834,28 @@ function config_process_config() config_update_value('activate_netflow', 0); } + if (!isset($config['activate_sflow'])) { + config_update_value('activate_sflow', 0); + } + + if (!isset($config['general_network_path'])) { + if ($is_windows) { + $default = 'C:\PandoraFMS\Pandora_Server\data_in\\'; + } else { + $default = '/var/spool/pandora/data_in/'; + } + + config_update_value('general_network_path', $default); + } + + if (!isset($config['netflow_name_dir'])) { + config_update_value('netflow_name_dir', 'netflow'); + } + + if (!isset($config['sflow_name_dir'])) { + config_update_value('sflow_name_dir', 'sflow'); + } + if (!isset($config['netflow_path'])) { if ($is_windows) { $default = 'C:\PandoraFMS\Pandora_Server\data_in\netflow'; @@ -2806,6 +2894,48 @@ function config_process_config() config_update_value('netflow_max_lifetime', '5'); } + if (!isset($config['sflow_interval'])) { + config_update_value('sflow_interval', SECONDS_10MINUTES); + } + + if (!isset($config['sflow_daemon'])) { + config_update_value('sflow_daemon', '/usr/bin/nfcapd'); + } + + if (!isset($config['sflow_nfdump'])) { + config_update_value('sflow_nfdump', '/usr/bin/nfdump'); + } + + if (!isset($config['sflow_nfexpire'])) { + config_update_value('sflow_nfexpire', '/usr/bin/nfexpire'); + } + + if (!isset($config['sflow_max_resolution'])) { + config_update_value('sflow_max_resolution', '50'); + } + + if (!isset($config['sflow_disable_custom_lvfilters'])) { + config_update_value('sflow_disable_custom_lvfilters', 0); + } + + if (!isset($config['sflow_max_lifetime'])) { + config_update_value('sflow_max_lifetime', '5'); + } + + if (!isset($config['sflow_name_dir'])) { + config_update_value('sflow_name_dir', 'sflow'); + } + + if (!isset($config['sflow_path'])) { + if ($is_windows) { + $default = 'C:\PandoraFMS\Pandora_Server\data_in\sflow'; + } else { + $default = '/var/spool/pandora/data_in/sflow'; + } + + config_update_value('sflow_path', $default); + } + if (!isset($config['auth'])) { config_update_value('auth', 'mysql'); } diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index e4ac71e690..be271ef974 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -1025,9 +1025,29 @@ function netflow_get_command($options, $filter) // Build command. $command = io_safe_output($config['netflow_nfdump']).' -N'; - // Netflow data path. - if (isset($config['netflow_path']) && $config['netflow_path'] != '') { - $command .= ' -R. -M '.$config['netflow_path']; + if ($config['activate_sflow'] && $config['activate_netflow']) { + if (isset($config['sflow_name_dir']) && $config['sflow_name_dir'] !== '' + && isset($config['netflow_name_dir']) && $config['netflow_name_dir'] !== '' + && isset($config['general_network_path']) && $config['general_network_path'] !== '' + ) { + $command .= ' -R. -M '.$config['general_network_path'].$config['netflow_name_dir'].':'.$config['sflow_name_dir']; + } + } else { + if ($config['activate_sflow']) { + if (isset($config['sflow_name_dir']) && $config['sflow_name_dir'] !== '' + && isset($config['general_network_path']) && $config['general_network_path'] !== '' + ) { + $command .= ' -R. -M '.$config['general_network_path'].$config['sflow_name_dir']; + } + } + + if ($config['activate_netflow']) { + if (isset($config['netflow_name_dir']) && $config['netflow_name_dir'] !== '' + && isset($config['general_network_path']) && $config['general_network_path'] !== '' + ) { + $command .= ' -R. -M '.$config['general_network_path'].$config['netflow_name_dir']; + } + } } // Add options. @@ -1035,7 +1055,7 @@ function netflow_get_command($options, $filter) // Filter options. $command .= ' '.netflow_get_filter_arguments($filter); - + hd($command, true); return $command; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 62984b4078..7dd1126cd9 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -205,7 +205,7 @@ if ($access_console_node === true) { $sub['operation/inventory/inventory']['refr'] = 0; } - if ($config['activate_netflow']) { + if ($config['activate_netflow'] || $config['activate_sflow']) { $sub['network_traffic'] = [ 'text' => __('Network'), 'id' => 'Network', @@ -213,34 +213,20 @@ if ($access_console_node === true) { 'subtype' => 'nolink', 'refr' => 0, ]; - - // Initialize the submenu. - $netflow_sub = []; - - $netflow_sub = array_merge( - $netflow_sub, - [ - 'operation/netflow/netflow_explorer' => [ - 'text' => __('Netflow explorer'), - 'id' => 'Netflow explorer', - ], - 'operation/netflow/nf_live_view' => [ - 'text' => __('Netflow Live View'), - 'id' => 'Netflow Live View', - ], - ] - ); - - $netflow_sub = array_merge( - $netflow_sub, - [ - 'operation/network/network_usage_map' => [ - 'text' => __('Network usage map'), - 'id' => 'Network usage map', - ], - ] - ); - + $netflow_sub = [ + 'operation/netflow/netflow_explorer' => [ + 'text' => __('Netflow explorer'), + 'id' => 'Netflow explorer', + ], + 'operation/netflow/nf_live_view' => [ + 'text' => __('Netflow Live View'), + 'id' => 'Netflow Live View', + ], + 'operation/network/network_usage_map' => [ + 'text' => __('Network usage map'), + 'id' => 'Network usage map', + ], + ]; $sub['network_traffic']['sub2'] = $netflow_sub; } diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index acb6636dca..f79f17b8cd 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -72,6 +72,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('stats_interval', '60'), ('activate_gis', '0'), ('activate_netflow', '0'), +('activate_sflow', '0'), +('general_network_path', '/var/spool/pandora/data_in/'), ('timezone', 'Europe/Berlin'), ('string_purge', 7), ('audit_purge', 15), @@ -87,6 +89,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('netflow_daemon', '/usr/bin/nfcapd'), ('netflow_nfdump', '/usr/bin/nfdump'), ('netflow_max_resolution', '50'), +('sflow_interval', '3600'), +('sflow_daemon', '/usr/bin/nfcapd'), +('sflow_nfdump', '/usr/bin/nfdump'), +('sflow_max_resolution', '50'), ('event_fields', 'mini_severity,evento,estado,agent_name,timestamp'), ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,last_status_change,graph,warn,data,timestamp'), ('list_ACL_IPs_for_API', '127.0.0.1'), From a4d1d2c9b23a2a077bd6dad9aa69d4347aec4027 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 11 Mar 2023 01:00:20 +0100 Subject: [PATCH 053/234] 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 5a6b6e4894..0a32463988 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230310 +Version: 7.0NG.769-230311 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 0ff5c31c0b..818a7dfae0 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.769-230310" +pandora_version="7.0NG.769-230311" 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 0e6522165b..6d80b6ff83 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230310'; +use constant AGENT_BUILD => '230311'; # 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 c23d462fd1..e5f98516a4 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230310 +%define release 230311 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 33324b25e1..7fa9acc2c3 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230310 +%define release 230311 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 ab50df62d1..6f6ba7ccc4 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230310" +PI_BUILD="230311" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8d6bea8586..21581e29b2 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230310} +{230311} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 024db5dc39..c3602378d9 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.769 Build 230310") +#define PANDORA_VERSION ("7.0NG.769 Build 230311") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 63db898d79..cbccd60e65 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.769(Build 230310))" + VALUE "ProductVersion", "(7.0NG.769(Build 230311))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index de8bff7c41..187c697b96 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230310 +Version: 7.0NG.769-230311 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 486224eab7..ab21f4a778 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.769-230310" +pandora_version="7.0NG.769-230311" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3ad202b031..5a644be4dc 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 = 'PC230310'; +$build_version = 'PC230311'; $pandora_version = 'v7.0NG.769'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index eb75f84d09..cb931e1931 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7f657e1ab8..42a1c0735a 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230310 +%define release 230311 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index adbe75189b..3d9164a73c 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230310 +%define release 230311 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index da483f4b7d..0fceb4999e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230310" +PI_BUILD="230311" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6942f8e4fe..cf74e3a4a0 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.769 Build 230310"; +my $version = "7.0NG.769 Build 230311"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 15ff91c2b8..8dd39c6752 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.769 Build 230310"; +my $version = "7.0NG.769 Build 230311"; # save program name for logging my $progname = basename($0); From 39ace106296008af33212072efc6c2f1546237d8 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Sat, 11 Mar 2023 02:08:37 +0100 Subject: [PATCH 054/234] Fix image issue with Networkmap --- pandora_console/operation/agentes/pandora_networkmap.editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php index 4450e101ea..14d04dcc60 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.editor.php +++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php @@ -275,7 +275,7 @@ if ($not_found) { } else { if ($disabled_source === false) { echo '
'; - echo html_print_image('images/spinner.gif', true, 'width: 50px;height: 50px;'); + echo html_print_image('images/spinner.gif', true, ['width' => '50px', 'height' => '50px']); echo '
'.__('Creating map...').'
'; echo '
'; $info1 = __('To create a network map that visually recreates link-level (L2) relationships, you must first discover these relationships with Discovery Server. Network maps only reflect relationships that have already been discovered.'); From f553019a404e2ad075e1cde7a99f4305dfb46d7c Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Sat, 11 Mar 2023 02:10:16 +0100 Subject: [PATCH 055/234] Minor fixes --- pandora_console/include/styles/pandora.css | 1 + pandora_console/include/styles/pandora_black.css | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 5a340c3218..f3a2e32799 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11262,6 +11262,7 @@ span.subsection_header_title { span.subsection_header_title.secondary { height: 14px; + line-height: 14px; } .regular_font { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 9a0a6ac63e..94c87cd1fc 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1111,6 +1111,7 @@ select, border: 1px solid #707070; background-color: #222 !important; color: #fff !important; + border-radius: 0; } .white_table_graph { @@ -1475,13 +1476,6 @@ span.select2-dropdown.select2-dropdown--below { z-index: 1200; } -div.fixed_filter_bar, -div.white_table_graph_header { - border-radius: 0; - border-left: 0px; - border-right: 0px; -} - div.white_table_graph { border-radius: 0; } @@ -1502,3 +1496,9 @@ table.filter-table-adv td > div label { #principal_action_buttons { background: #111111; } +div.fixed-bottom-box, +div.fixed-bottom-box + > div.fixed-bottom-box-head + > div.fixed-bottom-box-head-body { + background-color: #111111 !important; +} From ef04e54058f40e7326cb00013baaf4de8f8fa767 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 12 Mar 2023 01:00:40 +0100 Subject: [PATCH 056/234] 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 0a32463988..8cb75d2199 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230311 +Version: 7.0NG.769-230312 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 818a7dfae0..97696c12a9 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.769-230311" +pandora_version="7.0NG.769-230312" 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 6d80b6ff83..1d44d5ff12 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230311'; +use constant AGENT_BUILD => '230312'; # 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 e5f98516a4..453ae23d37 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230311 +%define release 230312 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 7fa9acc2c3..35f6aa06c0 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230311 +%define release 230312 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 6f6ba7ccc4..ac1c2c241c 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230311" +PI_BUILD="230312" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 21581e29b2..ed2843992d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230311} +{230312} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c3602378d9..3c010ae74f 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.769 Build 230311") +#define PANDORA_VERSION ("7.0NG.769 Build 230312") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index cbccd60e65..eb988c71cc 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.769(Build 230311))" + VALUE "ProductVersion", "(7.0NG.769(Build 230312))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 187c697b96..781bfd3b59 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230311 +Version: 7.0NG.769-230312 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 ab21f4a778..829b62c00f 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.769-230311" +pandora_version="7.0NG.769-230312" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 5a644be4dc..b3341342d8 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 = 'PC230311'; +$build_version = 'PC230312'; $pandora_version = 'v7.0NG.769'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index cb931e1931..676f79a973 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 42a1c0735a..39a650ee84 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230311 +%define release 230312 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 3d9164a73c..9d017bd114 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230311 +%define release 230312 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 0fceb4999e..19f13fafb9 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230311" +PI_BUILD="230312" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index cf74e3a4a0..be892298a4 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.769 Build 230311"; +my $version = "7.0NG.769 Build 230312"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8dd39c6752..23ba6cbdc0 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.769 Build 230311"; +my $version = "7.0NG.769 Build 230312"; # save program name for logging my $progname = basename($0); From 87e165ff806935dc634435c6f73e89adf22463ce Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 13 Mar 2023 01:00:18 +0100 Subject: [PATCH 057/234] 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 8cb75d2199..e6553ada2f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230312 +Version: 7.0NG.769-230313 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 97696c12a9..cadc4a6fd2 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.769-230312" +pandora_version="7.0NG.769-230313" 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 1d44d5ff12..f828e1a7ae 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230312'; +use constant AGENT_BUILD => '230313'; # 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 453ae23d37..4ff8cf8848 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230312 +%define release 230313 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 35f6aa06c0..6705e0ee72 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230312 +%define release 230313 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 ac1c2c241c..06c37d34cd 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230312" +PI_BUILD="230313" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ed2843992d..60ebc7abad 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230312} +{230313} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3c010ae74f..e7aeba8540 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.769 Build 230312") +#define PANDORA_VERSION ("7.0NG.769 Build 230313") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index eb988c71cc..394e2e2be5 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.769(Build 230312))" + VALUE "ProductVersion", "(7.0NG.769(Build 230313))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 781bfd3b59..020733306e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230312 +Version: 7.0NG.769-230313 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 829b62c00f..5a23822ad2 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.769-230312" +pandora_version="7.0NG.769-230313" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b3341342d8..9fa5ae55f2 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 = 'PC230312'; +$build_version = 'PC230313'; $pandora_version = 'v7.0NG.769'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 676f79a973..94fba1f271 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 39a650ee84..f12dce0155 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230312 +%define release 230313 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9d017bd114..6b03f847d1 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230312 +%define release 230313 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 19f13fafb9..b14901c613 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230312" +PI_BUILD="230313" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index be892298a4..1d7dd60493 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.769 Build 230312"; +my $version = "7.0NG.769 Build 230313"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 23ba6cbdc0..37c365cfcd 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.769 Build 230312"; +my $version = "7.0NG.769 Build 230313"; # save program name for logging my $progname = basename($0); From 596ade6d3706a54b9cf5a5c9ccf185ed6b618ead Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 13 Mar 2023 09:14:16 +0100 Subject: [PATCH 058/234] #10324 added system fav in tactical view group --- pandora_console/godmode/groups/tactical.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandora_console/godmode/groups/tactical.php b/pandora_console/godmode/groups/tactical.php index 037af05723..d7984c3212 100644 --- a/pandora_console/godmode/groups/tactical.php +++ b/pandora_console/godmode/groups/tactical.php @@ -74,6 +74,12 @@ if (is_metaconsole() === false) { 'link' => '', 'label' => __('Tactic group'), ], + ], + [ + 'id_element' => $id_group, + 'url' => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group, + 'label' => groups_get_name($id_group), + 'section' => 'Tactic_group', ] ); } From bbec6a92a4c065c49d41f82a1d98f1402a334ca8 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 09:35:12 +0100 Subject: [PATCH 059/234] Minor fixes --- pandora_console/godmode/category/category.php | 5 +---- pandora_console/include/functions_treeview.php | 12 ++++++------ pandora_console/include/functions_ui.php | 14 ++++++++++---- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index aa3a23778d..935d2c1d5d 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -262,10 +262,7 @@ if ($is_management_allowed === true) { [ 'icon' => 'next' ], true ), - [ - 'type' => 'form_action', - 'right_content' => $tablePagination, - ] + [ 'right_content' => $tablePagination ] ); echo ''; diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index e93910ec15..86367a1097 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -727,8 +727,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) false, false, '', - 'white-box-content', - 'white_table_flex margin-bottom-10 border-bottom-gray' + 'white-box-content mrgn_top_0 mrgn_btn_0px', + 'white_table_flex' ); if ($config['agentaccess']) { @@ -747,8 +747,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) true, false, '', - 'white-box-content border-bottom-gray', - 'white_table_flex margin-top-10 margin-bottom-10' + 'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray', + 'white_table_flex' ); } @@ -920,8 +920,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) true, false, '', - 'white-box-content border-bottom-gray', - 'white_table_flex margin-top-10 margin-bottom-10' + 'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray', + 'white_table_flex' ); if (empty($server_data) === false && is_metaconsole() === true) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d272ee224a..8df6dc2fa1 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4327,7 +4327,10 @@ function ui_toggle( $image_a = html_print_image( $img_a, true, - [ 'style' => 'rotate: '.$rotateA ], + [ + 'class' => 'mrgn_right_10px', + 'style' => 'rotate: '.$rotateA, + ], true ); } else { @@ -4338,7 +4341,10 @@ function ui_toggle( $image_b = html_print_image( $img_b, true, - [ 'style' => 'rotate: '.$rotateB ], + [ + 'class' => 'mrgn_right_10px', + 'style' => 'margin-right:10px; rotate: '.$rotateB, + ], true ); } else { @@ -4401,7 +4407,7 @@ function ui_toggle( $original, true, [ - 'class' => 'float-left main_menu_icon', + 'class' => 'float-left main_menu_icon mrgn_right_10px', 'style' => 'object-fit: contain; margin-right:10px; rotate:'.$imageRotate, 'title' => $title, 'id' => 'image_'.$uniqid, @@ -4433,7 +4439,7 @@ function ui_toggle( $original, true, [ - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon mrgn_right_10px', 'style' => 'object-fit: contain; float:right; margin-right:10px; rotate:'.$imageRotate, 'title' => $title, 'id' => 'image_'.$uniqid, From daae94f904f1d03e5dc6db2a2b33feb6b4f6027f Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 13 Mar 2023 09:49:44 +0100 Subject: [PATCH 060/234] #9624 deleted General network path from database --- pandora_console/pandoradb_data.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index f79f17b8cd..0e75acb879 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -73,7 +73,6 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('activate_gis', '0'), ('activate_netflow', '0'), ('activate_sflow', '0'), -('general_network_path', '/var/spool/pandora/data_in/'), ('timezone', 'Europe/Berlin'), ('string_purge', 7), ('audit_purge', 15), From f79d22b7813af682fba1140f0ff4efae7a572fab Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 13 Mar 2023 09:57:57 +0100 Subject: [PATCH 061/234] #9624 clear log --- pandora_console/include/functions_netflow.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index be271ef974..89a6110b2e 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -1055,7 +1055,6 @@ function netflow_get_command($options, $filter) // Filter options. $command .= ' '.netflow_get_filter_arguments($filter); - hd($command, true); return $command; } From 80076434b34d44b73eda55b180a457efb90cab93 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 13 Mar 2023 10:29:03 +0100 Subject: [PATCH 062/234] SNMP visual fix staticts --- .../include/class/SnmpConsole.class.php | 140 +++++------------- pandora_console/include/functions_ui.php | 9 +- pandora_console/include/styles/pandora.css | 18 +++ .../operation/snmpconsole/snmp_statistics.php | 29 ++-- 4 files changed, 79 insertions(+), 117 deletions(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index ec7e3394dd..f1895dfc51 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -181,113 +181,47 @@ class SnmpConsole extends HTML $default_refr = 300; - if (!isset($config['pure']) || $config['pure'] === false) { - $statistics['text'] = ''.html_print_image( - 'images/logs@svg.svg', - true, - [ - 'title' => __('Statistics'), - 'class' => 'main_menu_icon invert_filter', - ] - ).''; - $list['text'] = ''.html_print_image( - 'images/SNMP-network-numeric-data@svg.svg', - true, - [ - 'title' => __('List'), - 'class' => 'main_menu_icon invert_filter', - ] - ).''; - $list['active'] = true; + $statistics['text'] = ''.html_print_image( + 'images/logs@svg.svg', + true, + [ + 'title' => __('Statistics'), + 'class' => 'main_menu_icon invert_filter', + ] + ).''; + $list['text'] = ''.html_print_image( + 'images/SNMP-network-numeric-data@svg.svg', + true, + [ + 'title' => __('List'), + 'class' => 'main_menu_icon invert_filter', + ] + ).''; + $list['active'] = true; - $screen['text'] = ''.html_print_image( - 'images/fullscreen@svg.svg', - true, + // Header. + ui_print_standard_header( + __('SNMP Console'), + 'images/op_snmp.png', + false, + 'snmp_console', + false, + [ + $screen, + $list, + $statistics, + ], + [ [ - 'title' => __('View in full screen'), - 'class' => 'main_menu_icon invert_filter', - ] - ).''; - - // Header. - ui_print_standard_header( - __('SNMP Console'), - 'images/op_snmp.png', - false, - 'snmp_console', - false, - [ - $screen, - $list, - $statistics, + 'link' => '', + 'label' => __('Monitoring'), ], [ - [ - 'link' => '', - 'label' => __('Monitoring'), - ], - [ - 'link' => '', - 'label' => __('SNMP'), - ], - ] - ); - } else { - echo '
'; - - echo ''; - - echo '
'; - - ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/'); - ui_require_css_file('pandora_dashboard', ENTERPRISE_DIR.'/include/styles/'); - ui_require_css_file('cluetip', 'include/styles/js/'); - - ui_require_jquery_file('countdown'); - ui_require_javascript_file('pandora_dashboard', ENTERPRISE_DIR.'/include/javascript/'); - ui_require_javascript_file('wz_jsgraphics'); - ui_require_javascript_file('pandora_visual_console'); - } + 'link' => '', + 'label' => __('SNMP'), + ], + ] + ); // Datatables list. try { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d272ee224a..5a19b69da3 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -5044,6 +5044,8 @@ function ui_print_page_header( $breadcrumbs='', $hide_left_small=false ) { + global $config; + $title = io_safe_input_html($title); if (($icon == '') && ($godmode == true)) { $icon = 'images/gm_setup.png'; @@ -5057,13 +5059,18 @@ function ui_print_page_header( $type = 'view'; $type2 = 'menu_tab_frame_view'; $separator_class = 'separator'; + $div_style = ''; } else { $type = 'view'; $type2 = 'menu_tab_frame_view'; $separator_class = 'separator_view'; + $div_style = ''; + if ($config['pure'] === true) { + $div_style = 'top:0px;'; + } } - $buffer = '
'; + $buffer = '
'; if (!empty($breadcrumbs)) { $buffer .= '
'; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 4d8f807bdb..14f078855c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11635,3 +11635,21 @@ ul.tag-editor { padding-left: 5px !important; font-size: 20px !important; } + +div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget { + background-color: var(--primary-color); + color: #fff; + border: 1px solid var(--primary-color); + border-radius: 8px; + font-size: 11pt; +} + +div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:hover { + background-color: #1d7873; + border-color: #1d7873; +} + +div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:active { + background-color: #0d312f; + border-color: #0d312f; +} diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php index 0ebc548496..ec5dfd9837 100755 --- a/pandora_console/operation/snmpconsole/snmp_statistics.php +++ b/pandora_console/operation/snmpconsole/snmp_statistics.php @@ -57,16 +57,18 @@ if ($config['pure']) { ).''; } -// List -$list = []; -$list['text'] = ''.html_print_image( - 'images/SNMP-network-numeric-data@svg.svg', - true, - [ - 'title' => __('List'), - 'class' => 'main_menu_icon invert_filter', - ] -).''; +if ($config['pure'] === false) { + // List. + $list = []; + $list['text'] = ''.html_print_image( + 'images/SNMP-network-numeric-data@svg.svg', + true, + [ + 'title' => __('List'), + 'class' => 'main_menu_icon invert_filter', + ] + ).''; +} // Statistics (This file) $statistics = []; @@ -165,10 +167,9 @@ $water_mark = [ // By SOURCE $table_source = new StdClass(); $table_source->width = '100%'; -$table_source->class = 'databox data'; +$table_source->class = 'info_table'; $table_source->head[] = __('Traps received by source').' - '.sprintf(__('Top %d'), 25); $table_source->head_colspan[] = 2; -$table_source->headstyle[] = 'background-color: #82b92e'; $table_source->size = []; $table_source->size['table'] = '50%'; $table_source->size['graph'] = '50%'; @@ -182,6 +183,7 @@ $table_source_data->head = []; $table_source_data->head['source'] = __('Source IP'); $table_source_data->head['num'] = __('Number'); $table_source_data->data = []; +$table_source_data->class = 'info_table'; $table_source_graph_data = []; $labels = []; @@ -239,9 +241,9 @@ unset($table_source); // By OID $table_oid = new StdClass(); $table_oid->width = '100%'; +$table_oid->class = 'info_table'; $table_oid->head[] = __('Traps received by Enterprise String').' - '.sprintf(__('Top %d'), 25); $table_oid->head_colspan[] = 2; -$table_oid->headstyle[] = 'background-color: #82b92e'; $table_oid->size = []; $table_oid->size['table'] = '50%'; $table_oid->size['graph'] = '50%'; @@ -255,6 +257,7 @@ $table_oid_data->head = []; $table_oid_data->head['oid'] = __('Trap Enterprise String'); $table_oid_data->head['num'] = __('Number'); $table_oid_data->data = []; +$table_oid_data->class = 'info_table'; $table_oid_graph_data = []; $labels = []; From 590e7a39789a34a58601e2017b4f587765aee264 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 11:25:43 +0100 Subject: [PATCH 063/234] Netflow improvements --- pandora_console/include/functions_network.php | 4 +- .../operation/netflow/netflow_explorer.php | 24 ++++++---- .../operation/network/network_report.php | 48 ++++++++++++++----- 3 files changed, 55 insertions(+), 21 deletions(-) diff --git a/pandora_console/include/functions_network.php b/pandora_console/include/functions_network.php index c503945c87..1945b5428b 100644 --- a/pandora_console/include/functions_network.php +++ b/pandora_console/include/functions_network.php @@ -68,10 +68,10 @@ function network_print_explorer_header( $cell = '
'; $cell .= $title; $cell .= html_print_link_with_params( - 'images/arrow-down-white.png', + 'images/arrow@svg.svg', array_merge($hidden_data, ['order_by' => $order]), 'image', - ($selected === $order) ? 'opacity: 0.5' : '' + 'rotate: 270deg; width: 20px; margin-top: 4px;'.(($selected === $order) ? '' : 'opacity: 0.5') ); $cell .= '
'; diff --git a/pandora_console/operation/netflow/netflow_explorer.php b/pandora_console/operation/netflow/netflow_explorer.php index cb09927178..3f7e18ba52 100644 --- a/pandora_console/operation/netflow/netflow_explorer.php +++ b/pandora_console/operation/netflow/netflow_explorer.php @@ -1,21 +1,29 @@ $labels, ]; + // Results table. + $resultsTable = html_print_div( + [ + 'class' => '', + 'style' => 'flex: 50;margin-right: 5px;', + 'content' => html_print_table($table, true), + ], + true + ); // Pie graph. - html_print_div( + $pieGraph = html_print_div( [ 'class' => 'databox netflow-pie-graph-container padding-2 white_box', + 'style' => 'flex: 50;margin-left: 5px;', 'content' => pie_graph( $chart_data, $options ), - ] + ], + true ); // Print the filter remove link. if (empty($main_value) === false) { @@ -418,7 +438,13 @@ if (empty($data)) { } // Print results. - html_print_table($table); + html_print_div( + [ + 'style' => 'max-width: -webkit-fill-available; display: flex', + 'class' => '', + 'content' => $resultsTable.$pieGraph, + ] + ); } ?> From 2cd09d76186938d45c996bb9ae4bc37ddb656e9f Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 13 Mar 2023 12:03:33 +0100 Subject: [PATCH 064/234] Datatable message info --- pandora_console/include/functions_ui.php | 37 +++++++++++++++++++++-- pandora_console/include/styles/tables.css | 4 +++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d272ee224a..8c6546bde0 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -385,7 +385,12 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t $messageCreated = html_print_table($messageTable, true); $autocloseTime = ((int) $config['notification_autoclose_time'] * 1000); - $classes[] = 'info_box_container'; + if (empty($message['div_class']) === false) { + $classes[] = $message['div_class']; + } else { + $classes[] = 'info_box_container'; + } + $classes[] = (($autoclose === true) && ($autocloseTime > 0)) ? ' info_box_autoclose' : ''; // This session var is defined in index. @@ -3873,6 +3878,29 @@ function ui_print_datatable(array $parameters) }'; } + $js .= 'if ($("#'.$table_id.' tr td").length == 1) { + $("div[id^=info_box_]").show(); + $("div[id^=info_box_]").removeClass(\'invisible_important\'); + $("table#'.$table_id.'").hide(); + $("div.dataTables_paginate").hide(); + $("div.dataTables_info").hide(); + $("div.dataTables_length").hide(); + + if (dt_'.$table_id.'.page.info().pages > 1) { + $(".dataTables_paginate.paging_simple_numbers").show() + } + } else { + $("div[id^=info_box_]").hide(); + $("table#'.$table_id.'").show(); + $("div.dataTables_paginate").show(); + $("div.dataTables_info").show(); + $("div.dataTables_length").show(); + + if (dt_'.$table_id.'.page.info().pages == 1) { + $(".dataTables_paginate.paging_simple_numbers").hide() + } + }'; + if (isset($parameters['drawCallback'])) { $js .= $parameters['drawCallback']; } @@ -3996,8 +4024,13 @@ function ui_print_datatable(array $parameters) $js .= ''; // Order. + $info_msg_arr = []; + $info_msg_arr['message'] = $emptyTable; + $info_msg_arr['div_class'] = 'info_box_container invisible_important'; + + $info_msg = '
'.ui_print_info_message($info_msg_arr).'
'; $err_msg = '
'; - $output = $err_msg.$filter.$extra.$table.$js; + $output = $info_msg.$err_msg.$filter.$extra.$table.$js; if (is_ajax() === false) { ui_require_css_file('datatables.min', 'include/styles/js/'); ui_require_css_file('tables'); diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 1aeaa479e7..9fdd4fa1cf 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -798,3 +798,7 @@ div[id^="auto-os-"] > img { width: 20px; height: 20px; } + +.dataTables_paginate { + margin-right: 10px; +} From 0643b4e0bafd9b61d7ba3b5d9f7cbd5f25e98958 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 13 Mar 2023 12:19:27 +0100 Subject: [PATCH 065/234] fixed styles --- .../include/class/Diagnostics.class.php | 6 +++--- pandora_console/include/functions_menu.php | 4 ++-- pandora_console/include/styles/pandora.css | 1 + pandora_console/include/styles/pandora_black.css | 14 +++++++++++--- pandora_console/operation/agentes/stat_win.php | 2 +- pandora_console/operation/events/sound_events.php | 2 +- .../operation/gis_maps/public_console.php | 2 +- .../visual_console/legacy_public_view.php | 2 +- .../operation/visual_console/public_view.php | 2 +- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index aeb5a46400..2a041e63e8 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -1831,7 +1831,7 @@ class Diagnostics extends Wizard if ($items[$key]['status'] === 2) { $items[$key]['value'] = html_print_image( - 'images/icono-warning.png', + 'images/alert-yellow@svg.svg', true, [ 'title' => __('Warning'), @@ -1840,7 +1840,7 @@ class Diagnostics extends Wizard ); } else if ($items[$key]['status'] === 1) { $items[$key]['value'] = html_print_image( - 'images/exito.png', + 'images/validate.svg', true, [ 'title' => __('Successfully'), @@ -1849,7 +1849,7 @@ class Diagnostics extends Wizard ); } else { $items[$key]['value'] = html_print_image( - 'images/error_1.png', + 'images/fail@svg.svg', true, [ 'title' => __('Error'), diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 2708b8016e..1d567af5cc 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -842,7 +842,7 @@ if (is_ajax()) { $fragmentation_status = ''; if ($db_fragmentation->data->tablesFragmentationStatus->status === 1) { $fragmentation_status = html_print_image( - 'images/exito.png', + 'images/validate.svg', true, [ 'title' => __('Successfully'), @@ -851,7 +851,7 @@ if (is_ajax()) { ); } else { $fragmentation_status = html_print_image( - 'images/error_1.png', + 'images/fail@svg.svg', true, [ 'title' => __('Error'), diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 4d8f807bdb..0bb3b0e80c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -5843,6 +5843,7 @@ div.switch_radio_button label { margin-right: -1px; border: 1px solid #cbcbcb; transition: all 0.1s ease-in-out; + background: transparent; } div.switch_radio_button label:first-of-type { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 9d5185fd9f..62af20b92f 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1249,8 +1249,7 @@ a.pandora_pagination:hover { background-color: #555 !important; } .dt-button.buttons-csv.buttons-html5 { - filter: invert(100%); - background-color: transparent; + box-shadow: 0px 3px 6px #111; } .info_table.events > tbody > tr > td { @@ -1494,7 +1493,7 @@ div.white_box.white_box_opened.no_border { border-radius: 0px; } -table.filter-table-adv td > div label { +table.filter-table-adv td > div label:not(.inputFile) { color: white !important; } @@ -1507,3 +1506,12 @@ div.fixed-bottom-box > div.fixed-bottom-box-head-body { background-color: #111111 !important; } + +.filter_table, +.white_table_graph_fixed table { + background-color: transparent; +} + +span.select2 { + border-radius: 6px; +} diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 1dc0030eeb..8c39ad8b8d 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -97,7 +97,7 @@ ui_print_message_dialog( $conn_title, $conn_text, 'connection', - '/images/error_1.png' + '/images/fail@svg.svg' ); ?> diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 6ce7a31c3a..956282b045 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -173,7 +173,7 @@ ui_print_message_dialog( $conn_title, $conn_text, 'connection', - '/images/error_1.png' + '/images/fail@svg.svg' ); $inputs = []; diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php index 1070443ed1..b301754a1e 100755 --- a/pandora_console/operation/gis_maps/public_console.php +++ b/pandora_console/operation/gis_maps/public_console.php @@ -278,7 +278,7 @@ if ($layers != false) { $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); ui_require_javascript_file('connection_check'); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); - ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); + ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); } // Resize GIS map on fullscreen diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php index 40ae10e4bc..e8edbae7db 100644 --- a/pandora_console/operation/visual_console/legacy_public_view.php +++ b/pandora_console/operation/visual_console/legacy_public_view.php @@ -56,7 +56,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); $conn_title = __('Connection with server has been lost'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); -ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); require_once 'include/functions_visual_map.php'; diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index 265b3183c6..496a34f3a6 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -37,7 +37,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); $conn_title = __('Connection with server has been lost'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); -ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); echo ''."\n"; echo ''."\n"; From 339d7e8bfe13568a5b677bf0a5345cfb2645e2b1 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 13 Mar 2023 12:57:09 +0100 Subject: [PATCH 066/234] #10324 fixed error 500 --- .../operation/agentes/status_monitor.php | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index bc367cfd63..c94a5619a0 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -315,26 +315,48 @@ if (is_metaconsole() === false) { } } -// Header. -ui_print_standard_header( - __('Monitor detail').$subpage, - 'images/agent.png', - false, - '', - true, - $buttons, - [ +if ($loaded_filter['id_filter'] > 0) { + // Header. + ui_print_standard_header( + __('Monitor detail').$subpage, + 'images/agent.png', + false, + '', + true, + $buttons, [ - 'link' => '', - 'label' => __('Monitoring'), + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Views'), + ], ], + $fav_menu + ); +} else { + // Header. + ui_print_standard_header( + __('Monitor detail').$subpage, + 'images/agent.png', + false, + '', + true, + $buttons, [ - 'link' => '', - 'label' => __('Views'), + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Views'), + ], ], - ], - $fav_menu -); + ); +} $all_groups = []; From bdeb2240f379e9ab8606dea0a796ecc0add7ac1f Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 13 Mar 2023 13:01:48 +0100 Subject: [PATCH 067/234] 10324 refactor duplicity code --- .../operation/agentes/status_monitor.php | 54 ++++++------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index c94a5619a0..b1aff8bc72 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -315,48 +315,26 @@ if (is_metaconsole() === false) { } } -if ($loaded_filter['id_filter'] > 0) { - // Header. - ui_print_standard_header( - __('Monitor detail').$subpage, - 'images/agent.png', - false, - '', - true, - $buttons, +// Header. +ui_print_standard_header( + __('Monitor detail').$subpage, + 'images/agent.png', + false, + '', + true, + $buttons, + [ [ - [ - 'link' => '', - 'label' => __('Monitoring'), - ], - [ - 'link' => '', - 'label' => __('Views'), - ], + 'link' => '', + 'label' => __('Monitoring'), ], - $fav_menu - ); -} else { - // Header. - ui_print_standard_header( - __('Monitor detail').$subpage, - 'images/agent.png', - false, - '', - true, - $buttons, [ - [ - 'link' => '', - 'label' => __('Monitoring'), - ], - [ - 'link' => '', - 'label' => __('Views'), - ], + 'link' => '', + 'label' => __('Views'), ], - ); -} + ], + (empty($fav_menu) === true) ? [] : $fav_menu +); $all_groups = []; From 5466cb5995e1a34c1566e79ad0e6948a35a81462 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 13:25:42 +0100 Subject: [PATCH 068/234] Netflow live view --- .../operation/netflow/nf_live_view.php | 671 +++++++++++------- 1 file changed, 396 insertions(+), 275 deletions(-) diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index f5ee650fb0..59ff2e70f2 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -101,7 +101,7 @@ $max_aggregates = (int) get_parameter('max_aggregates', 10); $update_date = (int) get_parameter('update_date', 0); $connection_name = get_parameter('connection_name', ''); $interval_length = get_parameter('interval_length', NETFLOW_RES_MEDD); -$address_resolution = (int) get_parameter('address_resolution', $config['netflow_get_ip_hostname']); +$address_resolution = (int) get_parameter('address_resolution', ($config['netflow_get_ip_hostname'] ?? '')); $filter_selected = (int) get_parameter('filter_selected', 0); // Read time values. @@ -127,13 +127,23 @@ $update = get_parameter('update_button', ''); if (is_metaconsole() === false) { // Header. - ui_print_page_header( + ui_print_standard_header( __('Netflow live view'), 'images/op_netflow.png', false, '', false, - [] + [], + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Network'), + ], + ] ); $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'; @@ -202,22 +212,9 @@ if (isset($config['netflow_disable_custom_lvfilters'])) { $netflow_disable_custom_lvfilters = $config['netflow_disable_custom_lvfilters']; } -$class = 'databox filters'; - -echo '
'; - - echo ""; -if (is_metaconsole()) { - echo ' - - - - '; - +// Add nodes list. +if (is_metaconsole() === true) { $list_servers = []; - $servers = db_get_all_rows_sql( 'SELECT * FROM tmetaconsole_setup' @@ -244,62 +241,245 @@ if (is_metaconsole()) { metaconsole_restore_db(); } - echo ''; - echo ''; - echo ''; - echo ''; -} + true + ), + [ 'div_id' => 'period_container' ] +); - echo ''; - - $class_not_period = ($is_period) ? 'nf_hidden' : 'nf_display'; - $class_period = ($is_period) ? 'nf_display' : 'nf_hidden'; - echo ''; - echo ''; + 'class' => '', + 'content' => html_print_input_text( + 'date_lower', + $date_lower, + false, + 13, + 10, + true + ).html_print_image( + 'images/calendar_view_day.png', + true, + [ + 'alt' => 'calendar', + 'class' => 'main_menu_icon invert_filter', + ] + ).html_print_input_text( + 'time_lower', + $time_lower, + false, + 10, + 8, + true + ), + ], + true + ), + [ 'div_id' => 'end_date_container' ] +); - echo ''; - echo ''; +$filterTable->data[0][1] = html_print_label_input_block( + __('End date'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_input_text( + 'date', + $date, + false, + 13, + 10, + true + ).html_print_image( + 'images/calendar_view_day.png', + true, + ['alt' => 'calendar'] + ).html_print_input_text( + 'time', + $time, + false, + 10, + 8, + true + ), + ], + true + ) +); - echo ''; - echo ''; + ).ui_print_input_placeholder( + __('The interval will be divided in chunks the length of the resolution.'), + true + ) +); - echo ''; - echo ''; +$filterTable->data[1][] = html_print_label_input_block( + __('Defined period'), + html_print_checkbox_switch( + 'is_period', + 1, + ($is_period === true) ? 1 : 0, + true, + false, + 'nf_view_click_period(event)' + ) +); - echo ''; - echo ''; + ) +); - echo ''; - $max_values = [ - '2' => '2', - '5' => '5', - '10' => '10', - '15' => '15', - '20' => '20', - '25' => '25', - '50' => '50', - $max_aggregates => $max_aggregates, - ]; - echo ''; - - echo ''; - $aggregate_list = []; - $aggregate_list = [ - 'srcip' => __('Src Ip Address'), - 'dstip' => __('Dst Ip Address'), - 'srcport' => __('Src Port'), - 'dstport' => __('Dst Port'), - ]; - echo ''; - - echo ''; - - // Read filter type. - if ($filter['advanced_filter'] != '') { - $filter_type = 1; - } else { - $filter_type = 0; - } - - echo ""; - - echo "'; - - echo ''; - echo ""; - - echo ''; - echo "'; - $own_info = get_user_info($config['id_user']); - echo ''; - echo "'; - echo ''; - - $advanced_toggle = '
- '.__('Draw live filter').' -
'.__('Connection').''.html_print_select( - $list_servers, - 'connection_name', - $connection_name, + $nodeListInput = html_print_label_input_block( + __('Connection'), + html_print_select( + $list_servers, + 'connection_name', + $connection_name, + '', + '', + 0, + true, + false, + false + ) + ); +} else { + $nodeListInput = ''; +} + +$class_not_period = ($is_period === true) ? 'nf_hidden' : 'nf_display'; +$class_period = ($is_period === true) ? 'nf_display' : 'nf_hidden'; + +$max_values = [ + '2' => '2', + '5' => '5', + '10' => '10', + '15' => '15', + '20' => '20', + '25' => '25', + '50' => '50', + $max_aggregates => $max_aggregates, +]; + +$aggregate_list = []; +$aggregate_list = [ + 'srcip' => __('Src Ip Address'), + 'dstip' => __('Dst Ip Address'), + 'srcport' => __('Src Port'), + 'dstport' => __('Dst Port'), +]; + +$advanced_toggle = ''; +$advanced_toggle .= ''; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} + +$advanced_toggle .= ''; +$user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true); +$user_groups[0] = 0; +// Add all groups. +$sql = 'SELECT * + FROM tnetflow_filter + WHERE id_group IN ('.implode(',', array_keys($user_groups)).')'; +$advanced_toggle .= "'; +$advanced_toggle .= ''; + +$advanced_toggle .= ""; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +$advanced_toggle .= ''; + +$advanced_toggle .= ""; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +$advanced_toggle .= ''; + +$advanced_toggle .= ""; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= ''; + $advanced_toggle .= "'; +} + +$advanced_toggle .= ''; +$advanced_toggle .= ''; + +$onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; +$radio_buttons = __('Yes').'  '.html_print_radio_button_extended( + 'address_resolution', + 1, + '', + $address_resolution, + false, + $onclick, + '', + true +).'   '; +$radio_buttons .= __('No').'  '.html_print_radio_button( + 'address_resolution', + 0, + '', + $address_resolution, + true +); +$advanced_toggle .= ''; +$advanced_toggle .= ''; + +$advanced_toggle .= ''; +$advanced_toggle .= ''; + +$advanced_toggle .= ''; + +$advanced_toggle .= '
'.__('Filter').''.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).''.__('Load filter').'".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); +$advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false); +$advanced_toggle .= '
".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'
".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'
'.__('IP address resolution').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).''.$radio_buttons.''.__('Source ip').''.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'
'; + +// Read filter type. +if (empty($filter['advanced_filter']) === false) { + $filter_type = 1; +} else { + $filter_type = 0; +} + +$filterTable = new stdClass(); +$filterTable->id = ''; +$filterTable->class = 'filter-table-adv'; +$filterTable->size = []; +$filterTable->size[0] = '33%'; +$filterTable->size[1] = '33%'; +$filterTable->size[2] = '33%'; +$filterTable->data = []; + +if (empty($nodeListInput) === false) { + $filterTable->data[-1][] = $nodeListInput; +} + +$filterTable->data[0][0] = html_print_label_input_block( + __('Interval'), + html_print_extended_select_for_time( + 'period', + $period, '', '', 0, - true, false, - false - ).'
'; - echo ''.__('Interval').''; - echo ''.__('Start date').''; - echo ''; - echo html_print_extended_select_for_time('period', $period, '', '', 0, false, true, false, true, $class_period); - echo html_print_input_text('date_lower', $date_lower, false, 13, 10, true, false, false, '', $class_not_period); - echo html_print_image( - 'images/calendar_view_day.png', - true, +$filterTable->data[0][0] .= html_print_label_input_block( + __('Start date'), + html_print_div( [ - 'alt' => 'calendar', - 'class' => $class_not_period, - ] - ).html_print_input_text('time_lower', $time_lower, false, 10, 8, true, false, false, '', $class_not_period); - echo html_print_checkbox( - 'is_period', - 1, - ($is_period === true) ? 1 : 0, - true, - false, - 'nf_view_click_period(event)' - ); - echo ui_print_help_tip(__('Select this checkbox to write interval instead a date.'), true); - echo ''.__('End date').''.html_print_input_text('date', $date, false, 13, 10, true).html_print_image( - 'images/calendar_view_day.png', - true, - ['alt' => 'calendar'] - ).html_print_input_text('time', $time, false, 10, 8, true); - echo ''.__('Resolution').ui_print_help_tip(__('The interval will be divided in chunks the length of the resolution.'), true).''.html_print_select( +$filterTable->data[0][2] = html_print_label_input_block( + __('Resolution'), + html_print_select( netflow_resolution_select_params(), 'interval_length', $interval_length, @@ -309,13 +489,27 @@ if (is_metaconsole()) { true, false, false - ).'
'.__('Type').''.html_print_select( +$filterTable->data[1][] = html_print_label_input_block( + __('Type'), + html_print_select( netflow_get_chart_types(), 'chart_type', $chart_type, @@ -323,224 +517,152 @@ if (is_metaconsole()) { '', 0, true - ).''.__('Max. values').''.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).''.html_print_image('images/edit.svg', true, ['id' => 'pencil', 'class' => 'main_menu_icon invert_filter']).''; - echo ''.__('Aggregate by').''.html_print_select($aggregate_list, 'aggregate', $filter['aggregate'], '', '', 0, true, false, true, '', false).'
'; - - $advanced_toggle .= ''; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } - - - - $advanced_toggle .= ''; - $user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true); - $user_groups[0] = 0; - // Add all groups. - $sql = 'SELECT * - FROM tnetflow_filter - WHERE id_group IN ('.implode(',', array_keys($user_groups)).')'; - $advanced_toggle .= "'; - $advanced_toggle .= ''; - - $advanced_toggle .= ""; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - $advanced_toggle .= ''; - - $advanced_toggle .= ""; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - $advanced_toggle .= ''; - - $advanced_toggle .= ""; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= ''; - $advanced_toggle .= "'; - } - - $advanced_toggle .= ''; - $advanced_toggle .= ''; - - $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; - $radio_buttons = __('Yes').'  '.html_print_radio_button_extended( - 'address_resolution', - 1, +$filterTable->data[1][] = html_print_label_input_block( + __('Aggregated by'), + html_print_select( + $aggregate_list, + 'aggregate', + $filter['aggregate'], '', - $address_resolution, - false, - $onclick, '', - true - ).'   '; - $radio_buttons .= __('No').'  '.html_print_radio_button( - 'address_resolution', 0, + true, + false, + true, '', - $address_resolution, + false + ) +); + +$filterTable->data[2][] = html_print_label_input_block( + __('Max values'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_select( + $max_values, + 'max_aggregates', + $max_aggregates, + '', + '', + 0, + true + ).html_print_anchor( + [ + 'id' => 'max_values', + 'href' => '#', + 'onClick' => 'edit_max_value()', + 'content' => html_print_image( + 'images/edit.svg', + true, + [ + 'id' => 'pencil', + 'class' => 'main_menu_icon invert_filter', + ] + ), + ], + true + ), + ], true - ); - $advanced_toggle .= ''; - $advanced_toggle .= ''; + ) +); - $advanced_toggle .= ''; - $advanced_toggle .= ''; - - $advanced_toggle .= ''; - - $advanced_toggle .= '
'.__('Filter').''.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).''.__('Load filter').'".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); - $advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false); - $advanced_toggle .= '
".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'
".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'
'.__('IP address resolution').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).''.$radio_buttons.''.__('Source ip').''.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'
'; - - echo ''; - echo ui_toggle( +$filterTable->colspan[3][0] = 3; +$filterTable->data[3][0] = html_print_label_input_block( + '', + ui_toggle( $advanced_toggle, __('Advanced'), '', '', true, true, - 'white_box white_box_opened', - 'no-border flex-row' - ); - echo ''; - echo ''; + '', + 'white-box-content', + 'box-flat white_table_graph' + ) +); - echo "
"; +$buttons = html_print_submit_button( + __('Draw'), + 'draw_button', + false, + [ + 'icon' => 'cog', + 'mode' => 'mini', + ], + true +); - echo html_print_submit_button(__('Draw'), 'draw_button', false, 'class="sub upd"', true); - - if (!$netflow_disable_custom_lvfilters) { - if (check_acl($config['id_user'], 0, 'AW')) { - html_print_submit_button(__('Save as new filter'), 'save_button', false, 'style="margin-left: 5px;" class="sub upd" onClick="return defineFilterName();"'); - html_print_submit_button(__('Update current filter'), 'update_button', false, 'style="margin-left: 5px;" class="sub upd"'); - } +if (!$netflow_disable_custom_lvfilters) { + if ((bool) check_acl($config['id_user'], 0, 'AW') === true) { + $buttons .= html_print_submit_button(__('Save as new filter'), 'save_button', false, ['icon' => 'load', 'onClick' => 'return defineFilterName();', 'mode' => 'mini secondary'], true); + $buttons .= html_print_submit_button(__('Update current filter'), 'update_button', false, ['icon' => 'load', 'mode' => 'mini secondary'], true); } +} - echo '
'; +$filterInputTable = ''; +$filterInputTable .= html_print_table($filterTable, true); +$filterInputTable .= html_print_div( + [ + 'class' => 'action-buttons', + 'content' => $buttons, + ], + true +); +$filterInputTable .= '
'; - echo ''; +ui_toggle( + $filterInputTable, + ''.__('Filter').'', + __('Filter'), + 'search', + true, + false, + '', + 'white-box-content no_border', + 'box-flat white_table_graph fixed_filter_bar' +); - if (empty($draw) === false) { - // Draw. - echo '
'; +if (empty($draw) === false) { + // Draw. + echo '
'; - // No filter selected. - if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { - ui_print_error_message(__('No filter selected')); - } else { - // Hidden input for handle properly the text colors. - html_print_input_hidden( - 'selected_style_theme', - $config['style'] - ); - // Draw the netflow chart. - echo netflow_draw_item( - $start_date, - $end_date, - $interval_length, - $chart_type, - $filter, - $max_aggregates, - $connection_name, - 'HTML', - $address_resolution - ); - } + // No filter selected. + if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { + ui_print_error_message(__('No filter selected')); + } else { + // Hidden input for handle properly the text colors. + html_print_input_hidden( + 'selected_style_theme', + $config['style'] + ); + // Draw the netflow chart. + html_print_div( + [ + 'class' => 'white_box', + 'content' => netflow_draw_item( + $start_date, + $end_date, + $interval_length, + $chart_type, + $filter, + $max_aggregates, + $connection_name, + 'HTML', + $address_resolution + ), + ] + ); } +} - ui_include_time_picker(); - ?> +ui_include_time_picker(); +?> - \ No newline at end of file From 45ba4cdd15c5ccba74c8d8cb225ec695a0d9c1bd Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 14:03:00 +0100 Subject: [PATCH 069/234] Netflow --- .../operation/netflow/nf_live_view.php | 11 +- .../operation/network/network_report.php | 9 +- .../operation/network/network_usage_map.php | 312 ++++++++++++------ 3 files changed, 222 insertions(+), 110 deletions(-) diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 59ff2e70f2..2164aeb562 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -629,9 +629,6 @@ ui_toggle( ); if (empty($draw) === false) { - // Draw. - echo '
'; - // No filter selected. if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { ui_print_error_message(__('No filter selected')); @@ -659,11 +656,19 @@ if (empty($draw) === false) { ] ); } +} else { + ui_print_info_message(__('No data to show')); } ui_include_time_picker(); ?> + + 1 && $this->group === 1) { + if (count($groups) > 1 && $this->group === 1 && $this->dashboard === false) { $x_back = 0; $y_back = 0; @@ -1111,7 +1185,7 @@ class Heatmap echo ''; // Dialog. - echo ''; + echo '
'; } diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 7ffafd974f..3347ff0323 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -1560,3 +1560,36 @@ function showManualThresholds(element) { $(".dashboard-input-threshold-critical").addClass("invisible_important"); } } + +/** + * @return {void} + */ +// eslint-disable-next-line no-unused-vars +function type_change() { + var type = document.getElementById("type").value; + + switch (type) { + case "3": + $("#li_tags").hide(); + $("#li_groups").hide(); + $("#li_module_groups").hide(); + break; + case "2": + $("#li_tags").hide(); + $("#li_groups").hide(); + $("#li_module_groups").show(); + break; + case "1": + $("#li_tags").show(); + $("#li_groups").hide(); + $("#li_module_groups").hide(); + break; + + default: + case "0": + $("#li_tags").hide(); + $("#li_groups").show(); + $("#li_module_groups").hide(); + break; + } +} diff --git a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php index c10c7c1f27..2f9d9533cd 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php +++ b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php @@ -192,6 +192,26 @@ class HeatmapWidget extends Widget // Retrieve global - common inputs. $values = parent::decoders($decoder); + if (isset($decoder['search']) === true) { + $values['search'] = $decoder['search']; + } + + if (isset($decoder['type']) === true) { + $values['type'] = $decoder['type']; + } + + if (isset($decoder['groups']) === true) { + $values['groups'] = $decoder['groups']; + } + + if (isset($decoder['tags']) === true) { + $values['tags'] = $decoder['tags']; + } + + if (isset($decoder['module_groups']) === true) { + $values['module_groups'] = $decoder['module_groups']; + } + return $values; } @@ -205,9 +225,117 @@ class HeatmapWidget extends Widget */ public function getFormInputs(): array { + global $config; // Retrieve global - common inputs. $inputs = parent::getFormInputs(); + $values = $this->values; + + // Search. + $inputs[] = [ + 'label' => \__('Search'), + 'arguments' => [ + 'name' => 'search', + 'type' => 'text', + 'class' => 'event-widget-input', + 'value' => $values['search'], + 'return' => true, + 'size' => 30, + ], + ]; + + $inputs[] = [ + 'label' => __('Type'), + 'arguments' => [ + 'type' => 'select', + 'fields' => [ + 0 => __('Group agents'), + 1 => __('Group modules by tag'), + 2 => __('Group modules by module group'), + 3 => __('Group modules by agents'), + ], + 'name' => 'type', + 'selected' => $values['type'], + 'script' => 'type_change()', + 'return' => true, + ], + ]; + + // Filters. + $inputs[] = [ + 'label' => __('Groups'), + 'style' => ($values['type'] === '0') ? '' : 'display:none', + 'id' => 'li_groups', + 'arguments' => [ + 'type' => 'select_groups', + 'name' => 'groups[]', + 'returnAllGroup' => true, + 'privilege' => 'AR', + 'selected' => explode(',', $values['groups'][0]), + 'return' => true, + 'multiple' => true, + ], + ]; + + if (tags_has_user_acl_tags($config['id_user']) === false) { + $tags = db_get_all_rows_sql( + 'SELECT id_tag, name FROM ttag WHERE id_tag ORDER BY name' + ); + } else { + $user_tags = tags_get_user_tags($config['id_user'], 'AR'); + if (empty($user_tags) === false) { + $id_user_tags = array_keys($user_tags); + $tags = db_get_all_rows_sql( + 'SELECT id_tag, name FROM ttag + WHERE id_tag IN ('.implode(',', $id_user_tags).') + ORDER BY name' + ); + } else { + $tags = db_get_all_rows_sql( + 'SELECT id_tag, name FROM ttag WHERE id_tag ORDER BY name' + ); + } + } + + $inputs[] = [ + 'label' => __('Tag'), + 'style' => ($values['type'] === '1') ? '' : 'display:none', + 'id' => 'li_tags', + 'arguments' => [ + 'type' => 'select', + 'fields' => $tags, + 'name' => 'tags[]', + 'selected' => explode(',', $values['tags'][0]), + 'return' => true, + 'multiple' => true, + ], + ]; + + $module_groups_aux = db_get_all_rows_sql( + 'SELECT id_mg, name FROM tmodule_group ORDER BY name' + ); + + $module_groups = []; + foreach ($module_groups_aux as $key => $module_group) { + $module_groups[$module_group['id_mg']] = $module_group['name']; + } + + $inputs[] = [ + 'label' => __('Module group'), + 'style' => ($values['type'] === '2') ? '' : 'display:none', + 'id' => 'li_module_groups', + 'arguments' => [ + 'type' => 'select', + 'fields' => $module_groups, + 'name' => 'module_groups[]', + 'selected' => explode(',', $values['module_groups'][0]), + 'return' => true, + 'multiple' => true, + 'nothing' => __('Not assigned'), + 'nothing_value' => 0, + ], + ]; + return $inputs; } @@ -222,6 +350,27 @@ class HeatmapWidget extends Widget // Retrieve global - common inputs. $values = parent::getPost(); + $values['search'] = \get_parameter('search', ''); + $values['type'] = \get_parameter('type', 0); + + switch ((int) $values['type']) { + case 2: + $values['module_groups'] = \get_parameter('module_groups', 0); + break; + + case 1: + $values['tags'] = \get_parameter('tags', 0); + break; + + case 0: + $values['groups'] = \get_parameter('groups', 0); + break; + + default: + // Do nothing. + break; + } + return $values; } @@ -256,8 +405,8 @@ class HeatmapWidget extends Widget public function getSizeModalConfiguration(): array { $size = [ - 'width' => 400, - 'height' => 205, + 'width' => 500, + 'height' => 300, ]; return $size; @@ -276,10 +425,23 @@ class HeatmapWidget extends Widget \ui_require_css_file('heatmap', 'include/styles/', true); $values = $this->values; - hd($values, true); + $search = (empty($values['search']) === false) ? $values['search'] : ''; + $type = (empty($values['type']) === false) ? $values['type'] : 0; + $filter = []; + if (isset($values['groups'])) { + $filter = explode(',', $values['groups'][0]); + } + + if (isset($values['tags'])) { + $filter = explode(',', $values['tags'][0]); + } + + if (isset($values['module_groups'])) { + $filter = explode(',', $values['module_groups'][0]); + } // Control call flow. - $heatmap = new Heatmap(0, [], null, 300, 400, 200, 0, 1); + $heatmap = new Heatmap($type, $filter, null, 300, 400, 200, $search, 0, true); // AJAX controller. if (is_ajax() === true) { $method = get_parameter('method'); diff --git a/pandora_console/operation/heatmap.php b/pandora_console/operation/heatmap.php index a53eebd698..1e063d3c3d 100644 --- a/pandora_console/operation/heatmap.php +++ b/pandora_console/operation/heatmap.php @@ -62,6 +62,8 @@ if ($group_sent === true) { $group = (int) get_parameter('group', true); } +$dashboard = (bool) get_parameter('dashboard', false); + $is_ajax = is_ajax(); if ($is_ajax === false && $pure === false) { $viewtab['config'] = ''.html_print_image( @@ -192,6 +194,7 @@ if ($is_ajax === false && $pure === true) { html_print_input_hidden('type', $type); html_print_input_hidden('search', $search); html_print_input_hidden('filter', implode(',', $filter)); + html_print_input_hidden('dashboard', $dashboard); echo ''; echo '
'; echo '
'; @@ -230,7 +233,7 @@ if ($is_ajax === false && $pure === true) { // Control call flow. try { // Heatmap construct. - $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group); + $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group, $dashboard); } catch (Exception $e) { if (is_ajax() === true) { echo json_encode(['error' => '[Heatmap]'.$e->getMessage() ]); From a7a283fe2275326b54848974d7c9f6aba9512cb0 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 14 Mar 2023 12:52:44 +0100 Subject: [PATCH 100/234] #8642 Fixed heatmap widget --- pandora_console/include/class/Heatmap.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php index f7375c2a5e..c440fcfecc 100644 --- a/pandora_console/include/class/Heatmap.class.php +++ b/pandora_console/include/class/Heatmap.class.php @@ -381,7 +381,7 @@ class Heatmap } $id_grupo = ''; - if (empty($this->filter) === false && current($this->filter) != 0) { + if (empty($this->filter) === false && empty(current($this->filter)) === false) { $id_grupo = ' AND id_grupo IN ('.implode(',', $this->filter).')'; } From b428e77e7cf26e9234ced2e10dbf2eba2d965faf Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 14 Mar 2023 13:11:57 +0100 Subject: [PATCH 101/234] User management for meta --- pandora_console/general/header.php | 1 - .../godmode/users/configure_user.php | 269 ++---------------- pandora_console/godmode/users/user_list.php | 2 - .../godmode/users/user_management.php | 218 ++++++++------ pandora_console/include/functions_profile.php | 16 +- 5 files changed, 161 insertions(+), 345 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 40f6c3a382..b0cbc0cec5 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -407,7 +407,6 @@ echo sprintf('
', $menuTypeClass); // User. - // $headerUserImage = (is_user_admin($config['id_user']) === true) ? 'images/header_user_admin_green.png' : 'images/header_user_green.png'; $headerUser = []; $headerUser[] = html_print_image( 'images/edit_user@header.svg', diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 287de6a316..ecc3a76b72 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -1,5 +1,4 @@ 'user_form_title', - 'content' => ((bool) $id === true) ? sprintf('%s [ %s ]', __('Update User'), $id) : __('Create User'), - ] - ); -} - if (!$new_user) { $user_id = '

'.__('User ID').':

'; $user_id .= ''.$id.''; @@ -1282,8 +1272,9 @@ if (is_metaconsole() === false) { if (is_metaconsole() === true) { $array_filters = get_filters_custom_fields_view(0, true); - $search_custom_fields_view = '

'.__('Search custom field view').' '.ui_print_help_tip(__('Load by default the selected view in custom field view'), true).'

'; - $search_custom_fields_view .= html_print_select( + $searchCustomFieldView = []; + $searchCustomFieldView[] = __('Search custom field view'); + $searchCustomFieldView[] = html_print_select( $array_filters, 'default_custom_view', $user_info['default_custom_view'], @@ -1295,7 +1286,10 @@ if (is_metaconsole() === true) { true, '', false - ).'
'; + ).ui_print_input_placeholder( + __('Load by default the selected view in custom field view'), + true + ); } $values = [ @@ -1377,6 +1371,8 @@ $home_screen .= html_print_input_text( false ); +$home_screen = ''; + $size_pagination = '

'.__('Block size for pagination').'

'; $size_pagination .= html_print_input_text( 'block_size', @@ -1395,19 +1391,20 @@ if ($id === $config['id_user']) { ); } -if (enterprise_installed() && is_metaconsole() === true) { +if (enterprise_installed() === true && is_metaconsole() === true) { $user_info_metaconsole_access = 'only_console'; if (isset($user_info['metaconsole_access'])) { $user_info_metaconsole_access = $user_info['metaconsole_access']; } - // TODO review help tips on meta. - $meta_access = '

'.__('Metaconsole access').' './* ui_print_help_icon('meta_access', true). */ '

'; $metaconsole_accesses = [ 'basic' => __('Basic'), 'advanced' => __('Advanced'), ]; - $meta_access .= html_print_select( + + $outputMetaAccess = []; + $outputMetaAccess[] = __('Metaconsole access'); + $outputMetaAccess[] = html_print_select( $metaconsole_accesses, 'metaconsole_access', $user_info_metaconsole_access, @@ -1417,51 +1414,9 @@ if (enterprise_installed() && is_metaconsole() === true) { true, false, false - ).'
'; + ); } -/* - $not_login = '

'.__('Not Login').'

'; - $not_login .= ui_print_help_tip( - __('The user with not login set only can access to API.'), - true - ); - $not_login .= html_print_checkbox_switch( - 'not_login', - 1, - $user_info['not_login'], - true - ).'
'; - - $local_user = '

'.__('Local user').'

'; - $local_user .= ui_print_help_tip( - __('The user with local authentication enabled will always use local authentication.'), - true - ); - $local_user .= html_print_checkbox_switch( - 'local_user', - 1, - $user_info['local_user'], - true - ).'
'; - - $session_time = '

'.__('Session Time'); - $session_time .= ui_print_help_tip( - __('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), - true - ).'

'; - $session_time .= html_print_input_text( - 'session_time', - $user_info['session_time'], - '', - 5, - 5, - true.false, - false, - '', - 'class="input_line_small"' - ).'
'; -*/ $user_groups = implode(',', array_keys((users_get_groups($id, 'AR', $display_all_group)))); if (empty($user_groups) === false) { @@ -1582,31 +1537,6 @@ if (empty($doubleAuthElementsContent) === false) { $doubleAuthentication = ''; } - -/* - if (isset($double_authentication)) { - $double_authentication .= '
'; -}*/ - - - - - - - - - - - - - - - - - - - - $autorefresh_list_out = []; if (is_metaconsole() === false || is_centralized() === true) { $autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail'; @@ -1665,31 +1595,32 @@ if (isset($autorefresh_list) === false) { } } - - if (is_metaconsole() === true) { enterprise_include_once('include/functions_metaconsole.php'); $access_node = db_get_value('metaconsole_access_node', 'tusuario', 'id_user', $id); - $metaconsole_agents_manager = '

'.__('Enable agents managment').'

'; - $metaconsole_agents_manager .= html_print_checkbox_switch( + $metaconsoleAgentManager = []; + $metaconsoleAgentManager[] = __('Enable agents managment'); + $metaconsoleAgentManager[] = html_print_checkbox_switch( 'metaconsole_agents_manager', 1, $user_info['metaconsole_agents_manager'], true - ).'
'; + ); - $metaconsole_access_node = '

'.__('Enable node access').ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true).'

'; - $metaconsole_access_node .= html_print_checkbox( + $metaconsoleAgentManager[] = __('Enable node access').ui_print_help_tip( + __('With this option enabled, the user will can access to nodes console'), + true + ); + $metaconsoleAgentManager[] = html_print_checkbox_switch( 'metaconsole_access_node', 1, $access_node, true - ).'
'; + ); } - echo '
'; echo '
'; @@ -1701,141 +1632,8 @@ if (!$id) { $user_id_create = $user_id; } -if (is_metaconsole() === true) { - $access_or_pagination = $meta_access; - if ($id != '' && !$is_err) { - $div_user_info = ' - '; - } else { - $div_user_info = ' - '; - } - - echo '
-
- -

Extra info

'.$email.$phone.$not_login.$local_user.$session_time.'
-
-
-
'.$language.$access_or_pagination.$skin.$default_event_filter.$double_authentication.'
- -
'.$timezone; - - echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_access_node; - - $autorefresh_show = '

'._('Autorefresh').ui_print_help_tip( - __('This will activate autorefresh in selected pages'), - true - ).'

'; - $select_out = html_print_select( - $autorefresh_list_out, - 'autorefresh_list_out[]', - '', - '', - '', - '', - true, - true, - true, - '', - false, - 'width:100%' - ); - $arrows = ' '; - $select_in = html_print_select( - $autorefresh_list, - 'autorefresh_list[]', - '', - '', - '', - '', - true, - true, - true, - '', - false, - 'width:100%' - ); - - $table_ichanges = '
-
-

'.__('Full list of pages').':

-
'.$select_out.'
-
-
- '.html_print_image( - 'images/darrowright_green.png', - true, - [ - 'id' => 'right_autorefreshlist', - 'alt' => __('Push selected pages into autorefresh list'), - 'title' => __('Push selected pages into autorefresh list'), - ] - ).' - '.html_print_image( - 'images/darrowleft_green.png', - true, - [ - 'id' => 'left_autorefreshlist', - 'alt' => __('Pop selected pages out of autorefresh list'), - 'title' => __('Pop selected pages out of autorefresh list'), - ] - ).' -
-
-

'.__('List of pages with autorefresh').':

-
'.$select_in.'
-
-
'; - - $autorefresh_show .= $table_ichanges; - - // Time autorefresh. - $times = get_refresh_time_array(); - $time_autorefresh = '

'.__('Time autorefresh'); - $time_autorefresh .= ui_print_help_tip( - __('Interval of autorefresh of the elements, by default they are 30 seconds, needing to enable the autorefresh first'), - true - ).'

'; - $time_autorefresh .= html_print_select( - $times, - 'time_autorefresh', - $user_info['time_autorefresh'], - '', - '', - '', - true, - false, - false - ).'
'; - - - echo '
-
-
'.$autorefresh_show.$time_autorefresh.'
-
-
'.$comments.'
-
'; - - if (empty($ehorus) === false) { - html_print_div( - [ - 'class' => 'user_edit_third_row white_box', - 'content' => $ehorus, - ], - true - ); - } - - // User Profile definition table. (Only where user is not creating). - if ($new_user === false && ((bool) check_acl($config['id_user'], 0, 'UM') === true)) { - profile_print_profile_table($id, io_safe_output($json_profile), false, ($is_err === true)); - } -} else { - $access_or_pagination = $size_pagination; - // WIP: Only for node. - include_once 'user_management.php'; -} +// User management form. +require_once 'user_management.php'; if ((bool) $config['admin_can_add_user'] === true) { html_print_csrf_hidden(); @@ -1916,7 +1714,7 @@ if (is_metaconsole() === false) { $(document).ready(function() { // Set up the picker to update target timezone and country select lists. $('#timezone-image').timezonePicker({ - target: '#timezone', + target: '#timezone1', }); // Optionally an auto-detect button to trigger JavaScript geolocation. @@ -1938,17 +1736,6 @@ if (is_metaconsole() === false) { var json_profile = $('#hidden-json_profile'); /* data['passwordManage_table'] = html_print_table($passwordManageTable, true); +if (users_is_admin() === true) { + $userManagementTable->rowclass['captions_loginErrorUser'] = 'field_half_width w50p'; + $userManagementTable->cellclass['captions_loginErrorUser'][0] = 'wrap'; + $userManagementTable->cellclass['captions_loginErrorUser'][1] = 'wrap'; + $notLoginCheckContent = []; + $notLoginCheckContent[] = ''.__('Not Login').''; + $notLoginCheckContent[] = html_print_checkbox_switch( + 'not_login', + 1, + $user_info['not_login'], + true + ); -$userManagementTable->rowclass['captions_loginErrorUser'] = 'field_half_width w50p'; -$userManagementTable->cellclass['captions_loginErrorUser'][0] = 'wrap'; -$userManagementTable->cellclass['captions_loginErrorUser'][1] = 'wrap'; -$notLoginCheckContent = []; -$notLoginCheckContent[] = ''.__('Not Login').''; -$notLoginCheckContent[] = html_print_checkbox_switch( - 'not_login', - 1, - $user_info['not_login'], - true -); + $userManagementTable->data['captions_loginErrorUser'][0] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $notLoginCheckContent), + ], + true + ); + $userManagementTable->data['captions_loginErrorUser'][0] .= ui_print_input_placeholder( + __('The user with not login set only can access to API.'), + true + ); -$userManagementTable->data['captions_loginErrorUser'][0] = html_print_div( - [ - 'class' => 'margin-top-10', - 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', - 'content' => implode('', $notLoginCheckContent), - ], - true -); -$userManagementTable->data['captions_loginErrorUser'][0] .= ui_print_input_placeholder( - __('The user with not login set only can access to API.'), - true -); + $localUserCheckContent = []; + $localUserCheckContent[] = ''.__('Local User').''; + $localUserCheckContent[] = html_print_checkbox_switch( + 'local_user', + 1, + $user_info['local_user'], + true + ); -$localUserCheckContent = []; -$localUserCheckContent[] = ''.__('Local User').''; -$localUserCheckContent[] = html_print_checkbox_switch( - 'local_user', - 1, - $user_info['local_user'], - true -); + $userManagementTable->data['captions_loginErrorUser'][1] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $localUserCheckContent), + ], + true + ); + $userManagementTable->data['captions_loginErrorUser'][1] .= ui_print_input_placeholder( + __('The user with local authentication enabled will always use local authentication.'), + true + ); +} -$userManagementTable->data['captions_loginErrorUser'][1] = html_print_div( - [ - 'class' => 'margin-top-10', - 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', - 'content' => implode('', $localUserCheckContent), - ], - true -); -$userManagementTable->data['captions_loginErrorUser'][1] .= ui_print_input_placeholder( - __('The user with local authentication enabled will always use local authentication.'), - true -); $userManagementTable->data['show_tips_startup'][0] = html_print_checkbox_switch('show_tips_startup', 1, ($user_info['show_tips_startup'] === null) ? true : $user_info['show_tips_startup'], true); $userManagementTable->data['show_tips_startup'][1] = ''.__('Show usage tips at startup').''; @@ -551,10 +553,10 @@ $userManagementTable->data['fields_autorefreshTime'][0] .= ui_print_input_placeh // Title for Language and Appearance. $userManagementTable->data['title_lookAndFeel'] = html_print_subtitle_table(__('Language and Appearance')); // Language and color scheme. -$userManagementTable->rowclass['captions_lang_colorscheme'] = 'field_half_width'; -$userManagementTable->rowclass['fields_lang_colorscheme'] = 'field_half_width'; -$userManagementTable->data['captions_lang_colorscheme'][0] = __('Language'); -$userManagementTable->data['fields_lang_colorscheme'][0] = html_print_select_from_sql( +$userManagementTable->rowclass['line1_looknfeel'] = 'field_half_width'; +$userManagementTable->rowclass['line2_looknfeel'] = 'field_half_width'; +$userManagementTable->data['line1_looknfeel'][0] = __('Language'); +$userManagementTable->data['line2_looknfeel'][0] = html_print_select_from_sql( 'SELECT id_language, name FROM tlanguage', 'language', $user_info['language'], @@ -564,8 +566,15 @@ $userManagementTable->data['fields_lang_colorscheme'][0] = html_print_select_fro true ); -$userManagementTable->data['captions_lang_colorscheme'][1] = __('User color scheme'); -$userManagementTable->data['fields_lang_colorscheme'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true); +if (is_metaconsole() === true) { + if (users_is_admin() === true) { + $userManagementTable->data['line1_looknfeel'][1] = $outputMetaAccess[0]; + $userManagementTable->data['line2_looknfeel'][1] = $outputMetaAccess[1]; + } +} else { + $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme'); + $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true); +} $userManagementTable->rowclass['captions_blocksize_eventfilter'] = 'field_half_width'; $userManagementTable->rowclass['fields_blocksize_eventfilter'] = 'field_half_width'; @@ -591,41 +600,55 @@ $userManagementTable->data['fields_blocksize_eventfilter'][1] = html_print_selec false, false ); +if (is_metaconsole() === false) { + // Home screen table. + $homeScreenTable = new stdClass(); + $homeScreenTable->class = 'w100p table_section full_section'; + $homeScreenTable->id = 'home_screen_table'; + $homeScreenTable->style = []; + $homeScreenTable->rowclass = []; + $homeScreenTable->data = []; + // Home screen. + $homeScreenTable->data['captions_homescreen'][0] = __('Home screen'); + $homeScreenTable->colspan['captions_homescreen'][0] = 2; + $homeScreenTable->rowclass['captions_homescreen'] = 'field_half_width'; + $homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex'; + $homeScreenTable->data['fields_homescreen'][0] = html_print_select( + $homeScreenValues, + 'section', + io_safe_output($user_info['section']), + 'show_data_section();', + '', + -1, + true, + false, + false + ); + $homeScreenTable->data['fields_homescreen'][1] = html_print_div( + [ + 'class' => 'w100p', + 'content' => $customHomeScreenDataField, + ], + true + ); -// Home screen table. -$homeScreenTable = new stdClass(); -$homeScreenTable->class = 'w100p table_section full_section'; -$homeScreenTable->id = 'home_screen_table'; -$homeScreenTable->style = []; -$homeScreenTable->rowclass = []; -$homeScreenTable->data = []; + $userManagementTable->rowclass['homescreen_table'] = 'w100p'; + $userManagementTable->data['homescreen_table'] = html_print_table($homeScreenTable, true); +} -// Home screen. -$homeScreenTable->data['captions_homescreen'][0] = __('Home screen'); -$homeScreenTable->colspan['captions_homescreen'][0] = 2; -$homeScreenTable->rowclass['captions_homescreen'] = 'field_half_width'; -$homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex'; -$homeScreenTable->data['fields_homescreen'][0] = html_print_select( - $homeScreenValues, - 'section', - io_safe_output($user_info['section']), - 'show_data_section();', - '', - -1, - true, - false, - false -); -$homeScreenTable->data['fields_homescreen'][1] = html_print_div( - [ - 'class' => 'w100p', - 'content' => $customHomeScreenDataField, - ], - true -); +if (is_metaconsole() === true && users_is_admin() === true) { + $userManagementTable->rowclass['search_custom1_looknfeel'] = 'field_half_width'; + $userManagementTable->rowclass['search_custom2_looknfeel'] = 'field_half_width flex-column'; + $userManagementTable->data['search_custom1_looknfeel'][0] = $searchCustomFieldView[0]; + $userManagementTable->data['search_custom2_looknfeel'][0] = $searchCustomFieldView[1]; -$userManagementTable->rowclass['homescreen_table'] = 'w100p'; -$userManagementTable->data['homescreen_table'] = html_print_table($homeScreenTable, true); + $userManagementTable->rowclass['agent_manager1_looknfeel'] = 'field_half_width'; + $userManagementTable->rowclass['agent_manager2_looknfeel'] = 'field_half_width flex-column'; + $userManagementTable->data['agent_manager1_looknfeel'][0] = $metaconsoleAgentManager[0]; + $userManagementTable->data['agent_manager1_looknfeel'][1] = $metaconsoleAgentManager[2]; + $userManagementTable->data['agent_manager2_looknfeel'][0] = $metaconsoleAgentManager[1]; + $userManagementTable->data['agent_manager2_looknfeel'][1] = $metaconsoleAgentManager[3]; +} // Timezone. $userManagementTable->rowclass['captions_timezone'] = 'field_half_width'; @@ -639,14 +662,15 @@ $userManagementTable->data['fields_timezone'][0] .= ui_print_input_placeholder( __('The timezone must be that of the associated server.'), true ); - -$userManagementTable->data['fields_timezone'][1] = html_print_div( - [ - 'id' => 'timezone-picker', - 'content' => implode('', $timezoneContent), - ], - true -); +if (is_metaconsole() === false) { + $userManagementTable->data['fields_timezone'][1] = html_print_div( + [ + 'id' => 'timezone-picker', + 'content' => implode('', $timezoneContent), + ], + true + ); +} // Title for Language and Appearance. $userManagementTable->data['title_additionalSettings'] = html_print_subtitle_table(__('Additional settings')); @@ -743,3 +767,19 @@ html_print_table($userManagementTable); if ($new_user === false && ((bool) check_acl($config['id_user'], 0, 'UM') === true)) { profile_print_profile_table($id, io_safe_output($json_profile), false, ($is_err === true)); } + +?> + \ No newline at end of file diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php index d656cdeff2..f9d52ae289 100644 --- a/pandora_console/include/functions_profile.php +++ b/pandora_console/include/functions_profile.php @@ -191,15 +191,9 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c $table->id = 'table_profiles'; $table->width = '100%'; $table->class = 'info_table'; - if (is_metaconsole() === true) { - $table->head_colspan[0] = 0; - $table->width = '100%'; - $table->class = 'databox_tactical data'; - $table->title = $title; - } else { - echo '
'; - echo '

'.$title.'

'; - } + + echo '
'; + echo '

'.$title.'

'; $table->data = []; $table->head = []; @@ -405,9 +399,7 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c array_push($table->data, $data); html_print_table($table, $return); - if (is_metaconsole() === false) { - echo '
'; - } + echo '
'; unset($table); } From 00ba02e23e292b8d525d20f4fc99292a234775d1 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 14 Mar 2023 13:26:21 +0100 Subject: [PATCH 102/234] Visual changes PDFs slicebar --- pandora_console/include/chart_generator.php | 7 +-- pandora_console/include/functions.php | 13 +++++ pandora_console/include/functions_events.php | 2 +- .../include/functions_reporting_html.php | 50 ++++++++++--------- .../include/graphs/functions_flot.php | 6 ++- pandora_console/include/styles/events.css | 5 ++ 6 files changed, 54 insertions(+), 29 deletions(-) diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 7bc4785011..2e9ec50479 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -27,8 +27,6 @@ */ // Begin. -require_once 'config.php'; - require_once __DIR__.'/config.php'; require_once __DIR__.'/functions.php'; require_once __DIR__.'/functions_db.php'; @@ -87,7 +85,7 @@ if (check_login(false) === false) {

Access is not granted

-