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

23919 Commits

Author SHA1 Message Date
Daniel Rodriguez aa21da9e54 Merge branch 'ent-8731-umc-en-vendor-2' into 'develop' 
Swap some stuff in MR becouse some environments had FK in deprecated tables

See merge request artica/pandorafms!4807
 2022-04-08 09:46:29 +00:00
fbsanchez 9406fa2c09 switch order of drops in MR 2022-04-08 11:31:36 +02:00
artica d2787675d2 Auto-updated build strings. 2022-04-08 01:00:51 +02:00
fbsanchez 037bf016fb Swap some stuff in MR becouse some environments had FK in deprecated tables 2022-04-07 17:26:14 +02:00
alejandro.campos@artica.es 6b708777f6 change email alert templates 2022-04-07 17:24:06 +02:00
Daniel Rodriguez bfcb4dad5e Merge branch 'ent-8786-Borrado-de-IPs-en-agente-Delete-selected-items' into 'develop' 
Ent 8786 borrado de i ps en agente delete selected items

See merge request artica/pandorafms!4797
 2022-04-07 13:31:15 +00:00
fbsanchez 6c63d13a68 fix in title 2022-04-07 09:46:51 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
artica 63c63a2616 Auto-updated build strings. 2022-04-07 01:00:28 +02:00
Daniel Rodriguez 2471bbf1d4 Merge branch 'ent-8540-contel-nuevo-informe-custom-render' into 'develop' 
add new report custom render pandora_enterprise#8540

See merge request artica/pandorafms!4793
 2022-04-06 12:16:26 +00:00
Daniel Barbero Martin a0afaa156d add new report custom render pandora_enterprise#8540 2022-04-06 13:49:28 +02:00
artica b96b8b2a57 Updated version and build strings. 2022-04-06 13:12:18 +02:00
Daniel Barbero Martin 9de7f0564e update version 2022-04-06 09:42:09 +02:00
artica 7cb547dee4 Auto-updated build strings. 2022-04-06 01:00:46 +02:00
Daniel Rodriguez bcb4efe397 Merge branch 'ent-avoid-warnigs-with-php74' into 'develop' 
Fixed some codes to avoid warnings with some php74 environment.

See merge request artica/pandorafms!4795
 2022-04-05 15:17:47 +00:00
Daniel Rodriguez fb6381b789 Merge branch 'ent-improve-check-allowoverride' into 'develop' 
Added support for FreeBSD in checkAllowOverrideEnabled().

See merge request artica/pandorafms!4794
 2022-04-05 15:08:18 +00:00
Daniel Rodriguez fa62f8facc Merge branch 'ent-8541-cambio-funcionamiento-licencia-satelite' into 'develop' 
Ent 8541 cambio funcionamiento licencia satelite

See merge request artica/pandorafms!4792
 2022-04-05 13:44:12 +00:00
Daniel Barbero Martin 6bfde7e903 add new report custom render pandora_enterprise#8540 2022-04-05 13:55:29 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
artica d0f1723789 Auto-updated build strings. 2022-04-05 01:00:47 +02:00
Daniel Maya dcdcbfad88 #8786 Fixed delete address 2022-04-04 17:40:51 +02:00
Daniel Barbero Martin 6351b98777 add new report custom render pandora_enterprise#8540 2022-04-04 14:56:40 +02:00
Daniel Barbero Martin 502b5ab0db add new report custom render pandora_enterprise#8540 2022-04-04 14:40:20 +02:00
Daniel Rodriguez ad957c5a72 Merge branch 'ent-8742-No-se-pueden-crear-nuevos-mapas-GIS' into 'develop' 
Ent 8742 no se pueden crear nuevos mapas gis

See merge request artica/pandorafms!4789
 2022-04-04 10:38:54 +00:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop' 
implemented custom data filter in event view

See merge request artica/pandorafms!4787
 2022-04-04 10:38:30 +00:00
Junichi Satoh e0d50facf0 Fixed some codes to avoid warnings with some php74 environment. 2022-04-04 16:31:22 +09:00
Junichi Satoh 5fcf3a4009 Added support for FreeBSD in checkAllowOverrideEnabled(). 2022-04-04 16:22:25 +09:00
Daniel Barbero Martin 863e6c887f Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-04 08:17:03 +02:00
artica 8a5875f987 Auto-updated build strings. 2022-04-04 01:00:24 +02:00
artica 774d2a6777 Auto-updated build strings. 2022-04-03 01:00:26 +02:00
artica 8502bf3ae1 Auto-updated build strings. 2022-04-02 01:00:39 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es b7aca968a3 minor change 2022-04-01 14:06:51 +02:00
Daniel Barbero Martin 597e527f38 add new report custom render pandora_enterprise#8540 2022-04-01 13:55:18 +02:00
fbsanchez 0ef851ab7f errata fix in mc environment detection UMC 2022-04-01 10:43:57 +02:00
fbsanchez e4c58fcb40 fix in UMC 2022-04-01 10:37:03 +02:00
Daniel Rodriguez 99b8fa0cf6 Merge branch 'ent-8458-heatmap-view' into 'develop' 
Ent 8458 heatmap view

