Commit Graph

6129 Commits

Author SHA1 Message Date
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
fbsanchez d8b12233ed correlation_threads 2021-09-02 12:53:57 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
fbsanchez df95cbf960 Minor changes 2021-09-01 21:10:11 +02:00
fbsanchez e075c8339d CorrelationServer rc1 2021-09-01 17:56:14 +02:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
fbsanchez f0791cbd4f WIP CorrelationServer 2021-08-27 15:07:14 +02:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
Daniel Rodriguez 25c6a3eef4 Merge branch 'ent-7805-devolver-informacion-del-pandora-server-al-hacer-un-status' into 'develop'
Update the description for pandora_ha.

See merge request artica/pandorafms!4371
2021-08-26 10:12:23 +00:00
Ramon Novoa 7e27731ce2 Change more references to Pandora FMS HA Database tool. 2021-08-26 10:47:52 +02:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Ramon Novoa 3056874b52 Update the description for pandora_ha.
Ref. pandora_enterprise#7805.
2021-08-25 11:47:50 +02:00
Daniel Rodriguez 452d986ab5 Merge branch 'ent-7878-errata-funcion-get_console_api_url-en-db-pm' into 'develop'
Ensure latest slash in console url

See merge request artica/pandorafms!4368
2021-08-25 06:55:31 +00:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
fbsanchez f0c68a0f54 Ensure latest slash in console url 2021-08-23 12:17:03 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
artica 38c044f2ae Auto-updated build strings. 2021-08-19 01:00:34 +02:00
artica a1942147e4 Auto-updated build strings. 2021-08-18 01:00:49 +02:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
2021-08-17 12:19:54 +00:00
Junichi Satoh 54830f5eea Added PATH configuration. 2021-08-17 16:18:04 +09:00
Junichi Satoh ba5e78f398 Fixed warnings and problem with multibyte characters on WebServer. 2021-08-17 16:01:35 +09:00
artica 9f65e8deb0 Auto-updated build strings. 2021-08-17 01:00:44 +02:00
artica 18698827a6 Auto-updated build strings. 2021-08-16 01:00:21 +02:00
artica 4e17c0ecf4 Auto-updated build strings. 2021-08-15 01:00:22 +02:00
artica ce2c4afbb5 Auto-updated build strings. 2021-08-14 01:00:24 +02:00
artica 6a471546d5 Auto-updated build strings. 2021-08-13 01:00:30 +02:00
artica 3bb4c2ac09 Auto-updated build strings. 2021-08-12 01:00:45 +02:00
artica 568bdfb5c0 Auto-updated build strings. 2021-08-11 01:00:19 +02:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
artica 2951bf2871 Auto-updated build strings. 2021-08-10 01:00:12 +02:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
# Conflicts:
#   pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
artica 8b36a96867 Auto-updated build strings. 2021-08-09 01:00:08 +02:00
artica 7a36b18fc0 Auto-updated build strings. 2021-08-08 01:00:11 +02:00
artica 9ea746991b Auto-updated build strings. 2021-08-07 01:00:19 +02:00
artica 14688908e2 Auto-updated build strings. 2021-08-06 01:00:21 +02:00
Daniel Rodriguez 0f8a22feb3 Merge branch 'ent-7860-excluir-mfserver-en-chequeo-pandora_ha' into 'develop'
Excluded MFSERVER from component checks

See merge request artica/pandorafms!4332
2021-08-05 12:24:32 +00:00
artica 747d39a066 Auto-updated build strings. 2021-08-05 01:00:50 +02:00
artica c4e1243f18 Auto-updated build strings. 2021-08-04 01:00:42 +02:00
artica 69c4139cc1 Auto-updated build strings. 2021-08-03 01:00:44 +02:00
Daniel Rodriguez 5d501f3abf Merge branch 'ent-7866-12249-no-se-muestra-valor-de-macro-snmp_f1' into 'develop'
SNMP variable bindings, filter before capture, assign correctly macro values

