Commit Graph

19863 Commits

Author SHA1 Message Date
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
fbsanchez 9f60d824c5 Merge branch 'ent-3430-last-updates' into 'develop'
Updated breadcrum

See merge request artica/pandorafms!2203

Former-commit-id: f4497ff71f61bcb47c106bd2db13648ecc0f32b2
2019-02-26 12:40:16 +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
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
Daniel Rodriguez d7a8cdb181 Merge branch 'ent-2082-Mejoras-en-selector-de-widgets' into 'develop'
Ent 2082 mejoras en selector de widgets

See merge request artica/pandorafms!2201

Former-commit-id: 7a4a7bab989e10e3135f249c61d115dcaa0ea277
2019-02-25 19:10:21 +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
Alejandro Fraguas c603a9ecf3 Merge branch 'ent-3430-discovery' into 'develop'
Ent 3430 discovery

See merge request artica/pandorafms!2153

Former-commit-id: 92b4527dd76ecf403990669e08b6c43497b08fe9
2019-02-25 16:55:08 +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
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 13e49f92db added pcm_client and updated vmware-plugin path in pandora_update_version
Former-commit-id: 378948c8f5b90133b67b40ef5ea43f269bc0f6ea
2019-02-25 11:09:29 +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
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