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

16853 Commits

Author SHA1 Message Date
Alejandro Fraguas ec73be66f5 Merge branch 'ent-2707-System-Uptime-data-show-bug' into 'develop' 
Fixed bug data in history show

See merge request artica/pandorafms!2504
 2019-06-18 11:15:59 +02:00
fbsanchez dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
artica f293aa2dc0 Auto-updated build strings. 2019-06-18 00:01:08 +02:00
fbsanchez a8a206fa10 events 2019-06-17 19:12:45 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
Luis Calvo 6b2bb1a138 Merge remote-tracking branch 'origin/develop' into ent-2707-System-Uptime-data-show-bug 2019-06-17 16:59:33 +02:00
Daniel Rodriguez 2401ac5c6e Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop' 
Change module type ifOperStatus on Interface Wizard

See merge request artica/pandorafms!2473
 2019-06-17 16:34:14 +02:00
Daniel Rodriguez a583da3de3 Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop' 
Añadir el modo de edición a la vista de la consola visual

Closes pandora_enterprise#3981

See merge request artica/pandorafms!2482
 2019-06-17 15:07:12 +02:00
marcos.alconada 340e253901 Add global config to method getFirstLevel() to remove warning check_acl error 2019-06-17 13:38:05 +02:00
Luis Calvo 3daddc94d9 Fixed, only evaluate unit 2019-06-17 10:29:28 +02:00
artica 38412f2c9a Auto-updated build strings. 2019-06-17 00:01:06 +02:00
artica ef280b1377 Auto-updated build strings. 2019-06-16 00:01:05 +02:00
artica 5b3e6143b3 Auto-updated build strings. 2019-06-15 00:01:07 +02:00
fbsanchez 36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00
fbsanchez 20257edadd event ACL with tags 2019-06-14 18:30:09 +02:00
Luis Calvo 6f15e97a49 Modified module show data Sys Uptime format 2019-06-14 16:13:01 +02:00
Daniel Rodriguez 975d48a653 Merge branch 'ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra' into 'develop' 
Eventos en proceso no se validan ni por id_evento no por id_extra

See merge request artica/pandorafms!2481
 2019-06-14 15:51:18 +02:00
Alejandro Fraguas 08019f11c3 Merge branch 'ent-3463-csv-availability-reports-meta' into 'develop' 
Fixed reports export to csv meta bugs

See merge request artica/pandorafms!2489
 2019-06-14 13:54:50 +02:00
Daniel Rodriguez 4eab732c94 Merge branch 'ent-4179-No-se-guarda-certificado-SSL-en-el-setup-de-la-consola' into 'develop' 
fix bug: path of ssl certificate not being set on general settings

See merge request artica/pandorafms!2501
 2019-06-14 13:38:39 +02:00
fbsanchez 129c24c287 minor fix 2019-06-14 13:22:04 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
Daniel Rodriguez 4362bf3131 Merge branch 'ent-3429-event-report-options-saving' into 'develop' 
Added missing options parameters

See merge request artica/pandorafms!2173
 2019-06-14 13:19:43 +02:00
Daniel Rodriguez 5c7b45173b Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop' 
fix bug in item edition in metaconsole

See merge request artica/pandorafms!2500
 2019-06-14 13:05:27 +02:00
fbsanchez ebfdce1073 Improved ui_progress documentation 2019-06-14 10:40:30 +02:00
fbsanchez 7226a45df5 improved ui_progress now accepts ajax updates 2019-06-14 10:35:10 +02:00
Alejandro Fraguas 6c4dcdac87 Merge branch 'ent-4199-Fallo-estilo-visual-en-autoconfiguración-de-agentes-y-discovery-vmware' into 'develop' 
Ent 4199 fallo estilo visual en autoconfiguración de agentes y discovery vmware

See merge request artica/pandorafms!2498
 2019-06-14 10:14:27 +02:00
artica 8f25aa09fc Auto-updated build strings. 2019-06-14 00:01:08 +02:00
fbsanchez 23d09a3c46 wip massive event operations 2019-06-13 20:09:55 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
Luis Calvo 33bdb26e80 Fixed bug data in history show 2019-06-13 17:36:00 +02:00
fbsanchez 0df48675f3 event deletion 2019-06-13 16:28:26 +02:00
fbsanchez 029d3b073f Avoid double validation, avoid redraw 2019-06-13 13:52:38 +02:00
fbsanchez 0afb53dc17 fix in time comparison while validating events 2019-06-13 13:35:02 +02:00
Alejandro Fraguas beea6941e5 Merge branch 'ent-4200-visual-console-omnipresent-group-summary' into 'develop' 
Fixed the omnipresent group summary bug

See merge request artica/pandorafms!2496
 2019-06-13 13:25:50 +02:00
alejandro-campos 52b1c5e39b fix bug: path of ssl certificate not being set on general settings 2019-06-13 13:18:17 +02:00
fbsanchez 9740275388 dyn redraw 2019-06-13 13:07:11 +02:00
fbsanchez d12773cfd0 Avoid double validation, avoid redraw 2019-06-13 12:36:31 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
alejandro-campos 8554baef20 fix bug in item edition in metaconsole 2019-06-13 11:11:39 +02:00
Alejandro Fraguas fef1441d9f Merge branch 'ent-4197-#8171-Permisos-en-consolas-visuales-con-ACLS' into 'develop' 
Fixed bug in visual consoles permissions with ACLS

See merge request artica/pandorafms!2492
 2019-06-13 10:46:39 +02:00