See merge request artica/pandorafms!4337
2021-08-02 08:46:50 +00:00
Daniel Rodriguez 1db24ef895 Merge branch 'ent-7856-12235-integria-ims-manda-mal-la-accion-de-crear-ticket-integria' into 'develop'
fixed error with url integria api

See merge request artica/pandorafms!4329
2021-08-02 07:24:16 +00:00
artica b837adaf00 Auto-updated build strings. 2021-08-02 01:00:34 +02:00
artica 6e66675f7f Auto-updated build strings. 2021-08-01 01:00:36 +02:00
artica 170f0d9045 Auto-updated build strings. 2021-07-31 01:00:44 +02:00
fbsanchez d59b946954 Errata fix 2021-07-30 16:26:26 +02:00
fbsanchez c1e9025eca SNMP variable bindings, filter before capture, assign correctly macro values 2021-07-30 11:51:00 +02:00
artica 5e2c4349b3 Auto-updated build strings. 2021-07-30 01:00:38 +02:00
artica f9b69c289c Auto-updated build strings. 2021-07-29 01:00:43 +02:00
fbsanchez 403b901e8e Excluded MFSERVER from component checks 2021-07-28 15:06:00 +02:00
artica 5aef20ee31 Auto-updated build strings. 2021-07-28 01:00:37 +02:00
marcos 4431538d14 fixed error with url integria api 2021-07-27 15:48:56 +02:00
artica ee4868d433 Auto-updated build strings. 2021-07-27 01:00:18 +02:00
artica 1c6508947a Auto-updated build strings. 2021-07-26 01:00:35 +02:00
artica 29013e7dd6 Auto-updated build strings. 2021-07-25 01:00:36 +02:00
artica 8fa664c0c5 Auto-updated build strings. 2021-07-24 01:00:36 +02:00
artica 5654de748a Auto-updated build strings. 2021-07-23 01:00:43 +02:00
Calvo 72d57bc067 Get command field if it is not defined in alert or action 2021-07-22 11:39:00 +02:00
Calvo 51ca2de1e5 Get command field if it is not defined in alert or action 2021-07-22 11:34:07 +02:00
José González b554515ca3 Fixed issue with inversed intervals 2021-07-22 11:24:22 +02:00
artica 32210ee7a3 Auto-updated build strings. 2021-07-22 01:00:34 +02:00
Daniel Rodriguez 61bc6d9ff2 Merge branch 'ent-7836-error-del-snmpserver-pm-en-el-pandora_server-error' into 'develop'
Add a default value for snmpconsole_threshold.

See merge request artica/pandorafms!4319
2021-07-21 17:19:36 +00:00
Ramon Novoa 28c33aca6b Add a default value for snmpconsole_threshold.
Ref pandora_enterprise#7836.
2021-07-21 19:07:02 +02:00
Daniel Rodriguez 62be3f5830 Merge branch 'ent-improved-freebsd-support' into 'develop'
Improved daemon launcher and installer for FreeBSD.

See merge request artica/pandorafms!4306
2021-07-21 09:00:33 +00:00
artica 53ad5e1cd9 Updated version and build strings. 2021-07-21 10:57:56 +02:00
Junichi Satoh 4784cab29d Fixed a typo. 2021-07-21 09:08:01 +09:00
artica 89ebe2ea2e Auto-updated build strings. 2021-07-21 01:00:44 +02:00
Daniel Rodriguez 9d1fbf3127 Merge branch 'ent-7808-12182-promocion-de-servidor-master' into 'develop'
Updated component HA rule

