tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,305 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

5939 Commits

Author SHA1 Message Date
artica ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica 20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
artica 059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica 9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
artica 22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Barbero Martin 933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
artica 3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica 5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica 01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Barbero Martin 5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin 03e857ffc8 Wip command center 2021-05-20 17:36:01 +02:00
Daniel Barbero Martin 73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
artica 63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
José González e0ec645613 Fixed issue with last hash symbol 2021-05-19 15:22:24 +02:00
José González 45b5ab4589 Added separator control 2021-05-19 12:40:06 +02:00
Daniel Barbero Martin 3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
artica f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
José González 5342ae077c id_agent default value 2021-05-18 15:27:45 +02:00
José González 5cdc0b8a14 Code review 2021-05-18 10:52:39 +02:00
José González be6269fc89 Code review 2021-05-18 10:25:45 +02:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
Daniel Maya fd372d53d1 Ent 6978 umbrales inversos fallan 2021-05-17 13:00:59 +00:00
Ramon Novoa ecdd28fe0a Do not enforce SSL. 
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
 2021-05-17 13:37:36 +02:00
Ramon Novoa c3d81b7d4b Revert "Do not enforce SSL." 
This reverts commit 6b0aa45ebc.
 2021-05-17 13:36:58 +02:00
Ramon Novoa 6b0aa45ebc Do not enforce SSL. 
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
 2021-05-17 13:21:16 +02:00
Ramon Novoa 439bc2405c Add SSL support for database connections. 
Ref. pandora_enterprise#4759.
 2021-05-17 13:12:42 +02:00
Daniel Barbero Martin 1526dac01d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-17 08:35:52 +02:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
fbsanchez b70a056dc5 Avoid offline components to be marked as failed 2021-05-14 13:07:56 +02:00
fbsanchez b3ac981681 Gracefully stop pandorafms threads 2021-05-14 12:43:18 +02:00
Daniel Barbero Martin 3f509ebd09 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-14 08:36:58 +02:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
José González 0633ac24b9 Fixed issues with https calls 2021-05-13 16:43:18 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Barbero Martin 5b376568a4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/47.sql
 2021-05-13 08:25:59 +02:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Daniel Rodriguez 16c40c3ed4 Merge branch '7027-log-rotate-para-el-log-de-snmpd-de-las-traps' into 'develop' 
Add a comment regarding snmp_logfile.

See merge request artica/pandorafms!4122
 2021-05-12 15:56:45 +00:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
Daniel Rodriguez 6aa1188d35 Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop' 
Added missing fields to alert snmp actions

See merge request artica/pandorafms!3927
 2021-05-12 12:54:37 +00:00
Luis 7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
Ramon Novoa 3cfb07a36f Merge remote-tracking branch 'origin/develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:18:30 +02:00
Ramon Novoa 83822395f6 Merge branch 'develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:01:52 +02:00
José González 90573feb1b Issue with Perl5 paths 2021-05-12 09:35:35 +02:00
Daniel Barbero Martin ad03bc41aa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-12 08:41:00 +02:00
artica 671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +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
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez fc4d3b7d23 Merge branch 'ent-7302-bug-en-macro-moduledata-x' into 'develop' 
Fixed encoding ampersand on mail alerts

See merge request artica/pandorafms!4035
 2021-05-11 09:44:15 +00:00
Daniel Barbero Martin c19e398057 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-11 07:37:56 +02:00
artica 6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
Ramon Novoa 6939ec4d44 Unify the format of product version messages. 2021-05-10 17:58:17 +02:00
Daniel Rodriguez 847b567f5c Merge branch 'ent-7516-warnings-en-ejecuccion-de-vmware-plugin-pl' into 'develop' 
avoid warnings in old perl versions

See merge request artica/pandorafms!4114
 2021-05-10 11:06:45 +00:00
Daniel Rodriguez c6068a8544 Merge branch 'ent-7113-warning-ejecucion-erronea-pandora_server' into 'develop' 
Fixed issue with execution without correct params

Closes pandora_enterprise#7113

See merge request artica/pandorafms!3989
 2021-05-10 08:53:21 +00:00
