Commit Graph

5944 Commits

Author SHA1 Message Date
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
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
fbsanchez 7017c6136e Avoid events while ceasing alerts 2021-02-10 10:21:39 +01:00
artica 40852de906 Auto-updated build strings. 2021-02-10 01:00:22 +01:00
artica e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
artica c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00
artica fe8a54aa48 Auto-updated build strings. 2021-02-07 01:00:17 +01:00
artica 0362e4a1a0 Auto-updated build strings. 2021-02-06 01:00:17 +01:00
Kevin 0a432e574b Done right 2021-02-05 13:23:45 +01:00
Kevin cc9bf057f4 fixed slip-up 2021-02-05 13:20:56 +01:00
Kevin b657138fad Changed exit code so error modules are created 2021-02-05 13:07:54 +01:00
Daniel Rodriguez 1416135d86 Merge branch 'ent-5986-fallo-use_xml_timestamp-a-0' into 'develop'
Fix the description of use_xml_timestamp.

See merge request artica/pandorafms!3817
2021-02-05 10:00:23 +01:00
artica fffea9fd99 Auto-updated build strings. 2021-02-05 01:00:20 +01:00
Jose Gonzalez 4978ac3081 Fix issue 2021-02-04 16:41:47 +01:00
Ramon Novoa bf618cbb72 Fix the description of use_xml_timestamp. 2021-02-04 13:34:59 +01:00
artica 778b3762a2 Auto-updated build strings. 2021-02-04 01:00:25 +01:00
Daniel Rodriguez 6dee7a68db Merge branch 'ent-7001-open-modulos-host-latency-no-reportan-datos' into 'develop'
Fixed latency modules

See merge request artica/pandorafms!3813
2021-02-03 17:09:03 +01:00
artica 7ed515afd1 Auto-updated build strings. 2021-02-03 01:00:20 +01:00
fbsanchez cae68eac35 Fixed latency modules 2021-02-02 12:27:01 +01:00
artica ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
fbsanchez f4768b44fc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-02-01 15:38:19 +01:00
fbsanchez 712079c30e RC1 #4755 2021-02-01 15:00:54 +01:00
Daniel Rodriguez 897064183c Merge branch 'ent-fix-multi-byte-chars-treatment' into 'develop'
Fixed garbled characters with multi-byte characters.

See merge request artica/pandorafms!3802
2021-02-01 12:18:19 +01:00
artica 466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica 705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica 6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
fbsanchez 279bd5456d Disabled compactdb while running in historical database 2021-01-29 10:25:14 +01:00
artica 750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
Junichi Satoh a88a563b45 Fixed garbled characters with multi-byte characters. 2021-01-28 10:49:54 +09:00
artica ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +01:00
artica 096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
artica 7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
Daniel Rodriguez 6063c4f50b Merge branch 'ent-6091-Suprimir-corregir-logs' into 'develop'
Solved issue

Closes pandora_enterprise#6091

See merge request artica/pandorafms!3786
2021-01-25 12:15:16 +01:00
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Daniel Rodriguez d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop'
several fixes in netscan custom

See merge request artica/pandorafms!3736
2021-01-25 09:50:27 +01:00
Daniel Rodriguez 619574269b Merge branch 'ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos' into 'develop'
Fix capitalization issues in wmi windows env

See merge request artica/pandorafms!3677
2021-01-25 09:28:44 +01:00
artica 82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica 4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
artica a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
Jose Gonzalez 5283771e32 Solved issue with verbosity parameters 2021-01-21 13:33:14 +01:00
artica 3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
Jose Gonzalez a5d39365f8 Added feature for fix discovery tasks with server down 2021-01-20 17:56:39 +01:00
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
Jose Gonzalez c760a937ae Solved issue 2021-01-19 16:10:46 +01:00
artica 548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
fbsanchez 6f228fa2dd Merge remote-tracking branch 'origin/develop' into ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos 2021-01-18 10:52:06 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica 0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica 6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez 79d6c8fb59 Merge branch 'ent-6670-POST-Prioridad-incorrecta-en-el-contenido-de-las-alertas-SNMP' into 'develop'
changed action/alert priority of fields for snmp alerts

See merge request artica/pandorafms!3595
2021-01-11 18:09:58 +01:00
Daniel Rodriguez d4c161ae58 Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop'
Ent 6707 bug pandora db con compactacion en historico

See merge request artica/pandorafms!3615
2021-01-11 09:30:56 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez 1f7a68cacc Added group_password to print_agent 2021-01-07 16:37:13 +01:00
fbsanchez 3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-01-07 10:59:02 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop'
added additional check for token

