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

963 Commits

Author SHA1 Message Date
fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-05 09:55:14 +02:00
vgilc 159920a05d Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop' 
Add the AlertServer to the repo.

See merge request artica/pandorafms!4251
 2021-07-02 09:15:27 +00:00
Ramon Novoa f8bcd1660f Add the AlertServer to the repo. 
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
 2021-07-01 16:19:47 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
alejandro.campos@artica.es fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
fbsanchez d95eec0188 Enlarge numeric data fields 2021-05-25 09:57:23 +02:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
fbsanchez 818186ff28 DB updates - syncqueue 2021-05-17 12:57:15 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Barbero Martin 5b376568a4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/47.sql
 2021-05-13 08:25:59 +02:00
Luis 7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
Daniel Barbero Martin 2ca981b03e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-29 08:34:41 +02:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
fbsanchez 78487fa4e5 Auto-synchronizer MC 2021-04-22 15:37:59 +02:00
Daniel Barbero Martin 100ae705f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 13:33:40 +02:00
Daniel Barbero Martin b8b9fa561f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 08:07:21 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
fbsanchez 2e45e0bde4 Fixes in table tevent_rule definition 2021-04-15 10:35:21 +02:00
fbsanchez 21d72f41f9 Revert "Revert "Update tevent_rule schema"" 
This reverts commit 2b05cde214.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-15 00:20:42 +02:00
fbsanchez 2b05cde214 Revert "Update tevent_rule schema" 
This reverts commit a80e50b730.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-14 21:42:19 +02:00
fbsanchez a80e50b730 Update tevent_rule schema 2021-04-14 21:39:58 +02:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
Daniel Barbero Martin aa31ed8f58 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-13 08:34:05 +02:00
Daniel Maya 8a27517cc5 Ent 7281 aumentar carácteres de la caja de consulta sql en informes 2021-04-12 14:44:33 +00:00
Daniel Barbero Martin 37fe9bfafb WIP command center 2021-04-09 14:27:12 +02:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
Daniel Barbero Martin e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02:00
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
Daniel Barbero Martin 505e724384 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-15 08:19:32 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01: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 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
Daniel Barbero Martin 6c3cb2c61c WIP Command center 2021-03-08 12:20:32 +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 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Jose Gonzalez 26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +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
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48: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
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +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 eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez df517d8720 Added lost sql files 2020-11-26 15:02:06 +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 ed4ba27158 Fixed index 2020-09-16 17:11:19 +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 35644a367f Added ttag modifies 2020-08-10 14:53:07 +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
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
Jose Gonzalez a1bd93bac7 Add database changes 2020-07-07 11:08:44 +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 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
daniel 65c733e1dd iot metaconsole 2020-05-27 09:18:21 +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 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
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
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
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 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 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
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
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +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
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
Daniel Maya cf8bae66d1 Added index in MR 2019-11-26 10:31:57 +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 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
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 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 79a135b077 Fix errata DESC => COMMENT 2019-11-20 11:36:15 +01:00
fbsanchez 43ecba3bbb operator fields for event_rule 2019-11-20 10:40:52 +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
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
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 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 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 3056c6741a changes bbdd mr34 2019-10-28 12:20:55 +01:00
Tatiana Llorente 30caad5a6c Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810 2019-10-15 16:50:05 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
Luis Calvo 43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Luis Calvo e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
fbsanchez 148cd5cce6 db updates pandora_db 2019-09-05 10:45:17 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
fbsanchez db25d3b231 Cleared unused table 2019-07-26 21:56:37 +02:00
fbsanchez ce346bd604 agent deployment 2019-07-24 17:38:25 +02:00
fbsanchez 62d8c04ab3 Agent deployment v1 2019-07-23 13:01:50 +02:00
fbsanchez 8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
fbsanchez f0bfe6910d WIP agent deployment 2019-07-16 20:56:47 +02:00
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
Luis Calvo ef9502a552 Fixed errors on sum report uncompressed checkbox 2019-07-15 11:56:57 +02:00
Daniel Barbero ecaba5ebd3 fixed errorsr macros reports 2019-07-12 10:24:46 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
Daniel Barbero Martin 000cdfdcfd WIP failover 2019-07-04 12:09:08 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
Daniel Barbero 209681e4c2 ADD failover option availability_graph 2019-07-02 11:50:58 +02:00
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
fbsanchez d956f08011 Minor fixes 2019-06-27 10:39:43 +02:00
fbsanchez e4f6a95a89 MR29 credential store 2019-06-21 23:05:21 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
Marcos Alconada f1110c6d56 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
 2019-06-21 11:31:01 +02:00
