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

1278 Commits

Author SHA1 Message Date
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
Daniel Barbero Martin 68d9390519 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-23 08:41:39 +01:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
Jose Gonzalez 9e54f9517b WIP: Backup upload 2021-03-18 16:12:39 +01:00
Daniel Barbero Martin 505e724384 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-15 08:19:32 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-10 10:17:27 +00:00
Daniel Barbero Martin cb0883a87a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-10 08:34:29 +01:00
Daniel Rodriguez 06a027127f Merge branch 'ent-6851-Quitar-marquesina-de-vista-de-eventos' into 'develop' 
Ent 6851 quitar marquesina de vista de eventos

See merge request artica/pandorafms!3752
 2021-03-09 16:39:26 +00:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Jose Gonzalez f1dd050333 Solve deleted files 2021-03-09 15:19:28 +01:00
Daniel Barbero Martin 6c3cb2c61c WIP Command center 2021-03-08 12:20:32 +01:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Maya 208c0d10e8 Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas 2021-03-01 10:35:28 +00:00
fbsanchez ad347dc953 errata fix 2021-02-26 12:48:23 +01:00
fbsanchez d41b189612 Extra lines after mr file 2021-02-25 13:27:00 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
fbsanchez 34a19b969c missed mr file 2021-02-22 12:04:12 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Daniel Barbero Martin 39e603e908 fixed mr version and remove updates mr 2021-02-17 14:27:16 +01:00
Daniel Barbero Martin 234097320f fixed mr version and remove updates mr 2021-02-17 13:04:59 +01:00
fbsanchez 416bc8cad4 Minor fixes 
and speed out of control
 2021-02-16 12:33:15 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
fbsanchez 2826f4fd89 Fixes in MR, added uniqid macro to pandora_snmp_bandwidth 2021-02-15 19:08:32 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
Daniel Rodriguez 4d84ae8b58 Merge branch 'ent-6844-quitar-vista-estadisticas-eventos' into 'develop' 
Removes event_statistics view

See merge request artica/pandorafms!3738
 2021-01-28 10:25:13 +01:00
Luis 905f8801b7 Update 44.sql 2021-01-27 13:37:20 +01:00
Luis Calvo a09ee55d13 Added event_statistics to delete txt 2021-01-27 09:42:50 +01:00
Luis Calvo f2addc837a Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-27 09:25:12 +01:00
Luis Calvo 954c12646b Added task save report to disk changes to migrate 2021-01-26 16:46:45 +01:00
Luis Calvo dc3ee2d553 Added task save report to disk changes to MR 2021-01-26 16:36:13 +01:00
Jose Gonzalez 26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +01:00
fbsanchez d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
Daniel Rodriguez 9b92c5ff34 Merge branch 'ent-6932-Tags-no-entran-en-base-de-datos' into 'develop' 
Ent 6932 tags no entran en base de datos

See merge request artica/pandorafms!3776
 2021-01-25 10:15:29 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
Daniel Maya ca17e9cfcb change in column name of ttag 2021-01-15 09:50:40 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
fbsanchez 3f61d97e0f Event text to Event name in alert_actions Monitoring event 2021-01-12 13:39:03 +01:00
Daniel Rodriguez 7bbecceacc Merge branch 'ent-6779-Cambio-label-en-campo-de-alertas-SNMP' into 'develop' 
Ent 6779 cambio label en campo de alertas snmp

See merge request artica/pandorafms!3661
 2021-01-11 14:58:14 +01:00
fbsanchez dd08b7937c Set default value for review_mode to 1 instead 0 2021-01-07 14:36:56 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
Daniel Rodriguez 22159a6d69 Merge branch 'ent-6800-campos-no-se-guaerdan-plantillas' into 'develop' 
Ent 6800 campos no se guaerdan plantillas

Closes pandora_enterprise#6800

See merge request artica/pandorafms!3693
 2020-12-17 17:00:07 +01:00
Daniel Maya 369002cb96 inventory alerts 2020-12-04 10:31:22 +01:00
Jose Gonzalez 279a4124f1 Database changes 2020-12-03 15:51:08 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Daniel Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +01:00
Jose Gonzalez 7f2c00a4d6 Added lost sql files 2020-11-26 13:53:53 +01:00
Jose Gonzalez dbfe52e383 Fix issues with alert fields 2020-11-26 13:39:17 +01:00
Daniel Maya fc83121969 Changed event criticity 2020-11-26 13:22:59 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
Jose Gonzalez dc15125cd8 Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo 
Update
 2020-10-15 12:27:59 +02:00
Jose Gonzalez c28e2917ed Modified database files 2020-10-15 11:29:47 +02:00
Jose Gonzalez 65851afe4d Database update 2020-10-14 10:59:55 +02:00
daniel 40864eee6b add new token to report 2020-10-07 09:34:43 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
José González 0d8e2d5021 Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier' 
# Conflicts:
#   pandora_console/extras/mr/42.sql

