Commit Graph

15538 Commits

Author SHA1 Message Date
artica 88f1f16a5a Auto-updated build strings.
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +01:00
fbsanchez 825128e31e WIP: minor updates in notification wrapper
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
2019-03-05 19:10:44 +01:00
fbsanchez 63ee3b0329 wip: style checks
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
fbsanchez 70e4e86cdf Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +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
Alejandro Fraguas 63cd5fe018 Merge branch 'ent-3530-SNMP-event-graph-not-working' into 'develop'
Fixed width unit on graph, setted to px instead of %

See merge request artica/pandorafms!2234

Former-commit-id: 52caaa0de71150e62616b363471aa4bafadf4fcb
2019-03-05 18:06:45 +01:00
alejandro-campos 5c65f2541d Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 12579e897dc21339580e7b52f4de593714431c58
2019-03-05 16:48:41 +01:00
alejandro-campos 0548fdd95f Change english strings
Former-commit-id: 47d1b455f4997ce7b63672678aaeb42a8205e957
2019-03-05 16:48:27 +01:00
fbsanchez 4c0263206e WIP: Networkmap & recon improvements
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
2019-03-05 16:12:29 +01:00
Daniel Maya e26c81aa6c Fixed images and reset map in networkmap
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
alejandro-campos 4943521904 fix pandora migrate script
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
2019-03-05 15:28:39 +01:00
alejandro-campos 9d29af2af5 add new field for table treport_content
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
2019-03-05 15:15:48 +01:00
alejandro-campos da0f0b492a Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: dbfc5603652eacc4214e6503b5603bd79f834984
2019-03-05 15:06:18 +01:00
alejandro-campos 09897591c3 Add extended events to event reporting tables
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +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
Alejandro Fraguas 590accf90c Merge branch 'ent-3403-Pantalla_en_blanco_con_credenciales_erroneas_en_config_php' into 'develop'
Added new alert when failed database

See merge request artica/pandorafms!2229

Former-commit-id: b2fef57a8988766b75c048542c746977f03aba4e
2019-03-05 13:42:33 +01:00
Tatiana Llorente 033eb2ff7c Fixed problem with install.php #3432
Former-commit-id: 7b1ac63e6a032fe2b1511c15e783fc5bbb6ac537
2019-03-05 13:33:29 +01:00
Tatiana Llorente 35633d181b Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/install.php


Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
fbsanchez 054bc070f7 WIP review netmaps
Former-commit-id: 167c0fa7aacf7b3e916e9572faf43e32eee116dc
2019-03-05 13:19:03 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Daniel Rodriguez f817a94609 Merge branch 'ent-3319-ldap-save-password-conf-not-saving' into 'develop'
Fixed ldap conf tooltips

See merge request artica/pandorafms!2238

Former-commit-id: 355e217947287e500ea146a8f3777ec1cb3bc219
2019-03-05 10:34:15 +01:00
Luis Calvo 2ceba76d22 Fixed ldap conf tooltips
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
artica 930c527ad2 Auto-updated build strings.
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
fbsanchez d89e3993e7 WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
2019-03-04 20:02:35 +01:00
fbsanchez ab453fde68 WIP: event extended reports
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
fbsanchez 92974c71d9 Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: d6708f1ea30390850ca133f8bd474e177863b016
2019-03-04 16:43:55 +01:00
fbsanchez 756fdd2cd4 minor fix in supervisor - server status global counter
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
2019-03-04 16:43:48 +01:00
daniel 9d7c6854a8 fixed error in snmp browser change server
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
Daniel Maya 1f1c9de887 changes in default values in networkmap
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
2019-03-04 15:31:07 +01:00
fbsanchez 9fd391a819 Make always basic checks while browsing pandora
Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c
2019-03-04 14:57:57 +01:00
fbsanchez 5e496d0d7a Fixed url target in Supervisor
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
2019-03-04 14:52:57 +01:00
Daniel Rodriguez 1cfabda53e Merge branch 'ent-3224-7026-anadir-token-agent-name-as-alias-a-importacion-de-agentes-por-csv' into 'develop'
Modified agents_create_agent to permit create agents with name as alias

See merge request artica/pandorafms!2209

