Commit Graph

4188 Commits

Author SHA1 Message Date
fbsanchez 4abf19722b Minor fixes and improvements. Discovery
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
Daniel Rodriguez bd6ac21595 Merge branch 'ent-3554-7588-apply_policy-no-funciona' into 'develop'
Added new parameter in pandora_add_policy_queue

See merge request artica/pandorafms!2176

Former-commit-id: 65ceb6b0fe1bf2c81bcfb1ce946f7d73d2c68df2
2019-02-22 13:09:34 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
artica b1149a053b Auto-updated build strings.
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
fermin831 4930968ec9 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/godmode/reporting/reporting_builder.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/functions_reports.php

Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
2019-02-21 17:21:42 +01:00
fbsanchez 6409fc2ddd Added discovery name convention to server files
Former-commit-id: d432ac2c5526cc05b7cbb29df66aef60a35ab0e7
2019-02-21 15:07:51 +01:00
Daniel Rodriguez 36410a26d1 Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
Add support for column macros.

See merge request artica/pandorafms!2182

Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
Daniel Rodriguez ba87d6a9b8 Merge branch 'ent-3214-exact-oid-matches' into 'develop'
Add support for exact matches to SNMP alerts.

See merge request artica/pandorafms!2090

Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
2019-02-21 11:35:51 +01:00
artica 1156b29743 Auto-updated build strings.
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
fbsanchez 6a43536b33 Discovery. Added App.VMw
Former-commit-id: 18a9300f37163048bd99109c08c1228231426a59
2019-02-20 19:30:25 +01:00
fbsanchez 08c6d782a4 Add menuentry discovery
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
artica 53a41a7a56 Auto-updated build strings.
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
Ramon Novoa 7bd5851667 Add support for column macros.
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
Alejandro Fraguas 39a60639fb Merge branch 'ent-3439-Añadir-la-macro-de-id-del-trap-a-las-macros-de-alerta-de-trap-snmp' into 'develop'
Add _id_trap_ macro to snmp alert macros - #3439

See merge request artica/pandorafms!2177

Former-commit-id: 863b66aead27483654b8ec9eb21efd540f1a22e4
2019-02-19 12:33:43 +01:00
fbsanchez 906ba091e1 minor fixes/changes DiscoveryServer
Former-commit-id: 8273727109628f99fc86c125c9b6f62a416c07f1
2019-02-19 10:37:09 +01:00
artica 2b3a72e938 Auto-updated build strings.
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
2019-02-19 00:01:28 +01:00
fbsanchez 7f0b676e0f Discovery tasks. Extended events. Autoconfigure detected agents.
Former-commit-id: da2282082606c970dbace453193eb0a7e4089731
2019-02-18 19:50:13 +01:00
Daniel Maya 28e5ff0bc2 Added new parameter in pandora_add_policy_queue
Former-commit-id: 0a257538c31f86c572d6bfa4fb480035e302364f
2019-02-18 16:58:04 +01:00
fbsanchez 46af41a2cc support for autoconfiguration
Former-commit-id: 034ed513ed9cf7efbe22720b61e8ff431ebbbc84
2019-02-18 14:00:55 +01:00
artica 0ef118f401 Auto-updated build strings.
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00
artica 1fafda8502 Auto-updated build strings.
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
2019-02-17 00:01:24 +01:00
artica 0d93ccc094 Auto-updated build strings.
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
2019-02-16 00:01:31 +01:00
fbsanchez 7a1b66755d minor fixes H&D
Former-commit-id: a4ffc2e761dc0a4d06209fb1c448bc17d5d45022
2019-02-15 16:06:28 +01:00
fbsanchez 45fd528e38 minor fixes H&D
Former-commit-id: c3236b91b4b6a0f37af2d4da4955c711dd4ace43
2019-02-15 16:02:55 +01:00
samucarc 442e0306ea Merge branch 'develop' into ent-3108-Aplicar_una_politica_a_un_solo_agente_con_API_CLI
Former-commit-id: 496f7fa859c5745dcd22d73afe9426a46e772a9a
2019-02-15 11:15:58 +01:00
artica cd83f324a1 Auto-updated build strings.
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
2019-02-15 00:01:26 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
artica f0338cd08e Auto-updated build strings.
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
2019-02-14 00:01:26 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
artica 0e39e3fef7 Auto-updated build strings.
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
2019-02-13 00:01:37 +01:00
Ramon Novoa 6e236c404b Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
2019-02-12 13:47:44 +01:00
fbsanchez 166c3bbe88 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
fbsanchez 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
fbsanchez d40ced2043 alert_command send notification
Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf
2019-02-12 11:16:34 +01:00
artica bbd3cb79ce Auto-updated build strings.
Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04
2019-02-12 00:01:37 +01:00
artica 3acd6b8d31 Auto-updated build strings.
Former-commit-id: bb603dd63396712b8a649e3c08320653021c1289
2019-02-11 00:01:26 +01:00
artica 56797e717b Auto-updated build strings.
Former-commit-id: 728a4013a020328735f2e76b4ecb49e87d815d10
2019-02-10 00:01:25 +01:00
artica f992e7b1f4 Auto-updated build strings.
Former-commit-id: 7eb19cce56cb06b70ee9269f4b51d7b45b19f5d9
2019-02-09 00:01:35 +01:00
artica e6abb61a13 Auto-updated build strings.
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
2019-02-08 00:01:29 +01:00
enriquecd 8041c66f4c Add _id_trap_ macro to snmp alert macros - #3439
Former-commit-id: 81fca58b445355834e136be8f0c09d6ea3a8f54f
2019-02-07 16:28:05 +01:00
Daniel Rodriguez 8054809dda Merge branch '2931-Fallos_en_el_conteo_de_modulos_en_la_tabla_tagente' into 'develop'
Added new functionality in CLI and API to update module counts and alert counts

