fbsanchez
|
320ca5d021
|
Merge branch 'develop' into 'ent-4697-cicd-pandorafms'
Conflicts:
pandora_server/pandora_server.spec
|
2020-01-09 09:28:33 +01:00 |
artica
|
d8b97885a9
|
Auto-updated build strings.
|
2020-01-09 00:01:13 +01:00 |
|
fbsanchez
|
2084a233c3
|
test
|
2020-01-08 20:01:46 +01:00 |
|
fbsanchez
|
93380430ef
|
alternative dpkg-deb
|
2020-01-08 19:45:50 +01:00 |
|
fbsanchez
|
2e1ab56ae3
|
minor updates
|
2020-01-08 19:38:12 +01:00 |
|
fbsanchez
|
8563ff52fb
|
minor updates in make_deb_pacakge.sh
|
2020-01-08 19:36:15 +01:00 |
|
fbsanchez
|
6dd779c249
|
minor fix
|
2020-01-08 15:35:03 +01:00 |
|
fbsanchez
|
73e0a6d519
|
spec setup quiet
|
2020-01-08 13:19:51 +01:00 |
|
fbsanchez
|
be6e1e93f9
|
spec minor changes
|
2020-01-08 11:24:38 +01:00 |
|
fbsanchez
|
e26e12ea9d
|
spec changes reverted
|
2020-01-08 11:22:14 +01:00 |
|
fbsanchez
|
a9259d94f2
|
spec review
|
2020-01-08 10:45:16 +01:00 |
|
fbsanchez
|
c32e645e1b
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
|
2020-01-08 10:37:43 +01:00 |
|
artica
|
64e63dad63
|
Auto-updated build strings.
|
2020-01-08 00:01:15 +01:00 |
Daniel Rodriguez
|
4464bf71d8
|
Merge branch 'ent-4880-error-borrar-historico-datos-cli' into 'develop'
Fixed CLI delete data
See merge request artica/pandorafms!2857
|
2020-01-07 10:25:38 +01:00 |
|
artica
|
6e6e7ba249
|
Auto-updated build strings.
|
2020-01-07 00:01:09 +01:00 |
|
artica
|
ba9f6cd1a7
|
Auto-updated build strings.
|
2020-01-06 00:01:15 +01:00 |
|
artica
|
3f2884b282
|
Auto-updated build strings.
|
2020-01-05 00:01:08 +01:00 |
|
artica
|
9e5032e1e0
|
Auto-updated build strings.
|
2020-01-04 00:01:08 +01:00 |
|
fbsanchez
|
69be5aec24
|
Merge branch 'ent-5244-modulos-no-inicializan' into 'develop'
Fix perl date issue
See merge request artica/pandorafms!2997
|
2020-01-03 13:03:49 +01:00 |
|
artica
|
e66b8ca4e3
|
Auto-updated build strings.
|
2020-01-03 00:01:13 +01:00 |
|
fbsanchez
|
2e5a771663
|
timelocal to strftime
|
2020-01-02 16:00:01 +01:00 |
|
fbsanchez
|
14a2da39b1
|
minor fix
|
2020-01-02 15:49:32 +01:00 |
|
fbsanchez
|
dfca202dc4
|
Merge branch 'ent-5244-modulos-no-inicializan' of brutus.artica.es:artica/pandorafms into ent-5244-modulos-no-inicializan
Conflicts:
pandora_server/lib/PandoraFMS/Core.pm
|
2020-01-02 15:47:00 +01:00 |
|
fbsanchez
|
70d51413c9
|
timelocal to strftime
|
2020-01-02 15:46:27 +01:00 |
|
fbsanchez
|
fb3e395958
|
Fix perl date issue
|
2020-01-02 14:03:14 +01:00 |
|
fbsanchez
|
c1f026fea1
|
restored pandora_server.spec classic
|
2020-01-02 11:05:48 +01:00 |
|
fbsanchez
|
e48b41b7e7
|
Merge branch 'ent-5240-9303-bloqueos-discovery' of brutus.artica.es:artica/pandorafms into ent-5240-9303-bloqueos-discovery
|
2020-01-02 11:03:22 +01:00 |
|
fbsanchez
|
a3fdf4007d
|
Fixed method calls in Base.pm
|
2020-01-02 10:04:41 +01:00 |
|
fbsanchez
|
154b0c367f
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
|
2020-01-02 09:13:32 +01:00 |
|
artica
|
713737986b
|
Auto-updated build strings.
|
2020-01-02 00:01:10 +01:00 |
|
artica
|
d386d3c390
|
Auto-updated build strings.
|
2020-01-01 00:01:10 +01:00 |
|
artica
|
5b346c1ed9
|
Auto-updated build strings.
|
2019-12-31 00:01:11 +01:00 |
|
artica
|
287d377520
|
Auto-updated build strings.
|
2019-12-26 00:01:08 +01:00 |
|
artica
|
4294ec6d1b
|
Auto-updated build strings.
|
2019-12-25 00:01:11 +01:00 |
Enrique Martin
|
ea86205b36
|
Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan'
Conflicts:
pandora_server/conf/pandora_server.conf.new
|
2019-12-24 10:49:44 +01:00 |
|
Kike
|
79d3cd613f
|
Added rcmd_timeout_bin token in pandora_server.conf by default
|
2019-12-24 10:43:08 +01:00 |
Alejandro Fraguas
|
5c0636b074
|
Merge branch 'ent-5203-incluir-ssh_launcher-en-config-pm' into 'develop'
Added ssh_launcher settings to pandora_Server
See merge request artica/pandorafms!2979
|
2019-12-24 10:03:37 +01:00 |
|
artica
|
d653b4d685
|
Auto-updated build strings.
|
2019-12-24 00:01:22 +01:00 |
|
Kike
|
0f34528f6f
|
Set default rcmd_timeout=10 and new rcmd_timeout_bin token
|
2019-12-23 17:28:40 +01:00 |
|
fbsanchez
|
2a0187022b
|
Resolved deprecated options rpm spec
|
2019-12-23 13:28:38 +01:00 |
|
artica
|
cf8bf74cd4
|
Auto-updated build strings.
|
2019-12-23 00:01:17 +01:00 |
|
artica
|
59e91c0ed4
|
Auto-updated build strings.
|
2019-12-22 00:01:09 +01:00 |
|
artica
|
df704997e3
|
Auto-updated build strings.
|
2019-12-21 00:01:24 +01:00 |
|
artica
|
45a8904578
|
Auto-updated build strings.
|
2019-12-20 00:01:10 +01:00 |
|
fbsanchez
|
4197b7036b
|
Added ssh_launcher settings to pandora_Server
|
2019-12-19 11:48:20 +01:00 |
|
artica
|
f69d243330
|
Auto-updated build strings.
|
2019-12-19 00:01:09 +01:00 |
|
artica
|
dcd1bbd527
|
Auto-updated build strings.
|
2019-12-18 00:01:20 +01:00 |
|
artica
|
0b0c38f9c0
|
Auto-updated build strings.
|
2019-12-17 00:01:10 +01:00 |
artica
|
79cad3eaa9
|
Updated version and build strings.
|
2019-12-16 11:43:58 +01:00 |
|
artica
|
f7b0372e53
|
Auto-updated build strings.
|
2019-12-16 00:01:07 +01:00 |
|
artica
|
20f3583fc5
|
Auto-updated build strings.
|
2019-12-15 00:01:06 +01:00 |
|
artica
|
ebe0ba25c8
|
Auto-updated build strings.
|
2019-12-14 00:01:09 +01:00 |
|
artica
|
37c5acf4d1
|
Auto-updated build strings.
|
2019-12-13 00:01:12 +01:00 |
|
artica
|
dd49f0c91c
|
Auto-updated build strings.
|
2019-12-12 00:01:11 +01:00 |
|
artica
|
772b26ffcb
|
Auto-updated build strings.
|
2019-12-11 00:01:11 +01:00 |
|
Daniel Rodriguez
|
1350ef951b
|
Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop'
Code reset and solved other issues with comments
See merge request artica/pandorafms!2943
|
2019-12-10 17:21:48 +01:00 |
Jose Gonzalez
|
df79950a77
|
Solve issues with comments with quotes in CLI
|
2019-12-10 13:31:12 +01:00 |
Luis
|
01e3c8bcda
|
Ent 5004 crete event cli no funciona bien
|
2019-12-10 11:31:45 +01:00 |
|
artica
|
7a858fbc25
|
Auto-updated build strings.
|
2019-12-10 00:01:07 +01:00 |
|
artica
|
180d5842ee
|
Auto-updated build strings.
|
2019-12-09 00:01:08 +01:00 |
|
artica
|
8128f2605a
|
Auto-updated build strings.
|
2019-12-08 00:01:07 +01:00 |
|
artica
|
8f31fc21f1
|
Auto-updated build strings.
|
2019-12-07 00:01:07 +01:00 |
|
artica
|
f477014a1b
|
Auto-updated build strings.
|
2019-12-06 00:01:10 +01:00 |
|
artica
|
0263060639
|
Auto-updated build strings.
|
2019-12-05 00:01:09 +01:00 |
|
artica
|
0ba2d86971
|
Auto-updated build strings.
|
2019-12-04 00:01:08 +01:00 |
|
fbsanchez
|
a8a1b2bcc8
|
Fix ELK alerts
|
2019-12-03 19:54:09 +01:00 |
|
artica
|
60aaf4363e
|
Auto-updated build strings.
|
2019-12-03 00:01:07 +01:00 |
|
artica
|
80d5eea467
|
Auto-updated build strings.
|
2019-12-02 00:01:08 +01:00 |
|
artica
|
882198798a
|
Auto-updated build strings.
|
2019-12-01 00:01:06 +01:00 |
|
artica
|
a6f881c6fa
|
Auto-updated build strings.
|
2019-11-30 00:01:08 +01:00 |
|
artica
|
14999b7b84
|
Auto-updated build strings.
|
2019-11-29 00:01:08 +01:00 |
|
Jose Gonzalez
|
70780070bd
|
Changed mode of decode_json
|
2019-11-28 17:15:26 +01:00 |
|
artica
|
ec6d317bd4
|
Auto-updated build strings.
|
2019-11-28 00:01:09 +01:00 |
|
artica
|
d2fdc0cf9d
|
Auto-updated build strings.
|
2019-11-27 00:01:08 +01:00 |
|
fbsanchez
|
bf22ff7a50
|
minor fixes
|
2019-11-26 17:08:18 +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
|
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 |
|
artica
|
b3fa4b7b7d
|
Auto-updated build strings.
|
2019-11-26 00:01:08 +01:00 |
|
fbsanchez
|
a854809247
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
|
2019-11-25 09:39:25 +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 |
|
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 |
|
artica
|
561e73d524
|
Updated version and build strings.
|
2019-11-22 10:03:53 +01:00 |
|
artica
|
b386da7da6
|
Auto-updated build strings.
|
2019-11-22 00:01:10 +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 |
|
artica
|
23e64ab781
|
Auto-updated build strings.
|
2019-11-21 00:01:18 +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 |
|
artica
|
12123d68df
|
Auto-updated build strings.
|
2019-11-20 00:01:37 +01:00 |
|
fbsanchez
|
9cea131378
|
WIP CorrelatedAlerts
|
2019-11-19 23:35:29 +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 |
|
fbsanchez
|
be1e4324d2
|
missed port
|
2019-11-19 12:02:10 +01:00 |
|
fbsanchez
|
0fd95647ea
|
log_window
|
2019-11-19 11:56:11 +01:00 |
|
artica
|
04076a04b1
|
Auto-updated build strings.
|
2019-11-19 00:01:12 +01:00 |
|
fbsanchez
|
83e7d5a701
|
Minor fixes
|
2019-11-18 19:32:57 +01:00 |
|
José González
|
4cddf5a31a
|
Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento'
# Conflicts:
# pandora_console/include/functions_events.php
|
2019-11-18 11:02:31 +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 |
|
Jose Gonzalez
|
adb6f00597
|
Missed line added
|
2019-11-13 16:34:08 +01:00 |
|
Jose Gonzalez
|
62fbdd36a0
|
Solution for lost comments in the events section modal window
|
2019-11-13 15:36:52 +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 |
|
Luis Calvo
|
7a20ec8e82
|
Fixed CLI delete data
|
2019-11-04 16:04:26 +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 |
|
Alejandro Fraguas
|
405b91a2ac
|
Merge branch 'ent-3584-no-pasa-html_encode-al-alias-de-los-broker_agents' into 'develop'
Encode the agent alias with HTML entities.
See merge request artica/pandorafms!2836
|
2019-10-28 10:01:48 +01:00 |