tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,881 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

3544 Commits

Author SHA1 Message Date
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +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
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
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
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 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
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
artica c598eb60fb Auto-updated build strings. 
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
 2019-03-20 00:01:24 +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
artica 093404eedc Auto-updated build strings. 
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
 2019-03-17 00:01:29 +01:00
artica 16d5bf5f66 Auto-updated build strings. 
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
 2019-03-16 00:01:30 +01:00
Daniel Rodriguez eac346daf4 Merge branch 'ent-3598-cambio-en-plugin-dynamic-snmp' into 'develop' 
minor updates in plugintools

See merge request artica/pandorafms!2211

Former-commit-id: 30806fc6b073af4607cb4cdf1c3222d930a66d58
 2019-03-15 14:07:31 +01:00
artica be08d76e6c Auto-updated build strings. 
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
 2019-03-15 00:01:22 +01:00
fermin831 b660da6e84 Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/install.php

Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
 2019-03-14 10:49:16 +01:00
artica 0ccbb1198a Auto-updated build strings. 
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
 2019-03-14 00:01:25 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
 2019-03-13 09:52:00 +01:00
artica 99afea22cb Auto-updated build strings. 
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
 2019-03-13 00:01:24 +01:00
artica 67080c72d9 Auto-updated build strings. 
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
 2019-03-12 00:01:23 +01:00
artica 0210c2381d Auto-updated build strings. 
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
 2019-03-11 00:01:58 +01:00
artica b79815bb06 Auto-updated build strings. 
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
 2019-03-10 00:01:25 +01:00
artica fd68b49710 Auto-updated build strings. 
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
 2019-03-09 00:01:32 +01:00
Fermin dd8265f65e Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
 2019-03-08 09:02:22 +01:00
artica e43d1aa356 Auto-updated build strings. 
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
 2019-03-08 00:01:31 +01:00
artica 4eb6c16339 Auto-updated build strings. 
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
 2019-03-07 00:01:27 +01:00
fbsanchez b9357b6b73 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 275cfc7046e2155a6b9d1860372f59cc175924c8
 2019-03-06 18:02:47 +01:00
artica 88f1f16a5a Auto-updated build strings. 
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
 2019-03-06 00:01:33 +01:00
fbsanchez c03631ec9b Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
 2019-03-05 18:56:14 +01:00
fbsanchez 4c0263206e WIP: Networkmap & recon improvements 
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
 2019-03-05 16:12:29 +01:00
Daniel Rodriguez 6bc73b54cb Merge branch 'ent-3529-7431-conteo-de-agentes-deshabilitados-en-metaconsola' into 'develop' 
Fixed downtimes disabled and enabled agents

Closes pandora_enterprise#3529

See merge request artica/pandorafms!2205

Former-commit-id: dc624b9b6f73ca1a56527c71ba4b0495ad219aaa
 2019-03-05 14:43:10 +01:00
artica 930c527ad2 Auto-updated build strings. 
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
 2019-03-05 00:01:26 +01:00
fbsanchez f557d09529 discoveryserver change default value (server) and minor fix in subst_column_macros 
Former-commit-id: ff22af353cf794ae0600a23d61fd30256193d463
 2019-03-04 15:01:50 +01:00
artica 3ed6a2b089 Auto-updated build strings. 
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
 2019-03-04 00:01:22 +01:00
artica 62c7e8dffc Auto-updated build strings. 
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
 2019-03-03 00:01:24 +01:00
artica b194d439d2 Auto-updated build strings. 
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
 2019-03-02 00:01:29 +01:00
artica 8fc432b934 Auto-updated build strings. 
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
 2019-03-01 00:01:32 +01:00
Fermin 511c5e3d10 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/25.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/install.php
	pandora_server/util/pandora_db.pl

Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
 2019-02-28 17:13:48 +01:00
artica a8a9a9d620 Auto-updated build strings. 
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
 2019-02-28 00:01:32 +01:00
fbsanchez f979af0735 minor fixes 
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
 2019-02-27 13:56:06 +01:00
artica 26560c734c Updated version and build strings. 
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
 2019-02-27 11:25:50 +01:00
artica 65b89f6688 Auto-updated build strings. 
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
 2019-02-27 00:01:47 +01:00
fbsanchez c1aaacbc07 minor updates in plugintools 
Former-commit-id: 85d3d6a099d4b08b1d79d996157e1725e3414809
 2019-02-26 18:16:10 +01:00
fermin831 86509caf6b Fixed downtimes disabled and enabled agents 
Former-commit-id: a5c2362e4faf6c0ed9ff2047b6d070aa4d7cdac8
 2019-02-26 14:44:51 +01:00
artica 88202977fa Auto-updated build strings. 
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
 2019-02-26 00:01:57 +01:00
fbsanchez 510833eaf1 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery 
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
 2019-02-25 10:47:46 +01:00
artica 9753faa17a Auto-updated build strings. 
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
 2019-02-25 00:01:36 +01:00
artica a49f68e96b Auto-updated build strings. 
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
 2019-02-24 00:01:50 +01:00
fbsanchez 6105ef1116 Quick fix DiscoveryServer 
Former-commit-id: 0dea07b53b993a82d233acec71a45f7a241a205e
 2019-02-23 00:35:59 +01:00
artica febe2cc3a6 Auto-updated build strings. 
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
 2019-02-23 00:02:37 +01:00
fbsanchez 4289684e00 Cloud Discovery RC1 
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
 2019-02-23 00:01:59 +01:00