See merge request artica/pandorafms!2133

Former-commit-id: e5ee2c87fc7281ece82ace2d8b5654a1c278f60a
2019-02-07 13:10:56 +01:00
Ramon Novoa 92e2262440 Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
Ramon Novoa 58f68438e6 Merge remote-tracking branch 'origin/develop' into ent-3214-exact-oid-matches
Former-commit-id: cd673c501161eebf338b95289cee01906d5fa0b7
2019-02-07 10:10:28 +01:00
artica 1f3fe51f69 Auto-updated build strings.
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
samucarc fcb9275d11 Fixed conflict
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
artica c0a23889ab Auto-updated build strings.
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
2019-02-06 00:01:29 +01:00
artica 97259bc285 Auto-updated build strings.
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
2019-02-05 00:01:28 +01:00
fbsanchez 8d17c9e0d0 minor plugintools fix
Former-commit-id: d7d43777b952b483a733c7ac92776f12b5c17e62
2019-02-04 19:32:54 +01:00
Daniel Rodriguez 06e87d2b36 Merge branch 'ent-3248-6352-anadir-compatibilidad-snmp-v3-a-servidor-snmp-enterprise' into 'develop'
Add SNMPv3 support to the Enterprise SNMP Server.

See merge request artica/pandorafms!2122

Former-commit-id: 49fd3b38b38d95f6b457dbf83d46f6ba52e94e1e
2019-02-04 17:00:25 +01:00
Alejandro Fraguas 67ab08fc41 Merge branch 'ent-3344-7304-procesado-de-XML-con-acentos' into 'develop'
added accent compatibility Dataserver

See merge request artica/pandorafms!2109