Solved conflicts.
 2020-09-25 11:27:41 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
Jose Gonzalez da01f9abd5 Fix alter index 2020-09-16 17:32:05 +02:00
Jose Gonzalez dbb1ec6b84 Too long name fix 2020-09-16 17:19:07 +02:00
Jose Gonzalez e8efd228c0 Added indexes 2020-09-16 14:33:20 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +02:00
Jose Gonzalez 7300ccd185 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola 2020-08-07 13:29:25 +02:00
Jose Gonzalez c67d8bd005 Fixed little issues 2020-08-07 13:29:09 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
 2020-08-07 13:17:41 +02:00
Daniel Rodriguez 1f2e0e2d80 Merge branch 'ent-4943-identificar-version-instalada-server-enterprise-e6-o-e7' into 'develop' 
Increase the size of tserver.version.

See merge request artica/pandorafms!3368
 2020-07-27 12:17:27 +02:00
Ramon Novoa 8820d2756f Update the migration script. 2020-07-23 16:31:55 +02:00
Alejandro Campos 0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
 2020-07-15 09:30:35 +02:00
José González f3d1a80252 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql (solved)
 2020-07-10 08:19:07 +02:00
Ramon Novoa 19a8288f26 Increase the size of tserver.version. 
Ref pandora_enterprise#4943
 2020-07-09 17:47:11 +02:00
fbsanchez 5df418d226 MR changes 2020-07-09 16:56:51 +02:00
fbsanchez 231ba795dd MR update 2020-07-09 16:53:03 +02:00
Jose Gonzalez a1bd93bac7 Add database changes 2020-07-07 11:08:44 +02:00
alejandro-campos 49888fe48f Added change to MR 2020-07-06 09:56:15 +02:00
alejandro-campos 47a7502c6b Added change to MR 2020-07-06 09:55:14 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
 2020-06-22 14:06:13 +02:00
Luis efb69c18bc Ent 5809 message delete not working 2020-06-22 13:52:54 +02:00
fbsanchez 9bae4f8a17 MR change - minor 2020-06-19 12:14:09 +02:00
fbsanchez 6c5484baf0 MR change smart services 2020-06-18 12:35:52 +02:00
vanessa gil 4c3fd21971 Updated version. 2020-06-03 11:00:42 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
daniel 65c733e1dd iot metaconsole 2020-05-27 09:18:21 +02:00
fbsanchez 7be305298a Remove file - old cluster files 2020-05-22 14:15:10 +02:00
alejandro-campos 23c4609981 Merge branch 'develop' into ent-1193-Comprobar-codigo-de-estado-HTTP 2020-05-19 17:13:54 +02:00
Alejandro Fraguas aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop' 
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
 2020-05-14 10:32:43 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
alejandro-campos 197e309129 added new module type 2020-05-04 12:22:04 +02:00
alejandro-campos 1140a4345a added new module type 2020-05-04 12:20:50 +02:00
fbsanchez 026562e7ee MR changes 2020-04-30 15:00:04 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 
Conflicts:
	pandora_console/extras/mr/37.sql
 2020-04-14 16:06:17 +02:00
fbsanchez 36daf76cc5 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 
Conflicts:
	pandora_console/extras/mr/37.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2020-04-14 12:00:15 +02:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
fbsanchez a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
Kike 801624b8a2 Deleted [RT] tag for recon templates 2020-04-07 14:04:06 +02:00
Kike d908a9f7f6 Added default modules templates for recon tasks 2020-04-02 19:12:49 +02:00
fbsanchez 7f1d4725bd minor fix mr 2020-03-31 17:52:20 +02:00
Jose Gonzalez 6cad02635e Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:45:37 +02:00
Jose Gonzalez f28de6f4d0 Fixed db issue 2020-03-31 10:45:30 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
Jose Gonzalez fa372656f4 Fixed issue with DB 2020-03-30 17:48:09 +02:00
Jose Gonzalez dc55ca5eff WIP: Changes with PEN tables 2020-03-30 17:02:34 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
fbsanchez 452f5253e2 merge develop 2020-03-26 14:43:57 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
Jose Gonzalez e1d233453f Update database files 2020-03-25 13:05:56 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' 
# Conflicts:
#   pandora_console/extras/mr/37.sql
 2020-03-24 13:55:57 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
Daniel Maya c7e6f9fd34 Added disable event in alert template 2020-03-23 11:34:37 +01:00
Kike 037564810b Increase WUX tests field size in database 2020-03-20 14:09:06 +01:00
alejandro-campos 014688468c changes to show last status change of modules 2020-03-19 15:18:20 +01:00
Jose Gonzalez 451cdf2ca1 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-19 12:14:05 +01:00
Jose Gonzalez c9813afc9b DB changes 2020-03-19 12:13:56 +01:00
fbsanchez f58276ddbb Templates 2020-03-18 19:31:58 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Daniel Barbero 19b571fc78 update version 2020-03-03 10:17:18 +01:00
Daniel Maya 4e4c1495eb Fixed merge conflict 2020-02-20 15:07:14 +01:00
Daniel Maya 87dc92ffd9 Ent 5457 suid nodos elastic 2020-02-18 13:24:22 +01:00
Daniel Maya be47ed178b Added force apply in policies 2020-02-05 12:49:52 +01:00
Daniel Maya baecac1efb Next mr 2020-01-29 15:51:39 +01:00
Daniel Rodriguez 28392b71ef Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop' 
availability failover

