9c08aa7b57
Auto-updated build strings.
...
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
2019-05-15 00:01:11 +02:00
b7ebb44c48
Auto-updated build strings.
...
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
2019-05-14 00:01:09 +02:00
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
f48dd94c65
Check not_normal alerts when evaluating unknown modules.
...
Former-commit-id: 80f58d4ebfaf5179312a19eae8ea09a4a8d0bff5
2019-05-13 13:44:08 +02:00
40af2205b1
Auto-updated build strings.
...
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
2019-05-13 00:01:06 +02:00
3fc5f183fd
Auto-updated build strings.
...
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
2019-05-12 00:01:06 +02:00
0008f57e35
Auto-updated build strings.
...
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
2019-05-11 00:01:09 +02:00
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
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
3119278b26
Auto-updated build strings.
...
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
2019-05-10 00:01:14 +02:00
7da73afd08
Auto-updated build strings.
2019-05-09 00:01:10 +02:00
f2873714a6
Auto-updated build strings.
2019-05-08 00:01:08 +02:00
9116a72a2b
Auto-updated build strings.
...
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
2019-05-07 00:01:09 +02:00
6d7b748591
Auto-updated build strings.
...
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
2019-05-06 00:01:06 +02:00
83b6fe5a55
Auto-updated build strings.
...
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
2019-05-05 00:01:07 +02:00
168ee6cdc6
Auto-updated build strings.
...
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
2019-05-04 00:01:07 +02:00
b88456f696
Auto-updated build strings.
...
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
2019-05-03 00:01:06 +02:00
828d7830a5
Auto-updated build strings.
...
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
2019-05-02 00:01:06 +02:00
a9e0acd3e1
Auto-updated build strings.
...
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
2019-05-01 00:01:10 +02:00
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
310d217fb2
Auto-updated build strings.
...
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
2019-04-30 00:01:09 +02:00
5d6bd31786
Auto-updated build strings.
...
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
2019-04-29 00:01:06 +02:00
141a042ee2
Auto-updated build strings.
...
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
2019-04-28 00:01:06 +02:00
29b7ddeb6d
Auto-updated build strings.
...
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
2019-04-27 00:01:09 +02:00
6de9b4f23e
Auto-updated build strings.
...
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
73c9a0e049
fixed change status WUX
...
Former-commit-id: 3f557ac0c2d8164bff7c5410b662127d39544f7f
2019-04-25 17:32:43 +02:00
7f7a727c21
Auto-updated build strings.
...
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
a49eaf90f6
Add support for 'not_normal' alert templates.
...
Former-commit-id: f9bf95bd64f399badcd5f00b80921255f4642a8c
2019-04-24 12:50:42 +02:00
8bba24e13a
Updated version and build strings.
...
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
4a699c2b75
Auto-updated build strings.
...
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +02:00
883f3decb4
Auto-updated build strings.
...
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
2019-04-23 00:01:09 +02:00
cf82ed3ae7
including several extra tokens in config
...
Former-commit-id: a391371f0c6d9ee034670a65fa7422e4b08e87df
2019-04-22 16:28:07 +02:00
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
f06e81dcc4
Discovery: Minor update in description and extra information in log
...
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
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
ea7a8b2b90
Auto-updated build strings.
...
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
2019-04-21 00:01:29 +02:00
1dfda59ce6
Auto-updated build strings.
...
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
2019-04-20 00:01:24 +02:00
7283d87a17
Auto-updated build strings.
...
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
2019-04-19 00:01:25 +02:00
9d8e2abd98
Auto-updated build strings.
...
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
2019-04-18 00:01:27 +02:00
ff5a33ba2c
Auto-updated build strings.
...
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
8bf92720ee
Auto-updated build strings.
...
Former-commit-id: 544097161030608395112a142ed341e26700a678
2019-04-16 00:01:30 +02:00
68258661b1
Auto-updated build strings.
...
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00
d0f6726d00
Auto-updated build strings.
...
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
2019-04-14 00:01:23 +02:00
ef0f7cded8
Auto-updated build strings.
...
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
2019-04-13 00:01:31 +02:00
8bdc980ab0
minor fix
...
Former-commit-id: 4222b217953e88da43d0f50d3217a065dbb13332
2019-04-12 23:47:21 +02:00
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
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
15cd02a49b
fix v1
...
Former-commit-id: f217f78e8085a81df68b9899513e547e148fca0d
2019-04-12 13:45:13 +02:00
f5088299f3
Auto-updated build strings.
...
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
2019-04-12 00:01:24 +02:00
e80649073f
Minor fixes
...
Former-commit-id: 71698d61db59e7f94fb8c770715decb0fe6e5f0f
2019-04-11 15:36:55 +02:00
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
e998c8dd70
Discovery RDS
...
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
2019-04-11 15:05:03 +02:00
c91893c948
spec console open and build_rpm for rhel7
...
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
2019-04-11 13:45:57 +02:00
29e1fc828c
Auto-updated build strings.
...
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
2019-04-11 00:01:30 +02:00
2af9cbb711
Discovery RDS Bypass perl thread ENV limitation
...
Former-commit-id: 34ca5374e66c174887683077ba5efcae5412b9bb
2019-04-10 23:16:18 +02:00
834d5d6c50
WIP:Discovery RDS
...
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
2019-04-10 20:40:03 +02:00
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
765ca945a0
Auto-updated build strings.
...
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
2019-04-10 00:01:25 +02:00
e59ce5412c
WIP Discovery RDS
...
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00
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
0d05d5c842
Auto-updated build strings.
...
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
2019-04-09 00:01:31 +02:00
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
54bd3bf089
Discovery F3
...
Former-commit-id: 1990149c5f5795f825bc337fd7ae29d360348d45
2019-04-08 16:23:32 +02:00
9fd5d3bf5a
Auto-updated build strings.
...
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
2019-04-08 00:01:23 +02:00
d35e9dbaae
Auto-updated build strings.
...
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
2019-04-07 00:01:25 +02:00
1ddb5ebff4
Auto-updated build strings.
...
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
2019-04-06 00:01:32 +02:00
b9db5fdb6f
wip discovery f3
...
Former-commit-id: 6b9f5bc3995a16414e1c1a9201983f33eb6908ad
2019-04-05 17:20:45 +02:00
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
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
db9068e25a
fixes in non agent per database
...
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
2019-04-05 10:41:09 +02:00
8d0e53924d
Auto-updated build strings.
...
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
2019-04-05 00:01:32 +02:00
e76a5af441
minor fix parent link
...
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
2019-04-04 18:20:26 +02:00
14ea1a4714
Fixed inverses intervals on server
...
Former-commit-id: 20f9e139bb3f40700e3081e4ce9ec134b70786a6
2019-04-04 17:47:40 +02:00
143c501a6e
minor fixes
...
Former-commit-id: 8d8c891a963b0e03838c2bf184b5da6bed01b2a9
2019-04-04 17:08:31 +02:00
1274380270
minor fix
...
Former-commit-id: a012c8155cd1d950044bc2c0531ee2abd9e89d07
2019-04-04 16:07:50 +02:00
56f2acbbf1
discovery.app.mysql rc1
...
Former-commit-id: 51304e872d375b480cbbf88d058b1804106afb98
2019-04-04 16:05:16 +02:00
ce9f9eab4e
rc1 mysql recon
...
Former-commit-id: 51e000229d6c2c94e59e8eeb8ef77d539ee6c775
2019-04-04 16:00:08 +02:00
fcafe76943
wip discovery f34
...
Former-commit-id: bb08450d3304ff140c4bae37e77b20a2329c600b
2019-04-04 12:28:17 +02:00
f64835dca9
Auto-updated build strings.
...
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
2019-04-04 00:01:27 +02:00
9e83f139e1
WIP discovery f3
...
Former-commit-id: cee7ee096e0a0c065bc4312a149ee223303224fc
2019-04-03 22:52:37 +02:00
654e0c28f6
WIP discovery F3 app db my multiserver
...
Former-commit-id: a85c048a6d4e755b76a7e042e04cfebdfe69b6f4
2019-04-03 22:44:06 +02:00
74303168ac
WIP discovery F3
...
Former-commit-id: 493d05714a31c2f91f7b8ea5445397ebf1c526d7
2019-04-03 21:55:11 +02:00
60f37eac57
removed unused folders
...
Former-commit-id: 4c1870e836e7f05dd5a312e41c4f1f86bff26e22
2019-04-03 21:08:52 +02:00
798a2aad16
WIP discovery F3
...
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
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
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
30e9b67062
Auto-updated build strings.
...
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
2019-04-03 00:01:33 +02:00
11b2fbc245
WIP db
...
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
7af141258e
Add a missing configuration option.
...
Former-commit-id: 4a516f1507cba486defb0c6be7b63b12cebc383e
2019-04-02 10:30:53 +02:00
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
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
f67c3d5fc0
Auto-updated build strings.
...
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
2019-04-02 00:01:31 +02:00
5ca01b0294
add ff_type linux agent
...
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
2019-04-01 10:27:24 +02:00
2d26a74f9e
Auto-updated build strings.
...
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
69df187ae5
Auto-updated build strings.
...
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
05ce178854
Fixed week day cron in server
...
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
2019-03-29 11:51:51 +01:00
2a96b610d9
Auto-updated build strings.
...
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
33197df731
add new functionality flipflop
...
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
2019-03-28 17:33:49 +01:00
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
98a9c62de9
Auto-updated build strings.
...
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
74cb6970dc
Updated version and build strings.
...
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
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
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
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
8160983e36
Auto-updated build strings.
...
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
2019-03-27 00:01:24 +01:00
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
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
90a2e28247
Auto-updated build strings.
...
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
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
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
3916bcf636
Auto-updated build strings.
...
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
0e51cd0760
Auto-updated build strings.
...
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
2019-03-24 00:01:23 +01:00
9efd962867
Auto-updated build strings.
...
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
2019-03-23 00:01:24 +01:00
cb8cd37ee7
Auto-updated build strings.
...
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
2019-03-22 00:01:32 +01:00
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
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
dfadf48b4e
Auto-updated build strings.
...
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
2019-03-21 00:02:00 +01:00
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
9b68e7d04e
Switch extended events to standard events in host creation (recon)
...
Former-commit-id: 74ee131b3b4083fd50cc37e1a7854ad159afa13a
2019-03-20 14:15:33 +01:00
d7e5858050
Added new functionality in CLI create_network_component
...
Former-commit-id: 89e2bf6002da2f68c09d06e6756f8a7be7c4c241
2019-03-20 12:48:44 +01:00
c598eb60fb
Auto-updated build strings.
...
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
392c0d0bff
Auto-updated build strings.
...
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +01:00
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
4772f84850
Auto-updated build strings.
...
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00
093404eedc
Auto-updated build strings.
...
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
2019-03-17 00:01:29 +01:00
16d5bf5f66
Auto-updated build strings.
...
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
2019-03-16 00:01:30 +01:00
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
be08d76e6c
Auto-updated build strings.
...
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +01:00
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
0ccbb1198a
Auto-updated build strings.
...
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
83fc35c0c8
DNS plugin updated
...
Former-commit-id: c9b9da2c19eeeae743691b6d250ee2bbe09179cb
2019-03-13 12:42:17 +01:00
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
99afea22cb
Auto-updated build strings.
...
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
67080c72d9
Auto-updated build strings.
...
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
3b2d72308e
Merge branch 'ent-1800-Cambiar-informacion-de-los-instaladores' into 'develop'
...
Changed Maintainer in pandorafms-agent-unix
See merge request artica/pandorafms!2228
Former-commit-id: 861dfec496f2040810d0962e03cca41b2f180462
2019-03-11 14:23:00 +01:00
0210c2381d
Auto-updated build strings.
...
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
b79815bb06
Auto-updated build strings.
...
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
fd68b49710
Auto-updated build strings.
...
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
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
e43d1aa356
Auto-updated build strings.
...
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
2019-03-08 00:01:31 +01:00
4eb6c16339
Auto-updated build strings.
...
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
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
88f1f16a5a
Auto-updated build strings.
...
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +01:00
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
4c0263206e
WIP: Networkmap & recon improvements
...
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
2019-03-05 16:12:29 +01:00
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
930c527ad2
Auto-updated build strings.
...
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
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
3ed6a2b089
Auto-updated build strings.
...
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
62c7e8dffc
Auto-updated build strings.
...
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
b194d439d2
Auto-updated build strings.
...
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
3eef1b3dbe
Minor fix
...
Former-commit-id: 5e0e476822261c99c4c6e14d4be3b87880cce4a2
2019-03-01 13:26:15 +01:00
f0a3f4e9d7
Added configurable purge tnetwork_matrix
...
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
2019-03-01 12:39:55 +01:00
8fc432b934
Auto-updated build strings.
...
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
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
fb40ef7ce4
Changed Maintainer in pandorafms-agent-unix
...
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
2019-02-28 17:12:31 +01:00
a8a9a9d620
Auto-updated build strings.
...
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
f979af0735
minor fixes
...
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
2019-02-27 13:56:06 +01:00
26560c734c
Updated version and build strings.
...
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +01:00
9f92f3f010
Fixed
...
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
2019-02-27 10:35:40 +01:00
8f24c0cb18
Fixed conflict in CLI apply_policy
...
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
65b89f6688
Auto-updated build strings.
...
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
2019-02-27 00:01:47 +01:00
c1aaacbc07
minor updates in plugintools
...
Former-commit-id: 85d3d6a099d4b08b1d79d996157e1725e3414809
2019-02-26 18:16:10 +01:00
86509caf6b
Fixed downtimes disabled and enabled agents
...
Former-commit-id: a5c2362e4faf6c0ed9ff2047b6d070aa4d7cdac8
2019-02-26 14:44:51 +01:00
88202977fa
Auto-updated build strings.
...
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
2019-02-26 00:01:57 +01:00
510833eaf1
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
2019-02-25 10:47:46 +01:00
9753faa17a
Auto-updated build strings.
...
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
2019-02-25 00:01:36 +01:00
a49f68e96b
Auto-updated build strings.
...
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
2019-02-24 00:01:50 +01:00
6105ef1116
Quick fix DiscoveryServer
...
Former-commit-id: 0dea07b53b993a82d233acec71a45f7a241a205e
2019-02-23 00:35:59 +01:00
febe2cc3a6
Auto-updated build strings.
...
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
2019-02-23 00:02:37 +01:00
4289684e00
Cloud Discovery RC1
...
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
2019-02-23 00:01:59 +01:00
4abf19722b
Minor fixes and improvements. Discovery
...
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
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
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
b1149a053b
Auto-updated build strings.
...
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
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
6409fc2ddd
Added discovery name convention to server files
...
Former-commit-id: d432ac2c5526cc05b7cbb29df66aef60a35ab0e7
2019-02-21 15:07:51 +01:00
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
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
1156b29743
Auto-updated build strings.
...
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
6a43536b33
Discovery. Added App.VMw
...
Former-commit-id: 18a9300f37163048bd99109c08c1228231426a59
2019-02-20 19:30:25 +01:00
08c6d782a4
Add menuentry discovery
...
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
53a41a7a56
Auto-updated build strings.
...
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
7bd5851667
Add support for column macros.
...
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
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
906ba091e1
minor fixes/changes DiscoveryServer
...
Former-commit-id: 8273727109628f99fc86c125c9b6f62a416c07f1
2019-02-19 10:37:09 +01:00
2b3a72e938
Auto-updated build strings.
...
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
2019-02-19 00:01:28 +01:00
7f0b676e0f
Discovery tasks. Extended events. Autoconfigure detected agents.
...
Former-commit-id: da2282082606c970dbace453193eb0a7e4089731
2019-02-18 19:50:13 +01:00
28e5ff0bc2
Added new parameter in pandora_add_policy_queue
...
Former-commit-id: 0a257538c31f86c572d6bfa4fb480035e302364f
2019-02-18 16:58:04 +01:00
46af41a2cc
support for autoconfiguration
...
Former-commit-id: 034ed513ed9cf7efbe22720b61e8ff431ebbbc84
2019-02-18 14:00:55 +01:00
0ef118f401
Auto-updated build strings.
...
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00
1fafda8502
Auto-updated build strings.
...
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
2019-02-17 00:01:24 +01:00
0d93ccc094
Auto-updated build strings.
...
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
2019-02-16 00:01:31 +01:00
7a1b66755d
minor fixes H&D
...
Former-commit-id: a4ffc2e761dc0a4d06209fb1c448bc17d5d45022
2019-02-15 16:06:28 +01:00
45fd528e38
minor fixes H&D
...
Former-commit-id: c3236b91b4b6a0f37af2d4da4955c711dd4ace43
2019-02-15 16:02:55 +01:00
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
Daniel Rodriguez
Ramon Novoa
manuel
Alejandro Fraguas
Daniel Barbero Martin
artica
fbsanchez
Rafael Ameijeiras
fermin831
samucarc
Daniel Maya