fbsanchez 4abf19722b Minor fixes and improvements. Discovery 
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
 2019-02-22 18:12:01 +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
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
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
artica 0e39e3fef7 Auto-updated build strings. 
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
 2019-02-13 00:01:37 +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
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
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 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
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
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
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
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
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
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
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
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
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
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
artica e1bce89923 Auto-updated build strings. 
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
 2018-12-16 00:01:25 +01:00
artica 7af8f01b59 Auto-updated build strings. 
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
 2018-12-15 00:01:28 +01:00
artica b26d13db54 Auto-updated build strings. 
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
 2018-12-14 00:01:32 +01:00
artica 3d24bc264e Updated version and build strings. 
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
 2018-12-13 11:14:24 +01:00
artica 0648bf169c Auto-updated build strings. 
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
 2018-12-13 00:01:36 +01:00
artica 266b12f40a Auto-updated build strings. 
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
 2018-12-12 00:01:31 +01:00
artica 663c140b2b Auto-updated build strings. 
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
 2018-12-11 00:01:27 +01:00
fermin831 44f9a73a81 Added agent as name parameter in create_agent CLI function 
Former-commit-id: 1395aed8a79b8e26836ca523d457f939a006f5a1
 2018-12-10 12:17:12 +01:00
fermin831 32f665c761 Force to update the agent cache when an agent is created by server 
Former-commit-id: 0c00b9b2157e749bb33750a0715e16e91b02003c
 2018-12-10 11:15:13 +01:00
artica 7e40392740 Auto-updated build strings. 
Former-commit-id: b0e915bad1ff00a9c5c75276dd1234c97ea3319f
 2018-12-10 00:01:25 +01:00
artica 52520f151d Auto-updated build strings. 
Former-commit-id: 77fc145ae77c789a925853444723f45c6f43136a
 2018-12-09 00:01:27 +01:00
artica 9d65e6b27e Auto-updated build strings. 
Former-commit-id: 880eb1f55439b6ab5c4f0f86329377ff80bc2822
 2018-12-08 00:01:28 +01:00
artica e472612597 Auto-updated build strings. 
Former-commit-id: 8c3920b9c6a9f85574a5a3ad243b0a459c2a81ab
 2018-12-07 00:01:28 +01:00
artica 7d3b5664df Auto-updated build strings. 
Former-commit-id: 9536a5de43f0a3c635f058aa493d8bec3bf5d073
 2018-12-06 00:01:34 +01:00
artica fe47a9c07e Auto-updated build strings. 2018-12-05 00:01:38 +01:00
vgilc dfad4cf74f Merge branch 'pandora_enterprise/#3135-no-funciona-encriptacion-del-pandora_encrypt_db' into 'develop' 
Add a missing module to the Docker image and fix a related warning.

See merge request artica/pandorafms!2039
 2018-12-04 13:05:58 +01:00
Ramon Novoa e009ea5567 Add a missing module to the Docker image and fix a related warning. 2018-12-04 12:50:12 +01:00
artica 500601c67f Auto-updated build strings. 2018-12-04 00:01:28 +01:00
samucarc 517cb85547 Added new features in CLI to create and view alert commands 2018-12-03 17:38:57 +01:00
artica 76db57a8b6 Auto-updated build strings. 2018-12-03 00:01:26 +01:00
artica b5ac333dd4 Auto-updated build strings. 2018-12-02 00:01:27 +01:00
artica f18c7cfc08 Auto-updated build strings. 2018-12-01 00:01:45 +01:00
artica 2249ac4d8e Auto-updated build strings. 2018-11-30 00:01:26 +01:00
artica 4b1649d5f8 Auto-updated build strings. 2018-11-29 00:01:26 +01:00
Ramon Novoa 35cd33e446 Fix event replication for offline win32 nodes. 
Ref pandora_enterprise#3030.
 2018-11-28 13:33:15 +01:00
artica c48a0ffc49 Auto-updated build strings. 2018-11-28 00:01:25 +01:00
artica ad743d332e Auto-updated build strings. 2018-11-27 00:01:24 +01:00
artica b7546a5019 Auto-updated build strings. 2018-11-26 00:01:25 +01:00
artica 6bfe880dc8 Auto-updated build strings. 2018-11-25 00:01:24 +01:00
artica 53401e1f4d Auto-updated build strings. 2018-11-24 00:01:28 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
nramon 3586403a08 Merge branch 'fix/win32-set-names' into 'develop' 
Fix encoding related issues.

See merge request artica/pandorafms!2009
 2018-11-22 12:34:24 +01:00
Ramon Novoa 1abe45c662 Fix encoding related issues. 
Ref pandora_enterprise#3031.
 2018-11-22 12:29:41 +01:00
nramon 0b4b60dec9 Merge branch 'fix/win32-set-names' into 'develop' 
Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro!

See merge request artica/pandorafms!2008
 2018-11-22 11:02:47 +01:00
Ramon Novoa c8f94e6756 Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro! 
Ref pandora_enterprise#3031.
 2018-11-22 10:49:56 +01:00
artica de77e52297 Auto-updated build strings. 2018-11-22 00:01:28 +01:00
Ramon Novoa d912812127 Include Encode::CN, needed for cp936 support. 
Ref pandora_enterprise#3031.
 2018-11-21 12:17:22 +01:00
nramon 8735adc252 Merge branch 'feature/offline-license' into 'develop' 
Add support for offline licenses.

See merge request artica/pandorafms!2001
 2018-11-21 12:10:13 +01:00
Ramon Novoa 054546fd0f Add support for offline licenses. 
Ref pandora_enterprise#3098.
 2018-11-21 12:05:20 +01:00
artica fd6d830de3 Auto-updated build strings. 2018-11-21 00:01:25 +01:00
artica 01ba290a68 Auto-updated build strings. 2018-11-20 00:01:29 +01:00