See merge request artica/pandorafms!3015
 2020-01-27 10:48:50 +01:00
Daniel Maya aa3bf33607 Added treport_content_item in migrate 2020-01-24 09:28:16 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-20 12:00:42 +01:00
Daniel Maya c68f83f013 availability failover 2020-01-15 17:16:46 +01:00
Alejandro Campos c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 17:12:32 +01:00
Alejandro Campos 6dbe75169f Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 14:37:00 +01:00
Luis 2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-14 10:28:55 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-01-07 12:00:27 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
Luis b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00
Alejandro Fraguas ed0ad76e61 Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop' 
Add new search for id source event in metaconsole

See merge request artica/pandorafms!2438
 2019-11-27 10:14:35 +01:00
fbsanchez c28dfd60a5 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-26 16:16:15 +01:00
fbsanchez c985f2d5f9 Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-26 10:50:51 +01:00
Daniel Maya cf8bae66d1 Added index in MR 2019-11-26 10:31:57 +01:00
Marcos Alconada d0aab40fa8 Update 29.sql 2019-11-25 16:56:59 +01:00
fbsanchez 1b4b59d1c2 Rules migration DB 2019-11-25 13:36:43 +01:00
fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2019-11-22 15:49:07 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
fbsanchez 1565fee3f4 minor fix, errata 2019-11-22 11:59:24 +01:00
fbsanchez fd12c5a009 DB update, default values for Alert correlation 2019-11-22 11:57:20 +01:00
Daniel Barbero 35abd12499 WIP alert correlations 2019-11-22 11:06:55 +01:00
marcos ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
marcos de3f8b2a0f updates 2019-11-22 10:56:30 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 362837f856 updated default values for tevent_rule, new tokens for correlated alerts 2019-11-21 17:47:21 +01:00
marcos 93c4793025 add id_source_event 33.sql 2019-11-21 17:36:01 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' 
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
 2019-11-21 10:13:00 +01:00
fbsanchez e9432aaaa5 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-20 15:51:47 +01:00
alejandro-campos 4d332f2bef fix duplicated operation in migrate file 2019-11-20 12:43:08 +01:00
fbsanchez 446d6c3507 Fix windows commands 2019-11-20 12:35:55 +01:00
fbsanchez 79a135b077 Fix errata DESC => COMMENT 2019-11-20 11:36:15 +01:00
alejandro-campos 33b11af3c1 fix missing line in migrate 2019-11-20 11:26:28 +01:00
fbsanchez 43ecba3bbb operator fields for event_rule 2019-11-20 10:40:52 +01:00
fbsanchez 471389a72a Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl' 
Conflicts:
   pandora_console/extras/mr/33.sql
 2019-11-19 14:11:38 +01:00
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
alejandro-campos 070fe32d1e Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7 2019-11-18 16:27:12 +01:00
fbsanchez 443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez 9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez 990ad339d3 db schema 2019-11-15 09:45:49 +01:00
fbsanchez f69b86663a Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/godmode/wizards/Wizard.main.php
 2019-11-14 21:40:35 +01:00
fbsanchez 3c87efe113 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-14 17:13:38 +01:00
fbsanchez 94d87c2a3c Avoid welcome window on updates. 2019-11-14 14:14:50 +01:00
Daniel Barbero Martin c17acefc49 Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-14 12:22:11 +01:00
fbsanchez b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-13 18:15:19 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
Daniel Barbero Martin 0213bc675e add changes bbdd 2019-11-08 11:28:37 +01:00
Daniel Barbero Martin c68a5b57dd fixed Change bbdd 2019-11-05 16:04:48 +01:00
fbsanchez f4f618c1da Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl 2019-11-05 15:40:14 +01:00
fbsanchez 276fc82556 Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-05 15:39:18 +01:00
Daniel Barbero Martin e5f24ca884 Merge develop 2019-11-05 15:27:06 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
fbsanchez ec3c7ba559 Some remote command examples 2019-11-04 20:36:03 +01:00
fbsanchez 115c884cd4 Discovery SAP 2019-10-31 21:13:18 +01:00
Daniel Barbero Martin 7bfa076263 fixed error bbdd 2019-10-30 14:52:10 +01:00
Daniel Barbero Martin d37410ed8c fixed error bbdd 2019-10-30 14:43:10 +01:00
Daniel Barbero Martin b7710a6562 fix remove mr34 to mr33 2019-10-30 08:04:13 +01:00