Commit Graph

3178 Commits

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