tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,535 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

2135 Commits

Author SHA1 Message Date
marcos 26acac191f ad not condition on monitor detail 2021-06-25 09:37:26 +02:00
fbsanchez 36e455e5c5 Fixes for agent_module widget 2021-06-23 18:00:54 +02:00
marcos fafcef7e85 se command sanpshot black theme 2021-06-23 17:35:16 +02:00
fbsanchez 76fbf75572 Fix for filtering common modules 2021-06-23 14:31:42 +02:00
fbsanchez be09c1c64d Some changes, multibox fixes for metaconsole 2021-06-23 14:24:16 +02:00
fbsanchez 9fb7074082 minor fix 2021-06-22 19:44:41 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
fbsanchez 1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
marcos 56b6418716 add not condition filter 2021-06-17 15:04:21 +02:00
marcos dff7220be9 add not condition filter 2021-06-17 14:59:43 +02:00
marcos 0cfb7c994f fixed merge conflict 2021-06-14 11:02:57 +02:00
marcos ee4a3dc450 fixed merge conflict 2021-06-14 10:52:50 +02:00
marcos 5162864b28 fixed merge conflict 2021-06-14 09:03:17 +02:00
marcos 0ab343e672 merge conflict 2021-06-14 08:26:33 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin a9864f7d87 Wip command center, clean functions db 2021-06-10 08:45:50 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
marcos c4c772032a add help string on status monitor not condition 2021-05-26 10:35:35 +02:00
José González e7b59ab472 Added standarized headers 2021-05-26 10:16:23 +02:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Junichi Satoh 362855a24e Fixed to follow ACL with get_agents_group_json. 2021-05-24 18:56:18 +09:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
alejandro.campos@artica.es 2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es 86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez 4e871ed296 Merge branch 'ent-6983-typo-en-traduccion' into 'develop' 
fixed wrong string

See merge request artica/pandorafms!4099
 2021-05-12 07:55:09 +00:00
Daniel Rodriguez 8a3d977e82 Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop' 
Ent 5401 búsqueda de módulo por id al llegar desde link de consola

See merge request artica/pandorafms!4026
 2021-05-11 15:38:01 +00:00
Daniel Rodriguez a0197dab87 Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop' 
Ent 7453 busqueda alertas en vista de agente no funciona

See merge request artica/pandorafms!4084
 2021-05-10 09:15:40 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' 
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
 2021-05-10 08:15:50 +00:00
marcos e526cfbfad add not option in monitor detail filter 2021-05-07 11:16:28 +02:00
marcos 943232ed7e add not option in monitor detail filter 2021-05-07 09:32:54 +02:00
marcos f03364bf96 add not option in monitor detail filter 2021-05-06 17:08:11 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
José González 3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Daniel Maya a193234270 #7453 Fixed id alert_list 2021-04-28 16:46:27 +02:00
Daniel Rodriguez e9956092d4 Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop' 
Fixed errors display tab ehorus

See merge request artica/pandorafms!4078
 2021-04-28 11:24:45 +00:00
Daniel Barbero Martin d3f3364830 Fixed errors display tab ehorus 2021-04-27 11:06:17 +02:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Daniel Maya bdbfe81f31 Fixed id_agente_modulo in sql condiction 2021-04-13 12:24:35 +02:00
alejandro.campos@artica.es 93f3551326 Create interface views 2021-04-12 18:17:09 +02:00
Daniel Rodriguez b4e469c463 Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Reverted failed change

Closes pandora_enterprise#7040

See merge request artica/pandorafms!4007
 2021-04-12 14:40:28 +00:00
Daniel Rodriguez a203a6e80d Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' 
fixed size box log sources status

See merge request artica/pandorafms!4006
 2021-04-09 09:35:50 +00:00
Jose Gonzalez 34b01fdf51 Merge 2021-04-07 13:10:52 +02:00
marcos 7a5125ea8c fixed size box log sources status 2021-04-07 11:52:57 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
Calvo d0bddbe27c Fixed metaconsole ACL on module graphs view 2021-03-31 10:30:18 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
marcos b4cc075870 resolved error with modal module detail on agent detail 2021-03-24 14:10:46 +01:00
Daniel Rodriguez 3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' 
fixed visual error group view