Daniel Barbero Martin 2240f71c0c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-10 08:40:59 +02:00
artica dfba1da200 Auto-updated build strings. 2021-05-10 01:00:34 +02:00
artica fb1ea7bd1d Auto-updated build strings. 2021-05-09 01:00:25 +02:00
artica 68f4f6f135 Auto-updated build strings. 2021-05-08 01:00:43 +02:00
fbsanchez d160737fb2 Avoid die while decoding erroneus json data 2021-05-07 14:15:16 +02:00
fbsanchez a5c5a30bde avoid warnings in old perl versions 2021-05-07 14:01:42 +02:00
Daniel Barbero Martin 77693b6c6d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-07 08:33:56 +02:00
artica 454e6120e4 Auto-updated build strings. 2021-05-07 01:00:44 +02:00
Daniel Barbero Martin d5dcc5bf69 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-06 08:30:30 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
Ramon Novoa 6b4cb8d9df Update pandora_server to work with PAR:Packer binaries. 
Binaries compiled with PAR::Packer insert blanks between the name of the
executable and the first command line argument, which breaks startup
scripts.
 2021-05-05 17:42:33 +02:00
Ramon Novoa e40014444f Merge branch 'develop' into ent-5620-nuevo-compilador-para-backend 2021-05-05 17:23:29 +02:00
fbsanchez 735df105d3 Mute some license checks while initializing enterprise component (pandora-ha) 2021-05-05 12:40:56 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
artica c95b629776 Auto-updated build strings. 2021-04-30 01:00:41 +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
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
Daniel Rodriguez 2930306767 Merge branch 'ent-7381-comportamiento-extraño-cron-modulos' into 'develop' 
Improved business logic for cron

See merge request artica/pandorafms!4080
 2021-04-28 15:24:47 +00:00
Daniel Rodriguez 9b90039fe2 Merge branch 'ent-7414-rear-eventos-por-cli-metaconsola' into 'develop' 
fixed error with meta create vent cli

See merge request artica/pandorafms!4079
 2021-04-28 14:19:21 +00:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
fbsanchez 24976c4860 Disable timezone offset while setting timestamp from server 2021-04-27 17:58:20 +02:00
Daniel Rodriguez 2787a1f64c Merge branch 'ent-7385-no-se-actualizan-los-hilos-del-servidor-transaccional' into 'develop' 
Removed token trasnsactional_threads as manager only runs 1 thread

See merge request artica/pandorafms!4075
 2021-04-27 14:25:36 +00:00
fbsanchez 2ef9743d5b Added elastic_query_size 2021-04-27 14:59:59 +02:00
Daniel Rodriguez dedd578fe1 Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop' 
fixed count in several views

See merge request artica/pandorafms!4052
 2021-04-27 11:47:43 +00:00
Daniel Rodriguez 5aea0d17f0 Merge branch 'ent-7347-no-funciona-envio-de-mails-desde-servidor-con-sendgrid' into 'develop' 
Make sure encode_base64 does not break auth strings.

See merge request artica/pandorafms!4059
 2021-04-27 11:43:06 +00:00
José González d0c3174d8c Improved business logic for cron 2021-04-27 12:19:20 +02:00
marcos 9edfe43cb7 fixed error with meta create vent cli 2021-04-27 12:14:32 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00
fbsanchez 5bfd86d944 Removed token trasnsactional_threads as manager only runs 1 thread 2021-04-26 21:21:01 +02:00
fbsanchez 00acc46eca Fix locating agent while correlating logs 2021-04-26 19:49:43 +02:00
artica 72b9748be9 Auto-updated build strings. 2021-04-26 01:00:14 +02:00
artica fa2748ac5d Auto-updated build strings. 2021-04-25 01:00:22 +02:00
artica 351570213f Auto-updated build strings. 2021-04-24 01:00:38 +02:00
artica f3f44ebbdd Auto-updated build strings. 2021-04-23 01:00:18 +02:00
Ramon Novoa d423979426 Make sure encode_base64 does not break auth strings. 
The way Mail::Sendmail called encode_base64 could break auth strings
into multiple lines, resulting in authentication errors.

Ref pandora_enterprise#7347
 2021-04-22 15:03:27 +02:00
