tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,020 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

13813 Commits

Author SHA1 Message Date
artica b29dd4eb8a Auto-updated build strings. 2018-06-18 00:01:21 +02:00
artica a47f7b7e97 Auto-updated build strings. 2018-06-17 00:01:21 +02:00
artica 2926c7789e Auto-updated build strings. 2018-06-16 00:01:21 +02:00
artica 76bc8ad280 Auto-updated build strings. 2018-06-15 00:01:24 +02:00
daniel 651347897c fixed minor error add link phantomjs 2018-06-14 20:15:04 +02:00
daniel 7d4a29cbe2 fixed errors in meta and windows 2018-06-14 19:19:58 +02:00
daniel 9e229e6228 fixed minor errors 2018-06-14 18:14:54 +02:00
daniel 80ddcbe1b6 fixed security error phantomjs 2018-06-14 16:47:23 +02:00
fermin831 d3c0b0473f Fixed module functions ACL check 2018-06-14 16:04:50 +02:00
daniel 85570dedba Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-14 12:17:31 +02:00
daniel 46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +02:00
vgilc 3a4f3a38be Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1538
 2018-06-14 10:12:05 +02:00
daniel 9d2f069d20 fixed font and font-family 2018-06-14 10:02:26 +02:00
artica d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
daniel fc970b9b8e fixed minor error 2018-06-13 19:22:22 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
danielmaya 9af4b25f31 Changed permission AW for VR in visual console 2018-06-13 17:28:03 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
danielmaya 6f689f0d0e Added mr 17 and update migrate 2018-06-13 15:39:31 +02:00
daniel 92204c4ec2 fixed minor error alert phantomjs 2018-06-13 11:55:05 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +02:00
daniel ef95d9c68c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-13 11:03:51 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
artica 7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
manuel.montes c8b5ecad06 Fixed submenu2 in functions_menu.php 2018-06-12 17:41:46 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
daniel e07da64c5d fixed minor errors size stat-win 2018-06-12 16:54:45 +02:00
daniel 57503a2d3b Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 16:37:57 +02:00
daniel dfc43a35ab fixed errors grid black in vbars and hbars 2018-06-12 16:37:41 +02:00
vgilc d42d8a2fd7 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports-2' into 'develop' 
Always group All in custom reports and custom graphs

See merge request artica/pandorafms!1528
 2018-06-12 15:56:09 +02:00
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
fermin831 68ae6e3112 Always group All in custom reports and custom graphs 2018-06-12 13:06:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
vgilc 2ff7e496bd Merge branch '2294-Requisitos-API-cluster-3' into 'develop' 
Add mode 1 and empty ip on create agent by API  new_cluster, and get cluster items by API - #2294

See merge request artica/pandorafms!1526
 2018-06-12 12:32:31 +02:00
vgilc 24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
 2018-06-12 12:13:46 +02:00
enriquecd fd368aec86 Add mode 1 and empty ip on create agent by API new_cluster, and get cluster items by API - #2294 2018-06-12 12:08:57 +02:00
daniel 6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
vgilc fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
danielmaya f9be72b34a added image 2018-06-12 10:14:59 +02:00
Alejandro Gallardo Escobar a258dc7e43 Fixed a message 2018-06-12 10:04:33 +02:00
vgilc c389661057 Merge branch '2290-seguridad-en-la-api' into 'develop' 
2290 seguridad en la api

See merge request artica/pandorafms!1513
 2018-06-12 09:09:26 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
fermin831 2150f58ec0 [API ACL] Metaconsole functions 2018-06-11 18:39:19 +02:00
manuel.montes bcd937b1ba Fixed bug in pandorafms 2018-06-11 17:42:12 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 c949ab3dc7 Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-11 15:55:48 +02:00
vgilc 5e1c88cd45 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed minor errorstime graphs

See merge request artica/pandorafms!1522
 2018-06-11 15:39:58 +02:00
fermin831 e3fbef309b [API ACL] Added ACL to set functions 2018-06-11 15:39:58 +02:00
vgilc e40bbbd24d Merge branch 'update-console-translation-for-japanese' into 'develop' 
Updated Japanese translation.

See merge request artica/pandorafms!1521
 2018-06-11 15:37:34 +02:00
daniel abad4f4f4b fixed minor errorstime graphs 2018-06-11 15:35:04 +02:00
daniel adf9e4d1fe fixed minor errors 2018-06-11 13:53:10 +02:00
daniel b25332d014 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-11 08:24:07 +02:00
Junichi Satoh 5d727a1e8f Updated Japanese translation. 2018-06-11 15:02:42 +09:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
fermin831 eda5898031 [API ACL] More setters 2018-06-08 15:20:15 +02:00
daniel f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
manuel.montes 17b2b01e7a Fixed select in modificar_agente.php 2018-06-08 14:09:59 +02:00
danielmaya 7dfd3fcfa1 changes in tdatabase 2018-06-08 13:21:33 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
Fermin 9bf6102ac6 [ACL API] Added ACL in some set functions 2018-06-07 19:45:54 +02:00
Fermin 054b915846 [ACL API] Fixed get planned_downtimes_items and added ACL to more the rest of get functions 2018-06-07 13:11:40 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
Fermin 2a9a7b931a Fixed visualconsole status modules and agents in metaconsole 2018-06-07 10:03:27 +02:00
daniel 7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
fermin831 b3bdd5d492 [API ACL] More get functions (2) 2018-06-06 19:39:57 +02:00
fermin831 7f2d583f63 [API ACL] More get functions 2018-06-06 19:04:06 +02:00
daniel 867e00c50d fixed minor error 2018-06-06 18:00:44 +02:00
daniel ea6f96e96b fixed minor error api 2018-06-06 17:53:52 +02:00
daniel d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
manuel.montes 4281824555 Fixed jquery in pandora_console/general/main_menu.php 2018-06-05 16:23:30 +02:00
danielmaya f8aa351987 Fixed line graph and box item when exporting visual consoles 2018-06-05 15:14:27 +02:00
vgilc 9cd95e2a48 Merge branch '2154-Fallo-de-visualización-al-crear-y-eliminar-grupos-de-agentes' into 'develop' 
2154 fallo de visualización al crear y eliminar grupos de agentes