See merge request artica/pandorafms!3897
 2021-03-17 15:22:01 +00:00
marcos 0195a80b78 fixed visual error 2021-03-17 14:41:36 +01:00
marcos 137a2c31ad fixed visual fails 2021-03-15 15:30:56 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
marcos ac3587208b fixed visual error 2021-03-12 12:10:56 +01:00
marcos de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop' 
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
 2021-03-10 15:56:15 +00:00
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-10 10:17:27 +00:00
Daniel Rodriguez 1846cb6471 Merge branch 'ent-6888-uniway-deshabilitar-boton-crear-una-vez-pulsado-para-evitar-duplicados' into 'develop' 
avoid double networkmap creation

See merge request artica/pandorafms!3762
 2021-03-09 16:38:51 +00:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
alejandro.campos@artica.es 0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Rodriguez f6d9997b16 Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop' 
Ent 6547 visual styles cambio de tamaño agente modulo y descripcion

See merge request artica/pandorafms!3707
 2021-03-01 10:57:08 +00:00
Daniel Rodriguez 5661f9fbdd Merge branch 'ent-5163-error-texto-pestaña-Network-tools-agente' into 'develop' 
Fixed

Closes pandora_enterprise#5163

See merge request artica/pandorafms!3713
 2021-03-01 10:32:55 +00:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
Daniel Rodriguez f92ba2ce3d Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop' 
Modified query for show only available alerts

Closes pandora_enterprise#6503

See merge request artica/pandorafms!3672
 2021-01-25 10:11:25 +01:00
Jose Gonzalez 579b8d4965 Solve issue and added correct headers 2021-01-14 19:08:01 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
fbsanchez f89397996f avoid double networkmap creation 2021-01-08 11:59:45 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop' 
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
 2020-12-23 17:19:46 +01:00
Daniel Rodriguez 41730cbe58 Merge branch 'ent-6339-Monitors-View-Metaconsole' into 'develop' 
Ent 6339 monitors view metaconsole

See merge request artica/pandorafms!3676
 2020-12-23 11:46:00 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
Daniel Rodriguez 697b467a77 Merge branch 'ent-5115-Metaconsola-Vista-de-monitores' into 'develop' 
Ent 5115 metaconsola vista de monitores

See merge request artica/pandorafms!3659
 2020-12-17 16:51:57 +01:00
Daniel Rodriguez 398cc3ac2a Merge branch 'ent-6689-Selector-de-grupos-muy-estrecho-en-Monitors-View-metaconsola' into 'develop' 
fix name filters

See merge request artica/pandorafms!3664
 2020-12-17 16:37:31 +01:00
Jose Gonzalez 959fbd4764 WIP: Backup upload 2020-12-17 13:04:21 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Jose Gonzalez 0e20c3d547 Fixed 2020-12-11 09:38:37 +01:00
Daniel Maya fcf4b6c239 Fixed Agent and module text size 2020-12-10 12:06:56 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
Daniel Maya 2b52b3beef Show data type 2020-12-01 12:29:53 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b3437b3432 fix name filters 2020-11-27 08:24:01 +01:00
Daniel Maya e9f8077c23 Fixed section in metaconsole 2020-11-26 12:28:12 +01:00
Daniel Rodriguez 38c9dafa1b Merge branch 'ent-6061-vmware-view' into 'develop' 
Discovery task instead Recon task in some places

See merge request artica/pandorafms!3507
 2020-11-17 16:38:29 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Daniel Rodriguez 79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop' 
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
 2020-10-30 13:28:35 +01:00
Daniel Rodriguez 64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop' 
fix charts

See merge request artica/pandorafms!3581
 2020-10-30 13:23:03 +01:00
Daniel Rodriguez 4f3e09c6c3 Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop' 
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0

See merge request artica/pandorafms!3541
 2020-10-29 13:43:10 +01:00