See merge request artica/pandorafms!4301
2021-07-20 13:05:37 +00:00
artica 63a8ff3f53 Auto-updated build strings. 2021-07-20 01:00:43 +02:00
Junichi Satoh b1ce3acd2f Improved daemon launcher and installer for FreeBSD. 2021-07-19 13:47:24 +09:00
artica 9183110028 Auto-updated build strings. 2021-07-19 01:00:37 +02:00
artica ac28fb7b58 Auto-updated build strings. 2021-07-18 01:00:36 +02:00
artica c5b8f647fe Auto-updated build strings. 2021-07-17 01:00:41 +02:00
fbsanchez 8f009db92b Updated component HA rule 2021-07-16 12:03:26 +02:00
fbsanchez 9643e3ade9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-16 10:36:06 +02:00
artica 0508c0fa88 Auto-updated build strings. 2021-07-16 01:00:32 +02:00
artica bf890c0d11 Auto-updated build strings. 2021-07-15 01:00:40 +02:00
fbsanchez 18948ea9c2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-14 10:04:13 +02:00
artica 31b99ecbfb Auto-updated build strings. 2021-07-14 01:00:39 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
artica 925c9fce4f Auto-updated build strings. 2021-07-13 01:00:34 +02:00
artica 922fb81a58 Auto-updated build strings. 2021-07-12 01:00:31 +02:00
artica f3ea9fedf9 Auto-updated build strings. 2021-07-11 01:00:30 +02:00
artica faf154e69c Auto-updated build strings. 2021-07-10 01:00:35 +02:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
marcos 4c82ade184 add agent_update_custom_fields on cli 2021-07-09 13:58:01 +02:00
artica d6cd48fdde Auto-updated build strings. 2021-07-09 01:00:35 +02:00
artica 239e149b3c Auto-updated build strings. 2021-07-08 01:00:36 +02:00
artica a06989dc11 Auto-updated build strings. 2021-07-07 01:00:38 +02:00
artica dec62ffca4 Auto-updated build strings. 2021-07-06 01:00:32 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
2021-07-05 09:55:14 +02:00
artica 3baae4147a Auto-updated build strings. 2021-07-05 01:00:29 +02:00
artica b6477e5526 Auto-updated build strings. 2021-07-04 01:00:26 +02:00
artica 8a4e51bf1b Auto-updated build strings. 2021-07-03 01:00:31 +02:00
vgilc 159920a05d Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop'
Add the AlertServer to the repo.

See merge request artica/pandorafms!4251
2021-07-02 09:15:27 +00:00
artica 1328b2055c Auto-updated build strings. 2021-07-02 01:00:32 +02:00
Ramon Novoa f8bcd1660f Add the AlertServer to the repo.
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
artica 911d9fe8fe Auto-updated build strings. 2021-07-01 01:00:09 +02:00
Daniel Rodriguez b67e6a3f85 Merge branch 'ent-7480-dejar-fino-rpm-de-servidor-enterprise' into 'develop'
Add a base pandora_ha.service.

See merge request artica/pandorafms!4252
2021-06-30 08:04:44 +00:00
artica 7dc2245f2e Auto-updated build strings. 2021-06-30 01:00:32 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Rodriguez 35e889be15 Merge branch 'ent-4759-compatibilidad-ssl-y-certificados-conexiones-mysql' into 'develop'
Add SSL support for database connections.

See merge request artica/pandorafms!4134
2021-06-29 14:50:25 +00:00
fbsanchez c64b972564 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 10:51:55 +02:00
artica 7f58a93bfd Auto-updated build strings. 2021-06-29 01:00:15 +02:00
Ramon Novoa e073e634b9 Add a base pandora_ha.service. 2021-06-28 17:15:50 +02:00
fbsanchez 753bb7ff03 Avoid apply a non-synced policy 2021-06-28 12:44:24 +02:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
artica 6fc94f3fad Auto-updated build strings. 2021-06-28 01:00:29 +02:00
artica 69c1a5fdad Auto-updated build strings. 2021-06-27 01:00:26 +02:00
artica b7d956041d Auto-updated build strings. 2021-06-26 01:01:41 +02:00
fbsanchez c0d56f8563 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-25 09:48:52 +02:00
artica 4438dad309 Auto-updated build strings. 2021-06-25 01:00:39 +02:00
Calvo 7c14b5a7fc Fixed entities on text for custom events 2021-06-24 16:36:10 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
artica 86abd75206 Auto-updated build strings. 2021-06-24 01:00:51 +02:00
fbsanchez 2fe6092d37 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-23 20:08:59 +02:00
Daniel Rodriguez be8318dc9b Merge branch 'ent-7559-11881-limitacion-en-macro-_snmp_fx_' into 'develop'
Ent 7559 11881 limitacion en macro  snmp fx

