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 |
|
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 |
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
|
32466a5f0f
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-15 16:36:06 +01:00 |
|
artica
|
378192a449
|
Auto-updated build strings.
|
2019-11-15 00:01:12 +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 |
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 |
|
artica
|
cfdb5330ae
|
Auto-updated build strings.
|
2019-11-14 00:01:12 +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
|
83590146b1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
|
2019-11-13 17:38:24 +01:00 |
|
fbsanchez
|
360d0d7120
|
added rcmd_timeout base configuration
|
2019-11-13 16:41:36 +01:00 |
|
fbsanchez
|
875d4430a7
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
|
2019-11-13 12:21:42 +01:00 |
|
fbsanchez
|
b11dbc639f
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-13 12:20:29 +01:00 |
marcos
|
fe45afa662
|
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
|
2019-11-13 12:01:36 +01:00 |
|
artica
|
c19d760bdb
|
Auto-updated build strings.
|
2019-11-13 00:01:12 +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 |
|
fbsanchez
|
19d06dc061
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
|
2019-11-12 10:19:34 +01:00 |
|
artica
|
2ee4f9d88f
|
Auto-updated build strings.
|
2019-11-12 00:01:09 +01:00 |
|
fbsanchez
|
ca9d168e67
|
wip omnishell
|
2019-11-11 18:12:43 +01:00 |
|
artica
|
c390befc2a
|
Auto-updated build strings.
|
2019-11-11 00:01:07 +01:00 |
|
artica
|
7e275febcd
|
Auto-updated build strings.
|
2019-11-10 00:01:07 +01:00 |
|
artica
|
cba38680bd
|
Auto-updated build strings.
|
2019-11-09 00:01:09 +01:00 |
|
fbsanchez
|
2daf473ba9
|
wip omnishell, command executor and directories
|
2019-11-08 17:07:14 +01:00 |
|
artica
|
c8b39740a9
|
Auto-updated build strings.
|
2019-11-08 11:05:59 +01:00 |
|
fbsanchez
|
98237a8d34
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-06 15:36:53 +01:00 |
|
Alejandro Fraguas
|
37ffff12eb
|
Merge branch '4727-macros-grupos-secundarios' into 'develop'
4727 macros grupos secundarios
See merge request artica/pandorafms!2811
|
2019-11-06 12:20:39 +01:00 |
Daniel Rodriguez
|
b7d8323583
|
Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop'
Added API and cli function get_agents_id_by_alias
See merge request artica/pandorafms!2802
|
2019-11-05 17:08:32 +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 |
|
fbsanchez
|
d3e1d34bed
|
SAP discovery
|
2019-11-05 15:38:17 +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 |
|
Alejandro Fraguas
|
b409dde9c0
|
Merge branch 'ent-4384-cli-stop-downtime-bug' into 'develop'
fixed fixed error on stop_downtime
See merge request artica/pandorafms!2717
|
2019-11-05 11:03:02 +01:00 |
|
fbsanchez
|
844414dc8b
|
Discovery SAP - backend start
|
2019-11-04 19:52:38 +01:00 |
|
Alejandro Fraguas
|
777bbdd180
|
Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop'
Added feature sample_agent
See merge request artica/pandorafms!2826
|
2019-11-04 17:54:33 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
Luis Calvo
|
7f01f3d014
|
Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli
|
2019-10-29 10:23:46 +01:00 |
|
artica
|
6f3e42e732
|
Auto-updated build strings.
|
2019-10-29 00:01:13 +01:00 |
|
fbsanchez
|
2e629af15c
|
Simplified log message avoid extra symbols "*"
|
2019-10-28 20:43:36 +01:00 |
|
fbsanchez
|
7accbc97c4
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:36:19 +01:00 |
artica
|
3094d5af05
|
Updated version and build strings.
|
2019-10-28 12:35:59 +01:00 |
|
fbsanchez
|
ccf971c2eb
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:18:19 +01:00 |
|
Daniel Rodriguez
|
08247c1952
|
Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop'
changed pandora api functions to include possibility of using agent alias when...
See merge request artica/pandorafms!2819
|
2019-10-28 11:25:38 +01:00 |