See merge request artica/pandorafms!1502
 2018-06-05 11:11:57 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc ede1a3e091 Merge branch 'fix-error-with-php72' into 'develop' 
Fixed error and white screen with php7.2.

See merge request artica/pandorafms!1515
 2018-06-05 10:26:10 +02:00
manuel.montes d4aae1c4c1 Fixed checkbox select in manage_network_templates.php 2018-06-05 10:11:44 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
vgilc 2be81f76b9 Merge branch '2196-Menús-fijados-y-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed menu with top property

See merge request artica/pandorafms!1501
 2018-06-05 09:42:01 +02:00
Junichi Satoh 5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
danielmaya 89aa85626c Fixed export and import visual consoles 2018-06-04 15:56:17 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
 2018-06-04 10:19:56 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop' 
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
 2018-06-04 10:18:44 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
vgilc 0008e0183b Merge branch 'ent-2247-busqueda-libre-en-vista-de-eventos-ext-5725' into 'develop' 
Fixed free search in events view

See merge request artica/pandorafms!1511
 2018-06-04 10:15:29 +02:00
vgilc 900f6ba609 Merge branch '2294-Requisitos-API-cluster-2' into 'develop' 
Add cluster and API get functions - #2294

See merge request artica/pandorafms!1495
 2018-06-04 10:13:28 +02:00
vgilc b7dcd79eb3 Merge branch 'ent-2329-graficas-en-tiempo-real-con-modulos-SNMP-fallo-en-algunos-casos' into 'develop' 
Fixed problems with strange names on SNMP realtime graphs

See merge request artica/pandorafms!1509
 2018-06-04 10:12:27 +02:00
vgilc 9ea0115043 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports' into 'develop' 
[ACL] Now only RM can delete custom graphs

See merge request artica/pandorafms!1341
 2018-06-04 10:10:56 +02:00
vgilc b2eada198a Merge branch 'ent-2142-la-vista-de-grupos-del-nodo-usando-la-cache-esta-mal' into 'develop' 
Ent 2142 la vista de grupos del nodo usando la cache esta mal

See merge request artica/pandorafms!1512
 2018-06-04 10:00:53 +02:00
vgilc 0943540b05 Merge branch '2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola' into 'develop' 
Fixed static graph links to another visual console in meta

See merge request artica/pandorafms!1507
 2018-06-04 09:59:51 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
daniel 97aaad0b02 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-01 14:04:46 +02:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
fermin831 a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
fermin831 f0aacc4c33 Secondary groups are implemented in group view cache 2018-06-01 12:25:20 +02:00
fermin831 5c57ee34a7 Fixed group view on metaconsole (typo) 2018-06-01 12:23:25 +02:00
fermin831 0757d2ed56 Fixed cached group view in node 2018-06-01 12:19:34 +02:00
artica ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
fermin831 6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +02:00
fermin831 ad4b38d510 Fixed problems with strange agent name on SNMP realtime graphs 2018-05-31 18:02:50 +02:00
fermin831 552f2ce14c Fixed problems with strange names on SNMP realtime graphs 2018-05-31 18:00:44 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831 0b0fe5ea6c Fixed static graph links to another visual console in meta 2018-05-31 17:14:35 +02:00
fermin831 836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
danielmaya 6711ff3e9c Added ha_cluster images 2018-05-31 10:30:21 +02:00
artica e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
fermin831 f1807246a1 Changed MR to 16 and current_package_enterprise to 723 for new and migrated installations 2018-05-30 15:49:59 +02:00
fermin831 3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831 061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +02:00
artica 7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
fermin831 0acaf2312d [Rebranding] Mobile console head title 2018-05-29 13:26:47 +02:00
manuel.montes 5021144405 fixed resize in stat_win.php 2018-05-29 13:19:20 +02:00
fermin831 1391f8cc11 [Rebranding] Fixed get header logo on metaconsole 2018-05-29 12:45:08 +02:00
artica aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
manuel.montes bc98327bb4 Fixed cache in functions_users.php 2018-05-28 17:33:35 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
manuel.montes 23b6dd5bdb Fixed menu with top property 2018-05-28 12:58:23 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
fbsanchez 2f8cdb5ea5 Added check_login to plugin registration 2018-05-28 11:31:09 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831 6675597b62 [Rebranding] Minor fix 2018-05-24 18:35:20 +02:00
fermin831 8eb44762b2 [Rebranding] Added custom favicon and white background to meta 2018-05-24 18:33:45 +02:00
danielmaya 3f1a1a816b Fixed id_agente lost in insert_data 2018-05-24 17:24:53 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
danielmaya 8a6755d224 fixed conditional in ajax.php 2018-05-24 16:28:51 +02:00
manuel.montes b28047ae9e Fixed the online-style of submit 2018-05-24 13:56:29 +02:00
fermin831 063865e179 [Rebranding] Refactorized logos preview in nodo 2018-05-24 12:50:24 +02:00
vgilc ad3a7071b3 Merge branch '2297-Visor-de-logs-pone-un-ancho-enorme-y-se-mete-en-scroll-horizontal' into 'develop' 
Fixed white-space / pre-wrap

See merge request artica/pandorafms!1494
 2018-05-24 12:07:09 +02:00
fermin831 acad8d537b [Rebranding] Added tooltip to avoid Monitoring Event name will be changed 2018-05-24 11:37:26 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
fermin831 bcb3af09ca [Rebranding] Minor fix 2 2018-05-24 10:56:24 +02:00
fermin831 653248698d [Rebranding] Remove a obsolete link 2018-05-24 10:31:51 +02:00
danielmaya ad7e8229ed Added check_login 2018-05-24 09:02:06 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
enriquecd dbafab2ae7 Add cluster and API get functions - #2294 2018-05-23 19:13:47 +02:00
fermin831 5e9cf38474 [Rebranding] Modified some strings to new installations 2018-05-23 18:21:42 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
manuel.montes b68948307b Fixed white-space / pre-wrap 2018-05-23 17:55:07 +02:00
daniel 16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +02:00
vgilc dcf6e46f61 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop' 
Más corrección de errores