See merge request artica/pandorafms!4203
2021-06-23 15:29:02 +00:00
Daniel Rodriguez 2a48208fc2 Merge branch 'ent-7635-11977-procesamiento-de-traps-multi-hilo' into 'develop'
Ent 7635 11977 procesamiento de traps multi hilo

See merge request artica/pandorafms!4187
2021-06-23 15:16:47 +00:00
artica e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
artica 17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
2021-06-21 17:33:45 +02:00
Daniel Rodriguez a2eb62150c Merge branch 'ent-7508-Macro-timestamp-en-alertas-unknown-no-funciona' into 'develop'
fixed bug in unknown alerts

See merge request artica/pandorafms!4179
2021-06-21 10:15:15 +00:00
Daniel Rodriguez 7b7265baa5 Merge branch 'ent-7179-cli-update-agent-duplica-referencias-ip' into 'develop'
Fixed CLI update_agent adding duplicate agent address references

See merge request artica/pandorafms!4010
2021-06-21 09:30:17 +00:00
Daniel Rodriguez acfa36b380 Merge branch 'ent-7286-Líneas-en-pandora-server-error-con-check_string' into 'develop'
Ent 7286 líneas en pandora server error con check string

See merge request artica/pandorafms!4208
2021-06-21 09:09:52 +00:00
fbsanchez d22cdf027c Empty variables also translates macros 2021-06-21 10:06:03 +02:00
fbsanchez 6d67a03b78 Merge remote-tracking branch 'origin/develop' into ent-7559-11881-limitacion-en-macro-_snmp_fx_ 2021-06-21 10:03:46 +02:00
artica 447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica 682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
Daniel Barbero Martin 1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica 0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Ramon Novoa 8d5acc0d74 Improvements to the SNMP Console.
Add several improvements to the SNMP Console:
- Source-based locking.
- Server-specific 'threshold'.
- Other small improvements.

Ref. pandora_enterprise#7635.
2021-06-17 18:59:10 +02:00
Daniel Barbero Martin 50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
Daniel Barbero Martin 841842da59 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/pandoradb_data.sql
2021-06-16 08:46:21 +02:00
artica 90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Maya 38ad3574f3 scape meta characters 2021-06-15 15:57:13 +02:00
Daniel Rodriguez 9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop'
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
2021-06-15 13:11:21 +00:00
fbsanchez c009451d62 Fulfill all variables FX from SNMPTRAP alerts 2021-06-15 13:06:23 +02:00
Daniel Barbero Martin 9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
artica 2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez 7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez 04a9b10904 Pandora HA verified 2021-06-14 19:18:45 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
Daniel Rodriguez 08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop'
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
2021-06-14 11:56:43 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs.
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Daniel Rodriguez 42f5727b18 Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop'
Avoid die while decoding erroneus json data

See merge request artica/pandorafms!4116
2021-06-14 11:39:41 +00:00
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica 595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
fbsanchez 86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
fbsanchez f6f0d35a5f Collections Async synchronization Meta <=> Nodes 2021-06-10 21:36:54 +02:00
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
alejandro.campos@artica.es fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Daniel Rodriguez 4fa8e5cf29 Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop'
Fixed macro address on network server modules

See merge request artica/pandorafms!4170
2021-06-08 10:53:15 +00:00
Luis 72cb359133 Fixed macro address on network server modules 2021-06-08 10:53:15 +00:00
Daniel Barbero Martin df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
alejandro.campos@artica.es eb87406e58 fixed bug in unknown alerts 2021-06-07 15:22:20 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica 656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica 2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
fbsanchez 423a46af8c Avoid mark as crashed satellite_server 2021-06-03 10:29:49 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin 18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica 2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin 33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
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