389 Commits

Author SHA1 Message Date
José González
9e9ea4d00a Merge with last develop 2021-05-12 09:17:32 +02:00
Ramon Novoa
47c73518bd Add a comment regarding snmp_logfile.
There's an entry for pandora_snmptrap.log in
/etc/logrotate.d/pandora_server which should be updated if snmp_logfile
is changed in pandora_server.conf. Ref. pandora_enterprise#7027.
2021-05-11 17:40:15 +02:00
Daniel Rodriguez
4951552d1d Merge branch 'ent-7413-filtro-log-agent-alertas-correladas-logs-no-funciona-correctamente' into 'develop'
Fix locating agent while correlating logs

See merge request artica/pandorafms!4074
2021-04-29 12:05:10 +00:00
fbsanchez
2ef9743d5b Added elastic_query_size 2021-04-27 14:59:59 +02:00
fbsanchez
5bfd86d944 Removed token trasnsactional_threads as manager only runs 1 thread 2021-04-26 21:21:01 +02:00
vgilc
3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop'
reviewing correlated alerts

See merge request artica/pandorafms!4024
2021-04-20 07:56:04 +00:00
artica
3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
fbsanchez
114f23f474 Added event_server_cache_ttl 2021-04-14 22:36:56 +02:00
artica
96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
José González
6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2021-03-23 12:00:45 +00:00
Jose Gonzalez
9e54f9517b WIP: Backup upload 2021-03-18 16:12:39 +01:00
fbsanchez
71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2021-03-17 10:11:58 +01:00
Jose Gonzalez
08cc259f07 Fixed issue 2021-02-26 14:24:44 +01:00
Ramon Novoa
bf618cbb72 Fix the description of use_xml_timestamp. 2021-02-04 13:34:59 +01:00
artica
831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Jose Gonzalez
430457b30a Deleted logstash references 2020-12-15 13:12:00 +01:00
José González
623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
artica
17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Maya
c1a7fc2e9a Added snmp_storm_silence_period 2020-10-28 10:57:21 +01:00
artica
3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica
0ee9ed5dfa Updated version and build strings. 2020-09-08 15:00:36 +02:00
artica
6e6e194e73 Updated version and build strings. 2020-08-03 14:50:49 +02:00
artica
40659c01da Updated version and build strings. 2020-07-02 10:52:47 +02:00
Luis
5db15e12d8 Changed default web engine from LWP to CURL 2020-06-25 16:34:09 +02:00
fbsanchez
55f10fc640 Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-06-17 13:41:09 +02:00
artica
c127ed84f0 Updated version and build strings. 2020-06-02 18:19:16 +02:00
fbsanchez
19f7280c86 Cleanup old SEL GRID sessions 2020-04-22 16:09:12 +02:00
artica
91d1832f8f Updated version and build strings. 2020-04-22 12:42:47 +02:00
fbsanchez
18876c6e06 Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 2020-03-17 12:56:48 +01:00
Jose Gonzalez
db2fc26c41 Modified default parameters 2020-03-03 12:52:58 +01:00
artica
015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
fbsanchez
85f512db5c mssql driver settings 2020-02-18 16:43:36 +01:00
artica
2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +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
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