Commit Graph

4885 Commits

Author SHA1 Message Date
Luis Calvo bf19fbffd3 Added API and cli function get_agents_id_by_alias 2019-10-10 14:25:17 +02:00
Kike 0433718612 Allowed several destination numbers in a single script call 2019-10-10 14:07:22 +02:00
fbsanchez 1a2ee3f00b Config - rcmd_timeout 2019-10-10 08:59:55 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
fbsanchez 9cb2a0e1a1 NetworkServer enterprise improvement 2019-10-09 19:13:11 +02:00
fbsanchez cc58cd6515 get_agent_name_from_addr => get_agent_from_addr 2019-10-09 18:09:09 +02:00
Jose Gonzalez 43261bd3f8 Changed parameter of use_xml_timestamp 2019-10-09 15:46:44 +02:00
artica be2148ff26 Auto-updated build strings. 2019-10-09 00:01:09 +02:00
Daniel Rodriguez dd772f95d6 Merge branch 'ent-4756-conexion-servidor-nodo-a-metaconsola' into 'develop'
encryption key prepared before being used

See merge request artica/pandorafms!2785
2019-10-08 18:20:18 +02:00
Daniel Rodriguez 45b90d43e5 Merge branch 'ent-4744-is_numeric-no-admite-numeros-en-notacion-cientifica' into 'develop'
is_numeric review, with fallback to looks_like_number

See merge request artica/pandorafms!2778
2019-10-08 15:56:36 +02:00
artica 2a76b06870 Auto-updated build strings. 2019-10-08 00:01:11 +02:00
Daniel Rodriguez 588d2f60ef Merge branch 'ent-4678-No-funciona-macro-moduledata-modulename-cuando-el-tipo-de-modulo-es-string-y-no-generic-data-string' into 'develop'
Ent 4678 no funciona macro moduledata modulename cuando el tipo de modulo es string y no generic data string

See merge request artica/pandorafms!2781
2019-10-07 19:20:08 +02:00
fbsanchez 8b771f6a35 Minor fix 2019-10-07 17:35:20 +02:00
fbsanchez 2ac4ae3a18 Minor fix 2019-10-07 17:08:09 +02:00
fbsanchez 7ecaf11d07 Locate instead search before create new Discovered agent 2019-10-07 16:38:58 +02:00
Luis Calvo 37c0f340dc Fixed macro _policy_ in alerts 2019-10-07 15:09:46 +02:00
Jose Gonzalez 662e86c1c2 Improved solution 2019-10-07 10:31:59 +02:00
Jose Gonzalez 7bdd2a02e5 Added a string with information of the caller of pandora_server. Modified too an issue with security level messages 2019-10-07 10:02:21 +02:00
artica 745971dfa6 Auto-updated build strings. 2019-10-07 00:01:06 +02:00
artica 936ce0ee26 Auto-updated build strings. 2019-10-06 00:01:06 +02:00
artica d0dead58f0 Auto-updated build strings. 2019-10-05 00:01:09 +02:00
fbsanchez 647ce5706e encryption key prepared before being used 2019-10-04 14:53:07 +02:00
artica cc239e5e68 Auto-updated build strings. 2019-10-04 00:01:09 +02:00
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
Tatiana Llorente 5a2ca8e65f Added all string types - #4678 2019-10-02 17:37:14 +02:00
fbsanchez 8bb1e4ed2d is_numeric review, with fallback to looks_like_number 2019-10-02 11:33:43 +02:00
artica 8e204605e5 Auto-updated build strings. 2019-10-02 00:01:07 +02:00
artica c600f74ee2 Auto-updated build strings. 2019-10-01 00:01:06 +02:00
artica b072bb5314 Auto-updated build strings. 2019-09-30 00:01:06 +02:00
artica 7ae5a8e5be Auto-updated build strings. 2019-09-29 00:01:06 +02:00
artica 15752c10ef Auto-updated build strings. 2019-09-28 00:01:08 +02:00
artica dc3dd1cffa Auto-updated build strings. 2019-09-27 00:01:09 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
Daniel Rodriguez c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
2019-09-26 14:34:50 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
artica 0dd0c4c36d Auto-updated build strings. 2019-09-26 00:01:08 +02:00
artica 0a6c5352e6 Auto-updated build strings. 2019-09-25 00:01:10 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
alejandro-campos a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
artica 1d58e25a88 Auto-updated build strings. 2019-09-24 00:01:11 +02:00
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
artica 2543f54413 Auto-updated build strings. 2019-09-23 00:01:17 +02:00
artica b763650177 Auto-updated build strings. 2019-09-22 00:01:06 +02:00
artica 27d8c5025e Auto-updated build strings. 2019-09-21 00:01:09 +02:00
Alejandro Fraguas 0418c86867 Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop'
pandora HA review