Former-commit-id: ef47fc540cedd0c06b58805a3fb162d5807ecc32
2019-03-04 13:22:56 +01:00
manuel 488be0d602 Changed radio buttons by checkbox switch
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
Tatiana Llorente 12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +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
fbsanchez 41138fbfbb discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +01:00
Luis Calvo d4b79179d9 Fixed width unit on graph, setted to px instead of %
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
daniel c5a5df01f6 add tip SLA Services
Former-commit-id: da452d98c0b3b43d36c4c53de70df762f6530c8d
2019-03-01 14:26:25 +01:00
daniel fadf75a626 fixed minor error lenght str.warning and str.critical 1024 charts
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
daniel 02ff69ea0b fixed errors SLA With planned downtime
Former-commit-id: 7350d33d917f967ea624e4763ed816af97c0743a
2019-03-01 12:34:34 +01:00
Alejandro Fraguas a5c3136321 Merge branch 'ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into 'develop'
fix discover task view

See merge request artica/pandorafms!2223

Former-commit-id: f8c236623756ef6e76d54cf4ab905f706df1ea84
2019-03-01 12:16:08 +01:00
fbsanchez adb25e91f8 Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
2019-03-01 11:09:11 +01:00
fbsanchez b4170ca285 minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
2019-03-01 11:08:49 +01:00
fbsanchez d547024274 fixes non-enterprise components
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
2019-03-01 09:51:16 +01:00
fbsanchez ed9b736299 Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
2019-03-01 09:50:09 +01:00
Alejandro Gallardo Escobar 42d8e72400 Recovered the lost code for the current user macro at the event responses.
(cherry picked from commit d554dcc7db [formerly 1a5860bc7a62efecba44d467df9eb9cf7e25070b])


Former-commit-id: de201ec04f1dc211c56db3fc0dbf8ae66a549ddf
2019-03-01 09:40:36 +01:00
artica 8fc432b934 Auto-updated build strings.
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
samucarc 7e53461b94 Added new alert when failed database
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
Daniel Maya fb40ef7ce4 Changed Maintainer in pandorafms-agent-unix
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
2019-02-28 17:12:31 +01:00
manuel 46089b31a8 Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/install.php


Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
2019-02-28 13:36:18 +01:00
Daniel Maya cefaccb651 Fixed synchronize collections in node
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
2019-02-28 13:02:59 +01:00
daniel 95b5c4ad01 add new macro for alert events
Former-commit-id: 08c5bf0168bcd5d9c23a23443187870269d61a40
2019-02-28 12:30:01 +01:00
alejandro-campos 52d6dfe815 fix discover task view
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
2019-02-28 12:00:43 +01:00
artica a8a9a9d620 Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
fbsanchez ec5c9d7c27 clippy returns
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
2019-02-27 13:41:26 +01:00
daniel e55e47cbfa change mr
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
2019-02-27 11:35:00 +01:00
alejandro-campos 0a37f6d848 add changes to migrate script
Former-commit-id: 7e1beeed2a8ff709cdd2e2ff992b610cd4aa7409
2019-02-27 11:32:39 +01:00
artica 26560c734c Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +01:00
daniel 8780571a74 add new functionality in event response
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
samucarc 9f92f3f010 Fixed
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
2019-02-27 10:35:40 +01:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
Alejandro Fraguas 75b889ff4a Merge branch 'ent-3430-proyecto-discovery' into 'develop'
Ent 3430 proyecto discovery

See merge request artica/pandorafms!2210

Former-commit-id: 104df0b898d6f4bb9eef21005cca6a3f74c3e035
2019-02-27 10:02:14 +01:00
Daniel Rodriguez e18eaaf415 Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'
Ent 3287 sincronizacion plugin de servidor

See merge request artica/pandorafms!2199

Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
2019-02-27 09:58:42 +01:00
artica 65b89f6688 Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
2019-02-27 00:01:47 +01:00
fbsanchez 7ed3252ca5 minor fixes
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
2019-02-26 20:23:52 +01:00
fbsanchez 24a1adfb9f minor fix
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
2019-02-26 20:08:01 +01:00
fbsanchez a8874f9b1b Minor fixes
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
2019-02-26 20:00:41 +01:00
Daniel Rodriguez 33235b26d3 Merge branch '3597-Pequeno_arreglo_config_732' into 'develop'
fix minor error

See merge request artica/pandorafms!2202

Former-commit-id: fded71effc82a3ffde4d3a003f6f090f9e8e4b9f
2019-02-26 18:19:58 +01:00
fbsanchez 0e7c498e1a Comment updates
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
2019-02-26 17:53:58 +01:00
fbsanchez 5382f07ae2 Comment updates in wizard class
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
2019-02-26 17:42:12 +01:00
fbsanchez 5b3ce09515 Comment updates in wizard class
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
2019-02-26 17:41:42 +01:00
fermin831 e19e7d3484 Modified agents_create_agent to permit create agents with name as alias
Former-commit-id: 9d3524e2dc02beb92d819cd877b9b44f64154fd5
2019-02-26 17:30:21 +01:00
Daniel Maya 2c0c050507 Disabled cache in server plugin synchronization
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
2019-02-26 17:20:23 +01:00
Alejandro Fraguas d177bda2bd Merge branch 'ent-3520-7484-Autenticación-por-ldap-no-contempla-la-posibilidad-de-ldaps' into 'develop'
Parameter changes deprecated in LDAP