artica 60ee0dd0fd Auto-updated build strings. 2019-06-13 00:01:07 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
Tatiana Llorente af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00
Tatiana Llorente 7d54a37e13 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:44:09 +02:00
Alejandro Fraguas d0e7a03926 Merge branch 'ent-3809-error-sql-eventos-de-grupos-de-agentes' into 'develop' 
Changed sql error

See merge request artica/pandorafms!2321
 2019-06-12 16:00:58 +02:00
Daniel Rodriguez 1780341524 Merge branch 'ent-4183-Ayudas-vacias' into 'develop' 
Removed empty helps - #4183

See merge request artica/pandorafms!2491
 2019-06-12 14:34:40 +02:00
Daniel Rodriguez f399023d46 Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop' 
Solucionado pantalla en blanco

See merge request artica/pandorafms!2269
 2019-06-12 14:25:58 +02:00
Alejandro Fraguas b930588f84 Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop' 
Ent 3892 bug en bulk operations de plugins

See merge request artica/pandorafms!2389
 2019-06-12 13:54:09 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez b615b50920 wip event grouped 2019-06-12 13:17:18 +02:00
Alejandro Fraguas 1305e267de Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop' 
Remove autocomplete user and password in the form to create wmi modules - #3437

See merge request artica/pandorafms!2485
 2019-06-12 13:03:56 +02:00
marcos.alconada c1d1c23a4f Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph 2019-06-12 12:37:52 +02:00
marcos.alconada 608f079ca0 now you need put an agent or visual console, else you cant create or update a Static Grap 2019-06-12 12:36:56 +02:00
Alejandro Gallardo Escobar 8793e2debd Fixed the omnipresent group summary bug 2019-06-12 09:16:47 +02:00
Alejandro Gallardo Escobar d3da3747dd Fixed the visualization of the combined graph item from the new visual console 2019-06-12 08:48:51 +02:00
artica 51d5e1d951 Auto-updated build strings. 2019-06-12 00:01:07 +02:00
Alejandro Fraguas fdce139f84 Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop' 
fix bug when adding connection maps in gis map builder

See merge request artica/pandorafms!2490
 2019-06-11 18:01:54 +02:00
Tatiana Llorente 31905f005a Visual changes in Agent/Module View - #3739 2019-06-11 17:34:13 +02:00
Daniel Rodriguez 4cf0fda28c Merge branch 'ent-3300-Error-borrado-masivo-de-informes' into 'develop' 
Fix bug in report massive deletion

See merge request artica/pandorafms!2493
 2019-06-11 17:17:14 +02:00
Alejandro Fraguas cb6d71b930 Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop' 
Ent 3474 exportar a csv custom field view

See merge request artica/pandorafms!2483
 2019-06-11 17:06:14 +02:00
Alejandro Campos cc9a7553bc Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
 2019-06-11 16:18:29 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
manuel 40119f6d2e Fixed bug in visual consoles permissions with ACLS 2019-06-11 12:55:43 +02:00
Daniel Rodriguez 1436ec0782 Merge branch 'ent-4088-Falta-campo-estado-en-modulos-plugin-erroneos' into 'develop' 
Added image for unknown and no data status - 4088

See merge request artica/pandorafms!2484
 2019-06-11 12:07:45 +02:00
Tatiana Llorente 80ed5dc9c1 Removed empty helps - #4183 2019-06-11 09:33:43 +02:00
artica 4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
Daniel Rodriguez 9d71c10308 Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' into 'develop' 
Redolved ticket

See merge request artica/pandorafms!2273
 2019-06-10 18:47:23 +02:00
Alejandro Fraguas cd1f8d0c10 Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop' 
Fixed function ldapsearch

See merge request artica/pandorafms!2301
 2019-06-10 18:08:18 +02:00
alejandro-campos 577ddef8b3 fix bug when adding connection maps in gis map builder 2019-06-10 17:04:36 +02:00
marcos.alconada a40e420de0 Removed , from numer format 2019-06-10 16:59:05 +02:00
Daniel Rodriguez 81ac4e5bef Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop' 
Ent 3466 ad advanced perms fixed

See merge request artica/pandorafms!2194
 2019-06-10 16:05:21 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
marcos.alconada 58ba42cec1 Changed code for conversión 2019-06-10 14:53:47 +02:00
marcos.alconada cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
Luis Calvo 8092528742 Fixed reports export to csv meta bugs 2019-06-10 12:27:43 +02:00
Alejandro Fraguas d14ad39785 Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop' 
Node deleted disapear in tree view

See merge request artica/pandorafms!2486
 2019-06-10 10:51:26 +02:00
artica 7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica 0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
fbsanchez bb552226a6 minor fix 2019-06-07 22:58:49 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
marcos.alconada 833248991b Add mr 29 2019-06-07 11:24:00 +02:00
marcos.alconada 1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
Marcos Alconada f89aefa7ab Merge branch 'revert-928f6a79' into 'develop' 
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"

See merge request artica/pandorafms!2487
 2019-06-07 10:24:27 +02:00
Marcos Alconada d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Alejandro Fraguas 021ae9b1cd Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop' 
Ticket Resolved

See merge request artica/pandorafms!2227
 2019-06-07 09:48:51 +02:00
Marcos Alconada 241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'" 
This reverts merge request !2282
 2019-06-07 09:35:13 +02:00
marcos.alconada a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
artica 2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
Luis Calvo ac679797a3 Merge remote-tracking branch 'origin/develop' into ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra 2019-06-06 14:53:14 +02:00
Luis Calvo 701c11a457 Added event in process status validation when same extra id 2019-06-06 14:52:39 +02:00
Tatiana Llorente a4ea5e7c77 Added image for unknown and no data status - 4088 2019-06-06 14:16:09 +02:00