See merge request artica/pandorafms!2654
2019-09-20 13:57:03 +02:00
Daniel Rodriguez 409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
Ramon Novoa 0bdf967259 Temporarily disable cert verification for STARTTLS too. 2019-09-20 10:36:56 +02:00
artica d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Ramon Novoa 274b6b9327 Disable certificate verification until it can be turned on/off from the console. 2019-09-19 15:27:46 +02:00
Ramon Novoa 0e281c7a0a Send sendmail errors to pandora_server.error. 2019-09-19 12:43:31 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-19 10:18:15 +02:00
artica 14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
artica 15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
artica 2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica 05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
fbsanchez 3eabfb7456 Added a subroutine to get a list of enabled servers 2019-09-13 11:35:57 +02:00
artica 2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
artica 602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00
Ramon Novoa 9809443016 Add IO::Socket::SSL to the list of dependencies. 2019-09-11 13:36:14 +02:00
Ramon Novoa 4f2b2df1b0 Comment mta_address by default. 2019-09-11 12:42:52 +02:00
marcos.alconada 47b61a2025 refactor --stop_downtime 2019-09-11 12:36:15 +02:00
marcos.alconada 64e69da924 simplify code 2019-09-11 11:41:14 +02:00
marcos.alconada d2b7ec7a6f deleted duplicated code 2019-09-11 10:06:08 +02:00
marcos.alconada 329cafad49 fixed fixed error on stop_downtime 2019-09-11 10:04:18 +02:00
Alejandro Fraguas a9e6409cf9 Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop'
delete session open by api calls

See merge request artica/pandorafms!2691
2019-09-11 09:40:18 +02:00
Ramon Novoa 39d5285720 Re-read the configuration from the DB periodically. 2019-09-11 09:25:40 +02:00
artica fdef0b5188 Auto-updated build strings. 2019-09-11 00:01:10 +02:00
Ramon Novoa 33d9ce9de8 Add SSL/STARTTLS support to pandora_sendmail. 2019-09-10 15:53:47 +02:00
artica 16912732d2 Auto-updated build strings. 2019-09-10 00:01:08 +02:00
artica 5526bb49ed Auto-updated build strings. 2019-09-09 00:01:07 +02:00
artica f088f47605 Auto-updated build strings. 2019-09-08 00:01:06 +02:00
artica 3680555bae Auto-updated build strings. 2019-09-07 00:01:10 +02:00
artica ae474a2731 Auto-updated build strings. 2019-09-06 00:01:10 +02:00
artica a4739e4891 Auto-updated build strings. 2019-09-05 00:01:07 +02:00
artica 61c75118f2 Auto-updated build strings. 2019-09-04 00:01:10 +02:00
Daniel Rodriguez 0f85f91c47 Merge branch 'ent-4452-macro-policy-no-funciona' into 'develop'
Changed function to get policy name macro

See merge request artica/pandorafms!2681
2019-09-03 17:52:46 +02:00
artica fa39119264 Auto-updated build strings. 2019-09-03 00:01:12 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
fbsanchez 0abb2ae987 Revert "Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'""
This reverts commit 74c9e604e8.
2019-09-02 15:24:21 +02:00
artica d6b91e9fce Auto-updated build strings. 2019-09-02 00:01:15 +02:00
artica aea8a6b3c7 Auto-updated build strings. 2019-09-01 00:01:07 +02:00
artica fe7ec38cef Auto-updated build strings. 2019-08-31 00:01:12 +02:00
Luis Calvo 72ba228b68 Fixed policy macro on mail 2019-08-30 12:48:03 +02:00
Daniel Maya 25354f6f3b delete session open by api calls 2019-08-30 08:47:49 +02:00
artica 79298d0b8e Auto-updated build strings. 2019-08-30 00:01:09 +02:00
artica 1c4b639deb Auto-updated build strings. 2019-08-29 00:01:08 +02:00
Daniel Rodriguez 74c9e604e8 Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'"
This reverts merge request !2644
2019-08-28 14:19:59 +02:00
artica 662c9ca7f2 Auto-updated build strings. 2019-08-28 00:01:10 +02:00
artica c06ec0477c Auto-updated build strings. 2019-08-27 00:01:10 +02:00
Luis Calvo a88329dbb3 Changed function to get policy name macro 2019-08-26 15:07:13 +02:00
artica a2713517f0 Auto-updated build strings. 2019-08-26 00:01:08 +02:00
artica 1320426628 Auto-updated build strings. 2019-08-25 00:01:09 +02:00
artica 56da633588 Auto-updated build strings. 2019-08-24 00:01:09 +02:00
artica 6a982697d2 Auto-updated build strings. 2019-08-23 00:01:11 +02:00
artica 1d0875e89a Auto-updated build strings. 2019-08-22 00:01:11 +02:00
artica c36234a3ae Auto-updated build strings. 2019-08-21 00:01:09 +02:00
artica 13d8c065e6 Auto-updated build strings. 2019-08-20 00:01:10 +02:00
artica 6550d52813 Auto-updated build strings. 2019-08-19 00:01:07 +02:00
artica 7a57ae9063 Auto-updated build strings. 2019-08-18 00:01:06 +02:00
artica 0802d45e85 Auto-updated build strings. 2019-08-17 00:01:10 +02:00
artica ac85884e46 Auto-updated build strings. 2019-08-16 00:01:08 +02:00
artica 4e544e8433 Auto-updated build strings. 2019-08-15 00:01:16 +02:00
artica 7b78b5820e Auto-updated build strings. 2019-08-14 00:01:10 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
artica 411bb093b2 Merge remote-tracking branch 'remotes/origin/ent-4489-revision-comportamiento-pandora_server-e7' into develop 2019-08-13 10:53:45 +02:00
artica a8915e13ad Auto-updated build strings. 2019-08-13 00:01:08 +02:00
artica 5cecf1f899 Auto-updated build strings. 2019-08-12 00:01:07 +02:00
artica 390acf0459 Auto-updated build strings. 2019-08-11 00:01:09 +02:00
artica 4f25e42be1 Auto-updated build strings. 2019-08-10 00:01:17 +02:00
artica 992958f4b4 Auto-updated build strings. 2019-08-09 00:01:09 +02:00
artica 21c81f6dfe Auto-updated build strings. 2019-08-08 00:01:08 +02:00
fbsanchez 32ad249024 XML::SAX::ExpatXS thread protection 2019-08-07 13:45:57 +02:00
fbsanchez 4e42db2981 XML::SAX::ExpatXS thread protection 2019-08-07 13:43:13 +02:00
fbsanchez d902afc7db XML::SAX::ExpatXS thread protection 2019-08-07 13:18:44 +02:00
fbsanchez b07be3885d XML::SAX::ExpatXS thread protection 2019-08-07 12:41:15 +02:00
artica 871e0568d7 Auto-updated build strings. 2019-08-07 00:01:32 +02:00
artica 5aa9320ae3 Auto-updated build strings. 2019-08-06 00:01:22 +02:00
artica 2133551889 Auto-updated build strings. 2019-08-05 00:01:08 +02:00
artica 914a41ab8d Auto-updated build strings. 2019-08-04 00:01:08 +02:00
artica e417b775c7 Auto-updated build strings. 2019-08-03 00:01:10 +02:00
fbsanchez 45f7c89b5e Fallback to Perl parser if ExpatXS is not installed 2019-08-02 14:11:28 +02:00
fbsanchez f38962de8d Merge branch '4319-parser-xml' into 'develop'
Changed from XML::Parser to XML::SAX::ExpatXS

