5224 Commits

Author SHA1 Message Date
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