See merge request artica/pandorafms!4695
 2022-04-01 07:46:25 +00:00
Daniel Rodriguez a4bce4aa7a Merge branch 'ent-8739-12903-Graficas-real-time-dan-error-500-php-8' into 'develop' 
Ent 8739 12903 graficas real time dan error 500 php 8

See merge request artica/pandorafms!4790
 2022-04-01 07:23:25 +00:00
Daniel Barbero Martin bfa137aa67 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-01 09:02:30 +02:00
artica 4218413b82 Auto-updated build strings. 2022-04-01 01:00:40 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
Daniel Maya 55e847a5c9 #8541 Added file customer_key 2022-03-31 16:52:50 +02:00
Daniel Rodriguez 9da8be71bc Merge branch 'ent-8533-Mostrar-valores-en-elementos-Agents-modules' into 'develop' 
Ent 8533 mostrar valores en elementos agents modules

See merge request artica/pandorafms!4764
 2022-03-31 14:26:51 +00:00
Daniel Rodriguez 45ca5850f7 Merge branch 'ent-8777-notificar-en-el-resumen-de-la-tarea-de-discovery-cuando-falle-por-falta-de-algun-componente' into 'develop' 
Notify in details popup when critical issues happened in discovery task scan

See merge request artica/pandorafms!4791
 2022-03-31 14:12:30 +00:00
Daniel Rodriguez 2cc019ea29 Merge branch 'ent-7225-monitorizacion-global-de-discovery-vmware-mediante-tokens' into 'develop' 
remove extra margin from grid forms in discovery

See merge request artica/pandorafms!4777
 2022-03-31 13:43:42 +00:00
fbsanchez 62172c19a2 Notify in details popup when critical issues happened in discovery task scan 2022-03-31 14:34:16 +02:00
Ramon Novoa a94f729237 Write the customer key to disk. 
Writing the customer key to disk allows other components without access
to the database to download it. Ref. pandora_enterprise#8541.
 2022-03-31 13:21:22 +02:00
Daniel Maya f2fb3fd7cb #8739 Fixed table 2022-03-31 13:10:09 +02:00
Daniel Maya fc9760676e #8458 Change in refresh value 2 2022-03-31 09:47:36 +02:00
Daniel Maya e796dc52bb #8458 Change in refresh value 2022-03-31 09:46:30 +02:00
Daniel Maya 5e37c264c1 #8533 change of default value 2022-03-31 09:38:07 +02:00
artica 35bcec046a Auto-updated build strings. 2022-03-31 01:00:46 +02:00
Daniel Rodriguez 6ec51c0e97 Merge branch 'ent-8687-bugs-en-horario-de-alertas' into 'develop' 
fixed calendar templates alerts pandora_enterprise#8687

See merge request artica/pandorafms!4788
 2022-03-30 14:07:51 +00:00
alejandro.campos@artica.es ad6b1f26ed rollback 2022-03-30 15:53:21 +02:00
Daniel Maya c5d0237c23 #8533 Fixed order 2022-03-30 15:12:53 +02:00
fbsanchez e70c85fc65 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 2022-03-30 15:05:04 +02:00
fbsanchez 2ac8defa48 cleanup old UMC files from proyect 2022-03-30 14:54:08 +02:00
fbsanchez 68a058c698 removed unused file 2022-03-30 14:45:09 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Rodriguez 134ee890eb Merge branch 'ent-8300-gestion-ejecucion-console-tasks' into 'develop' 
Added enable console task feature

See merge request artica/pandorafms!4776
 2022-03-30 09:29:22 +00:00
Daniel Maya cab85cbfbd #8458 Fixed errors 2022-03-30 10:21:30 +02:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-30 08:03:08 +00:00
alejandro.campos@artica.es 7bfa78a3d5 minor fix 2022-03-30 10:01:37 +02:00
Daniel Rodriguez 46535b7201 Merge branch 'ent-8693-13270-Buscador-ahora-es-case-sensitive-2' into 'develop' 
Ent 8693 13270 buscador ahora es case sensitive 2

See merge request artica/pandorafms!4784
 2022-03-30 07:46:31 +00:00
Daniel Rodriguez 7f1e8aab8d Merge branch 'ent-8703-file-repository-tamano-de-descarga-excedido' into 'develop' 
Fix files repo download file hash error

See merge request artica/pandorafms!4760
 2022-03-30 07:45:46 +00:00
Daniel Rodriguez 74e4461d8a Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop' 
Fix dashboard events responses

See merge request artica/pandorafms!4759
 2022-03-30 07:45:07 +00:00
Daniel Rodriguez 6b4c2a46e1 Merge branch 'ent-8573-conteo-erroneo-vista-tactica-metaconsola' into 'develop' 
Subquery needed for avoid duplicates