artica c7521d27fa Auto-updated build strings. 2021-04-22 01:00:16 +02:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
artica d4d7494e27 Auto-updated build strings. 2021-04-21 01:00:16 +02:00
fbsanchez fc21a1234d PluginTools transfer_xml, Rename filename if it contains symbols (only parsed ones) 2021-04-20 14:05:15 +02:00
fbsanchez d3dc3044aa Allow sending file_path with symbols 2021-04-20 13:22:13 +02:00
vgilc d380e2cd45 Merge branch 'ent-7320-11651-creacion-masiva-de-xml-incorrectos-con-servidor-develop' into 'develop' 
Ent 7320 11651 creacion masiva de xml incorrectos con servidor develop

See merge request artica/pandorafms!4038
 2021-04-20 08:55:21 +00: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 20fe99ef29 Auto-updated build strings. 2021-04-20 01:00:15 +02:00
fbsanchez 7275bdd061 Allow transfer_xml direct file paths in pluginTools 2021-04-19 18:11:34 +02:00
artica 3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
artica 08abb25fc4 Auto-updated build strings. 2021-04-19 01:00:13 +02:00
artica 1030ef052a Auto-updated build strings. 2021-04-18 01:00:13 +02:00
artica 9ec945fa3c Auto-updated build strings. 2021-04-17 01:00:15 +02:00
Calvo 256d4333c6 Fixed encoding ampersand on mail alerts 2021-04-16 15:36:12 +02:00
artica f585e44692 Auto-updated build strings. 2021-04-16 01:00:41 +02:00
Ramon Novoa 4d1a0d9ef4 Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend 2021-04-15 18:16:41 +02:00
Ramon Novoa 8edaad4e5a Push /usr/lib/perl5 to the back of the module search path. 
When /usr/lib/perl5 is added to the front of the module search path it
takes precedence over libraries distributed with binary versions of
Pandora FMS. This can be fixed by pushing it to the back instead.
 2021-04-15 17:56:02 +02:00
fbsanchez 3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
artica fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02:00
fbsanchez 114f23f474 Added event_server_cache_ttl 2021-04-14 22:36:56 +02:00
Daniel Rodriguez daf44e6a42 Merge branch 'ent-fix-improve-cli-profile' into 'develop' 
Fixed and improved profile related CLIs.

See merge request artica/pandorafms!4029
 2021-04-14 09:56:07 +00:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
Junichi Satoh 56ff245675 Fixed the order of arguments in 'create_profile' as the same as comment in pandora_manage.pl and documentation, and fixed 'profile_name' was not encoded. 
Plus, added new cli, 'update_profile'.
 2021-04-14 11:07:13 +09:00
artica 46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00
Daniel Rodriguez fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
Daniel Rodriguez dd41c1c0f7 Merge branch 'ent-2177-lead-error-en-plugin-de-servidor-snmp_remote-pl-catrian' into 'develop' 
hrStorageAllocationUnits fixed ref. snmp_remote.pl

See merge request artica/pandorafms!3913
 2021-04-13 13:24:03 +00:00
marcos 27df4348be resolved error with mail graph 2021-04-13 10:29:42 +02:00
artica c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
Daniel Rodriguez 34aeb4ddd8 Merge branch 'ent-6883-11170-pandora_server_installer-pandora_server-spec-borra-configuracion-de-logrotate' into 'develop' 
Prevent logrotate file to be overwritten

See merge request artica/pandorafms!3992
 2021-04-12 08:32:49 +00:00
artica 4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica 3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
artica 2e27cebad2 Auto-updated build strings. 2021-04-08 01:00:37 +02:00
Calvo 34b361e21a Fixed CLI update_agent adding duplicate agent address references 2021-04-07 17:38:38 +02:00
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-04-07 10:28:44 +02:00
artica 8734494b7f Auto-updated build strings. 2021-04-07 01:00:38 +02:00
Daniel Rodriguez 0f5f41e97f Merge branch 'ent-7011-nexcon-se-sigue-generando-el-evento-de-alerta-cesada-aunque-esten-deshabilitados-los-eventos-de-la-alera' into 'develop' 
Avoid events while ceasing alerts

See merge request artica/pandorafms!3827
 2021-04-06 17:25:21 +00:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' 
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
 2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
