1668 Commits

Author	SHA1	Message	Date
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
Daniel Barbero Martin	2bb81a839a	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/menu.php pandora_console/pandoradb_data.sql	2019-10-29 17:15:19 +01:00
fbsanchez	383967f68a	Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF	2019-10-29 16:56:01 +01:00
fbsanchez	f3fdcb4de0	MR update	2019-10-29 16:06:34 +01:00
alejandro-campos	049c3c2476	fix migrate missing content	2019-10-28 13:46:37 +01:00
Daniel Barbero Martin	3056c6741a	changes bbdd mr34	2019-10-28 12:20:55 +01:00
fbsanchez	74007ebf70	33 => 34, cleanup	2019-10-28 12:18:56 +01:00
fbsanchez	d6681cedd1	33 => 34	2019-10-28 12:18:13 +01:00
Daniel Barbero Martin	f06a55c6bb	continue feedback mail	2019-10-23 19:50:57 +02: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	6bf3772690	remote cmd => remote execution	2019-10-09 19:20:58 +02:00