See merge request artica/pandorafms!3757
2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es 84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
2021-01-05 13:43:42 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez 60f43dadb9 Merge branch 'ent-6719-mensaje-error-server-open' into 'develop'
Fix error

Closes pandora_enterprise#6719

See merge request artica/pandorafms!3623
2020-12-23 17:05:38 +01:00
Daniel Rodriguez 1324725263 Merge branch 'ent-6856-Warning-feo-server' into 'develop'
Applied fix

Closes pandora_enterprise#6856

See merge request artica/pandorafms!3725
2020-12-23 16:06:24 +01:00
Daniel Rodriguez ccf806755b Merge branch 'ent-6854-Warning-feo-arrancar-servidor' into 'develop'
Added fix

Closes pandora_enterprise#6854

See merge request artica/pandorafms!3726
2020-12-23 16:04:53 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
artica 71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
artica 1d72913310 Auto-updated build strings. 2020-12-22 01:00:16 +01:00
artica da07c5d7da Auto-updated build strings. 2020-12-21 01:00:14 +01:00
artica 42f7183c7b Auto-updated build strings. 2020-12-20 01:00:15 +01:00
artica 37fda15ad4 Auto-updated build strings. 2020-12-19 01:00:18 +01:00
fbsanchez bc3616e6c5 visual console mobile wip 2020-12-18 13:40:00 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
artica 87ce193c10 Auto-updated build strings. 2020-12-18 01:00:19 +01:00
artica 2692da94f5 Auto-updated build strings. 2020-12-17 01:00:17 +01:00
artica b5d52a5afe Auto-updated build strings. 2020-12-16 01:00:16 +01:00
Jose Gonzalez 430457b30a Deleted logstash references 2020-12-15 13:12:00 +01:00
Rafael c06940c181 add fping as dependencie for pandora server open rpms 2020-12-15 12:57:48 +01:00
Jose Gonzalez 397254e4d8 Added fix 2020-12-15 10:45:37 +01:00
Jose Gonzalez 13d7889cc4 Applied fix 2020-12-15 09:57:09 +01:00
artica fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +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
Luis Calvo c4eb3dd088 Added log on deleting tgraph_source data in pandora_db 2020-12-14 10:52:12 +01:00
artica f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica 37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00
artica c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
artica 463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica 17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request artica/pandorafms!3479
2020-12-09 13:54:25 +01:00
artica 3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica 12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00
artica 85c8dfe52f Auto-updated build strings. 2020-12-07 01:00:13 +01:00
artica f016803dbf Auto-updated build strings. 2020-12-06 01:00:13 +01:00
artica 223f3685b3 Auto-updated build strings. 2020-12-05 01:00:17 +01:00
artica acce2cc2b0 Auto-updated build strings. 2020-12-04 01:00:18 +01:00
Daniel Rodriguez a23d807baf Merge branch 'ent-6787-plugin-server-timeout-no-funciona-correctamente' into 'develop'
minor fixes in pluginserver

See merge request artica/pandorafms!3667
2020-12-03 11:05:22 +01:00
artica fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
artica 913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
fbsanchez 340c3026c2 Fix capitalization issues in wmi windows env 2020-12-01 12:36:24 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Daniel Rodriguez e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop'
Fixed CLI update_group

See merge request artica/pandorafms!3596
2020-12-01 11:57:07 +01:00
artica e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
Daniel Rodriguez b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez b1d2e7bba0 Merge branch 'ent-5572-9625-añadir-configuración-periodo-de-silencio-trap-storm-protection' into 'develop'
Ent 5572 9625 añadir configuración periodo de silencio trap storm protection

See merge request artica/pandorafms!3580
2020-11-30 14:26:23 +01:00
fbsanchez 0eab0c3a18 Merge remote-tracking branch 'origin/develop' into ent-5145-omnishell-agentes-windows 2020-11-30 10:06:04 +01:00
fbsanchez 3f8123e879 Merge remote-tracking branch 'origin/develop' into ent-6787-plugin-server-timeout-no-funciona-correctamente 2020-11-30 10:05:19 +01:00
artica 863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica 9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica 66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
fbsanchez f4c17087c5 minor fixes in pluginserver 2020-11-27 13:54:58 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
artica 935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
fbsanchez 7e61465955 Avoid erase ALL sessions from tsessions_php (pandora_db) 2020-11-26 18:27:11 +01:00
Daniel Rodriguez 7cfa10dcbd Merge branch 'ent-6691-cli-delete-group-doesnt-delete-group-name-blankspaces' into 'develop'
Fixed safe input on cli delete_group

