Commit Graph

4259 Commits

Author SHA1 Message Date
Daniel Rodriguez a38ef3e729 Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop'
Added condition type not normal in alert templates

See merge request artica/pandorafms!2376

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

See merge request artica/pandorafms!2385

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


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

See merge request artica/pandorafms!2275

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

See merge request artica/pandorafms!2354

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