See merge request artica/pandorafms!2576
2019-08-02 13:55:05 +02:00
artica 3a654c7f79 Auto-updated build strings. 2019-08-02 00:01:11 +02:00
artica 28e562a2f7 Auto-updated build strings. 2019-08-01 00:01:09 +02:00
Alejandro Fraguas b47e66d35b Merge branch 'ent-3747-deshabilitar-alertas-con-eventos-en-proceso' into 'develop'
'in-process' events can now inhibit alerts.

See merge request artica/pandorafms!2624
2019-07-31 11:58:48 +02:00
artica 6713f51414 Updated version and build strings. 2019-07-31 09:25:59 +02:00
Ramon Novoa eaa7edd89f 'in-process' events can now inhibit alerts.
Ref pandora_enterprise#3747
2019-07-31 09:07:47 +02:00
artica 9995d8b654 Auto-updated build strings. 2019-07-31 00:01:13 +02:00
fbsanchez 380574b863 Ondemand based on environment XML parser 2019-07-30 19:46:16 +02:00
fbsanchez f97429fb46 Merge remote-tracking branch 'origin/develop' into 4319-parser-xml 2019-07-30 19:34:46 +02:00
fbsanchez 755b0bbf7d Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-30 12:53:23 +02:00
artica 8734697169 Auto-updated build strings. 2019-07-30 00:01:11 +02:00
fbsanchez d85b0141e4 minor warning based on different configurations 2019-07-29 19:09:13 +02:00
artica 4d9d0deab7 Auto-updated build strings. 2019-07-29 00:01:08 +02:00
artica 32b013e11c Auto-updated build strings. 2019-07-28 00:01:06 +02:00
artica 3980cefd2c Auto-updated build strings. 2019-07-27 00:01:09 +02:00
fbsanchez f7e2023253 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-26 21:56:45 +02:00
fbsanchez d504532d82 Agent deployment with candidate scan 2019-07-26 21:47:11 +02:00
Daniel Rodriguez 07b5091dd0 Merge branch 'ent-744-cambios-al-autocreate-group' into 'develop'
Add autocreate_group_focre (see pandora_enterprise#744).

See merge request artica/pandorafms!2614
2019-07-26 11:07:28 +02:00
artica 871d8e9885 Auto-updated build strings. 2019-07-26 00:01:10 +02:00
Ramon Novoa ffa713da20 Add autocreate_group_focre (see pandora_enterprise#744). 2019-07-25 13:16:15 +02:00
fbsanchez 1445740e2c Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-25 12:08:18 +02:00
Daniel Rodriguez 8279fff11b Merge branch 'ent-4297-Bug-habilitar-agente-mediante-pandora_manage' into 'develop'
Ent 4297 bug habilitar agente mediante pandora manage

See merge request artica/pandorafms!2612
2019-07-25 12:05:04 +02:00
artica 3f90ebc938 Auto-updated build strings. 2019-07-25 00:01:09 +02:00
fbsanchez ce346bd604 agent deployment 2019-07-24 17:38:25 +02:00
Daniel Barbero Martin 94553df28f Fixed write in conf agent from CLI 2019-07-24 16:58:31 +02:00
artica 6e68b8dc5e Auto-updated build strings. 2019-07-24 00:01:09 +02:00
fbsanchez 6c79bfb135 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-23 15:28:04 +02:00
fbsanchez 62d8c04ab3 Agent deployment v1 2019-07-23 13:01:50 +02:00
Daniel Rodriguez ddc4e2f843 Merge branch 'ent-2253-5693-nueva-funcionalidad-para-el-procesado-mas-rapido-de-xml-de-un-mismo-agente-descartando-alertas-y-eventos' into 'develop'
Faster XML processing in LIFO mode.

See merge request artica/pandorafms!2573
2019-07-23 13:00:13 +02:00
artica 776fcc3f81 Auto-updated build strings. 2019-07-23 00:01:08 +02:00
artica 10e2b5beaf Auto-updated build strings. 2019-07-22 00:01:07 +02:00
artica 3d5a40d4da Auto-updated build strings. 2019-07-21 00:01:07 +02:00
artica 86ad61a010 Auto-updated build strings. 2019-07-20 00:01:07 +02:00
artica 921de9aeea Auto-updated build strings. 2019-07-19 00:01:09 +02:00
Daniel Barbero Martin c9779ef0a8 fixed pandora manage disable agent software 2019-07-18 18:21:20 +02:00
Ramon Novoa 13de5dbd51 Faster XML processing in LIFO mode.
Ref pandora_enterprise#2253
2019-07-18 13:36:24 +02:00
artica 3d496357d7 Auto-updated build strings. 2019-07-18 00:01:11 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
artica 02d62a9e78 Auto-updated build strings. 2019-07-17 00:01:11 +02:00
fbsanchez f0bfe6910d WIP agent deployment 2019-07-16 20:56:47 +02:00
artica a1055311ad Auto-updated build strings. 2019-07-16 00:01:17 +02:00
Daniel Barbero Martin 1323de2097 add syncserver conf 2019-07-15 15:43:53 +02:00
artica 7a8413154f Auto-updated build strings. 2019-07-15 10:21:25 +02:00
artica 17dcb2feb3 Auto-updated build strings. 2019-07-13 00:01:10 +02:00
artica fe98189779 Auto-updated build strings. 2019-07-12 00:01:08 +02:00
Alejandro Fraguas 99a219aa64 Merge branch 'ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into 'develop'
Ent 3545 8250 7558 7882 monitorizar servicios de azure

See merge request artica/pandorafms!2591
2019-07-11 18:28:34 +02:00
fbsanchez 624045caa6 Merge remote-tracking branch 'origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 12:18:37 +02:00
fbsanchez 467ee5fb8f Minor errata fix 2019-07-11 12:01:19 +02:00
fbsanchez 9548cd4028 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 11:14:34 +02:00
artica 45c9db2b69 Auto-updated build strings. 2019-07-11 00:01:12 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez 58465090b2 Merge remote-tracking branch 'remotes/origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-10 22:05:02 +02:00
Daniel Rodriguez f864573486 Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop'
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias

See merge request artica/pandorafms!2577
2019-07-10 09:33:41 +02:00
artica ca237a0fc4 Auto-updated build strings. 2019-07-10 00:01:10 +02:00
fbsanchez ca3b893073 Discovery Cloud Azure 2019-07-09 16:08:29 +02:00
artica 729fb32ffb Auto-updated build strings. 2019-07-09 00:01:10 +02:00
Kike f444f639bd New SMPP client 2019-07-08 12:17:48 +02:00
artica 034181037d Auto-updated build strings. 2019-07-08 00:01:17 +02:00
artica 90497410c7 Auto-updated build strings. 2019-07-07 00:01:07 +02:00
artica d0f3a6bc0b Auto-updated build strings. 2019-07-06 00:01:19 +02:00
artica 8229f634e0 Auto-updated build strings. 2019-07-05 00:01:09 +02:00
fbsanchez 26464651c8 Changed from XML::Parser to XML::SAX::ExpatXS 2019-07-04 13:24:31 +02:00
artica f4b8b39704 Auto-updated build strings. 2019-07-04 00:01:09 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
artica 3b68964f27 Auto-updated build strings. 2019-07-03 00:01:12 +02:00
artica 78bcf83856 Auto-updated build strings. 2019-07-02 00:01:09 +02:00
artica dd75aa6a42 Auto-updated build strings. 2019-07-01 00:01:07 +02:00
artica c9f101eda6 Auto-updated build strings. 2019-06-30 00:01:05 +02:00
artica eeffe40b6b Auto-updated build strings. 2019-06-29 00:01:07 +02:00
artica 8a04e2eec2 Auto-updated build strings. 2019-06-28 00:01:06 +02:00
artica ead768c9df Auto-updated build strings. 2019-06-27 00:01:10 +02:00
artica fb407c51f2 Updated version and build strings. 2019-06-26 13:25:57 +02:00
artica ff48757077 Merge remote-tracking branch 'remotes/origin/ent-4141-Errores-en-el-Log-del-servidor' into develop 2019-06-26 11:36:22 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
artica 9a65d8188a Auto-updated build strings. 2019-06-26 00:01:09 +02:00
Daniel Maya ae4a9dc324 Fixed uninitialized value in pattern match 2019-06-25 15:33:19 +02:00
Daniel Rodriguez ea7e4892c3 Merge branch 'ent-4064-7999-pandora-ha-eventserver-alertas-duplicadas' into 'develop'
HA related fixes to the Recon Server.

See merge request artica/pandorafms!2529
2019-06-25 10:36:16 +02:00
artica a469ff29da Auto-updated build strings. 2019-06-25 00:01:09 +02:00
fbsanchez 2a95fbb87a Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-24 19:58:33 +02:00
Ramon Novoa 3fe4256743 HA related fixes to the Recon Server. 2019-06-24 11:25:26 +02:00
artica c56f1dea9e Auto-updated build strings. 2019-06-24 00:01:06 +02:00
artica 3bd4743247 Auto-updated build strings. 2019-06-23 00:01:08 +02:00
fbsanchez 38f72bed8d AWS multi account 2019-06-22 13:11:35 +02:00
artica 0878af4ab1 Auto-updated build strings. 2019-06-22 00:01:08 +02:00
artica e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +02:00
artica 61b35d4bf2 Auto-updated build strings. 2019-06-20 00:01:08 +02:00
fbsanchez 4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
artica a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +02:00
artica f293aa2dc0 Auto-updated build strings. 2019-06-18 00:01:08 +02:00
artica 38412f2c9a Auto-updated build strings. 2019-06-17 00:01:06 +02:00
artica ef280b1377 Auto-updated build strings. 2019-06-16 00:01:05 +02:00
artica 5b3e6143b3 Auto-updated build strings. 2019-06-15 00:01:07 +02:00
Daniel Rodriguez 975d48a653 Merge branch 'ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra' into 'develop'
Eventos en proceso no se validan ni por id_evento no por id_extra

See merge request artica/pandorafms!2481
2019-06-14 15:51:18 +02:00
Alejandro Fraguas b2dc732712 Merge branch '3702-bug-en-plugin-dns-servidor' into 'develop'
DNS plugin updated

See merge request artica/pandorafms!2261
2019-06-14 12:42:16 +02:00
artica 8f25aa09fc Auto-updated build strings. 2019-06-14 00:01:08 +02:00
artica 60ee0dd0fd Auto-updated build strings. 2019-06-13 00:01:07 +02:00
artica 51d5e1d951 Auto-updated build strings. 2019-06-12 00:01:07 +02:00
artica 4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
artica 7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica 0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
artica 2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
Luis Calvo e60433591e Added event in process status validation when same extra id 2019-06-06 14:56:28 +02:00
Luis Calvo ac679797a3 Merge remote-tracking branch 'origin/develop' into ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra 2019-06-06 14:53:14 +02:00
Luis Calvo 701c11a457 Added event in process status validation when same extra id 2019-06-06 14:52:39 +02:00
Daniel Rodriguez 75872850ce Merge branch 'ent-4153-threads-shared' into 'develop'
threads-shared returns

See merge request artica/pandorafms!2480
2019-06-06 13:31:12 +02:00
artica 034a910000 Auto-updated build strings. 2019-06-06 00:01:07 +02:00
artica 95574adf80 Auto-updated build strings. 2019-06-05 00:01:08 +02:00
fbsanchez b7c14d49fd threads-shared returns 2019-06-04 15:10:05 +02:00
artica c584367c14 Auto-updated build strings. 2019-06-04 00:01:06 +02:00
Alejandro Fraguas 45c58a7c72 Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
Variability event_storm_protection check is added with empty data

See merge request artica/pandorafms!2428
2019-06-03 11:58:52 +02:00
marcos.alconada 9b1e5a64b8 changes of core.pm reverted 2019-06-03 10:57:24 +02:00
marcos.alconada 2c0e8273a2 changes of core.pm reverted 2019-06-03 10:56:58 +02:00
marcos.alconada 87a9ce2d46 changes of core.pm reverted 2019-06-03 10:56:16 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +02:00
artica a11b674467 Auto-updated build strings. 2019-06-03 00:01:06 +02:00
artica cfc8d7d177 Auto-updated build strings. 2019-06-02 00:01:05 +02:00
artica f06d160141 Auto-updated build strings. 2019-06-01 00:01:06 +02:00
artica 2f734f2454 Auto-updated build strings. 2019-05-31 00:01:07 +02:00
artica bfef8e61ea Auto-updated build strings. 2019-05-30 00:01:06 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
#   pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
artica 8572a13319 Auto-updated build strings. 2019-05-29 00:01:07 +02:00
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
fbsanchez 83602e07b9 Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4 2019-05-27 11:06:29 +02:00
artica de3464bd02 Auto-updated build strings. 2019-05-27 00:01:05 +02:00
artica ba97da46c6 Auto-updated build strings. 2019-05-26 00:01:04 +02:00
artica a13701ed82 Auto-updated build strings. 2019-05-25 00:01:06 +02:00
fbsanchez c5bd3204ab Minor style, avoided duplicated iface names with spaces 2019-05-24 11:42:46 +02:00
artica cc09c257bc Auto-updated build strings. 2019-05-24 00:01:06 +02:00
Alejandro Fraguas 09020c3b9c Merge branch 'fix/pandora_ha_paths' into 'develop'
including several extra tokens in config

See merge request artica/pandorafms!2368
2019-05-23 11:58:15 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
artica 4c3dea3ba4 Auto-updated build strings. 2019-05-23 00:01:07 +02:00
fbsanchez 4fe7680694 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 15:33:13 +02:00
fbsanchez bd88cbd42d 1st approach simplifying MC management 2019-05-22 15:31:59 +02:00
artica 892dcc750f Updated version and build strings. 2019-05-22 15:29:49 +02:00
artica ba9edc0378 Auto-updated build strings. 2019-05-22 00:01:07 +02:00
fbsanchez c0f40a8d5f Update dbmetaconsole get setup_id behaviour 2019-05-21 14:23:14 +02:00
artica 20e38ead81 Auto-updated build strings. 2019-05-21 00:01:08 +02:00
artica d82d178a0d Auto-updated build strings. 2019-05-20 00:01:08 +02:00
artica 2dc5fce6a6 Auto-updated build strings. 2019-05-19 00:01:06 +02:00
artica 509c476c33 Auto-updated build strings. 2019-05-18 00:01:08 +02:00
marcos.alconada 86dabc6476 Variability event_storm_protection check is added with empty data 2019-05-17 11:31:02 +02:00
artica bf202496da Auto-updated build strings.
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
2019-05-17 00:01:10 +02:00
artica f5f66fc144 Auto-updated build strings.
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
2019-05-16 00:01:06 +02:00
artica 9c08aa7b57 Auto-updated build strings.
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
2019-05-15 00:01:11 +02:00
artica b7ebb44c48 Auto-updated build strings.
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
2019-05-14 00:01:09 +02:00
Daniel Rodriguez a38ef3e729 Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop'
Added condition type not normal in alert templates

See merge request artica/pandorafms!2376

Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
2019-05-13 16:51:34 +02:00
Ramon Novoa f48dd94c65 Check not_normal alerts when evaluating unknown modules.
Former-commit-id: 80f58d4ebfaf5179312a19eae8ea09a4a8d0bff5
2019-05-13 13:44:08 +02:00
artica 40af2205b1 Auto-updated build strings.
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
2019-05-13 00:01:06 +02:00
artica 3fc5f183fd Auto-updated build strings.
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
2019-05-12 00:01:06 +02:00
artica 0008f57e35 Auto-updated build strings.
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
2019-05-11 00:01:09 +02:00
Daniel Rodriguez 948c4eb7b4 Merge branch 'ent-3726-WUX_no_se_puede_aplicar_FF_Interval' into 'develop'
fixed change status WUX

See merge request artica/pandorafms!2385

Former-commit-id: c203a7a321303a33843b8ab85a96b69cc041a8c5
2019-05-10 11:44:08 +02:00
manuel 12c9952e4a Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
Conflicts:
pandora_console/extras/mr/28.sql


Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
artica 3119278b26 Auto-updated build strings.
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
2019-05-10 00:01:14 +02:00
artica 7da73afd08 Auto-updated build strings. 2019-05-09 00:01:10 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
artica 9116a72a2b Auto-updated build strings.
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
2019-05-07 00:01:09 +02:00
artica 6d7b748591 Auto-updated build strings.
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings.
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings.
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
2019-05-04 00:01:07 +02:00
artica b88456f696 Auto-updated build strings.
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings.
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings.
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
2019-05-01 00:01:10 +02:00
Alejandro Fraguas 39786e4d32 Merge branch 'ent-3395-Añadir-un-componente-de-red-por-CLI' into 'develop'
Added new functionality in CLI create_network_component

See merge request artica/pandorafms!2275

Former-commit-id: ca972d681e20579a32a1847bf4bfdce35f4f3de4
2019-04-30 13:42:23 +02:00
artica 310d217fb2 Auto-updated build strings.
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
2019-04-30 00:01:09 +02:00
artica 5d6bd31786 Auto-updated build strings.
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings.
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
2019-04-28 00:01:06 +02:00
artica 29b7ddeb6d Auto-updated build strings.
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
2019-04-27 00:01:09 +02:00
artica 6de9b4f23e Auto-updated build strings.
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
Daniel Barbero Martin 73c9a0e049 fixed change status WUX
Former-commit-id: 3f557ac0c2d8164bff7c5410b662127d39544f7f
2019-04-25 17:32:43 +02:00
artica 7f7a727c21 Auto-updated build strings.
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
Ramon Novoa a49eaf90f6 Add support for 'not_normal' alert templates.
Former-commit-id: f9bf95bd64f399badcd5f00b80921255f4642a8c
2019-04-24 12:50:42 +02:00
artica 8bba24e13a Updated version and build strings.
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
artica 4a699c2b75 Auto-updated build strings.
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +02:00
artica 883f3decb4 Auto-updated build strings.
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
2019-04-23 00:01:09 +02:00
fbsanchez cf82ed3ae7 including several extra tokens in config
Former-commit-id: a391371f0c6d9ee034670a65fa7422e4b08e87df
2019-04-22 16:28:07 +02:00
Daniel Rodriguez 3a68e1bb77 Merge branch 'ent-3882-revision-politicas' into 'develop'
Función auxiliar políticas

See merge request artica/pandorafms!2354

Former-commit-id: de065e2ef71e864862a4b2a93419cdf9285f092c
2019-04-22 16:27:51 +02:00
fbsanchez f06e81dcc4 Discovery: Minor update in description and extra information in log
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
artica ea7a8b2b90 Auto-updated build strings.
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
2019-04-21 00:01:29 +02:00
artica 1dfda59ce6 Auto-updated build strings.
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
2019-04-20 00:01:24 +02:00
artica 7283d87a17 Auto-updated build strings.
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
2019-04-19 00:01:25 +02:00
artica 9d8e2abd98 Auto-updated build strings.
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
2019-04-18 00:01:27 +02:00
artica ff5a33ba2c Auto-updated build strings.
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
artica 8bf92720ee Auto-updated build strings.
Former-commit-id: 544097161030608395112a142ed341e26700a678
2019-04-16 00:01:30 +02:00
artica 68258661b1 Auto-updated build strings.
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00
artica d0f6726d00 Auto-updated build strings.
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
2019-04-14 00:01:23 +02:00
artica ef0f7cded8 Auto-updated build strings.
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
2019-04-13 00:01:31 +02:00
fbsanchez 8bdc980ab0 minor fix
Former-commit-id: 4222b217953e88da43d0f50d3217a065dbb13332
2019-04-12 23:47:21 +02:00
fbsanchez 45c9f6d51c Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
2019-04-12 19:24:27 +02:00
fbsanchez fa6529b652 Merge remote-tracking branch 'origin/develop' into ent-3792-spec_console_enterprise_for_rhel7
Former-commit-id: 8c7e1f5f4aad250e01931a420f8da8819817152f
2019-04-12 19:18:15 +02:00
fbsanchez 15cd02a49b fix v1
Former-commit-id: f217f78e8085a81df68b9899513e547e148fca0d
2019-04-12 13:45:13 +02:00
artica f5088299f3 Auto-updated build strings.
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
2019-04-12 00:01:24 +02:00
fbsanchez e80649073f Minor fixes
Former-commit-id: 71698d61db59e7f94fb8c770715decb0fe6e5f0f
2019-04-11 15:36:55 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
2019-04-11 15:12:46 +02:00
fbsanchez e998c8dd70 Discovery RDS
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
2019-04-11 15:05:03 +02:00
Rafael Ameijeiras c91893c948 spec console open and build_rpm for rhel7
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
2019-04-11 13:45:57 +02:00
artica 29e1fc828c Auto-updated build strings.
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
2019-04-11 00:01:30 +02:00
fbsanchez 2af9cbb711 Discovery RDS Bypass perl thread ENV limitation
Former-commit-id: 34ca5374e66c174887683077ba5efcae5412b9bb
2019-04-10 23:16:18 +02:00
fbsanchez 834d5d6c50 WIP:Discovery RDS
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
2019-04-10 20:40:03 +02:00
Daniel Rodriguez 4ab7f2c56f Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' into 'develop'
Ent 3791 7780 cron en modulos no funcionan bien

See merge request artica/pandorafms!2337

Former-commit-id: 2d7e13817fee6c23d271405d48198ab069357e2b
2019-04-10 10:20:35 +02:00
artica 765ca945a0 Auto-updated build strings.
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
2019-04-10 00:01:25 +02:00
fbsanchez e59ce5412c WIP Discovery RDS
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00
Daniel Barbero Martin 8404450458 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
2019-04-09 09:53:31 +02:00
artica 0d05d5c842 Auto-updated build strings.
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
2019-04-09 00:01:31 +02:00
fbsanchez 79bd37ee5b Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
2019-04-08 16:28:26 +02:00
fbsanchez 54bd3bf089 Discovery F3
Former-commit-id: 1990149c5f5795f825bc337fd7ae29d360348d45
2019-04-08 16:23:32 +02:00
artica 9fd5d3bf5a Auto-updated build strings.
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
2019-04-08 00:01:23 +02:00
artica d35e9dbaae Auto-updated build strings.
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
2019-04-07 00:01:25 +02:00
artica 1ddb5ebff4 Auto-updated build strings.
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
2019-04-06 00:01:32 +02:00
fbsanchez b9db5fdb6f wip discovery f3
Former-commit-id: 6b9f5bc3995a16414e1c1a9201983f33eb6908ad
2019-04-05 17:20:45 +02:00
Daniel Barbero 49d925d96a Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Conflicts:
	pandora_console/extras/mr/27.sql


Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
fermin831 873525726e Avoid infinite loops when the day of the week in cron is out of limits
Former-commit-id: 6c0a87a29818219364fb9c08c44b48cb79dd74a8
2019-04-05 12:32:43 +02:00
fbsanchez db9068e25a fixes in non agent per database
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
2019-04-05 10:41:09 +02:00
artica 8d0e53924d Auto-updated build strings.
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
2019-04-05 00:01:32 +02:00
fbsanchez e76a5af441 minor fix parent link
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
2019-04-04 18:20:26 +02:00
fermin831 14ea1a4714 Fixed inverses intervals on server
Former-commit-id: 20f9e139bb3f40700e3081e4ce9ec134b70786a6
2019-04-04 17:47:40 +02:00
fbsanchez 143c501a6e minor fixes
Former-commit-id: 8d8c891a963b0e03838c2bf184b5da6bed01b2a9
2019-04-04 17:08:31 +02:00
fbsanchez 1274380270 minor fix
Former-commit-id: a012c8155cd1d950044bc2c0531ee2abd9e89d07
2019-04-04 16:07:50 +02:00
fbsanchez 56f2acbbf1 discovery.app.mysql rc1
Former-commit-id: 51304e872d375b480cbbf88d058b1804106afb98
2019-04-04 16:05:16 +02:00
fbsanchez ce9f9eab4e rc1 mysql recon
Former-commit-id: 51e000229d6c2c94e59e8eeb8ef77d539ee6c775
2019-04-04 16:00:08 +02:00
fbsanchez fcafe76943 wip discovery f34
Former-commit-id: bb08450d3304ff140c4bae37e77b20a2329c600b
2019-04-04 12:28:17 +02:00
artica f64835dca9 Auto-updated build strings.
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
2019-04-04 00:01:27 +02:00
fbsanchez 9e83f139e1 WIP discovery f3
Former-commit-id: cee7ee096e0a0c065bc4312a149ee223303224fc
2019-04-03 22:52:37 +02:00
fbsanchez 654e0c28f6 WIP discovery F3 app db my multiserver
Former-commit-id: a85c048a6d4e755b76a7e042e04cfebdfe69b6f4
2019-04-03 22:44:06 +02:00
fbsanchez 74303168ac WIP discovery F3
Former-commit-id: 493d05714a31c2f91f7b8ea5445397ebf1c526d7
2019-04-03 21:55:11 +02:00
fbsanchez 60f37eac57 removed unused folders
Former-commit-id: 4c1870e836e7f05dd5a312e41c4f1f86bff26e22
2019-04-03 21:08:52 +02:00
fbsanchez 798a2aad16 WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
fermin831 e642907215 Merge remote-tracking branch 'origin/develop' into ent-3791-7780-cron-en-modulos-no-funcionan-bien
Former-commit-id: 46844dc1e44569be828ae90bfb22c669d4eb352a
2019-04-03 12:00:48 +02:00
Alejandro Fraguas ee59f4678e Merge branch 'ent-3801-no-funciona-event-storm-protection' into 'develop'
Add a missing configuration option.

See merge request artica/pandorafms!2322

Former-commit-id: 6ccc3926eb2d4fe76e2a60f6f74a242ce7e84051
2019-04-03 10:57:26 +02:00
artica 30e9b67062 Auto-updated build strings.
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
2019-04-03 00:01:33 +02:00
fbsanchez 11b2fbc245 WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
Ramon Novoa 7af141258e Add a missing configuration option.
Former-commit-id: 4a516f1507cba486defb0c6be7b63b12cebc383e
2019-04-02 10:30:53 +02:00
daniel 431c807f61 Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
# Conflicts:
#   pandora_console/extras/mr/27.sql

Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
Fermin 4957bd763a Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3791-7780-cron-en-modulos-no-funcionan-bien
Former-commit-id: e9a9619b767208a7249e44a1fb98623f2ff93c11
2019-04-02 09:04:34 +02:00
artica f67c3d5fc0 Auto-updated build strings.
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
2019-04-02 00:01:31 +02:00
Daniel Barbero Martin 5ca01b0294 add ff_type linux agent
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
2019-04-01 10:27:24 +02:00
artica 2d26a74f9e Auto-updated build strings.
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
artica 69df187ae5 Auto-updated build strings.
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
Daniel Barbero b2e16848f9 add new ff type
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
Fermin 05ce178854 Fixed week day cron in server
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
2019-03-29 11:51:51 +01:00
artica 2a96b610d9 Auto-updated build strings.
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
Daniel Barbero Martin 33197df731 add new functionality flipflop
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
2019-03-28 17:33:49 +01:00
Daniel Barbero Martin 626aacbf43 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
2019-03-28 08:49:08 +01:00
artica 98a9c62de9 Auto-updated build strings.
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
artica 74cb6970dc Updated version and build strings.
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
fermin831 9ee095406b Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php

Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
2019-03-27 11:59:25 +01:00
fbsanchez c717baafc0 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 70601a390ebca2a1530b77c86a83c19e29e98261
2019-03-27 10:53:46 +01:00
artica 8160983e36 Auto-updated build strings.
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
2019-03-27 00:01:24 +01:00
fbsanchez 511295f1c6 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
2019-03-26 16:32:19 +01:00
fermin831 a2f5b8502a Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/include/styles/pandora.css

Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
artica 90a2e28247 Auto-updated build strings.
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
fbsanchez 1238f15190 discovery task advanced summary support
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
fbsanchez 040f942c9f Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9affd1c5f658a8c24c92f7e3b9868fc35868bd32
2019-03-25 10:29:49 +01:00
fermin831 2711eb59ea Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql

Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
artica 3916bcf636 Auto-updated build strings.
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
artica 0e51cd0760 Auto-updated build strings.
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
2019-03-24 00:01:23 +01:00
artica 9efd962867 Auto-updated build strings.
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
2019-03-23 00:01:24 +01:00
artica cb8cd37ee7 Auto-updated build strings.
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
2019-03-22 00:01:32 +01:00
fbsanchez da3602fbc5 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 7867c83c3571bcd27c19f4c1dcdc6e8b95eb2715
2019-03-21 18:38:41 +01:00
fermin831 af9936c78f Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/install.php

Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
2019-03-21 13:26:55 +01:00
artica dfadf48b4e Auto-updated build strings.
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
2019-03-21 00:02:00 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
fbsanchez 9b68e7d04e Switch extended events to standard events in host creation (recon)
Former-commit-id: 74ee131b3b4083fd50cc37e1a7854ad159afa13a
2019-03-20 14:15:33 +01:00
samucarc d7e5858050 Added new functionality in CLI create_network_component
Former-commit-id: 89e2bf6002da2f68c09d06e6756f8a7be7c4c241
2019-03-20 12:48:44 +01:00
artica c598eb60fb Auto-updated build strings.
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
fermin831 bc9192b98a [Netflow] Merge three reports in one
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
artica 392c0d0bff Auto-updated build strings.
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +01:00
fermin831 e91335ae21 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/install.php

Former-commit-id: 3d8ef5634d3c1b87e09db11180047bedc0518028
2019-03-18 08:21:25 +01:00
artica 4772f84850 Auto-updated build strings.
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00