fbsanchez 98a04bfcf8 omg... what a file 2020-10-29 12:55:44 +01:00
fbsanchez 2748f0ac29 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:41:24 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
fbsanchez 29174a87ef removed strict-user from monitor detail 2020-10-26 10:14:14 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 6b25ae6004 improved agent_module report (CSV) 2020-10-21 13:23:17 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Maya 3c95d17482 Fixed new_agent 2020-10-20 16:15:42 +02:00
fbsanchez 5ce1bd23e4 Discovery task instead Recon task in some places 2020-10-07 10:56:40 +02:00
Daniel Rodriguez e403c781ea Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop' 
Group selection improvement

See merge request artica/pandorafms!3450
 2020-10-05 13:11:23 +02:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
marcos add9387876 fixed error on create empty network map 2020-09-30 14:42:51 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
fbsanchez d152ba2980 estado_agente prevent filter options overlapping 2020-09-28 16:11:26 +02:00
Jose Gonzalez 7f45a2133d Added lost connection data in stat_win file 2020-09-21 17:40:54 +02:00
Luis Calvo 4a93f6c3a6 Fixed metaconsole SNMP interface graphs 2020-09-08 11:48:27 +02:00
Daniel Rodriguez 37c8cb74ce Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop' 
Implemented log source status info box in agent view

See merge request artica/pandorafms!3379
 2020-08-19 10:36:00 +02:00
alejandro-campos 29026ef3be changed tooltip 2020-08-19 09:10:17 +02:00
Marcos Alconada 50c089587d Update estado_monitores.php 2020-08-07 08:39:58 +02:00
alejandro-campos 4edef7099b added check to display log sources info box when log collector activated 2020-07-15 09:25:39 +02:00
alejandro-campos 909d7cba58 Implemented log source status info box in agent view 2020-07-14 17:12:38 +02:00
marcos e2ae568ed3 change message in non initialited modules 2020-07-07 15:48:31 +02:00
fbsanchez 2de8f2b730 minor fix 2020-05-29 13:40:43 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
Daniel Rodriguez 46f1f44883 Merge branch 'ent-5574-field-description-not-in-general-search-nor-agent-detailed' into 'develop' 
Added agent description to search and agent detail

See merge request artica/pandorafms!3130
 2020-05-12 12:53:32 +02:00
fbsanchez 58eeffd04d clearer maps 2020-04-13 18:28:56 +02:00
marcos 333f3ba9f0 show full graph 2020-04-06 18:18:39 +02:00
marcos 6a9b55ea36 fixed minnor error 2020-04-06 14:48:26 +02:00
Luis Calvo e575f65b6a Added agent description to search and agent detail 2020-03-31 20:02:28 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
alejandro-campos 531e729ebe added N/A in case last status change is not set 2020-03-25 18:01:39 +01:00
alejandro-campos 9d14c25b40 added order functionality to last status change column 2020-03-23 13:19:08 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
alejandro-campos db3709164a Merge branch 'develop' into ent-5214-Bug-rutas 2020-03-12 13:15:19 +01:00
Tatiana Llorente 04f2ebeaf1 Ent 4515 filtro de alertas en vista de agente 2020-03-12 10:47:59 +01:00
Luis Calvo 1196524581 Fixed monitor view groups without tags 2020-02-28 12:33:36 +01:00
alejandro-campos b29e0c7966 added ui_get_full_url to paths 2020-02-28 11:38:41 +01:00
Daniel Barbero Martin c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
alejandro-campos d05551f85a fix characters breaking html 2020-02-03 16:17:46 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop' 
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
 2020-01-20 09:54:20 +01:00
Luis 2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
Daniel Maya c9a524b128 fixed interval counter 2020-01-10 11:12:05 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Rodriguez fa9d60a3ef Merge branch 'ent-5128-Metaconsola-conteo-y-paginacion' into 'develop' 
fix pagination in meta monitor view

See merge request artica/pandorafms!2963
 2020-01-07 09:46:22 +01:00
Daniel Rodriguez e6616374f0 Merge branch 'ent-5000-Bug-en-el-icono-de-graficas-de-Monitor-detail-con-modulos-con-tags' into 'develop' 
fix bug when checking acl permissions with regard to secondary groups in monitor view

See merge request artica/pandorafms!2908
 2020-01-07 09:41:11 +01:00
