Commit Graph

305 Commits

Author SHA1 Message Date
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
Jose Gonzalez 7102b14e8b Refactoring and adding new specs 2020-01-24 13:10:02 +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
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
Kike 0f34528f6f Set default rcmd_timeout=10 and new rcmd_timeout_bin token 2019-12-23 17:28:40 +01:00
fbsanchez 4197b7036b Added ssh_launcher settings to pandora_Server 2019-12-19 11:48:20 +01:00
artica 79cad3eaa9 Updated version and build strings. 2019-12-16 11:43:58 +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
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
fbsanchez 0fd95647ea log_window 2019-11-19 11:56:11 +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 2f80759227 minor updates pandora sap 2019-11-18 10:04:47 +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 360d0d7120 added rcmd_timeout base configuration 2019-11-13 16:41:36 +01:00
fbsanchez 2daf473ba9 wip omnishell, command executor and directories 2019-11-08 17:07:14 +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
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
Jose Gonzalez 7c39f3680e Added feature sample_agent 2019-10-22 11:54:27 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
Ramon Novoa 4f2b2df1b0 Comment mta_address by default. 2019-09-11 12:42:52 +02:00
Ramon Novoa 33d9ce9de8 Add SSL/STARTTLS support to pandora_sendmail. 2019-09-10 15:53:47 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
Alejandro Fraguas b47e66d35b Merge branch 'ent-3747-deshabilitar-alertas-con-eventos-en-proceso' into 'develop'
'in-process' events can now inhibit alerts.