artica 31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica 4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica 95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica 2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica 10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
Kevin a935278b5d Prevent RPMs from overwriting logrotate 2021-03-31 18:38:14 +02:00
Kevin 89a7eb7a20 Prevent logrotate file to overwrite in tarball 2021-03-31 17:24:18 +02:00
Jose Gonzalez 14b364baec Fixed issue with execution without correct params 2021-03-31 12:37:02 +02:00
artica 321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
artica 8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
artica 96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez c4b6f709c9 Merge branch 'ent-6979-fallo-discovery-contraseñas-caracteres-especiales' into 'develop' 
Fix issue

Closes pandora_enterprise#6979

See merge request artica/pandorafms!3821
 2021-03-25 11:54:45 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
artica 1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
José González 9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-24 15:50:12 +00:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
Daniel Rodriguez 9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop' 
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
 2021-03-24 11:57:47 +00:00
fbsanchez 9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
José González 561060cdda Reverted change over mysqldriver 2021-03-23 20:37:28 +00:00
Jose Gonzalez 910154389e Fix 2021-03-23 16:15:57 +01:00
Jose Gonzalez 3cb504397f Solve issues for compilation 2021-03-23 15:15:07 +01: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
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Jose Gonzalez 4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop' 
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
 2021-03-22 12:39:59 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
Jose Gonzalez 9e54f9517b WIP: Backup upload 2021-03-18 16:12:39 +01:00
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop' 
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
 2021-03-18 09:56:31 +00:00
artica 572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +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
artica 610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +01:00
Daniel Rodriguez 8715cbceaf Merge branch 'ent-6984-server-log-permissions' into 'develop' 
adding permissions to apache group

See merge request artica/pandorafms!3877
 2021-03-16 16:39:48 +00:00
fbsanchez c67e5f9846 hrStorageAllocationUnits fixed ref. snmp_remote.pl 2021-03-16 10:14:28 +01:00
Daniel Rodriguez cb6bb195b5 Merge branch 'ent-5700-traza-ejecucion-pandora-db-tgraph-source' into 'develop' 
Added log on deleting tgraph_source data in pandora_db

See merge request artica/pandorafms!3721
 2021-03-16 09:13:00 +00:00
artica df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
artica fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica 0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica 5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Daniel Rodriguez d0234314a0 Merge branch 'ent-6052-revision-parametros-binario-server' into 'develop' 
Solved issue with verbosity parameters

Closes pandora_enterprise#6052

See merge request artica/pandorafms!3790
 2021-03-12 09:11:53 +00:00
artica d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
José González d79d1a1262 Merge branch 'develop' into 'ent-6052-revision-parametros-binario-server' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-11 08:16:50 +00:00
artica 74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez 96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
Jose Gonzalez d86bfa8e7a Updated 2021-03-10 14:00:29 +01:00
Jose Gonzalez 2d4577b23b Cleaned -v and -q options 2021-03-10 13:58:56 +01:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
artica e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
artica f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
artica 2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica 438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica 80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
rafael.ameijeiras ab68bcf1d6 adding permissions to apache group 2021-03-04 12:13:16 +01:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
artica 4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
artica 442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
Daniel Rodriguez f9faac8abd Merge branch 'ent-6710-instalacion-desatendida-agente-windows' into 'develop' 
Fixed issue

Closes pandora_enterprise#6710

See merge request artica/pandorafms!3871
 2021-03-02 12:18:48 +00:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
artica 19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
artica 0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica 0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica 814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
Jose Gonzalez 08cc259f07 Fixed issue 2021-02-26 14:24:44 +01:00
artica dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
artica 078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
artica 508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
artica a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
artica cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica 396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
artica 0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
artica 4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
artica a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
artica c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
fbsanchez aca9814e0f uniqid pandora_snmp_bandwidth 2021-02-15 19:10:49 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
artica 2a7ba5fbe0 Auto-updated build strings. 2021-02-15 01:00:15 +01:00
artica 2ef0a1b395 Auto-updated build strings. 2021-02-14 01:00:15 +01:00
artica 3c29314dc7 Auto-updated build strings. 2021-02-13 01:00:18 +01:00
Luis 0469c3c9a8 Pandora sendmail control write all data in socket 2021-02-12 15:30:44 +01:00
fbsanchez 24ed77b5a1 Pandora bandwidth server plugin 2021-02-12 15:25:41 +01:00
artica 768494e796 Auto-updated build strings. 2021-02-12 01:00:20 +01:00
artica 16f2a60490 Auto-updated build strings. 2021-02-11 01:00:22 +01:00