Former-commit-id: 7e7479c3d82aeb398fb0c76fe7df61d8522af2b3
2019-02-04 14:05:40 +01:00
artica af1f081e5c Auto-updated build strings.
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
2019-02-04 00:01:33 +01:00
artica 934533141e Auto-updated build strings.
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
2019-02-03 00:01:26 +01:00
artica 24e799f18e Auto-updated build strings.
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
2019-02-02 00:01:29 +01:00
artica 62461525e8 Auto-updated build strings.
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
2019-02-01 00:01:36 +01:00
artica d6667354fc Auto-updated build strings.
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
2019-01-31 00:01:24 +01:00
fermin831 2995c86a70 Added network matrix purge
Former-commit-id: a2b5f8b5662685924835a592ba04e750e4650fd9
2019-01-30 13:03:16 +01:00
Ramon Novoa 2626605030 Validate alerts at the time agents/modules are modified.
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
fermin831 ac3792690c Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Former-commit-id: 311dc42f717a4419371d0de20c048bd5e0a9cd00
2019-01-30 12:04:56 +01:00
artica 6485de04fd Auto-updated build strings.
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
Alejandro Fraguas 11456bcfbb Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
Add commands alert

See merge request artica/pandorafms!2025

Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
fermin831 78fd6850e7 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm

Former-commit-id: 423e2d818730f97ef1ed0a286f717243731b5363
2019-01-29 18:15:59 +01:00
Samuel Carcases 3eeaf83ee3 Update pandora_manage.pl
Former-commit-id: 4bc758a4284e96658137fb9580f36163a2031944
2019-01-29 17:40:25 +01:00
Alejandro Fraguas eb0b9bd05b Update pandora_manage.pl
Former-commit-id: 4064310d63eb101eb1a13825357aa5c425eae502
2019-01-29 17:16:47 +01:00
Alejandro Fraguas ae190ef058 Merge branch 'ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into 'develop'
Ent 2523 api listar, crear, borrar y modificar usuarios desde la api #6167 eu comm

See merge request artica/pandorafms!2149

Former-commit-id: a5a1e6aadf4efe43160eebe883a27ce58ac09bc2
2019-01-29 16:23:35 +01:00
Alejandro Fraguas c05e99f37e Update pandora_manage.pl
Former-commit-id: 451b04e91078b99c8b9f41a35271797c343f357c
2019-01-29 16:07:39 +01:00
Daniel Rodriguez 5bc10915da Merge branch 'ent-3451-retoques-ipam' into 'develop'
added pandora_block_ping to check response of multiple addresses

See merge request artica/pandorafms!2147

Former-commit-id: 6adf7e7f59beba0d1f579ab267fd40d0c21a24c4
2019-01-29 15:58:00 +01:00
samucarc 902e8589f3 Apply a policy into an agent with CLI
Former-commit-id: 87037688b1dd3a551c0585319ec545c855484a97
2019-01-29 15:30:04 +01:00
samucarc a3c71f4bca Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
artica cec6aedaf5 Updated version and build strings.
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
artica 354834a872 Auto-updated build strings.
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
2019-01-29 00:01:27 +01:00
fbsanchez d0d95cbca5 added pandora_block_ping to check response of multiple addresses
Former-commit-id: a2202f029e0fae80f3156a1a10afca0fe18c7ac2
2019-01-28 20:02:58 +01:00
samucarc cf2b9c5798 Fixed conflicts
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
Alejandro Fraguas 042bf1c6e7 Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
List alert actions in nodes with CLI and API

See merge request artica/pandorafms!2085

Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
artica 550abc6634 Auto-updated build strings.
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
2019-01-28 00:01:23 +01:00
artica dd9f6e5f21 Auto-updated build strings.
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
2019-01-27 00:01:29 +01:00
artica 50036f2120 Auto-updated build strings.
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
2019-01-26 00:01:25 +01:00
daniel 61c9603ae8 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
artica d191cdef17 Auto-updated build strings.
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
artica f9113fa2e5 Auto-updated build strings.
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
Alejandro Fraguas 25d4239ef9 Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
Create module group API

See merge request artica/pandorafms!2053

Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
2019-01-23 17:02:34 +01:00
daniel 841a9cf60b Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
2019-01-23 11:08:48 +01:00
artica 1e4a288f53 Auto-updated build strings.
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00
daniel 2e2774f256 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm


Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
2019-01-22 17:42:47 +01:00
fermin831 1ecd656513 Data server can handle several events from a single agent
Former-commit-id: 2f47df007eb27cf181b130aac79d35698de67387
2019-01-22 12:59:54 +01:00
Daniel Rodriguez f1dbd40a6a Merge branch 'ent-3421-error-en-un-push' into 'develop'
Ent 3421 error en un push