See merge request artica/pandorafms!1492
 2018-05-23 08:46:52 +02:00
vgilc 6727941bac Merge branch 'ent-2268-fallo-en-la-vista-de-RSS-de-eventos' into 'develop' 
Fixed rss events due to secondary groups

See merge request artica/pandorafms!1481
 2018-05-23 08:45:45 +02:00
vgilc 076724ba35 Merge branch '1141-Ajustar-grafica-a-los-valores-mostrados' into 'develop' 
add zoom graphs xy

See merge request artica/pandorafms!1491
 2018-05-23 08:45:17 +02:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
fermin831 2c97232f90 [Rebranding] Miscelaneous rebranding 2018-05-22 19:22:37 +02:00
Alejandro Gallardo Escobar dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
fermin831 9935b7f8a3 [Rebranding] Added custom logo to node request new license 2018-05-22 16:49:49 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Alejandro Gallardo Escobar 37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel 3accc31372 add zoom graphs xy 2018-05-22 15:57:36 +02:00
fermin831 946e897db6 [Rebranding] Get the correct header logo in the metaconsole 2018-05-22 15:26:11 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
daniel 727b173392 fixed error library pdf example 2018-05-22 13:15:09 +02:00
fbsanchez a5be501f4d Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-22 11:41:29 +02:00
fbsanchez 9f140e6197 Applied lukasr patch for pchart 2018-05-22 10:51:03 +02:00
daniel 25666e1bff fixed errors 2018-05-22 10:50:38 +02:00
vgilc 58370449dd Merge branch 'ent-2200-Unreachable-host-en-respuestas-de-eventos' into 'develop' 
Removed unreachable host from events responses

See merge request artica/pandorafms!1450
 2018-05-22 10:00:37 +02:00
danielmaya d48aeb05bb Update HA. change of icon and text 2018-05-22 08:39:38 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
fbsanchez a82299f1cf PluginTools minor changes 
API cluster minor changes
 2018-05-21 18:08:36 +02:00
vgilc f9a5df12db Merge branch 'ent-2266-mobile-sql-injection-vulnerability' into 'develop' 
Vulnerabilidad: Inyección SQL en la consola móvil

See merge request artica/pandorafms!1486
 2018-05-21 17:55:47 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
Alejandro Gallardo Escobar f0f331be4e Moved a button 2018-05-21 16:22:38 +02:00
Alejandro Gallardo Escobar 447958144e Error fix 2018-05-21 16:00:54 +02:00
Alejandro Gallardo Escobar 2e96c2bbd1 Fixed a SQL injection vulnerability 2018-05-21 15:19:25 +02:00
fbsanchez 2ab45d28b8 Added api_get_agent_id (API) updated plugintools 2018-05-21 14:42:27 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Fermin 3497132517 [Rebranding] Moved rebranding to visual styles section 2018-05-21 11:56:16 +02:00
Fermin ef07eff769 [Rebranding] Added enable update manager option 2018-05-21 11:07:39 +02:00
Fermin 2fa1fb5ea3 [Rebranding] Fixed double safe input in product name and copyright notice 2018-05-21 09:49:44 +02:00
vgilc b283cb2469 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop' 
Improvements and fixes into the internal audit view

See merge request artica/pandorafms!1468
 2018-05-21 08:50:11 +02:00
vgilc 2cc7fe00e9 Merge branch 'ent-2284-fix-xss-vulnerability' into 'develop' 
Fixed XSS vulnerability

See merge request artica/pandorafms!1483
 2018-05-21 08:39:43 +02:00