alejandro-campos cc574cdb39 fix pagination in meta monitor view 2019-12-16 11:46:07 +01:00
Marcos Alconada 888988572a Merge branch 'develop' into 'ent-4876-pandora_ui.js' 
# Conflicts:
#   pandora_console/include/javascript/pandora.js
 2019-11-27 11:39:11 +01:00
Daniel Rodriguez 66c67ea74a Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop' 
Ent 4226 mejoras plugin sap

See merge request artica/pandorafms!2853
 2019-11-26 14:14:10 +01:00
marcos 6f8bf104b4 update sap view 2019-11-25 13:50:26 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
alejandro-campos 02780aed41 fix bug when checking acl permissions with regard to secondary groups in monitor view 2019-11-21 16:36:34 +01:00
Daniel Rodriguez 775289fc20 Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop' 
Changed definition of link in group icon

See merge request artica/pandorafms!2891
 2019-11-21 10:21:07 +01:00
marcos 294c160622 semifinal sap sap view agent 2019-11-20 18:01:07 +01:00
Jose Gonzalez 93200e2af1 Changed definition of link in group icon 2019-11-18 10:51:09 +01:00
fbsanchez e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
marcos fe45afa662 Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap 2019-11-13 12:01:36 +01:00
Daniel Rodriguez 2f0b646cd8 Merge branch 'ent-4463-Histórico-IP' into 'develop' 
Fixed scroll in other ip addres in agent view - #4463

See merge request artica/pandorafms!2641
 2019-11-12 18:10:16 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
fbsanchez 307eabc7b9 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-07 18:33:37 +01:00
Tatiana Llorente 90912e2636 Hide agent info when only GIS data is displayed and it is empty 2019-11-07 09:52:06 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
Daniel Rodriguez 0cf3e01f74 Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' 
Ent 1880 umbrales inversos en negativo

See merge request artica/pandorafms!2818
 2019-10-22 12:56:21 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Kike f34d30dd39 Fixed loop on network map migration process 2019-10-02 12:38:13 +02:00
Luis Calvo 0aa73b1a60 Added current gis location to agent gis view list 2019-09-30 14:58:44 +02:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Kike 279b360236 Fixed open and enterprise network map migration 2019-09-20 10:13:09 +02:00
Jose Gonzalez 3c609b4d6d Changed the mode of obtain the title 2019-09-19 13:17:29 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Rodriguez 66f6267495 Merge branch 'ent-4575-Problema-permisos-en-vista-de-gráficas-dentro-de-un-agente' into 'develop' 
Change permissions to save custom graph in agent view - #4575

See merge request artica/pandorafms!2689
 2019-09-03 17:08:48 +02:00
Tatiana Llorente 94195cf70a Change permissions to save custom graph in agent view - #4575 2019-08-29 11:27:40 +02:00
marcos.alconada 3d68641e4e add space in networkp map 2019-08-13 14:41:57 +02:00
Tatiana Llorente 4436d96717 Fixed scroll in other ip addres in agent view - #4463 2019-08-07 12:09:34 +02:00
Luis Calvo 00662058f3 Fixed agent detail events permission 2019-07-29 15:16:24 +02:00
Daniel Rodriguez b8f6626947 Merge branch 'ent-4201-Agent-info-campos-vacios-siguen-saliendo' into 'develop' 
Dont show empty custom fields in agent view - #4201

See merge request artica/pandorafms!2572
 2019-07-16 11:20:53 +02:00
Daniel Barbero Martin 56ddf0700e fixed error SQL 2019-07-15 11:58:27 +02:00
Daniel Rodriguez 24cbe3bd8e Merge branch 'ent-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop' 
Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles

See merge request artica/pandorafms!2598
 2019-07-12 10:26:05 +02:00
Tatiana Llorente 46f55c6d65 Fixed several minor visual bugs - #4347 2019-07-12 08:59:26 +02:00
Tatiana Llorente fd24398219 Fixed several minor visual bugs - #4347 2019-07-11 14:46:41 +02:00
fbsanchez 0e3fd848f7 minor fixes and visual change in azure credentials 2019-07-04 19:34:03 +02:00