See merge request artica/pandorafms!3597
2020-11-26 11:48:35 +01:00
artica f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
Daniel Rodriguez b2fb9898f2 Merge branch 'ent-4868-poner-la-version-de-producto-en-pandora_ha-anda' into 'develop'
Export product VERSION from Tools.pm

See merge request artica/pandorafms!3641
2020-11-25 18:40:07 +01:00
artica b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
fbsanchez 04f4aee7eb Export product VERSION from Tools.pm 2020-11-24 10:51:27 +01:00
artica 1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
fbsanchez a767b6c133 Fixes in history db settings and improved pandora_db tool 2020-11-23 20:16:11 +01:00
artica 7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00
artica b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica 87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
artica f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00
Daniel Rodriguez 1df3c4f595 Merge branch 'ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada' into 'develop'
Avoid host latency "fake" value 0

See merge request artica/pandorafms!3509
2020-11-19 14:51:16 +01:00
artica e9259da802 Auto-updated build strings. 2020-11-19 01:00:19 +01:00
Jose Gonzalez 31f23a7994 Fix bug with macro fields 2020-11-18 13:16:04 +01:00
fbsanchez 952de36aab Merge remote-tracking branch 'origin/develop' into ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada 2020-11-18 12:02:17 +01:00
artica ce814ba580 Auto-updated build strings. 2020-11-18 01:00:20 +01:00
Jose Gonzalez ef899ef529 Fix error 2020-11-17 15:21:38 +01:00
artica 9bfdfa87f6 Auto-updated build strings. 2020-11-17 01:00:35 +01:00
Daniel Rodriguez 26006fe33b Merge branch 'ent-6493-provisioning-server-autoconfiguracion-de-agentes-no-es-funcional' into 'develop'
Ent 6493 provisioning server autoconfiguracion de agentes no es funcional

See merge request artica/pandorafms!3600
2020-11-16 18:51:08 +01:00
Daniel Maya 55c368f957 fixed last_compact in history db 2020-11-16 17:34:23 +01:00
artica 810db1eec4 Auto-updated build strings. 2020-11-16 01:00:30 +01:00
artica efa96ab947 Auto-updated build strings. 2020-11-15 01:00:31 +01:00
artica 26ab48073b Auto-updated build strings. 2020-11-14 01:00:30 +01:00
artica 6fcc1107ec Auto-updated build strings. 2020-11-13 01:00:33 +01:00
artica 834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
artica 33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
fbsanchez edb0ebd508 minor changes 2020-11-10 19:31:14 +01:00
fbsanchez b8fde5e8f5 Tools (trim) added 2020-11-10 17:56:56 +01:00
artica 2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica 767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica 4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica 5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
artica 2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00
Luis Calvo 64bd9bfc79 Fixed safe input on cli delete_group 2020-11-05 16:14:06 +01:00
Luis Calvo 6337fd3667 Fixed CLI update_group 2020-11-05 14:31:26 +01:00
alejandro-campos d75bb46f34 changed action/alert priority of fields for snmp alerts 2020-11-05 12:47:25 +01:00
artica 6662b4f286 Auto-updated build strings. 2020-11-05 01:00:35 +01:00
Daniel Rodriguez a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
Added server component status - crash -

See merge request artica/pandorafms!3547
2020-11-04 16:39:28 +01:00
artica 081e46c9c2 Auto-updated build strings. 2020-11-04 01:00:47 +01:00
artica 58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica 4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica 3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
artica 8c92e5420d Auto-updated build strings. 2020-10-30 01:00:21 +01:00
artica 860024a11a Auto-updated build strings. 2020-10-29 01:00:21 +01:00
Daniel Maya c1a7fc2e9a Added snmp_storm_silence_period 2020-10-28 10:57:21 +01:00
artica 288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
artica 3b9558c7a0 Auto-updated build strings. 2020-10-27 01:00:21 +01:00
fbsanchez 5842235846 Orphan service modules + control require argument select from sql 2020-10-26 13:37:05 +01:00
artica 76324679ec Auto-updated build strings. 2020-10-26 01:00:14 +01:00
artica 89fc211e6f Auto-updated build strings. 2020-10-25 01:00:15 +02:00
artica bd95c0a4f0 Auto-updated build strings. 2020-10-24 01:00:16 +02:00
artica 002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
artica 7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
artica fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
artica c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica 880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
artica dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
artica 3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica 6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00