Daniel Rodriguez
|
2b9b53f84a
|
Merge branch '4916-macros-no-funciona-versiones-nuevas' into 'develop'
Changed mode of decode_json
See merge request artica/pandorafms!2924
|
2020-02-11 13:20:16 +01:00 |
artica
|
0db7abbe9e
|
Auto-updated build strings.
|
2020-02-11 00:01:12 +01:00 |
|
artica
|
583c605b31
|
Auto-updated build strings.
|
2020-02-10 00:01:08 +01:00 |
|
artica
|
47b60c29d6
|
Auto-updated build strings.
|
2020-02-09 00:01:08 +01:00 |
|
artica
|
1be17441e7
|
Auto-updated build strings.
|
2020-02-08 00:01:08 +01:00 |
|
artica
|
0cb2f88540
|
Auto-updated build strings.
|
2020-02-07 00:01:25 +01:00 |
|
Daniel Rodriguez
|
f5cdb34167
|
Merge branch 'ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml' into 'develop'
Ent 5333 7076 encoding iso 8859 15 enc genera badxml
See merge request artica/pandorafms!3037
|
2020-02-06 19:54:40 +01:00 |
|
artica
|
36fdaf3ff7
|
Auto-updated build strings.
|
2020-02-06 00:01:11 +01:00 |
|
Daniel Rodriguez
|
9617d08df7
|
Merge branch 'ent-4808-plugin-update-md5' into 'develop'
New util - update remote config files MD5
See merge request artica/pandorafms!2810
|
2020-02-05 12:16:34 +01:00 |
|
artica
|
70e5486ce6
|
Auto-updated build strings.
|
2020-02-05 00:01:11 +01:00 |
|
artica
|
3415838700
|
Auto-updated build strings.
|
2020-02-04 00:01:10 +01:00 |
|
artica
|
af7d1ea5f9
|
Auto-updated build strings.
|
2020-02-03 00:01:08 +01:00 |
|
artica
|
690f6e715d
|
Auto-updated build strings.
|
2020-02-02 00:01:08 +01:00 |
|
artica
|
3136563bba
|
Auto-updated build strings.
|
2020-02-01 00:01:09 +01:00 |
|
artica
|
7aa9a630d0
|
Auto-updated build strings.
|
2020-01-31 00:01:10 +01:00 |
|
artica
|
1134c041f2
|
Auto-updated build strings.
|
2020-01-30 00:01:08 +01:00 |
Jose Gonzalez
|
3c5554b985
|
Deleted stderr for curl testing
|
2020-01-29 17:32:04 +01:00 |
fbsanchez
|
668027e794
|
Merge remote-tracking branch 'origin/develop' into ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml
|
2020-01-29 16:31:14 +01:00 |
|
fbsanchez
|
c8c2141f83
|
Added enc_dir to Encoding_Path (ExpatXS)
|
2020-01-29 16:31:08 +01:00 |
|
Daniel Rodriguez
|
783331d18b
|
Merge branch 'ent-5381-9482-problemas-windows-server-con-742fix' into 'develop'
Fix Windows strftime reference
See merge request artica/pandorafms!3032
|
2020-01-29 13:20:51 +01:00 |
|
Daniel Rodriguez
|
747b482864
|
Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Solved issue with logger message when default path was assumed
See merge request artica/pandorafms!3033
|
2020-01-29 13:04:01 +01:00 |
|
Jose Gonzalez
|
d1e545da24
|
Solved issue with logger message when default path was assumed
|
2020-01-29 11:46:31 +01:00 |
artica
|
2f6fed368d
|
Updated version and build strings.
|
2020-01-29 10:13:37 +01:00 |
|
artica
|
395920f8eb
|
Auto-updated build strings.
|
2020-01-29 00:01:09 +01:00 |
|
fbsanchez
|
77863ae150
|
Fix Windows strftime reference
|
2020-01-28 20:15:53 +01:00 |
|
Daniel Rodriguez
|
914a796ce1
|
Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Changed pandora server start for control if is needed add parameters.
See merge request artica/pandorafms!3017
|
2020-01-28 13:41:42 +01:00 |
|
artica
|
71cc1f4951
|
Auto-updated build strings.
|
2020-01-28 00:01:07 +01:00 |
|
Jose Gonzalez
|
c8194166ef
|
Added console_api_pass write for pandora_server.conf
|
2020-01-27 16:19:27 +01:00 |
|
fbsanchez
|
50a2d74adb
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
Conflicts:
pandora_server/pandora_server.spec
|
2020-01-27 12:38:19 +01:00 |
|
artica
|
e35edd92b3
|
Auto-updated build strings.
|
2020-01-27 00:01:09 +01:00 |
|
artica
|
5dbb80287e
|
Auto-updated build strings.
|
2020-01-26 00:01:10 +01:00 |
|
artica
|
b4b1fbb3c1
|
Auto-updated build strings.
|
2020-01-25 00:01:10 +01:00 |
|
Jose Gonzalez
|
7102b14e8b
|
Refactoring and adding new specs
|
2020-01-24 13:10:02 +01:00 |
|
artica
|
ea3a317a1b
|
Auto-updated build strings.
|
2020-01-24 00:01:33 +01:00 |
|
Jose Gonzalez
|
78fb874886
|
Solved some issues with paramethers
|
2020-01-22 16:33:12 +01:00 |
|
artica
|
475517afd7
|
Auto-updated build strings.
|
2020-01-22 00:01:19 +01:00 |
|
artica
|
2a17065065
|
Auto-updated build strings.
|
2020-01-21 00:01:11 +01:00 |
|
Jose Gonzalez
|
ee44c74d27
|
Solved issue with user profile creation
|
2020-01-20 12:40:19 +01:00 |
|
Jose Gonzalez
|
6fdd460f8a
|
Solved an internal issue for control the test result
|
2020-01-20 11:27:39 +01:00 |
|
artica
|
ba1f0b96b4
|
Auto-updated build strings.
|
2020-01-20 00:01:08 +01:00 |
|
artica
|
8eb77fa6cc
|
Auto-updated build strings.
|
2020-01-19 00:01:07 +01:00 |
|
artica
|
14de9f3c59
|
Auto-updated build strings.
|
2020-01-18 00:01:15 +01:00 |
|
Jose Gonzalez
|
867ae40b17
|
Changed pandora server start for control if is needed add parameters. Also, deleted default parameters
|
2020-01-17 22:58:45 +01:00 |
|
artica
|
cf4362e433
|
Auto-updated build strings.
|
2020-01-17 00:01:10 +01:00 |
Alejandro Fraguas
|
4e1c3a72a8
|
Merge branch 'ent-5187-modulos-remote_cmd-no-funcionan' into 'develop'
Set default rcmd_timeout=10 and new rcmd_timeout_bin token
See merge request artica/pandorafms!2990
|
2020-01-16 19:16:20 +01:00 |
|
Alejandro Fraguas
|
2189709cf6
|
Merge branch 'ent-5240-9303-bloqueos-discovery' into 'develop'
Fixed method calls in Base.pm
See merge request artica/pandorafms!2996
|
2020-01-16 13:06:28 +01:00 |
|
artica
|
40f03e5682
|
Auto-updated build strings.
|
2020-01-16 00:01:08 +01:00 |
|
artica
|
6bf5d07a2c
|
Auto-updated build strings.
|
2020-01-15 00:01:09 +01:00 |
|
artica
|
8038e16c25
|
Auto-updated build strings.
|
2020-01-14 00:01:11 +01:00 |
|
artica
|
2fa637ee4d
|
Auto-updated build strings.
|
2020-01-13 00:01:08 +01:00 |
|
artica
|
f7ea19863f
|
Auto-updated build strings.
|
2020-01-12 00:01:08 +01:00 |
|
artica
|
f4bc172355
|
Auto-updated build strings.
|
2020-01-11 00:01:09 +01:00 |
|
fbsanchez
|
bec40aa5f3
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
|
2020-01-10 21:22:35 +01:00 |
|
artica
|
467db373b7
|
Auto-updated build strings.
|
2020-01-10 00:01:55 +01:00 |
|
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 |