See merge request artica/pandorafms!2624
2019-07-31 11:58:48 +02:00
artica 6713f51414 Updated version and build strings. 2019-07-31 09:25:59 +02:00
Ramon Novoa eaa7edd89f 'in-process' events can now inhibit alerts.
Ref pandora_enterprise#3747
2019-07-31 09:07:47 +02:00
Ramon Novoa ffa713da20 Add autocreate_group_focre (see pandora_enterprise#744). 2019-07-25 13:16:15 +02:00
Daniel Barbero Martin 1323de2097 add syncserver conf 2019-07-15 15:43:53 +02:00
artica fb407c51f2 Updated version and build strings. 2019-06-26 13:25:57 +02:00
artica 892dcc750f Updated version and build strings. 2019-05-22 15:29:49 +02:00
artica 8bba24e13a Updated version and build strings.
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
artica 74cb6970dc Updated version and build strings.
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
artica 26560c734c Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +01:00
Daniel Rodriguez 06e87d2b36 Merge branch 'ent-3248-6352-anadir-compatibilidad-snmp-v3-a-servidor-snmp-enterprise' into 'develop'
Add SNMPv3 support to the Enterprise SNMP Server.

See merge request artica/pandorafms!2122

Former-commit-id: 49fd3b38b38d95f6b457dbf83d46f6ba52e94e1e
2019-02-04 17:00:25 +01:00
artica cec6aedaf5 Updated version and build strings.
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
Ramon Novoa 33500e635c Add SNMPv3 support to the Enterprise SNMP Server.
Former-commit-id: 8e0edc671caa7c864fa92c3770fca93bb575958d
2019-01-14 15:16:36 +01:00
artica 3d24bc264e Updated version and build strings.
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
2018-12-13 11:14:24 +01:00
artica f308e1f590 Updated version and build strings. 2018-11-13 15:59:16 +01:00
artica f899910dd0 Updated version and build strings. 2018-10-22 09:45:06 +02:00
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
artica e94af2ee15 Updated version and build strings. 2018-08-14 15:24:31 +02:00
artica 7748fcf5ce Updated version and build strings. 2018-07-24 17:45:16 +02:00
fermin831 219988018f [GeoIP] Modified server conf file to remove recon_reverse_geolocation_mode 2018-07-05 15:19:13 +02:00
Ramon Novoa ad687b3823 Added HA config parameters to pandora_server.conf. 2018-06-19 12:20:02 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
fermin831 4bc10e503b Modified launch daemon Tentacle script to use configuration file 2018-04-30 15:53:09 +02:00
fermin831 1bf0fa6e02 Moved tentacle configuration file 2018-04-27 12:13:01 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
artica 05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica 77392c70fc Updated version and build strings. 2018-02-13 11:51:11 +01:00
daniel bed124b483 add configuration token conf pandora 2018-02-12 10:08:46 +01:00
daniel 137f4a1b69 resolve confict 2018-01-31 13:34:43 +01:00
vgilc 2ef8a4905f Merge branch '1601-WUX_bloquea_el_inicio' into 'develop'
fixed error server WUX

See merge request artica/pandorafms!1146
2018-01-29 13:34:03 +01:00
vgilc 192fc99bf4 Merge branch '1620-Parametros_que_no_estan_o_sobran_en_el_pandora_server_conf' into 'develop'
fixed minor error pandora_server.conf

See merge request artica/pandorafms!1148
2018-01-29 13:32:45 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
Ramon Novoa 934ab8ed91 Add support for periodically updating the status of unknown modules. 2018-01-11 16:00:22 +01:00
artica e895d06016 Updated version and build strings. 2017-12-18 13:26:41 +01:00
Ramon Novoa e495afe5ed Add support for thread status logging.
Ref pandora_enterprise#1551.
2017-12-05 11:28:29 +01:00
daniel ee7521e417 Add news token server conf 2017-12-04 11:37:08 +01:00
daniel 9a976ae8c8 fixed minor error pandora_server.conf 2017-12-01 12:44:35 +01:00
daniel ea03a485c1 fixed error server WUX 2017-12-01 12:26:13 +01:00
Ramon Novoa c72f583f0a Merge remote-tracking branch 'origin/develop' into 1526-grep_syslog_module 2017-11-30 13:20:51 +01:00
artica 13e0221013 Updated version and build strings. 2017-11-27 12:24:02 +01:00
Ramon Novoa 18fdba9dd6 Add a new enterprise server to parse syslog's output.
Ref pandora_enterprise#1526.
2017-11-15 11:29:50 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
Ramon Novoa ab03a6b71c Change the default number of ICMP packets and retries for ping modules.
Ref pandora_enterprise#1562.
2017-11-08 10:37:15 +01:00
artica 906201a34c Updated version and build strings. 2017-10-23 17:45:29 +02:00
slerena 551704a0bf Updated description to be more precise in the comments of web server configuration token. 2017-10-13 17:10:48 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
artica c4a709acf1 Updated version and build strings. 2017-09-06 17:22:32 +02:00
artica 924518e02b Auto-updated build strings. 2017-09-05 00:01:21 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
artica d3df682528 Updated version and build strings. 2017-06-12 16:05:06 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
Ramon Novoa 78e919a65e Add a default timeout for web modules. Ref artica/pandora_enterprise#662.
(cherry picked from commit e49400ae15)
2017-05-05 14:43:35 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
artica e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7.
2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
Ramon Novoa 1efd180726 Document how to test console API settings in pandora_server.conf. 2017-03-08 08:53:35 +01:00
artica 8ab66f6d64 Updated version and build strings for the NG BETA release. 2017-03-01 16:01:27 +01:00
artica 02332570de Revert "Updated version and build strings."
This reverts commit 8867a17baf.
2017-03-01 15:25:58 +01:00
artica 8867a17baf Updated version and build strings. 2017-03-01 15:25:30 +01:00
Ramon Novoa ac3f45e5d3 Add the dynamic_updates configuration option with examples. 2017-03-01 14:59:10 +01:00
Ramon Novoa 17bf92b695 Added an option to disable events related to unknown modules. 2016-11-29 09:11:31 +01:00
artica ae2d5a7231 Updated version and build strings. 2016-11-25 13:56:32 +01:00
Ramon Novoa 9667151fa1 Added the enc_dir option to the configuration file. 2016-11-17 11:15:40 +01:00