See merge request artica/pandorafms!2138

Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d
2019-01-22 10:04:07 +01:00
daniel 4236b55694 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm


Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
2019-01-22 09:00:47 +01:00
artica c586b68cb3 Auto-updated build strings.
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
2019-01-22 00:01:24 +01:00
samucarc da7e8e5487 Fixed conflict
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
fermin831 c9e11780bb Added matrix_data XML
Former-commit-id: 8b927f2e3fd2c78058d4a736c371e4274c94bc1a
2019-01-21 18:49:20 +01:00
fermin831 e5eab4ca67 Added events in DataServer processed XML
Former-commit-id: db7be33ef7e6e5f58106dfef2cfb042637624f27
2019-01-21 18:49:00 +01:00
fermin831 e540d96eb2 Revert "Added events in DataServer processed XML"
This reverts commit cbe518dc53 [formerly e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6].


Former-commit-id: 759a3da8b31fef88d2d7b22daeae09062f3bd80c
2019-01-21 18:43:47 +01:00
fermin831 64b8223f12 Revert "Added matrix_data XML"
This reverts commit d970c6628a [formerly cd26d436e6745a456df95484120d1b96439b274d].


Former-commit-id: 7f5d3d628605a2458622174edcd56916a3a63cd9
2019-01-21 18:43:09 +01:00
samucarc 75dc82f42f Merged two branches into one
Former-commit-id: 1e15cd80a5ef0a03834c4d835c7ff0fe77b4c7e0
2019-01-21 18:41:46 +01:00
fermin c75f94f9e0 Merge branch 'ent-3418-nueva-estructura-de-datos-tnetworkmatrix' into 'develop'
Ent 3418 nueva estructura de datos tnetworkmatrix

See merge request artica/pandorafms!2136

Former-commit-id: b04eaee2ce78625f9710b0851609ca8dfa2aea43
2019-01-21 18:32:05 +01:00
fermin831 d970c6628a Added matrix_data XML
Former-commit-id: cd26d436e6745a456df95484120d1b96439b274d
2019-01-21 18:27:31 +01:00
fbsanchez f77373aa1d Plugintools added ip2long & long2ip
Former-commit-id: 5c5f9589a32947ce2d9a725e504661a11c8311ee
2019-01-21 18:06:44 +01:00
fermin831 cbe518dc53 Added events in DataServer processed XML
Former-commit-id: e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6
2019-01-21 15:12:46 +01:00
samucarc 367c9fc6fc Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
daniel dc24599f18 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
2019-01-21 09:22:42 +01:00
artica e2471b376c Auto-updated build strings.
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
artica 14c5e9d48b Auto-updated build strings.
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
artica 5a75662b99 Auto-updated build strings.
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
samucarc 0c9446fceb Added new functionality in CLI and API to update module counts and alert counts
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
2019-01-18 17:24:32 +01:00
fbsanchez c24bea32a8 ip to long utils moved to Tools
Former-commit-id: 737257575dc1ac69ad9f1a284d7165077d7d6d4e
2019-01-18 12:55:49 +01:00
artica 979a87762e Auto-updated build strings.
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
fbsanchez d57e6db0c0 Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: e65828cb880c2e11f7e54b61d748bf43d8e0f53b
2019-01-17 18:42:46 +01:00
fbsanchez 81a6584d1c Discovery modules (IPAM: DHCP)
Former-commit-id: 1849f6625fbd19dd2d6362d3ea20dc16ac73c29b
2019-01-17 18:42:38 +01:00
Daniel Rodriguez d0ded14018 Merge branch 'ent-3328-7200-correcciones-consola-vmware' into 'develop'
Ent 3328 7200 correcciones consola vmware

See merge request artica/pandorafms!2126