See merge request artica/pandorafms!2168

Former-commit-id: 8cccefd16b2fab4134ddd397b45094936155ceea
2019-02-26 16:57:25 +01:00
Alejandro Fraguas 441fb979e1 Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios

See merge request artica/pandorafms!2195

Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
fermin831 86509caf6b Fixed downtimes disabled and enabled agents
Former-commit-id: a5c2362e4faf6c0ed9ff2047b6d070aa4d7cdac8
2019-02-26 14:44:51 +01:00
alejandro-campos 7791639b35 fix bad image routes
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
manuel c886dd1dfa Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php


Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
Daniel Maya 45419fbfb0 Fixed href in plugins with centralized node
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
2019-02-26 12:23:46 +01:00
manuel 875d7ecaba Unified sizes of the checkbox switch
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
Tatiana Llorente 34eedc5330 new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
Tatiana Llorente 3e87c8e931 new header and menu
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
fbsanchez c38ac4b837 Updated breadcrum
Former-commit-id: 51c14ea50e6c7d419d610ef1b52c4769214495ef
2019-02-26 10:34:37 +01:00
Luis Calvo de7c1ce978 Fixed ACL selection menu wrong sec for visual console
Former-commit-id: dd9f4a212f43774c2602932baa0c1a83e3ba6e56
2019-02-26 09:40:04 +01:00
daniel d4c46ec14f fix minor error
Former-commit-id: 81b5c41c49a5e121c5ac34c12bfd5b1b7f5f943a
2019-02-26 08:44:50 +01:00
artica 88202977fa Auto-updated build strings.
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
2019-02-26 00:01:57 +01:00
Daniel Rodriguez 11106f9b86 Merge branch 'ent-2835-revision-visor-de-logs' into 'develop'
Added models in tlog_graph_models

See merge request artica/pandorafms!2200

Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
2019-02-25 19:37:49 +01:00
Alejandro Campos 7f47a4504b Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets'
# Conflicts:
#   pandora_console/extras/mr/25.sql

Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
2019-02-25 18:47:28 +01:00
alejandro-campos 4bf7469565 change mr and migrate for table twidget
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
2019-02-25 18:42:52 +01:00
alejandro-campos 13cbc78fdd change mr and migrate for table twidget
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
2019-02-25 18:41:24 +01:00
Daniel Maya 16f1474691 Added models in tlog_graph_models
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
2019-02-25 17:45:37 +01:00
alejandro-campos db5d2ceee1 fix bad routes in services treeview
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
fermin831 ac9452583a Added no data to show to some graphs where id not found
Former-commit-id: 1697a482e80521666f679eb18d2f44fc3975e304
2019-02-25 16:50:27 +01:00
manuel b7cc25314d Unified sizes of the checkbox switch
Former-commit-id: 392fdf006c81fb5586349b8a4b4544e0c07aa903
2019-02-25 16:20:05 +01:00
alejandro-campos 67e53bf7a7 add new way of importing css for treeview
Former-commit-id: d88bb38ac7d20ab5f554cfb1399b17ddf6f62fb2
2019-02-25 16:15:17 +01:00
Daniel Maya 5812a8bdaa Merge remote-tracking branch 'origin/develop' into ent-3287-Sincronización-plugin-de-servidor
Former-commit-id: 93fd236f1876132a18aae31f8ccbcd888a1613f0
2019-02-25 15:43:33 +01:00
fbsanchez d8ee90c285 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
fbsanchez cdca720d9a minor fix user_edig
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +01:00
Daniel Rodriguez 7f01e47e1f Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar

See merge request artica/pandorafms!2132

Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
daniel 504a8e9d1a fixed warnings php
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
Tatiana Llorente 6ec148c59c new header and menu
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
2019-02-25 12:28:41 +01:00
Tatiana Llorente 4c92375a58 new header and menu
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
Tatiana Llorente 526311d1c6 new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
alejandro-campos be7eadeb2c extend status change functionality in monitor detail view custom fields
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
fbsanchez 1f26a8c4b3 Updated message warnings in Tasklist
Former-commit-id: beb870813818ff8a7000ffaac7e09f326f0bf253
2019-02-25 11:30:09 +01:00
fbsanchez 4da8f54f84 Updated message warnings in Tasklist
Former-commit-id: 9f8324e4f882e14451bda7034b1ff081c14a7a41
2019-02-25 11:29:39 +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 797f922748 Discovery Tasklist minor fixes
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
2019-02-23 12:13:54 +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 8b5f50f883 Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
fbsanchez 4abf19722b Minor fixes and improvements. Discovery
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
Daniel Maya 12b8042c53 Added server plugins in meta
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
2019-02-22 14:26:58 +01:00
fermin831 2c1eb0fe03 Added aws view menu
Former-commit-id: a64079eb5e773d3fe36031bac856aa801728f79d
2019-02-22 14:16:39 +01:00
alejandro-campos faae9c58b3 implement services tree view
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
daniel f0c9d16318 fixed errors view discovery task list
Former-commit-id: 7e3160cde5c0fa46ee3d918789ffec4091f42c31
2019-02-22 13:45:59 +01:00
fbsanchez 1feebae564 removed fullurl supervisor
Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a
2019-02-22 13:33:46 +01:00
alejandro-campos eb56fd566c implemented services treeview
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
daniel 3d2bfa95b5 add table console task in discovery
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
2019-02-22 12:53:35 +01:00
fbsanchez e65d128b25 minor fix db schema
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
2019-02-22 12:40:02 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
marcos.alconada 35ad2f4bb5 Validations for default values
Former-commit-id: a33139b817ece206a611d5f2678b62c876a8e41f
2019-02-22 11:21:38 +01:00
fbsanchez 42448cf0d8 Updated path for discovery plugins
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
2019-02-22 10:41:54 +01:00
Alejandro Fraguas e55915e1e2 Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop

See merge request artica/pandorafms!2193

Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
Alejandro Fraguas 1aa60fd15d Merge branch 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'
Ent 3511 bug en la edicion del widget de tipo agent/module view

See merge request artica/pandorafms!2190

Former-commit-id: bffc145be0e0eee4265dcdf7d8be2447e467bb79
2019-02-22 09:18:11 +01:00
artica b1149a053b Auto-updated build strings.
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
alejandro-campos 45bba4faa8 fix agent name input
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
fbsanchez 64679ee72e discovery minor fixes
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
2019-02-21 18:00:50 +01:00
alejandro-campos 59159ec473 change last status change info
Former-commit-id: e40f4ce7f042219584f0224822ca8a112f453194
2019-02-21 17:22:00 +01:00
Alejandro Fraguas a9eb3cf37b Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
Fixed filter by name of agents in events when they contain spaces

See merge request artica/pandorafms!2160

Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
fermin831 9e9d915609 Modified redirection
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
2019-02-21 15:35:44 +01:00
fbsanchez e856969a59 Minor fix changed vmware_plugin reference to vmware-plugin
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
2019-02-21 15:13:27 +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
fbsanchez 8fb84e910a Minor SQL fixes discovery
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
2019-02-21 14:29:59 +01:00
fbsanchez 1167cfcafc Minor SQL fixes discovery
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
2019-02-21 14:27:09 +01:00
fbsanchez e32c4025a4 Supervisor. minor fixes
Former-commit-id: 036bc6a871db86d7a8925c7d5e2531d9f62ca839
2019-02-21 14:18:33 +01:00
fbsanchez fd77b94f96 Fix regexp Supervisor
Former-commit-id: 7dc32dd119ae78a3158e7c5d20bc5f73a8c94d2f
2019-02-21 14:16:17 +01:00
marcos.alconada 6ef1c3951a Ticket Changed
Former-commit-id: e258f0932398d9fc58a8d097098c83b7bed084c5
2019-02-21 14:04:00 +01:00
fbsanchez c12ba3b12e Minor MR and sql updates - presets
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
2019-02-21 13:58:29 +01:00
fbsanchez 698451ee98 MR25 Discovery
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
2019-02-21 13:38:58 +01:00
Alejandro Fraguas a54903d9c6 Merge branch 'ent-3279-planned-downtime-creation-api-cli' into 'develop'
API/CLI: fixed planned downtime creation

See merge request artica/pandorafms!2184

Former-commit-id: 84f21e2c9762af3a1c1c04c24dc6e35848c0f437
2019-02-21 13:32:15 +01:00
daniel d9e0f2ea42 Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
daniel dc4d5b1bd7 fixed error in widget
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
alejandro-campos acf3c94642 fix bad solved conflict and added changes in bd to migrate and mr
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
2019-02-21 13:16:32 +01:00
fbsanchez 4148387c50 Updates discovery
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00