See merge request artica/pandorafms!4785
 2022-03-30 07:43:25 +00:00
Daniel Rodriguez 2ab122405d Merge branch 'ent-8727-Error_autenticacion_AWS_View' into 'develop' 
Fix credential storing with spaces

See merge request artica/pandorafms!4767
 2022-03-30 07:42:39 +00:00
José González 1e3355730b Fix typo 2022-03-30 09:19:04 +02:00
artica 01c2fd5da4 Auto-updated build strings. 2022-03-30 01:00:52 +02:00
fbsanchez dc2d577def WIP historical updates registry 2022-03-29 20:58:18 +02:00
fbsanchez dd1768535d Vendor files update (unneeded in a while) 2022-03-29 19:22:26 +02:00
Luis eceb60e12c Update mysql.php 2022-03-29 17:03:05 +00:00
Calvo 7f0dbb0476 Added secondary ldap server 2022-03-29 18:59:27 +02:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
José González 0fe97217c0 Merge branch 'ent-8300-gestion-ejecucion-console-tasks' of https://brutus.artica.es:8081/artica/pandorafms into ent-8300-gestion-ejecucion-console-tasks 2022-03-29 14:44:38 +02:00
José González 18927108ef Added in meta console task enable/disable feature 2022-03-29 14:44:12 +02:00
Daniel Maya 59db8f3daf #8533 style changes 2022-03-29 10:46:44 +02:00
artica a54344348c Auto-updated build strings. 2022-03-29 01:00:47 +02:00
José González 6bf82accad Subquery needed for avoid duplicates 2022-03-28 17:19:36 +02:00
fbsanchez dd798d6f52 UMC LTS 2022-03-28 15:09:21 +02:00
Daniel Maya 44e93fa1ed #8693 Emptying collate for alias and nombre 2022-03-28 13:48:33 +02:00
fbsanchez b832fd17e4 update_manager_client => vendor 2022-03-28 12:20:36 +02:00
Calvo b7923fe494 Added files repo error information for post_max_size and upload_max_filesize 2022-03-28 11:18:08 +02:00
artica 775942e0b6 Auto-updated build strings. 2022-03-28 01:00:39 +02:00
artica 859f689ade Auto-updated build strings. 2022-03-27 01:00:30 +01:00
artica 5f1b81b089 Auto-updated build strings. 2022-03-26 01:00:50 +01:00
Calvo 4109d94853 Fix events dashboard user owner entities 2022-03-25 14:07:44 +01:00
Calvo 5e6bdaeb15 Fix events dashboard user owner entities 2022-03-25 14:05:38 +01:00
Daniel Rodriguez e9fcc89eac Merge branch 'ent-8677-app-android-consolas-visuales' into 'develop' 
Ent 8677 app android consolas visuales

See merge request artica/pandorafms!4748
 2022-03-25 11:52:26 +00:00
Daniel Rodriguez 906e9ecd7a Merge branch 'ent-8734-deshacer-cambios-de-autenticacion-de-global-admin' into 'develop' 
reverted changes

See merge request artica/pandorafms!4772
 2022-03-25 11:34:07 +00:00
José González 187a633bae Fix mistake 2022-03-25 11:19:41 +00:00
Daniel Rodriguez 512f754548 Merge branch 'ent-8740-13348-Pete-SQL-en-vista-Agent-detail' into 'develop' 
fix query

See merge request artica/pandorafms!4781
 2022-03-25 11:07:27 +00:00
Daniel Rodriguez c2b2ab3394 Merge branch 'ent-8674-job-failed-244975' into 'develop' 
Missing network components

See merge request artica/pandorafms!4758
 2022-03-25 11:02:30 +00:00
Daniel Rodriguez c6a3a7df10 Merge branch 'ent-8569-item-icon-cv-cambiar-token-link-enabled-a-habilitado-por-defecto' into 'develop' 
enable link item icon for default CV pandora_enterprise#8569

See merge request artica/pandorafms!4771
 2022-03-25 10:44:07 +00:00
Daniel Rodriguez 42b561ab2b Merge branch 'ent-8612-Bugs-varios-relacionados-con-Netflow' into 'develop' 
Ent 8612 bugs varios relacionados con netflow

See merge request artica/pandorafms!4768
 2022-03-25 10:42:25 +00:00
Daniel Rodriguez ecd2f7e35e Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop' 
Fix console setup visual issues

See merge request artica/pandorafms!4756
 2022-03-25 10:39:05 +00:00
Daniel Rodriguez c33cb143bf Merge branch 'ent-8645-estilos-dashboard-no-ajusta-bien-a-los-lados' into 'develop' 
fixed  visual dashboard pandora_enterprise#8645

See merge request artica/pandorafms!4770
 2022-03-25 10:29:16 +00:00
alejandro.campos@artica.es 84ca3c040c fix query 2022-03-25 11:04:14 +01:00
Daniel Maya 26d598529c Fixed margin 2022-03-25 10:53:30 +01:00