Daniel Rodriguez
|
b64218cedb
|
Merge branch 'ent-4226-Mejoras-plugin-SAP' into 'develop'
Fixed translate
See merge request artica/pandorafms!2919
|
2019-11-27 11:52:12 +01:00 |
|
Daniel Barbero Martin
|
ea2c5bc8c9
|
Fixed translate
|
2019-11-27 11:49:20 +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 |
|
artica
|
d2fdc0cf9d
|
Auto-updated build strings.
|
2019-11-27 00:01:08 +01:00 |
|
Daniel Rodriguez
|
becaad2447
|
Merge branch 'ent-EDF' into 'develop'
Ent edf
See merge request artica/pandorafms!2890
|
2019-11-26 18:38:49 +01:00 |
|
fbsanchez
|
bf22ff7a50
|
minor fixes
|
2019-11-26 17:08:18 +01:00 |
|
fbsanchez
|
c28dfd60a5
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-26 16:16:15 +01:00 |
|
fbsanchez
|
69b813390d
|
minor fix - removed trace
|
2019-11-26 15:49:28 +01:00 |
|
fbsanchez
|
a4db8483d1
|
Discovery Applications minor fixes - SAP backend
|
2019-11-26 15:47:04 +01:00 |
|
fbsanchez
|
d4b99a03bb
|
perl-YAML-Tiny RPM spec (agents)
|
2019-11-26 15:46:44 +01:00 |
|
Alejandro Fraguas
|
e96d7f1f30
|
Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop'
Added index in MR
See merge request artica/pandorafms!2916
|
2019-11-26 15:37:49 +01:00 |
|
Daniel Rodriguez
|
66c67ea74a
|
Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop'
Ent 4226 mejoras plugin sap
See merge request artica/pandorafms!2853
|
2019-11-26 14:14:10 +01:00 |
|
fbsanchez
|
cb2aacf25e
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-26 13:08:31 +01:00 |
|
Alejandro Fraguas
|
2deee86f53
|
Merge branch 'ent-4660-problema-con-agentes-windows-en-envio-xml' into 'develop'
Non-intensive modules do not need to check a timestamp.
See merge request artica/pandorafms!2911
|
2019-11-26 10:59:12 +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 |
|
fbsanchez
|
d3f18a94f7
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
|
2019-11-26 10:48:59 +01:00 |
|
fbsanchez
|
340d117e08
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-26 10:47:28 +01:00 |
|
Daniel Maya
|
cf8bae66d1
|
Added index in MR
|
2019-11-26 10:31:57 +01:00 |
|
artica
|
b3fa4b7b7d
|
Auto-updated build strings.
|
2019-11-26 00:01:08 +01:00 |
|
Daniel Barbero
|
867f0cfbe9
|
WIP Rules alert correlation
|
2019-11-25 20:06:42 +01:00 |
|
Marcos Alconada
|
d0aab40fa8
|
Update 29.sql
|
2019-11-25 16:56:59 +01:00 |
|
marcos
|
0490024abc
|
add sap view to autorefresh edit my user
|
2019-11-25 15:01:27 +01:00 |
|
marcos
|
6f8bf104b4
|
update sap view
|
2019-11-25 13:50:26 +01:00 |
|
fbsanchez
|
1b4b59d1c2
|
Rules migration DB
|
2019-11-25 13:36:43 +01:00 |
|
fbsanchez
|
1b57b279fb
|
minor changes
|
2019-11-25 13:03:55 +01:00 |
|
fbsanchez
|
a854809247
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
|
2019-11-25 09:39:25 +01:00 |
|
Daniel Barbero
|
f24034e729
|
Add styles Rules
|
2019-11-25 09:09:59 +01:00 |
|
artica
|
1592773b46
|
Auto-updated build strings.
|
2019-11-25 00:01:07 +01:00 |
|
artica
|
44311c0438
|
Auto-updated build strings.
|
2019-11-24 00:01:07 +01:00 |
|
fbsanchez
|
ae5d7b8944
|
minor style fix rulebuilder
|
2019-11-23 13:20:19 +01:00 |
|
fbsanchez
|
9bfe3f3152
|
minor style fix rulebuilder
|
2019-11-23 13:16:30 +01:00 |
|
fbsanchez
|
d3b5e7a2b0
|
minor style fix rulebuilder
|
2019-11-23 13:13:24 +01:00 |
|
fbsanchez
|
2f0b2c1766
|
minor fix css
|
2019-11-23 13:06:58 +01:00 |
|
fbsanchez
|
64e481187f
|
RuleBuilder Style updates
|
2019-11-23 12:48:47 +01:00 |
|
artica
|
09e6615611
|
Auto-updated build strings.
|
2019-11-23 00:01:09 +01:00 |
|
fbsanchez
|
4e2bd7ed55
|
minor fixes
|
2019-11-22 20:49:46 +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 |
|
fbsanchez
|
8001ba0d41
|
minor fix
|
2019-11-22 15:37:32 +01:00 |
|
Daniel Barbero
|
d6ce54cddf
|
fixed errors Alert correlation
|
2019-11-22 15:26:30 +01:00 |
|
Daniel Barbero
|
e8812cba95
|
add img
|
2019-11-22 14:50:23 +01:00 |
|
Ramon Novoa
|
337e3357db
|
Non-intensive modules do not need to check a timestamp.
Ref pandora_enterprise#4660.
|
2019-11-22 13:59:22 +01:00 |
|
marcos
|
21bf49c218
|
update id_source_event
|
2019-11-22 13:38:08 +01:00 |
|
fbsanchez
|
5b5895a644
|
minor fix
|
2019-11-22 13:30:25 +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 Barbero
|
4caf84da25
|
WIP alert correlations
|
2019-11-22 10:24:12 +01:00 |
|
artica
|
561e73d524
|
Updated version and build strings.
|
2019-11-22 10:03:53 +01:00 |
|