Commit Graph

22955 Commits

Author SHA1 Message Date
fbsanchez 35bd29d222 Merge branch 'ent-4610-Alertas-de-logs' of brutus.artica.lan:artica/pandorafms into ent-4610-Alertas-de-logs 2019-11-20 10:40:57 +01:00
fbsanchez 43ecba3bbb operator fields for event_rule 2019-11-20 10:40:52 +01:00
Daniel Barbero Martin cd8f52fd92 WIP alert correlations 2019-11-20 09:11:03 +01:00
fbsanchez 9cea131378 WIP CorrelatedAlerts 2019-11-19 23:35:29 +01:00
fbsanchez 0fd95647ea log_window 2019-11-19 11:56:11 +01:00
fbsanchez 83e7d5a701 Minor fixes 2019-11-18 19:32:57 +01:00
Daniel Barbero 8811095a3e WIP ALerts 2019-11-18 15:25:35 +01:00
Daniel Barbero 79f5e879cc WIP Alerts 2019-11-18 13:37:10 +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 6126503285 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-18 12:30:51 +01:00
fbsanchez 61ccd5bdbc help_link omnishell 2019-11-18 12:30:12 +01:00
fbsanchez a5ab29e90e omnishell retries 2019-11-18 11:22:54 +01:00
fbsanchez 85ca03b054 fix- removed traces 2019-11-18 11:07:04 +01:00
fbsanchez 99b0714850 PWE keep db connection up 2019-11-18 11:06:27 +01:00
fbsanchez 1cacbbc08f fix tools 2019-11-18 10:40:02 +01:00
fbsanchez 4a05cbb544 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 10:05:47 +01:00
fbsanchez 6fb2e3af81 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 10:05:40 +01:00
fbsanchez 13dd2ebc18 Merge branch 'ent-4226-mejoras-plugin-sap' of brutus.artica.lan:artica/pandorafms into ent-4226-mejoras-plugin-sap 2019-11-18 10:04:52 +01:00
fbsanchez 2f80759227 minor updates pandora sap 2019-11-18 10:04:47 +01:00
fbsanchez 61eb7f0635 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 09:55:15 +01:00
artica 73389a7164 Auto-updated build strings. 2019-11-18 00:01:07 +01:00
artica 39b449be9c Auto-updated build strings. 2019-11-17 00:01:07 +01:00
artica 727b3bde5d Auto-updated build strings. 2019-11-16 00:01:11 +01:00
fbsanchez 46c42ef8a4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:52:26 +01:00
fbsanchez 84c6640032 minor style fix 2019-11-15 16:51:53 +01:00
fbsanchez 89e014a9e4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:37:01 +01:00
fbsanchez 17918cd5c6 minor fix omnishell functionality - unix agent 2019-11-15 16:36:46 +01:00
fbsanchez 32466a5f0f Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-15 16:36:06 +01:00
fbsanchez 495fdfc6f0 minor fix omnishell functionality - unix agent 2019-11-15 16:35:25 +01:00
marcos 91f28384b8 changed sap icon button 2019-11-15 16:22:30 +01:00
Alejandro Fraguas 7e8f22b1de Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop'
Ent 4936 comillas dobles en comentarios de eventos no funcionan

See merge request artica/pandorafms!2869
2019-11-15 13:20:13 +01:00
fbsanchez 9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez 990ad339d3 db schema 2019-11-15 09:45:49 +01:00
artica 378192a449 Auto-updated build strings. 2019-11-15 00:01:12 +01:00
fbsanchez 8edbb74354 discovery help link and minor fixes 2019-11-14 21:52:02 +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 cb43d06c13 minor fix 2019-11-14 21:31:07 +01:00
fbsanchez dcd9467bfb fix symbols in gotty credentials 2019-11-14 21:10:46 +01:00
fbsanchez 547e0c4364 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-14 20:58:16 +01:00
fbsanchez 546b8dc448 omnishell minor changes 2019-11-14 20:55:55 +01:00
fbsanchez 9dec1709c4 Fixed help content well printed 2019-11-14 19:10:31 +01:00
marcos f348310675 ADD function to get SAP agents and sap view to sap agents 2019-11-14 19:01:23 +01:00
fbsanchez 0d3817d64d dynamic toggle in wizard input printForm 2019-11-14 17:45:45 +01:00
fbsanchez 192fd10dd8 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-14 17:14:34 +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 7efb1367ef Merge branch 'ent-EDF' into ent-4772-omnishell 2019-11-14 17:12:21 +01:00
fbsanchez 14128590d6 Minor corrections&fixes 2019-11-14 17:05:01 +01:00
fbsanchez 17f324ef8d Agent remote cmd fixes 2019-11-14 17:04:47 +01:00
Alejandro Fraguas 27bdf04735 Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop'
first changed to welcome window

See merge request artica/pandorafms!2822
2019-11-14 16:05:22 +01:00