marcos.alconada 1dc826c9ff Added field to tevent_filter (id_source_event) 2019-06-21 11:29:51 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/extras/mr/28.sql
 2019-05-29 11:10:31 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
Daniel Maya 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
Luis Calvo 702926cf85 solved merge conflict mr 28.sql 
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
 2019-05-16 10:15:46 +02:00
Daniel Barbero Martin 79701bba60 Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA 
Conflicts:
	pandora_console/extras/mr/28.sql


Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
 2019-05-14 12:34:40 +02:00
Luis Calvo 860a4cdbf2 Updated pandoradb and migrate 
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
 2019-05-13 17:57:21 +02:00
Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' 
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
 2019-05-13 17:10:06 +02:00
manuel 12c9952e4a Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal 
Conflicts:
pandora_console/extras/mr/28.sql


Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
 2019-05-10 09:11:17 +02:00
Daniel Maya f186cd6201 Added cache_expiration in mr, pandoradb and migrate 2019-05-09 17:37:01 +02:00
Daniel Barbero c5884f1ac9 add changes sql for mr 28 
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
 2019-05-03 14:09:23 +02:00
alejandro-campos 5b3dfcbf74 add feature to enable obfuscation on command fields when creating or updating commands 
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
 2019-05-03 13:46:52 +02:00
manuel 8dc3beaaa9 changed in pandoradb 
Former-commit-id: 8a9ccee718b24455fa21c7bfb38cf704c1aa2a0a
 2019-04-29 15:07:39 +02:00
manuel 9e0748e718 Added changes in pandoradb.sql 
Former-commit-id: 30f4d7bdc303c6ddd2ac6933872faa5f05de58b5
 2019-04-24 11:19:27 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
 2019-04-22 09:01:24 +02:00
marcos.alconada 1b5786aedb Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter 
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
 2019-04-12 10:32:07 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
 2019-04-11 15:12:46 +02:00
fbsanchez 798a2aad16 WIP discovery F3 
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
 2019-04-03 18:13:19 +02:00
fbsanchez 11b2fbc245 WIP db 
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
 2019-04-02 16:25:29 +02:00
marcos.alconada b3c7a9fb4d change 
Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d
 2019-03-29 13:38:36 +01:00
marcos.alconada 7412a7cef0 change 
Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
 2019-03-29 13:37:12 +01:00
marcos.alconada 3f41561628 Added pandoradb.sql without output column in tnetflow_filter 
Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
 2019-03-29 09:23:38 +01:00
Daniel Barbero Martin e3222626dc fixed error in bbdd 
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
 2019-03-28 09:49:16 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters 
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
 2019-03-27 18:16:53 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
 2019-03-27 12:11:23 +01:00
fbsanchez 1238f15190 discovery task advanced summary support 
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
 2019-03-25 17:32:18 +01:00
fermin831 2711eb59ea Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql

Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
 2019-03-25 09:20:06 +01:00
fermin831 b660da6e84 Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/install.php

Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
 2019-03-14 10:49:16 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
 2019-03-13 09:52:00 +01:00
manuel c41c9d10e0 Changed sql files 
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
 2019-03-08 10:01:55 +01:00
alejandro-campos 9d29af2af5 add new field for table treport_content 
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
 2019-03-05 15:15:48 +01:00
fbsanchez 41138fbfbb discovery tasks assimilate cron 
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
 2019-03-01 15:26:05 +01:00
Fermin 511c5e3d10 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/25.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/install.php
	pandora_server/util/pandora_db.pl

Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
 2019-02-28 17:13:48 +01:00
fbsanchez 5816320eff new token. autoconfiguration_enabled. discovery tasks 
Former-commit-id: d19c86696b73335b6977d11d5ea683131780097e
 2019-02-18 14:00:38 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices 
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
 2019-02-14 10:59:27 +01:00
fbsanchez 6e7369d672 Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery' 
Ent 3381 eventos extendidos