Former-commit-id: e050791eefa12e7df5348fb190788be539e56c05
2019-01-17 16:29:11 +01:00
artica 6bf6fd19d6 Auto-updated build strings.
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
artica fe13a117aa Auto-updated build strings.
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
fbsanchez 2e8e911ca7 added safe_input to custom_fields - value while storing them in db
Former-commit-id: e06e141883d87a7247a6426a75c03c7df6045e9b
2019-01-15 18:22:55 +01:00
fbsanchez a84db4d88f Merge remote-tracking branch 'origin/develop' into ent-3328-7200-correcciones-consola-vmware
Former-commit-id: b09a410d415480efd4bcf6c387347e2e582febeb
2019-01-15 18:22:27 +01:00
Daniel Rodriguez 6ba8b9ab9a Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
2299 añadir nueva funcionalidad en el cli remove agent from policy

See merge request artica/pandorafms!2092

Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +01:00
artica 6894623429 Auto-updated build strings.
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
Ramon Novoa 33500e635c Add SNMPv3 support to the Enterprise SNMP Server.
Former-commit-id: 8e0edc671caa7c864fa92c3770fca93bb575958d
2019-01-14 15:16:36 +01:00
artica ad9a316a47 Auto-updated build strings.
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
artica 20a0aefe84 Auto-updated build strings.
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
artica 5abf8e14ff Auto-updated build strings.
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
artica ea34cc3b16 Auto-updated build strings.
Former-commit-id: 0d164597ba66950d16573ad8b618164c24b578d1
2019-01-11 00:01:25 +01:00
artica 00523128cf Auto-updated build strings.
Former-commit-id: ea896e01eeba9faf882c98c4dbaa788b58d46f7b
2019-01-10 00:01:25 +01:00
artica 344e5f1a6f Auto-updated build strings.
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
artica 02b497c250 Auto-updated build strings.
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
artica dd922c41fc Auto-updated build strings.
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
artica 48f1196400 Auto-updated build strings.
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
artica cf1d28cf8b Auto-updated build strings.
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +01:00
fbsanchez eb1ce680d8 added accent compatibility Dataserver
Former-commit-id: 039f7a5b776715c8c6a69bc6ab025dd9ff33fad9
2019-01-04 10:42:24 +01:00
artica cfdde23d96 Auto-updated build strings.
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
fbsanchez cf15f715b6 safe_input in custom_field operations Dataserver
Former-commit-id: 7cbb8fdb97a1265201f6dd5600ad58664cc89c29
2019-01-03 18:00:49 +01:00
fbsanchez c5501e2b0a safe_input to custom field data received (dataserver)
Former-commit-id: 4f38e951d02d7e3645b632cd0e48b52647565966
2019-01-03 11:18:26 +01:00
artica d114a77151 Auto-updated build strings.
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
artica 5c16c08d59 Auto-updated build strings.
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
artica ff9f6549d4 Auto-updated build strings.
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
artica 5139308723 Auto-updated build strings.
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
artica 4356a8ce8e Auto-updated build strings.
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
artica 5e8b4b4500 Auto-updated build strings.
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
artica 60617def24 Auto-updated build strings.
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
artica fcfd68f102 Auto-updated build strings.
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +01:00
artica 2043546c52 Auto-updated build strings.
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
artica 5377cf6039 Auto-updated build strings.
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
artica 34502da313 Auto-updated build strings.
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
artica 86b1a3e424 Auto-updated build strings.
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
artica c5d4f395f2 Auto-updated build strings.
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
artica cba18381bd Auto-updated build strings.
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
artica 2d08c75bae Auto-updated build strings.
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
artica 8c20c93806 Auto-updated build strings.
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
artica 8a6033e002 Auto-updated build strings.
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
samucarc 58289e73bc Added new functionality for CLI to delete policy agents.
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
Ramon Novoa bc36bb0534 Add support for exact matches to SNMP alerts.
Ref pandora_enterprise#3214.


Former-commit-id: 35aa55d4d2ae236e614be7f4db50a9eb9f62aafa
2018-12-17 15:40:00 +01:00
artica 7f9ee21b4b Auto-updated build strings.
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00