artica dff20a609b Auto-updated build strings. 2018-05-21 00:01:23 +02:00
artica 4a6859aeae Auto-updated build strings. 2018-05-20 00:01:22 +02:00
artica b7ce2f2dc8 Auto-updated build strings. 2018-05-19 00:01:38 +02:00
fermin831 52ec66d939 [Rebranding] help ja dynamic_threshold 2018-05-18 14:47:15 +02:00
fermin831 4a8972a5d5 [Rebranding] help ja 2018-05-18 14:30:51 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
fermin831 929733598c [Rebranding] help es 2018-05-18 14:06:00 +02:00
fermin831 ce946c1093 [Rebranding] en help 2018-05-18 12:54:00 +02:00
Alejandro Gallardo Escobar cada865042 Fixed XSS vulnerability 2018-05-18 11:00:41 +02:00
artica f3509d285a Auto-updated build strings. 2018-05-18 00:01:28 +02:00
danielmaya 7783f81f59 Fixed mobile graph 2018-05-17 16:43:31 +02:00
artica a79f3b2d05 Auto-updated build strings. 2018-05-17 00:01:23 +02:00
danielmaya e9b2514b33 Update HA, pandoradb 2018-05-16 15:26:28 +02:00
artica 5f8e010d01 Auto-updated build strings. 2018-05-16 00:01:21 +02:00
artica 007715fb93 Auto-updated build strings. 2018-05-15 00:01:26 +02:00
fermin831 d8f63e9963 [Rebranding] Some missing string in extension 2018-05-14 17:51:10 +02:00
fermin831 cb11f0333e [Rebranding] Open general/firts_task/incidents.php 2018-05-14 16:06:32 +02:00
fermin831 ed18d58676 [Rebranding] Open operation/* 2018-05-14 15:52:51 +02:00
fermin831 fe124bff5f Fixed rss events due to secondary groups 2018-05-14 14:41:11 +02:00
fermin831 80aeded931 [Rebranding] Central node in network maps 2018-05-14 12:58:22 +02:00
vgilc 334d359076 Merge branch 'ent-2244-5710-No-funciona-el-Command-Line-Screenshot-en-v722' into 'develop' 
Fixed snapshots view in string data

See merge request artica/pandorafms!1471
 2018-05-14 11:46:07 +02:00
vgilc f920a407fb Merge branch '2231-Vistas-realtime-en-modulos-de-red-2' into 'develop' 
Fixed repeated real time item on agents view

See merge request artica/pandorafms!1479
 2018-05-14 08:47:32 +02:00
artica 3e8f9cbb34 Auto-updated build strings. 2018-05-14 00:01:23 +02:00
artica d63f316042 Auto-updated build strings. 2018-05-13 00:02:13 +02:00
enriquecd deb1cebeca Show warning modal window when change snmp or satellite module name - #2251 2018-05-11 16:13:56 +02:00
Fermin 29f56df1fd [Rebranding] Open operation/agents 2018-05-11 15:17:53 +02:00
Fermin 9cf7fee2c0 [Rebranding] Open mobile console 2018-05-11 14:24:26 +02:00
Fermin 6479e3ac64 Fixed repeated real time item on agents view 2018-05-11 13:14:08 +02:00
Fermin 0d6115726a [Rebranding] Open include root files (except networkmaps related sources) 2018-05-11 12:49:16 +02:00
artica 65f9fe1cb7 Auto-updated build strings. 2018-05-11 00:01:26 +02:00
fermin831 8a1f5c87ec [Rebranding] Open API 2018-05-10 18:56:59 +02:00
fermin831 e796b844d3 [Rebranding] Open include/* (not the root files) 2018-05-10 18:19:47 +02:00
fermin831 fcebfceffb Do not show always the percentil in custom graphs 2018-05-10 17:29:50 +02:00
fermin831 c3beafc499 [Rebranding] Open godmode/update_manager and godmode/users 2018-05-10 17:15:37 +02:00
fermin831 d9e35b3668 [Rebranding] Open git status 2018-05-10 17:08:30 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00
fermin831 d663553e8d [Rebranding] Open godmode/agentes 2018-05-10 13:08:34 +02:00
Alejandro Gallardo Escobar 7d6e50814f Merge branch 'develop' into ent-2215-cut-node-names-networkmap 2018-05-10 12:41:28 +02:00
Alejandro Gallardo Escobar 9af7b75e3e The node names of the networkmap are reduced if they are too long 2018-05-10 11:46:49 +02:00
Alejandro Gallardo Escobar 6bc8cee237 Added the user defined timezone to some dates 2018-05-10 11:43:03 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
 2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
fermin831 33abfa7f9d [Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php 2018-05-09 18:50:45 +02:00
fermin831 b9504038fa [Rebranding] First tasks 2018-05-09 15:16:39 +02:00
fermin831 34b953964a [Rebranding] Added rebranding to extensions 2018-05-09 13:42:20 +02:00
fermin831 a3ebd00876 [Rebranding] Node setup and footer 2018-05-09 13:12:03 +02:00
fermin831 614db8b523 [Rebranding] Added product name and copyright notice to setup 2018-05-09 11:49:12 +02:00
danielmaya 3c7fe95a33 Added check login and check acl in update_manager.ajax 2018-05-09 11:37:53 +02:00
danielmaya 931c41698b Fixed check login in ajax.php 2018-05-09 10:52:06 +02:00
vgilc 220ea8d319 Merge branch 'ent-2103-wms-map-server' into 'develop' 
Added a new GIS map source type called WMS

See merge request artica/pandorafms!1469
 2018-05-09 10:28:30 +02:00
vgilc c83def806b Merge branch '2231-Vistas-realtime-en-modulos-de-red' into 'develop' 
2231 vistas realtime en modulos de red

See merge request artica/pandorafms!1470
 2018-05-09 10:28:02 +02:00
vgilc 7cb31c945a Merge branch 'ent-1892-EXT-5237-el-percentil-no-se-muestra-en-las-graficas-personalizadas-del-un-contenedor-grafico' into 'develop' 
Added percentile to custom graphs containers

See merge request artica/pandorafms!1436
 2018-05-09 10:27:34 +02:00
vgilc 6eea48dccf Merge branch 'ent-2057-modulos-prediction-se-crean-en-otro-agente' into 'develop' 
Fixed module prediction agent creation

See merge request artica/pandorafms!1435
 2018-05-09 10:26:16 +02:00
vgilc e257d6dc8d Merge branch 'ent-2184-Bug-Custom-Graph-en-Consola-visual' into 'develop' 
[Visual console] Removed show all advanced options in all elements and add its…

See merge request artica/pandorafms!1472
 2018-05-09 10:24:56 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' 
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
 2018-05-09 10:24:19 +02:00
vgilc 96df6938fa Merge branch 'ent-1917-tmb-personalizacion-exportacion-csv-de-eventos' into 'develop' 
Ent 1917 tmb personalizacion exportacion csv de eventos

See merge request artica/pandorafms!1438
 2018-05-09 10:23:38 +02:00
vgilc 1614bbad88 Merge branch 'ent-1960-RedIRIS-URL-de-acceso-a-los-agentes-no-funciona-en-alertas-de-correos' into 'develop' 
Fixed login query params deletion (now it does not delete)

See merge request artica/pandorafms!1437
 2018-05-09 10:22:59 +02:00
vgilc 002eabca77 Merge branch 'ent-1961-Al-aplicar-un-Componente-de-red-por-politica-no-se-guarda-el-FF-Threshold' into 'develop' 
Fixed Flip Flop threshold change value on component loading via AJAX

See merge request artica/pandorafms!1464
 2018-05-09 10:22:32 +02:00
vgilc d1537f45ae Merge branch '2242-5694-se-superpone-info-timestamp-en-eje-x-graficas-personalizadas' into 'develop' 
Specified more accurate class for label styling

See merge request artica/pandorafms!1466
 2018-05-09 10:10:58 +02:00
artica 04e3d3071d Auto-updated build strings. 2018-05-09 00:01:23 +02:00
fermin831 597e702e13 [Visual console] Removed show all advanced options in all elements and add its options to donut graphs 2018-05-08 18:50:14 +02:00
Alejandro Gallardo Escobar e77b9f35b6 Improved the help of the WMS server connection creation 2018-05-08 17:29:58 +02:00
Alejandro Gallardo Escobar e1319cb584 Improved the GIS map screen 2018-05-08 10:07:33 +02:00
artica 3377ecfd64 Auto-updated build strings. 2018-05-08 00:01:23 +02:00
fermin831 57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
Alejandro Gallardo Escobar f1985313ab The audit view and csv now use the user defined timezone 2018-05-07 16:10:31 +02:00
fermin831 6297b20bf6 Added hint to Realtime SNMP graph 2018-05-07 13:30:09 +02:00
danielmaya 475d243224 Added master creation in ha_cluster 2018-05-07 13:21:06 +02:00
fermin831 fd91ba63f6 Added realtime graph to monitor view 2018-05-07 12:53:12 +02:00
artica e0cf024990 Auto-updated build strings. 2018-05-07 00:01:21 +02:00
artica 6dd28d2d75 Auto-updated build strings. 2018-05-06 00:01:21 +02:00
artica b92d9c9560 Auto-updated build strings. 2018-05-05 00:01:23 +02:00
Alejandro Gallardo Escobar 9c64026990 Improvements and fixes into the internal audit view 2018-05-04 13:38:04 +02:00
fermin831 0f4daee237 Added icon to realtime SNMP graph 2018-05-04 13:18:33 +02:00
fermin831 3d979ff975 advanced_sla should multiply by 100 the value 2018-05-04 12:29:38 +02:00
fbsanchez 3dd4dd51cb Specified more accurate class for label styling 2018-05-04 12:26:18 +02:00
enriquecd 734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
fermin831 bd3f0712f1 Added separated window view to SNMP realtime graphs 2018-05-04 10:58:37 +02:00
Ramon Novoa 7bb3fb8077 Fixes to the Dockerfiles. Thanks to marcelo-ochoa. 
Fix permissions in the DB Dockerfile and add mod_ssl to the Console
Dockerfile.
 2018-05-04 10:02:52 +02:00
artica 770267d72e Auto-updated build strings. 2018-05-04 00:01:21 +02:00
fermin831 32822054d6 Added realtime graph button to agent view 2018-05-03 17:13:38 +02:00
fermin831 2885885cc4 Fixed a JS error (invalid parameter in pandoraAreaGraph) 2018-05-03 13:02:17 +02:00
fermin831 5783e56a2e Fixed a PHP warning (invalida foreach) 2018-05-03 12:57:48 +02:00
fermin831 8bc9805288 [Realtime Graphs] Added the hidden type snmp_module 2018-05-03 12:57:24 +02:00
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
fermin831 27b2d55371 Fixed Flip Flop threshold change value on component loading via AJAX 2018-04-30 17:48:49 +02:00
fermin831 7162241ef9 Change the extension of CSV events file to .csv 2018-04-30 15:55:15 +02:00
Alejandro Gallardo Escobar 0b1546be22 Fixed a date 2018-04-30 15:35:41 +02:00
Alejandro Gallardo Escobar 26338dab4f Add timezone selection to the user profile 2018-04-30 15:34:46 +02:00
Alejandro Gallardo Escobar 01997ff479 Added a select component to choose a timezone 2018-04-30 15:34:18 +02:00
enriquecd d76f8f6c76 Fix MR - #2007 2018-04-30 14:59:35 +02:00
enriquecd 6affae9872 drop agents foreign keys in tcluster tables - #2007 2018-04-30 13:06:08 +02:00
fermin831 57c928ec8a [Events] Fixed csv export after secondary groups 2018-04-30 12:38:29 +02:00
artica 235f20ef86 Auto-updated build strings. 2018-04-30 00:01:56 +02:00
artica 9b1d62f999 Auto-updated build strings. 2018-04-29 00:02:00 +02:00
artica a1fa3a4ee8 Auto-updated build strings. 2018-04-28 00:01:34 +02:00
daniel b11e256c8b fixed custom graph 2018-04-27 13:51:13 +02:00
Alejandro Gallardo Escobar cc06dfe876 Added a new GIS map source type called WMS 2018-04-27 12:17:42 +02:00
vgilc 3855e4c378 Merge branch '2225-Vista_de_monitores_no_filtra_por_grupo_Metaconsola' into 'develop' 
fixed minor error in monitors view metaconsole filter group

See merge request artica/pandorafms!1457
 2018-04-27 12:04:43 +02:00
daniel 27aa2a4632 fixed minor error in monitors view metaconsole filter group 2018-04-27 11:07:54 +02:00
enriquecd d92dc1a2b0 Change API and flags in cluster manager - #2007 2018-04-27 11:06:29 +02:00
daniel 30dc841bae custom graph 2018-04-27 10:03:05 +02:00
artica 7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +02:00
vgilc 830a2090fb Merge branch '2219-Query_satura_base_de_datos_NT' into 'develop' 
tags secondary groups patch

See merge request artica/pandorafms!1452
 2018-04-26 15:11:43 +02:00
danielmaya 03b5cbdb62 Fixed issue in networkmap 2018-04-26 12:29:11 +02:00
daniel ddf1c3a3db tags secondary groups patch 2018-04-26 10:54:03 +02:00
nramon 50357c6b83 Merge branch '2134-Fallos-en-las-relaciones-de-nodos,-el-regreso-dev' into 'develop' 
Fixed repeated relationships in networkmap

See merge request artica/pandorafms!1451
 2018-04-26 10:46:20 +02:00
danielmaya 708cd1020b Fixed repeated relationships in networkmap 2018-04-26 10:40:16 +02:00
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
vgilc 4afc0e2d17 Merge branch '2073-revision-del-sla-2' into 'develop' 
[SLA] Fixed full not init and ignored availability and SLA reports

See merge request artica/pandorafms!1449
 2018-04-26 09:13:07 +02:00
artica edacc90226 Auto-updated build strings. 2018-04-26 00:01:26 +02:00
fermin831 5429ebb8de Removed unreachable host from events responses 2018-04-25 19:04:52 +02:00
fermin831 71d5be46a6 [SLA] Fixed full not init and ignored availability and SLA reports 2018-04-25 16:59:33 +02:00
fermin831 9c9f75152d Added custom confirm dialog to events 2018-04-25 12:34:33 +02:00
fermin831 675e8deb47 Added function display_confirm_dialog with custom dialog 2018-04-25 12:32:58 +02:00
artica ec61441587 Auto-updated build strings. 2018-04-25 00:01:32 +02:00
daniel ef9d31adfd fixed errors in function alias in metaconsole 2018-04-24 13:23:45 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
fermin831 112bbac527 Added id to in progress status bin icon (disabled) 2018-04-24 12:11:04 +02:00
fermin831 e09e1c4cd4 Fixed in progress event button in metaconsole and other problems 2018-04-24 11:54:45 +02:00
danielmaya 118f32e12e Fixed duplicate relationships in networkmap 2018-04-24 10:28:34 +02:00
artica de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
fermin831 a21eaafc61 Added in progress button to events list 2018-04-23 18:41:44 +02:00
Alejandro Gallardo Escobar 4239b669f2 Added a new confirm message when trying to delete groups with children 2018-04-23 16:26:35 +02:00
fermin831 cfbe80669a Fixed unloaded includes in interface graphs 2018-04-23 15:48:17 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
artica d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica 1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica 1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
vgilc 5512fd3bb1 Merge branch '2007-Monitorizacion-de-cluster-fase-2-API' into 'develop' 
Add API cluster functions - #2007

See merge request artica/pandorafms!1387
 2018-04-20 10:32:14 +02:00
vgilc 5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
enriquecd 676835ddc8 Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-API 
Conflicts:
	pandora_console/include/functions_api.php
 2018-04-20 10:10:33 +02:00
vgilc 1cb423fcfe Merge branch 'ent-1793-Etiquetas-de-las-graficas-con-decimales-2' into 'develop' 
Modified round decimals to avoid round string values

See merge request artica/pandorafms!1441
 2018-04-20 08:26:36 +02:00
nramon 0e003f9807 Merge branch '2126-Bloqueo-o-error-de-acceso-a-usuarios-sin-permisos-dev-2' into 'develop' 
Permit login with admin users without profiles

See merge request artica/pandorafms!1440
 2018-04-20 08:19:13 +02:00
artica 235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
fermin831 d6a695f793 Modified round decimals to avoid round string values 2018-04-19 19:17:04 +02:00
fermin831 cd2f97d941 Permit login with admin users without profiles 2018-04-19 18:05:47 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
fermin831 bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
artica ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
fermin831 32f96c45ba [Events] Added ID to export CSV 2018-04-18 19:50:13 +02:00
fermin831 0b23f25455 [Events] Fixed csv export after secondary groups 2018-04-18 19:47:20 +02:00
fermin831 8fc8c25548 Fixed login query params deletion (now it does not delete) 2018-04-18 17:58:44 +02:00
fermin831 70bf2dd49f Added percentile to custom graphs containers 2018-04-18 16:01:38 +02:00
fermin831 fdc70572ff Fixed module prediction agent creation 2018-04-18 15:00:56 +02:00
danielmaya ecb483af1a Fixed issue when target = -1 in networkmap 2018-04-18 14:51:38 +02:00
vgilc 292612f765 Merge branch 'ent-2121-Consolas-visuales-no-aplica-las-coordenadas-5539' into 'develop' 
[Visual console] Update position when change advanced options

See merge request artica/pandorafms!1430
 2018-04-18 11:12:29 +02:00
vgilc f7ae6f78b1 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev' into 'develop' 
Fixed issue in dashboard with firefox

See merge request artica/pandorafms!1431
 2018-04-18 11:11:35 +02:00
vgilc 1bc89ecd10 Merge branch '2126-Bloqueo-o-error-de-acceso-a-usuarios-sin-permisos-dev' into 'develop' 
Added profile check in login

See merge request artica/pandorafms!1433
 2018-04-18 11:08:32 +02:00
danielmaya 0cf5cc4b1a Added profile check in login 2018-04-18 10:54:51 +02:00
danielmaya e6dc7799c8 Fixed issue in dashboard with firefox 2018-04-18 10:30:24 +02:00
artica 3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
fermin831 3a47c3a8fb [Visual console] Update position when change advanced options 2018-04-17 19:08:30 +02:00
vgilc bb2b086364 Merge branch '1905-Conteos-y-paginacion-incorrecta-en-vista-de-eventos-dev' into 'develop' 
Added checking user tags in event list

See merge request artica/pandorafms!1428
 2018-04-17 16:26:31 +02:00
vgilc 2f2db81263 Merge branch '2054-Operaciones-masivas-de-edición-de-módulos-de-una-politica-dev' into 'develop' 
Added massive edit policy modules

See merge request artica/pandorafms!1423
 2018-04-17 16:26:02 +02:00
vgilc 77a8e5f856 Merge branch '2178-Herencia-de-estado-de-consolas-visuales-dev' into 'develop' 
Fixed static graph with unknown status in visual map

See merge request artica/pandorafms!1424
 2018-04-17 16:24:51 +02:00
vgilc 725bbb7d2d Merge branch '2179-Permisos-avanzados-de-LDAP-dev' into 'develop' 
Fixed atributtes ldap

See merge request artica/pandorafms!1425
 2018-04-17 16:24:20 +02:00
vgilc 12451fa63b Merge branch 'ent-2104-gis-tooltip-improvements' into 'develop' 
Ent 2104 gis tooltip improvements

See merge request artica/pandorafms!1414
 2018-04-17 16:23:38 +02:00
vgilc 981fa839b5 Merge branch 'ent-1793-Etiquetas-de-las-graficas-con-decimales' into 'develop' 
Fixed Y-axis label decimals

See merge request artica/pandorafms!1429
 2018-04-17 16:23:12 +02:00
vgilc 778be05874 Merge branch 'ent-1902-sql-error' into 'develop' 
Elimina un error SQL al obtener noticias

See merge request artica/pandorafms!1415
 2018-04-17 16:22:44 +02:00
vgilc d0458e0194 Merge branch 'ent-2102-graph-error' into 'develop' 
Ent 2102 - Error SQL Graphs meta

See merge request artica/pandorafms!1416
 2018-04-17 16:22:19 +02:00
vgilc 4e102e12da Merge branch 'ent-2129-Ventana-SNMP-walk-muy-pequena' into 'develop' 
Fixed size snmp walk modal

See merge request artica/pandorafms!1427
 2018-04-17 16:21:15 +02:00
vgilc 7367eb7d29 Merge branch '2073-revision-del-sla' into 'develop' 
2073 revision del sla

See merge request artica/pandorafms!1379
 2018-04-17 16:20:37 +02:00
vgilc 51df9802f7 Merge branch 'ent-2112-Error-ACLs-en-los-Graph-Container' into 'develop' 
[Graph container] Display only the containers group can see (ACL)

See merge request artica/pandorafms!1426
 2018-04-17 16:19:58 +02:00
vgilc 775501a11b Merge branch 'ent-2161-metaconsole-static-graph-status-bug' into 'develop' 
Fixed the static graph status into the Metaconsole Visual Maps

See merge request artica/pandorafms!1421
 2018-04-17 16:19:07 +02:00
fermin831 4d78256937 Fixed Y-axis label decimals 2018-04-17 11:54:52 +02:00
danielmaya 70bf27f48a Added checking user tags in event list 2018-04-17 10:10:18 +02:00
artica bc251e58df Auto-updated build strings. 2018-04-17 00:01:28 +02:00
fermin831 c889e5138e Fixed size snmp walk modal 2018-04-16 18:14:08 +02:00
fermin831 c1e463824b [Graph container] Display only the containers group can see (ACL) 2018-04-16 17:37:27 +02:00
danielmaya ee115f1d0e Fixed atributtes ldap 2018-04-16 17:17:59 +02:00
fermin831 03c7e96ee2 Removed unwanted code 2018-04-16 12:27:00 +02:00
fermin831 a190bd992b [SLA] Modified availability SLA to include priority modes 2018-04-16 12:25:02 +02:00
danielmaya 8f89611d7c Fixed static graph with unknown status in visual map 2018-04-16 10:57:26 +02:00
artica cb5c3016dc Auto-updated build strings. 2018-04-16 00:01:23 +02:00
artica 2ab79ce5e4 Auto-updated build strings. 2018-04-15 00:01:24 +02:00
artica 738b1fdd68 Auto-updated build strings. 2018-04-14 00:01:27 +02:00
fermin831 075a89a8b7 [SLA] Fixed availability graphs and SLA calculation 2018-04-13 15:02:54 +02:00
fermin831 38ea279b96 [Availability graph] Coloured the main data 2018-04-13 14:22:47 +02:00
fermin831 0c537b8178 [SLA] Added the time_downtime and time_unknown like OK time to SLA calculation 2018-04-13 13:22:32 +02:00
fermin831 95980456e9 [SLA] Added define to status (err, ok, downtimes, ignored, unknown and not init) 2018-04-13 10:05:11 +02:00
artica 9f2aa451fb Auto-updated build strings. 2018-04-13 00:01:25 +02:00
fermin831 9a55ee7d2a [SLA] Added priority mode to report style (only interface) 2018-04-12 15:42:53 +02:00
danielmaya 6799f5f504 Added massive edit policy modules 2018-04-12 15:42:39 +02:00
artica 92fb527ff8 Auto-updated build strings. 2018-04-12 00:01:23 +02:00
Alejandro Gallardo Escobar d49cfea9f4 Fixed the static graph status shown into the Metaconsole Visual Maps 2018-04-11 16:38:21 +02:00
fermin831 fb4be3cddf [SLA] Substitute the downplanned color 2018-04-11 16:22:16 +02:00
vgilc 0333accb5b Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop' 
Do not use cache only when secondary groups are used in tree view

See merge request artica/pandorafms!1420
 2018-04-11 11:08:57 +02:00
fermin831 1e1e6f5069 Do not use cache only when secondary groups are used in tree view 2018-04-11 11:04:21 +02:00
vgilc e4e814a752 Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop' 
Deleted unwanted traces

See merge request artica/pandorafms!1419
 2018-04-11 09:52:37 +02:00
fermin831 28a3d3d8cc Deleted unwanted traces 2018-04-11 09:47:20 +02:00
vgilc a958dc98f3 Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop' 
2015 implementacion de grupos secundarios 2

See merge request artica/pandorafms!1418
 2018-04-11 09:09:33 +02:00
artica 1ecfd4669e Auto-updated build strings. 2018-04-11 00:01:26 +02:00
fermin831 8ff29293a5 Avoid to add alert to total count in treeview 2018-04-10 18:20:51 +02:00
fermin831 9c82e3651a Avoid cache tree view 2018-04-10 17:59:34 +02:00
Alejandro Gallardo Escobar d22b2ba588 Bugfix 2018-04-10 11:37:17 +02:00
Alejandro Gallardo Escobar 1fbc8f01cc Added the alerts fired to the popup of the agent selected into the GIS map 2018-04-10 11:04:29 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
fermin831 1f79326e97 [Secondary groups] Added SQL changes to migrate scripts 2018-04-10 09:38:00 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
artica e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
fermin831 678aa02ed7 [Secondary groups] Added hint to node group view 2018-04-09 20:18:37 +02:00
fermin831 4e1f57a43a Hide the realtime statistic group view 2018-04-09 19:47:29 +02:00
fermin831 6310b499be [Secondary groups] Added secondary groups to meta monitor status view 2018-04-09 19:10:19 +02:00
fermin831 361bd23093 [Secondary groups] Added secondary groups to node monitor detail 2018-04-09 18:56:05 +02:00
fermin831 5dec329941 [Secondary groups] Added secondary groups to agent view 2018-04-09 18:23:06 +02:00
Alejandro Gallardo Escobar 6ccf1ef27a The GIS tooltip is now a modal view 2018-04-09 17:19:29 +02:00
Alejandro Gallardo Escobar d1608400f9 Avoid the news search for users without groups 2018-04-09 17:17:01 +02:00
fermin831 f6e03c0faa [Secondary groups] Added secondary groups in some events queries 2018-04-09 17:01:39 +02:00
fermin831 29a4e29cb9 [Secondary groups] Fixed display only secondary agents in tree view 2018-04-09 15:13:01 +02:00
Alejandro Gallardo Escobar 1dc8fec69a Added the number of not validated & critical events to the popup of the agent selected into the GIS map 2018-04-09 13:47:29 +02:00
fermin831 f8d900ee75 [Secondary groups] Fixed select all group on Profiles/Groups assigned 2018-04-09 13:37:55 +02:00
fermin831 8da6eca4ab [Secondary groups] Fixed get agents function to works properly with groups view 2018-04-09 12:40:52 +02:00
fermin831 9972252a3f [Secondary groups] Fixed agent filter on node tree view 2018-04-09 12:40:11 +02:00
fermin831 89181b6f42 [Secondary groups] Added secondary groups to meta tree view 2018-04-09 12:33:03 +02:00
artica 6bf0371a85 Auto-updated build strings. 2018-04-09 00:01:22 +02:00
artica 77f26cf08f Auto-updated build strings. 2018-04-08 00:01:21 +02:00
artica dcd57a421a Auto-updated build strings. 2018-04-07 00:01:33 +02:00
fermin831 310c2a6f15 [Secondary groups] Added secondary groups in tree view 2018-04-06 17:19:03 +02:00
fermin831 4c71450b6a [Secondary Groups] Added secondary agents to metaconsole group view 2018-04-06 14:08:36 +02:00
fermin831 3463cd1ea2 [Secondary Groups] Added secondary agents to node group view 2018-04-06 12:04:08 +02:00
artica f517edca1c Auto-updated build strings. 2018-04-06 00:01:25 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
vgilc 6a948c238e Merge branch '1454-Mostrar-o-no-agentes-y-módulos-no-iniciados-en-tree-view' into 'develop' 
Filter by not init agents and modules in tree view - #1454

See merge request artica/pandorafms!1397
 2018-04-05 16:35:12 +02:00
enriquecd fa82f45d7d Fix not init counters final - #1454 2018-04-05 16:11:24 +02:00
artica 4b36d86e48 Auto-updated build strings. 2018-04-05 00:01:24 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
artica f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
vgilc 2b608bf914 Merge branch '2080-Informe_de_tipo_Network_Interface_con_TIP_no_funciona_3' into 'develop' 
fixed minor error fullscale in report interfaces metaconsole

See merge request artica/pandorafms!1406
 2018-04-03 13:05:25 +02:00
daniel cac55053e3 fixed minor error fullscale in report interfaces metaconsole 2018-04-03 12:42:54 +02:00
danielmaya 7327998985 Fixed raw_text undefined in networkmap 2018-04-03 12:25:51 +02:00
vgilc b92ec56140 Merge branch '1878-Cluster-Añadir-opciones-de-permisos-ACL-para-clster-view-y-que-no-aparezca-grupo-all-en-el-creador-de-clusters-4' into 'develop' 
Fix cluster ACL - #1878

See merge request artica/pandorafms!1400
 2018-04-03 09:48:42 +02:00
vgilc c006ee227f Merge branch '2026-Quitar-el-parpadeo-del-reloj-digital-fix' into 'develop' 
Not blink separatos points in visual console digital clock - #2026

See merge request artica/pandorafms!1401
 2018-04-03 09:35:58 +02:00
vgilc 90280fd943 Merge branch '2030-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente-4' into 'develop' 
Hide password custom fields in agent view - #2030

See merge request artica/pandorafms!1399
 2018-04-03 09:35:22 +02:00
vgilc 3b418faeb2 Merge branch '2098-5480-Error-SQL-vista-de-informes-por-informes-creados-a-través-wizard' into 'develop' 
Fix reports made by wizard - #2098

See merge request artica/pandorafms!1402
 2018-04-03 09:34:51 +02:00
artica 337822a608 Auto-updated build strings. 2018-04-03 00:01:22 +02:00
daniel c2ba4e20db fixed minor error report network interfaces nodo 2018-04-02 12:23:47 +02:00
artica 1ab18d6c2d Auto-updated build strings. 2018-04-02 00:01:21 +02:00
artica 4e5d2477ac Auto-updated build strings. 2018-04-01 00:01:22 +02:00
artica 727b69462a Auto-updated build strings. 2018-03-31 00:01:21 +02:00
artica 7976e0461f Auto-updated build strings. 2018-03-30 00:01:21 +02:00
artica 9ea7dc0dbb Auto-updated build strings. 2018-03-29 00:01:22 +02:00
enriquecd 5418bbd099 Fix reports made by wizard - #2098 2018-03-28 18:54:15 +02:00
enriquecd 09d712d1ab Not blink separatos points in visual console digital clock - #2026 2018-03-28 18:42:59 +02:00
enriquecd 4378dc48ad Fix cluster ACL - #1878 2018-03-28 18:37:59 +02:00
enriquecd 52b61933df Hide password custom fields in agent view - #2030 2018-03-28 18:14:15 +02:00
enriquecd 87ed7f9cf7 Not blick separator points in visual console digital clock - #2026 2018-03-28 17:30:31 +02:00
enriquecd 8d39ae54fa Filter by not init agents and modules in tree view - #1454 2018-03-28 17:07:57 +02:00
artica 94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +02:00
fermin831 2839388e9e [Secondary Groups] More events fixes 2018-03-27 18:07:43 +02:00
fermin831 4d78b28d17 [Secondary Groups] Fixed grouped agents events in node 2018-03-27 17:53:11 +02:00