See merge request artica/pandorafms!2169

Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
 2019-02-14 10:51:04 +01:00
fbsanchez 10a37c313c DB schema update native WMI scan 
Former-commit-id: 995fce571f2f37c5cbe891f726fa979cbb8ef183
 2019-02-13 15:05:21 +01:00
fbsanchez 738443445c minor fix in tevento db script 
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
 2019-02-11 20:20:23 +01:00
fbsanchez 332c53b098 change behaviour to avoid mr slow updates. Event extended 
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
 2019-02-11 19:46:46 +01:00
fbsanchez a3a1bbb778 added missed new field extended_info for events 
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
 2019-02-08 17:30:13 +01:00
fbsanchez 348a10cfe4 Added tevent_extended to db scripts 
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
 2019-02-08 13:59:48 +01:00
fbsanchez cf5716e569 supervisor added subtype to tmensajes 
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
 2019-02-07 12:56:48 +01:00
fermin831 95f3c063a5 Added tnotification_source_group_user table 
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
 2019-01-31 16:27:55 +01:00
fbsanchez dc3d7cc5e2 notifications, first approach db schema 
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
 2019-01-30 11:56:21 +01:00
fermin831 e0180aeebe Added tnetwork_matrix data structure 
Former-commit-id: e42bd0f0a78aab5cc9068270269262cfe7465c7b
 2019-01-21 18:49:13 +01:00
fermin831 923c8ee0b8 Revert "Added tnetwork_matrix data structure" 
This reverts commit 5328a0e239 [formerly aa49de6c04a3c7a612ce7041393fe521e23e281d].


Former-commit-id: 2c762f04c289c46670aab7ed7844ff3880e8d39a
 2019-01-21 18:43:35 +01:00
fermin831 5328a0e239 Added tnetwork_matrix data structure 
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
 2019-01-21 17:42:41 +01:00
alejandro-campos a1ba6fdf07 Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado 
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
 2018-12-19 19:15:43 +01:00
fermin831 386eeec7ef Added group_recursion as tevent_rule column 
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
 2018-12-11 16:07:13 +01:00
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
daniel 01a9621eb5 Custom fields view add new filters 2018-12-03 11:36:34 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop' 
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
 2018-11-20 11:33:00 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
fermin831 d63666cbbc Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/godmode/alerts/alert_actions.php

Modified files extra:
	pandora_console/include/functions_alerts.php
 2018-11-08 14:00:49 +01:00
alejandro-campos ef90536152 added new field in treport table 2018-11-02 16:31:54 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
manuel.montes f4add9a7f8 Changed tlayout_template name table to varchar 600 2018-10-24 11:49:18 +02:00
fermin831 3946124cc7 Inaugurate the 22 mr with an alter table in talert_commands 2018-10-22 09:49:06 +02:00
daniel 6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
daniel 8c49b26a91 php7 version 2018-10-19 11:37:11 +02:00
daniel e299209a92 fixed visual console custam graph in meta 2018-10-18 13:24:15 +02:00
fermin831 aff2879340 Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos 
Conflicts:
	pandora_console/extras/mr/21.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2018-10-16 11:35:14 +02:00
fbsanchez 299868cfd5 meta_db* added to tmetaconsole_setup 2018-10-10 14:35:09 +02:00
enriquecd c1af14b90e Change tlayou name table to varchar 600 - #2823 2018-10-05 12:25:15 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
fermin831 8979890964 Added is_favourite to tservice table 2018-09-18 19:05:20 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487 
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2018-09-18 11:17:47 +02:00
vgilc 080cfb20ca Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2018-09-17 14:44:24 +02:00
manuel.montes 19645f0550 Modified trecon_task table 2018-09-13 18:17:28 +02:00
Alejandro Gallardo Escobar e9752e790e Added columns for a policy feature 2018-09-13 16:57:13 +02:00
manuel.montes a2b3d6e07f Deleted reports from cron 2018-09-12 13:43:23 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
danielmaya 816b969741 Added table tlog_graph_models 2018-09-06 16:48:18 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
danielmaya 19f7a5180c Added default value in parent_module_id 2018-09-04 12:48:58 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
fbsanchez f10058428f Added backend functions to create vconsole template 2018-08-01 12:22:13 +02:00
daniel cb77a299bb add templates console visual 2018-08-01 09:58:48 +02:00