fbsanchez
50c3453415
change default values for event synch
2018-11-16 11:27:32 +01:00
daniel
e6cd8c5471
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-16 09:11:49 +01:00
artica
a0fde9503f
Auto-updated build strings.
2018-11-16 00:01:29 +01:00
daniel
e21fde537a
fixed css errors custom field view and new features
2018-11-15 19:16:49 +01:00
vgilc
a00c10a136
Merge branch '2166-Hide-not-init-agents-2' into 'develop'
...
removed hide not init modules from sla and availability report
See merge request artica/pandorafms!1976
2018-11-15 17:20:00 +01:00
vgilc
73590705e9
Merge branch '3079-Alertas_php7' into 'develop'
...
3079 alertas php7
See merge request artica/pandorafms!1980
2018-11-15 15:41:16 +01:00
daniel
7700ee85ca
Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7
2018-11-15 15:34:08 +01:00
daniel
d12a25866d
fixed translate php7 warning
2018-11-15 15:33:46 +01:00
daniel
1edb7fda03
Merge remote-tracking branch 'origin/develop' into 3072-Problemas_jquery
2018-11-15 15:20:02 +01:00
daniel
34ea7cfbcb
fixed position select autocomplete agent jqui
2018-11-15 15:19:43 +01:00
vgilc
da410c9394
Merge branch '3079-Alertas_php7' into 'develop'
...
3079 alertas php7
See merge request artica/pandorafms!1978
2018-11-15 14:17:26 +01:00
daniel
aee12e6bf9
Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7
2018-11-15 13:23:09 +01:00
daniel
b78c52caa4
fixed error Acess for Access
2018-11-15 13:22:54 +01:00
fermin831
b786c6c3ab
Fixed snmptrap binary in windows trap generator
2018-11-15 13:04:35 +01:00
alejandro-campos
a1846a6e22
removed hide not init modules from sla and availability report
2018-11-15 12:00:25 +01:00
vgilc
614efef0c4
Merge branch '3079-Alertas_php7' into 'develop'
...
create alert php7
See merge request artica/pandorafms!1975
2018-11-15 09:46:27 +01:00
artica
e9e132589c
Auto-updated build strings.
2018-11-15 00:01:29 +01:00
daniel
6174e622c8
create alert php7
2018-11-14 18:15:48 +01:00
vgilc
e2612e2273
Merge branch '3072-Problemas_jquery' into 'develop'
...
fixed errors cv
See merge request artica/pandorafms!1974
2018-11-14 16:46:33 +01:00
daniel
60212dae50
fixed errors cv
2018-11-14 16:38:44 +01:00
vgilc
d7db1e95e4
Merge branch 'fix/ehorus-password' into 'develop'
...
Decode entities in the eHorus password.
See merge request artica/pandorafms!1972
2018-11-14 12:41:52 +01:00
nramon
0c019d1baf
Merge branch 'fix/db_connect_charset' into 'develop'
...
removed default charset, set to auto
See merge request artica/pandorafms!1973
2018-11-14 12:36:17 +01:00
fbsanchez
a20d541fb4
removed default charset, set to auto
2018-11-14 12:31:35 +01:00
Ramon Novoa
574e537ff1
Decode entities in the eHorus password.
...
Ref pandora_enterprise#3073.
2018-11-14 12:16:59 +01:00
samucarc
43629d5c2a
Fixed minor visual error in GIS Map
2018-11-14 12:10:38 +01:00
samucarc
dc6a293b52
Fixed error in agent table in GIS map
2018-11-14 11:53:12 +01:00
daniel
22a26aa072
fixed error upgrade jquery
2018-11-14 11:40:01 +01:00
vgilc
d91f81d0ed
Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop'
...
fixed minor bug: Assigned node field showing in meta user update form when…
See merge request artica/pandorafms!1968
2018-11-14 08:30:42 +01:00
artica
633d6987eb
Auto-updated build strings.
2018-11-14 00:01:29 +01:00
alejandro-campos
5eed82eb62
fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user
2018-11-13 19:00:16 +01:00
manuel.montes
dd7e623782
Fixed overflow in module data view
2018-11-13 17:04:14 +01:00
tatiana.llorente@artica.es
b2996e59d5
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 16:50:35 +01:00
tatiana.llorente@artica.es
a6b8929a37
Added jquery-ui styles to css - #2784
2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es
719e502a27
Revert "Added jquery-ui styles to css - #2784"
...
This reverts commit fdda5793d2
.
2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es
4a001d8192
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' of https://brutus.artica.lan:8081/artica/pandorafms into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 16:30:54 +01:00
tatiana.llorente@artica.es
fdda5793d2
Added jquery-ui styles to css - #2784
2018-11-13 16:27:57 +01:00
artica
f308e1f590
Updated version and build strings.
2018-11-13 15:59:16 +01:00
daniel
ac671d041c
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 15:47:07 +01:00
daniel
4dbcecb951
WIP custom fields view
2018-11-13 15:46:44 +01:00
alejandro-campos
c5a0065cba
decoded entities when retrieving module name in case SNMP module name is updated
2018-11-13 11:50:46 +01:00
tatiana.llorente@artica.es
ea9cbb6973
Changed visual styles - #2784
2018-11-13 11:20:27 +01:00
manuel.montes
5420da9f23
fixed error message
2018-11-13 09:36:20 +01:00
fermin831
66448673c1
Fixed no data to show in not init modules with TIP graphs
2018-11-13 09:00:42 +01:00
danielmaya
2a0d2e6c46
collection management from metaconsole
2018-11-13 08:33:47 +01:00
artica
e29160f34d
Auto-updated build strings.
2018-11-13 00:01:29 +01:00
vgilc
9d896de41a
Merge branch 'ent-3050-fallo-php-7-en-networks-maps' into 'develop'
...
Fixed php errors on radial networkmap
See merge request artica/pandorafms!1960
2018-11-12 16:49:58 +01:00
vgilc
6d0d7fd410
Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop'
...
removed Assigned node field from admin global profile when creating user from metaconsole
See merge request artica/pandorafms!1959
2018-11-12 16:49:08 +01:00
fermin831
a201262737
Fixed php errors on radial networkmap
2018-11-12 16:29:31 +01:00
alejandro-campos
75ad60a071
removed Assigned node field from admin global profile when creating user from metaconsole
2018-11-12 15:57:18 +01:00
tatiana.llorente@artica.es
406bf08e2e
Changed images for status modules and agents - #2784
2018-11-12 15:43:23 +01:00
samucarc
e9627949a8
Fixed link in static graph
2018-11-12 13:12:52 +01:00
fermin831
3d04a742a3
Merge remote-tracking branch 'origin/develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
2018-11-12 13:10:53 +01:00
alejandro-campos
420adb4630
implemented search filters for module group and agent group in module groups view
2018-11-12 13:02:37 +01:00
manuel.montes
69df02da48
Fixed bug in agent graph view
2018-11-12 10:45:50 +01:00
daniel
afaa6ad2ba
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-12 09:07:56 +01:00
artica
0dd6c54651
Auto-updated build strings.
2018-11-12 00:01:25 +01:00
artica
4f928c8c22
Auto-updated build strings.
2018-11-11 00:01:25 +01:00
artica
76b24c3214
Auto-updated build strings.
2018-11-10 00:01:28 +01:00
artica
2ed98eac77
Auto-updated build strings.
2018-11-09 00:01:27 +01:00
vgilc
0255492523
Merge branch '2652_Custom_graphs_en_formato_stacked_area_se_muestran_en_formato_area_al_generar_el_informe' into 'develop'
...
Fixed stacked area graph error when opened in PDF format
See merge request artica/pandorafms!1954
2018-11-08 17:22:13 +01:00
samucarc
8a2e82371d
Fixed stacked area graph error when opened in PDF format
2018-11-08 17:07:47 +01:00
fermin831
80d3299b2b
Removed unused code (meta static graphs)
2018-11-08 16:46:34 +01:00
daniel
c4c0cc59d4
fixed error automatic combined graph
2018-11-08 15:05:57 +01:00
daniel
bb15c39ef5
WIP Custom view fields
2018-11-08 15:03:40 +01:00
alejandro-campos
9c2e67f364
avoid sql injection in visual_map_get_user_layouts function
2018-11-08 14:01:18 +01:00
fermin831
d63666cbbc
Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/godmode/alerts/alert_actions.php
Modified files extra:
pandora_console/include/functions_alerts.php
2018-11-08 14:00:49 +01:00
fermin831
059ca855f9
Added cache to agents_get_alias
2018-11-08 13:03:04 +01:00
vgilc
7afc328e50
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios_2' into 'develop'
...
Display an error message when no changes have been made - #2900
See merge request artica/pandorafms!1948
2018-11-08 12:27:45 +01:00
tatiana.llorente@artica.es
85adf7cf8d
Display an error message when no changes have been made - #2900
2018-11-08 12:04:08 +01:00
manuel.montes
1d8a746329
Removed the adjustment of dimensions in custom graph
2018-11-08 09:49:36 +01:00
artica
d28b229423
Auto-updated build strings.
2018-11-08 00:01:29 +01:00
daniel
5c99a8138f
fixed minor error
2018-11-07 17:16:25 +01:00
daniel
1c1df4b5f7
fixed errors css jqueryui
2018-11-07 17:09:42 +01:00
manuel.montes
c131c631d4
Fixed bug in visual styles configuration
2018-11-07 16:34:09 +01:00
samucarc
46a7d4c5f5
Fixed minor visual error in planned downtimes
2018-11-07 16:19:54 +01:00
manuel.montes
a3f4bfaa3d
Implemented limitation decimals in y-axis realtime graphs
2018-11-07 13:57:47 +01:00
daniel
58aa334798
fixed minor errors in graphs an license diag
2018-11-07 13:33:07 +01:00
daniel
218bf81fa1
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-07 13:30:19 +01:00
daniel
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
daniel
267f83cc4c
add datatabes
2018-11-07 13:25:02 +01:00
daniel
7d54858b45
delete files dont use
2018-11-07 13:24:07 +01:00
vgilc
9c143d1d00
Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop'
...
fixed agent name and go to agent edition links in meta tree view
See merge request artica/pandorafms!1939
2018-11-07 12:49:15 +01:00
danielmaya
3ffd976365
resolved conflicts in ver_agente
2018-11-07 12:31:54 +01:00
alejandro-campos
2a616e1448
fixed agent name and go to agent edition links in meta tree view
2018-11-07 12:29:37 +01:00
tatiana.llorente@artica.es
aa19640497
Changed ORDER BY in SQL query - #3044
2018-11-07 10:34:14 +01:00
vgilc
c7a54182a3
Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop'
...
Added check for the creation of planned downtimes by pandora manage
See merge request artica/pandorafms!1936
2018-11-07 08:48:48 +01:00
artica
a01f79d294
Auto-updated build strings.
2018-11-07 00:01:31 +01:00
vgilc
eec3b1843d
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop'
...
2900 mensajes de error y success al mismo tiempo en la edición de usuarios
See merge request artica/pandorafms!1863
2018-11-06 17:08:54 +01:00
samucarc
a80c7e493e
Added check for the creation of planned downtimes by pandora manage
2018-11-06 16:42:03 +01:00
vgilc
c50b1b7243
Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl-2' into 'develop'
...
Fixed delete menu on main page dashboards
See merge request artica/pandorafms!1932
2018-11-06 15:23:42 +01:00
vgilc
1698f663a5
Merge branch '2730-Fallo-políticas-desde-la-meta3' into 'develop'
...
Fixed bug in deleted policies
See merge request artica/pandorafms!1934
2018-11-06 15:23:09 +01:00
vgilc
78c88c4f8f
Merge branch '3021-SLA-vista-descolocada' into 'develop'
...
Removed duplicated code - #3021
See merge request artica/pandorafms!1933
2018-11-06 15:22:33 +01:00
vgilc
62b27284aa
Merge branch '3000-lost-in-stash' into 'develop'
...
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options
See merge request artica/pandorafms!1919
2018-11-06 15:03:36 +01:00
fbsanchez
bfc669225c
Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash
2018-11-06 14:48:14 +01:00
manuel.montes
df8c5e8bf9
Fixed bug in deleted policies
2018-11-06 13:52:03 +01:00
tatiana.llorente@artica.es
26a4880f64
Removed duplicated code - #3021
2018-11-06 13:49:47 +01:00
fermin831
6ede68bf8d
Fixed delete menu on main page dashboards
2018-11-06 13:10:44 +01:00
vgilc
1435b196db
Merge branch '2973-La-paginación-en-la-vista-de-módulos-de-agente-no-funciona' into 'develop'
...
Fixed SQL query - #2973
See merge request artica/pandorafms!1931
2018-11-06 12:09:15 +01:00
tatiana.llorente@artica.es
9448111927
Fixed SQL query - #2973
2018-11-06 11:14:12 +01:00
artica
3ffad9fda8
Auto-updated build strings.
2018-11-06 00:01:27 +01:00
manuel.montes
45b757b5db
Fixed bug in SNMP Wizard
2018-11-05 14:17:43 +01:00
vgilc
4102f11f6b
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo_2' into 'develop'
...
2618 bug acceso agentes en vista de grupo 2
See merge request artica/pandorafms!1928
2018-11-05 13:11:44 +01:00
samucarc
3d99ef48aa
Fixed ACLs in monitoring View and agent detail
2018-11-05 13:05:34 +01:00
daniel
7a7fcaa6a8
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-05 09:35:38 +01:00
daniel
b71d396c84
WIP custom fields view
2018-11-05 09:35:17 +01:00
artica
50b8886916
Auto-updated build strings.
2018-11-05 00:01:25 +01:00
artica
f9e2936df5
Auto-updated build strings.
2018-11-04 00:01:25 +01:00
artica
afd922426e
Auto-updated build strings.
2018-11-03 00:01:27 +01:00
alejandro-campos
ef90536152
added new field in treport table
2018-11-02 16:31:54 +01:00
daniel
e2fabb6167
WIP custom fields view
2018-11-02 13:37:30 +01:00
tatiana.llorente@artica.es
233b9c2c70
Well centered message modal window - #2768
2018-11-02 13:07:38 +01:00
danielmaya
3c78e387df
Fixed nodes count in pandora_networkmap
2018-11-02 11:32:07 +01:00
daniel
c4eeb3cc76
fixed error edit modules in massive operation php7 error select
2018-11-02 10:18:33 +01:00
daniel
f2b1c99013
fixed minor error cluster name by alias
2018-11-02 09:56:31 +01:00
daniel
ec194208f5
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-02 08:20:39 +01:00
artica
fc82a9d172
Auto-updated build strings.
2018-11-02 00:01:26 +01:00
artica
f47918b4cc
Auto-updated build strings.
2018-11-01 00:01:31 +01:00
daniel
b5045d522e
WIP custom fields view
2018-10-31 18:02:36 +01:00
Fermin
9f0e43623b
Fixed agent popup with secondary groups privileges in tree view
2018-10-31 16:16:32 +01:00
daniel
879b1cfecb
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-10-31 09:23:58 +01:00
Fermin
7f22e2b067
Fixed disabled modules on agent view
2018-10-31 08:57:34 +01:00
artica
d9f8616b2c
Auto-updated build strings.
2018-10-31 00:01:26 +01:00
fbsanchez
39b6164526
snapshot viewer fix
2018-10-30 18:20:10 +01:00
fbsanchez
8fe82add30
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options
2018-10-30 17:53:57 +01:00
daniel
78a1c72eac
fixed warnings php7
2018-10-30 17:38:46 +01:00
vgilc
b1bf1d7b4b
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
2326 unificar vistas ux y wux en un mismo portal
See merge request artica/pandorafms!1917
2018-10-30 16:20:26 +01:00
fbsanchez
a58bde2118
fixed UX historical snapshot viewer
2018-10-30 16:12:48 +01:00
vgilc
e6a9ca7bfb
Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop'
...
fixed errors php7
See merge request artica/pandorafms!1916
2018-10-30 15:00:54 +01:00
daniel
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
vgilc
cb848238e4
Merge branch '2221-actualizacion-de-pandora-a-version-7-de-php' into 'develop'
...
xmlrpc php7 Dockerfile + debian specs
See merge request artica/pandorafms!1914
2018-10-30 13:29:33 +01:00
fbsanchez
4f166555da
xmlrpc php7 Dockerfile + debian specs
2018-10-30 12:54:20 +01:00
vgilc
70884f73d0
Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop'
...
fixed changes in pandora mobile
See merge request artica/pandorafms!1913
2018-10-30 12:45:57 +01:00
daniel
743a41d29c
fixed changes in pandora mobile
2018-10-30 12:30:10 +01:00
vgilc
d4fa8e7b27
Merge branch '2983-6699-bug-no-se-pueden-anadir-acciones-nuevas-a-alertas-dev' into 'develop'
...
Fixed add button on alerts
See merge request artica/pandorafms!1908
2018-10-30 09:36:37 +01:00
vgilc
020f9579a2
Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop'
...
fixed errors php7
See merge request artica/pandorafms!1909
2018-10-30 09:36:18 +01:00
artica
5a057490ad
Auto-updated build strings.
2018-10-30 00:01:29 +01:00
daniel
8e206eeeef
fixed errors php7
2018-10-29 18:20:56 +01:00
fermin831
294553941d
Fixed add button on alerts
2018-10-29 16:41:55 +01:00
fbsanchez
cdc0efae82
spec fix - php7
2018-10-29 16:11:29 +01:00
fermin831
c7a624000e
Added API function set delete_user_profile_info
2018-10-29 13:34:30 +01:00
Ramon Novoa
6353af0482
Merge remote-tracking branch 'github/develop' into develop
2018-10-29 13:20:48 +01:00
fermin831
bf7cdcc7ff
Added API function set update_user_profile_info
2018-10-29 12:45:03 +01:00
fermin831
4f02d72630
Added API function set create_user_profile_info
2018-10-29 12:22:08 +01:00
daniel
29fb922b70
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-10-29 11:06:57 +01:00
fermin831
c211433321
Added API function get user_profiles_info
2018-10-29 11:02:43 +01:00
vgilc
e03f56f0d7
Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'
...
2429 resaltar elementos al pasar por encima o marcar
See merge request artica/pandorafms!1762
2018-10-29 09:17:54 +01:00
vgilc
17286414c7
Merge branch '2619_Group_View' into 'develop'
...
Added warning and normal status agents in group view
See merge request artica/pandorafms!1799
2018-10-29 09:16:33 +01:00
vgilc
08a8165b93
Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop'
...
Added number of times an alert is fired - #2827
See merge request artica/pandorafms!1823
2018-10-29 09:15:32 +01:00
artica
696abbdead
Auto-updated build strings.
2018-10-29 00:01:25 +01:00
artica
507bbcff56
Auto-updated build strings.
2018-10-28 00:01:22 +02:00
artica
01e9251a88
Auto-updated build strings.
2018-10-27 00:01:26 +02:00
vgilc
1973a5fe54
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
WUX-UX integration
See merge request artica/pandorafms!1890
2018-10-26 14:42:23 +02:00
vgilc
7a4b7d4289
Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop'
...
2221 actualizacion de pandora a version 7 de php
See merge request artica/pandorafms!1875
2018-10-26 14:41:15 +02:00
nramon
3d964364e8
Merge branch 'fix-language-selection-problem' into 'develop'
...
Fixed language selection problem at initial setup.
See merge request artica/pandorafms!1902
2018-10-26 10:51:01 +02:00
Junichi Satoh
91ed413b0a
Fixed language selection problem at initial setup.
2018-10-26 17:34:49 +09:00
Junichi Satoh
ecf5ca3bb2
Updated Japanese help files.
2018-10-26 17:28:24 +09:00
artica
dba51e07b3
Auto-updated build strings.
2018-10-26 00:01:33 +02:00
daniel
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
daniel
f78e86b925
view cusatom field
2018-10-25 17:08:56 +02:00
fbsanchez
c06bd4207e
estilos popup
2018-10-25 16:40:45 +02:00
fbsanchez
172ac187a2
estilos popup
2018-10-25 15:58:06 +02:00
fermin831
d70969e6e9
Merge branch 'develop' into ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm
...
Conflicts resolved:
pandora_console/include/functions_api.php
2018-10-25 15:45:16 +02:00
fermin831
f831e59ac3
Added documentation and minor fixes related with API event responses functions
2018-10-25 15:42:45 +02:00
fbsanchez
8619adbf4c
estilos popup
2018-10-25 15:42:20 +02:00
fermin831
8cc68185d9
Added set delete_event_response to API
2018-10-25 15:34:02 +02:00
fermin831
1bd492307a
Added set update_event_response to API
2018-10-25 15:25:27 +02:00
fermin831
6b93cba119
Added set create_event_response to API
2018-10-25 15:03:07 +02:00
fbsanchez
85051924b7
estilos popup
2018-10-25 14:01:12 +02:00
vgilc
3aff162616
Merge branch '2961-Longitud-del-nombre-de-las-plantillas-de-consolas-visuales' into 'develop'
...
Changed tlayout_template name table to varchar 600
See merge request artica/pandorafms!1889
2018-10-25 13:27:25 +02:00
vgilc
2bd6b0c688
Merge branch '1863-Error-en-tipo-de-evento-going-up-critical' into 'develop'
...
1863 error en tipo de evento going up critical
See merge request artica/pandorafms!1736
2018-10-25 13:25:22 +02:00
vgilc
d218c586d9
Merge branch '2166-Hide-not-init-agents' into 'develop'
...
fixed bug: hide not init agents not working in report item creation
See merge request artica/pandorafms!1742
2018-10-25 13:23:22 +02:00
vgilc
9aed441246
Merge branch '2452-Fallo-recalculo-custom-graph' into 'develop'
...
Changed custom graph item insertion and deletion to fix bug when sorting elements in list
See merge request artica/pandorafms!1782
2018-10-25 13:20:30 +02:00
vgilc
3ed5b97e1d
Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop'
...
Fixed bug in the construction of the name of the xml file
See merge request artica/pandorafms!1737
2018-10-25 13:20:05 +02:00
vgilc
d1ff778102
Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl' into 'develop'
...
Removed dashboard menu if it is displayed from main page
See merge request artica/pandorafms!1879
2018-10-25 13:19:33 +02:00
vgilc
fcb95a8d8d
Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop'
...
visuals fix in visual styles
See merge request artica/pandorafms!1731
2018-10-25 13:16:57 +02:00
vgilc
aabd5435d0
Merge branch '2535-Macro-para-unidad-informes' into 'develop'
...
Added unit in label graphs
See merge request artica/pandorafms!1874
2018-10-25 13:12:26 +02:00
vgilc
d71257ea1c
Merge branch 'ent-2540-Macro-de-IP-del-agente-no-funciona-event-responses-EUComm' into 'develop'
...
Fixed macro _agent_adress_ on events responses
See merge request artica/pandorafms!1872
2018-10-25 13:03:44 +02:00
vgilc
3c548f1c98
Merge branch '6219_Comprobacion_paradas_planificadas' into 'develop'
...
Fixed problems in scheduled downtime CLI
See merge request artica/pandorafms!1806
2018-10-25 13:03:17 +02:00
vgilc
66e662c53e
Merge branch '2572-Fallo-visual' into 'develop'
...
Database and application_osx icons added to select icon of group - #2572
See merge request artica/pandorafms!1749
2018-10-25 13:02:08 +02:00
vgilc
3c4f6d3b23
Merge branch '2580-VERSION-OPEN-Línea-divisoria' into 'develop'
...
Fixed bug in module manager
See merge request artica/pandorafms!1729
2018-10-25 13:00:59 +02:00
vgilc
f2356a3a9b
Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop'
...
Ent 2608 mas problemas de vistas de grupos secundarios
See merge request artica/pandorafms!1856
2018-10-25 12:59:51 +02:00
vgilc
4c4c874553
Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop'
...
Fixed bug in csv export graph
See merge request artica/pandorafms!1814
2018-10-25 12:57:24 +02:00
vgilc
330bdbbce0
Merge branch '2637-Help-en-Event-Viewer' into 'develop'
...
Changed Actions column with the right icons - #2637
See merge request artica/pandorafms!1746
2018-10-25 12:32:37 +02:00
vgilc
ea2ed80f05
Merge branch '2655-Audit-log-con-entities' into 'develop'
...
Suppress entities in System audit log comments
See merge request artica/pandorafms!1714
2018-10-25 12:32:07 +02:00
vgilc
fb32ea240f
Merge branch '2704_SQL_Horizontal_bar_graph_en_informe_corta_los_labels_si_son_muy_largos' into 'develop'
...
Fixed SQL graphs in reports
See merge request artica/pandorafms!1791
2018-10-25 12:11:41 +02:00
vgilc
4b317b573b
Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop'
...
Added code for function api_get_agent_alias for the API of the metaconsole - #2708
See merge request artica/pandorafms!1816
2018-10-25 12:11:16 +02:00
vgilc
b50f52ae9d
Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop'
...
fixed bug: admin users not able to log in to node when they are created in…
See merge request artica/pandorafms!1812
2018-10-25 12:10:58 +02:00
vgilc
c14a7d270a
Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop'
...
Fixed bug: bad link in meta tree view's agent data, using relative path
See merge request artica/pandorafms!1793
2018-10-25 12:10:32 +02:00
vgilc
de0c81b7fa
Merge branch '2724-Fallo-en-una-parte-de-replicación-de-eventos3' into 'develop'
...
Fixed bug in events replication
See merge request artica/pandorafms!1804
2018-10-25 12:09:58 +02:00
vgilc
9b4eeb5c84
Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
...
new function that adds a border to the image if the status is warning - #2723
See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
vgilc
4dd2cd434c
Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop'
...
Changed colors for buttons - #2726
See merge request artica/pandorafms!1797
2018-10-25 12:05:56 +02:00
vgilc
48395acfaa
Merge branch '2730-Fallo-políticas-desde-la-meta' into 'develop'
...
Fixed bug in deleted policies from the metaconsole
See merge request artica/pandorafms!1774
2018-10-25 12:03:24 +02:00
vgilc
af2e49966b
Merge branch '2734-6444-Nombre-de-interfaces-en-SNMP-Interface-Wizard2' into 'develop'
...
Added horizontal scroll in the interfaces select
See merge request artica/pandorafms!1738
2018-10-25 11:58:33 +02:00
vgilc
8e1a946836
Merge branch '2738-Autorefresh-falla-en-la-meta' into 'develop'
...
Countdown in group view for autorefresh
See merge request artica/pandorafms!1768
2018-10-25 11:57:53 +02:00
vgilc
5255ced7d1
Merge branch '2762-Poner-capitalizacion-correcta' into 'develop'
...
Capital letter in the letter a of audit - #2762
See merge request artica/pandorafms!1766
2018-10-25 11:55:15 +02:00
vgilc
cf9bf2b4e2
Merge branch '2768-Mensajería-interna' into 'develop'
...
Fixed borders of tables with classes databox and data - #2768
See merge request artica/pandorafms!1786
2018-10-25 11:54:50 +02:00
vgilc
50d30e782f
Merge branch '2769-Bug-en-la-ayuda-de-Custom-Macros-en-la-creacion-de-un-modulo' into 'develop'
...
Fixed bug in custom macros help
See merge request artica/pandorafms!1779
2018-10-25 11:54:12 +02:00
fermin831
c0afbf0b6f
Added get event_responses to API
2018-10-25 11:49:39 +02:00
vgilc
cab90a4fd3
Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop'
...
Added module name and agent name in actions enable and disable module - #2783
See merge request artica/pandorafms!1783
2018-10-25 11:44:42 +02:00
vgilc
82f6e3cb95
Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop'
...
Fixed group and set_center
See merge request artica/pandorafms!1880
2018-10-25 11:43:38 +02:00
vgilc
67fc03ab6d
Merge branch '2814-Create-network-components-desde-SNMP-Walk' into 'develop'
...
Changed styles for the button create_network_component - #2814
See merge request artica/pandorafms!1817
2018-10-25 11:41:35 +02:00
vgilc
d0e9875795
Merge branch '2846-Descuadre-en-Windows' into 'develop'
...
Added class data to the table for last activity - #2846
See merge request artica/pandorafms!1818
2018-10-25 11:23:45 +02:00
vgilc
89f0d547b0
Merge branch '2848-Descuadre-en-SNMP-console' into 'develop'
...
Added align center for the head of the table - #2848
See merge request artica/pandorafms!1820
2018-10-25 11:20:37 +02:00
vgilc
e0f7d1310b
Merge branch '2858-Mensaje-de-error-poco-descriptivo-en-alertas' into 'develop'
...
2858 mensaje de error poco descriptivo en alertas
See merge request artica/pandorafms!1825
2018-10-25 11:14:31 +02:00
vgilc
a9949c8ed2
Merge branch '2860-idiomas-en-metaconsola' into 'develop'
...
Added option charset to db_connect
See merge request artica/pandorafms!1831
2018-10-25 11:13:59 +02:00
danielmaya
bbde9c70b6
conflict resolved
2018-10-25 11:13:57 +02:00
vgilc
4f406d8702
Merge branch '2876-No-se-guardan-datos-Network-components' into 'develop'
...
Fixed bug in the data collection of network component when creating its corresponding module
See merge request artica/pandorafms!1865
2018-10-25 10:58:03 +02:00
vgilc
2f9169c679
Merge branch '2903-Limitación-de-caracteres-en-Warning-Critical-status-tipo-string-al-crear-Network-component' into 'develop'
...
Increased the character limit in Warning / Critical status string type when…
See merge request artica/pandorafms!1861
2018-10-25 10:56:34 +02:00
vgilc
1de97d631a
Merge branch '2376-Bug-operaciones-masivas-de-módulos-dev' into 'develop'
...
Fixed force_type check in delete/edit modules in bulk
See merge request artica/pandorafms!1885
2018-10-25 10:43:29 +02:00
vgilc
aff94d0761
Merge branch 'ent-2543-6208-version-movil-metaconsola-no-muestra-graficas-ni-algunas-imagenes-metaconsola-no-redirige-a-vista-de-movil' into 'develop'
...
Ent 2543 6208 version movil metaconsola no muestra graficas ni algunas imagenes metaconsola no redirige a vista de movil
See merge request artica/pandorafms!1886
2018-10-25 10:40:56 +02:00
vgilc
582db8d3b5
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo' into 'develop'
...
Fixed enterprise ACLs in Agents View
See merge request artica/pandorafms!1853
2018-10-25 10:40:12 +02:00
vgilc
9cc08709dd
Merge branch 'ent-2709-i6079-Real-time-graphs-de-IfOperStatus-no-muestran-nada' into 'develop'
...
Fixed booleans realtime graphs
See merge request artica/pandorafms!1866
2018-10-25 10:35:04 +02:00
vgilc
5a551da1f8
Merge branch '2759-crear-iso-precargada-enterprise-para-demos' into 'develop'
...
Minor fix in cde cluster api methods
See merge request artica/pandorafms!1864
2018-10-25 10:34:39 +02:00
vgilc
6ab39aa728
Merge branch '2932-Bug-al-crear-un-evento-por-medio-de-la-API-no-te-inserta-el-campo-agent-name' into 'develop'
...
fixed bug: calling api method create event not inserting agent name
See merge request artica/pandorafms!1877
2018-10-25 10:33:06 +02:00
vgilc
2b6e8473dc
Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop'
...
Improve performance on tactical view with a lot of events
See merge request artica/pandorafms!1857
2018-10-25 10:32:11 +02:00
artica
db802c5a2e
Auto-updated build strings.
2018-10-25 00:01:22 +02:00
fbsanchez
50aa314191
WUX-UX integration
2018-10-24 19:31:39 +02:00
manuel.montes
2e74cd53f1
Changed tlayout_template name table to varchar 600
2018-10-24 16:50:40 +02:00
danielmaya
87abf1dc02
added event time filter in tactical view
2018-10-24 16:36:44 +02:00
manuel.montes
9d7f063ef2
Changed tlayout_template name table to varchar 600
2018-10-24 12:39:58 +02:00
fbsanchez
f0dbff1885
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-24 12:22:12 +02:00
manuel.montes
f4add9a7f8
Changed tlayout_template name table to varchar 600
2018-10-24 11:49:18 +02:00
manuel.montes
ca75cff3f7
Fixed bug in alert details
2018-10-24 10:25:45 +02:00
artica
7a64bb4855
Auto-updated build strings.
2018-10-24 00:01:28 +02:00
fermin831
4cb66c31f1
Fixed logo image on metaconsole login
2018-10-23 17:43:00 +02:00
fermin831
8cb2ff1d1b
Fixed tactical view graph on mobile metaconsole
2018-10-23 17:41:14 +02:00
danielmaya
a1f28480ae
Fixed force_type check in delete/edit modules in bulk
2018-10-23 15:46:48 +02:00
tatiana.llorente@artica.es
8dde77fb0e
Tip added - #2907
2018-10-23 15:42:01 +02:00
tatiana.llorente@artica.es
9e452993cf
Tip added - #2904
2018-10-23 15:19:15 +02:00
fbsanchez
9765a8c113
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-23 14:43:39 +02:00
tatiana.llorente@artica.es
b9112541fb
Tip added - #2906
2018-10-23 13:56:27 +02:00
tatiana.llorente@artica.es
448353e39c
Changed timestamp value by default - #2893
2018-10-23 12:44:14 +02:00
danielmaya
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
fermin831
2af6108b66
Removed dashboard menu if it is displayed from main page
2018-10-23 12:29:23 +02:00
fermin831
4308c3f92e
Added acl to alert commands select
2018-10-23 10:53:09 +02:00
artica
9a77256198
Auto-updated build strings.
2018-10-23 00:01:29 +02:00
fermin831
e24794d6ea
Fixed alert command creation error management
2018-10-22 16:54:22 +02:00
fermin831
7e8fbb4568
Added warning icon to actions that does not match with their commands
2018-10-22 16:48:24 +02:00
fermin831
d8a7ebea08
Only change the group to all grupo if neccesary when command is changed
2018-10-22 16:26:58 +02:00
fermin831
f537dbb961
Validate the group command on action creation
2018-10-22 16:19:29 +02:00
fermin831
1f299cad52
Added copy button to alert commands
2018-10-22 12:01:29 +02:00
alejandro-campos
aaa2c6aa10
fixed bug: calling api method create event not inserting agent name
2018-10-22 10:31:10 +02:00
fermin831
b50b1c9f34
Added group icon to alerts commands view
2018-10-22 10:08:25 +02:00
samucarc
57c411e3fa
Fixed Audit log in profiles, collections and policies
2018-10-22 10:06:02 +02:00
fermin831
8b0b23dc27
Added group to alert commands update and creation
2018-10-22 09:49:06 +02:00
fermin831
3946124cc7
Inaugurate the 22 mr with an alter table in talert_commands
2018-10-22 09:49:06 +02:00
artica
f899910dd0
Updated version and build strings.
2018-10-22 09:45:06 +02:00
daniel
6bb478ea1a
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-22 08:04:36 +02:00
artica
1d0d656996
Auto-updated build strings.
2018-10-22 00:01:23 +02:00
artica
b01362a873
Auto-updated build strings.
2018-10-21 00:01:26 +02:00
artica
5ced50863c
Auto-updated build strings.
2018-10-20 00:01:25 +02:00
manuel.montes
972f4b1e89
Added unit in label graphs
2018-10-19 14:03:15 +02:00
daniel
bd2a3a82ec
silence error php7(not solution)
2018-10-19 12:25:01 +02:00
daniel
81ebfc755e
fixed gdgraph
2018-10-19 12:01:22 +02:00
daniel
a7918a1816
delete field flash chart php7
2018-10-19 11:56:49 +02:00
daniel
8c49b26a91
php7 version
2018-10-19 11:37:11 +02:00
daniel
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
vgilc
b7f9149c20
Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop'
...
Changed function that creates a new agent from metaconsole to set field name…
See merge request artica/pandorafms!1873
2018-10-19 11:30:47 +02:00
daniel
0a1bee92a5
fixed slicebar to php7
2018-10-19 10:49:13 +02:00
alejandro-campos
3fd588353b
Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database
2018-10-19 10:43:43 +02:00
daniel
b736746e1c
php version upgrade
2018-10-19 10:04:26 +02:00
artica
f340a3dda0
Auto-updated build strings.
2018-10-19 00:01:26 +02:00
fermin831
4d3c74ed37
Minor typo fix in events responses
2018-10-18 19:20:37 +02:00
fermin831
40ceec6561
Fixed macro _agent_adress_ on events responses
2018-10-18 18:45:11 +02:00
samucarc
c27ac9a0e0
Fixed centralized management in nodes
2018-10-18 16:34:54 +02:00
tatiana.llorente@artica.es
f96c626823
Changed url - #2917
2018-10-18 16:34:03 +02:00
daniel
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
daniel
9492d11cc8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-18 12:51:32 +02:00
vgilc
d23e47dd9d
Merge branch '2737-Optimización-de-tags-dev-2' into 'develop'
...
Fixed tags filter on Tree tags
See merge request artica/pandorafms!1862
2018-10-18 09:53:03 +02:00
artica
0c39e321e4
Auto-updated build strings.
2018-10-18 00:01:24 +02:00
fermin831
e7663fc5f0
Fixed booleans realtime graphs
2018-10-17 19:20:22 +02:00
fermin831
2d2c465ff6
Removed unwanted traces
2018-10-17 15:43:26 +02:00
manuel.montes
aa0c4b41e7
Fixed bug in the data collection of network component when creating its corresponding module
2018-10-17 13:31:14 +02:00
fbsanchez
7a44f9dcdd
Minor fix in cde cluster api methods
2018-10-17 13:26:41 +02:00
tatiana.llorente@artica.es
525caee909
Fixed a minor mistake in error message - #2900
2018-10-17 12:59:37 +02:00
tatiana.llorente@artica.es
0b22ab6bfd
Minor bug fixed - #2900
2018-10-17 12:57:02 +02:00
tatiana.llorente@artica.es
561bce71ce
Changed error and success messages - #2900
2018-10-17 12:49:11 +02:00
fermin831
14afe2ff88
Added message 'Please, select an agent first'
2018-10-17 12:35:11 +02:00
fermin831
060e46868d
Fixed tags filter on bulk operation (select module first)
2018-10-17 11:57:22 +02:00
danielmaya
9ee64b4894
Fixed report agent/module
2018-10-17 08:44:51 +02:00
artica
fd53704dc0
Auto-updated build strings.
2018-10-17 00:01:34 +02:00
daniel
f824650642
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-16 15:42:17 +02:00
daniel
3c62388f0e
fixed errors php and slicebars change version php7
2018-10-16 15:32:31 +02:00
fermin831
0ca34c744d
Fixed tags filter on Tree tags
2018-10-16 13:29:00 +02:00
fermin831
aff2879340
Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos
...
Conflicts:
pandora_console/extras/mr/21.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2018-10-16 11:35:14 +02:00
vgilc
14419759b0
Merge branch 'ent-2631-i6106-error-al-editar-modulos-con-tag-con-perfil-de-usuario-determinado' into 'develop'
...
Fixed modules tags acl with to tagged modules with an user without tags
See merge request artica/pandorafms!1860
2018-10-16 09:01:13 +02:00
vgilc
3664099fca
Merge branch '2897-Fallo-al-hacer-update-en-Visual-Consoles-dev' into 'develop'
...
Fixed lost id_agent in visual console
See merge request artica/pandorafms!1858
2018-10-16 09:00:48 +02:00
artica
9675c6ce52
Auto-updated build strings.
2018-10-16 00:01:27 +02:00
manuel.montes
23fa30a514
Increased the character limit in Warning / Critical status string type when creating Network component
2018-10-15 16:59:39 +02:00
fermin831
dd4e1c9994
Fixed modules tags acl with to tagged modules with an user without tags
2018-10-15 16:50:23 +02:00
tatiana.llorente@artica.es
6adcba4b39
Changed url for widgets in public dashboard - #2888
2018-10-15 16:12:16 +02:00
danielmaya
392d4e7aad
Fixed lost id_agent in visual console
2018-10-15 15:05:47 +02:00
fermin831
41d104ae2c
Improve performance on tactical view with a lot of events
2018-10-15 12:23:51 +02:00
daniel
d84427b014
fixed errors php
2018-10-15 10:32:24 +02:00
daniel
d28bc79b79
upgrade php
2018-10-15 09:05:04 +02:00
daniel
c3bcb84293
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-15 08:58:55 +02:00
vgilc
f3c8b14b32
Merge branch '2457-Formulario-de-creacion-repetido' into 'develop'
...
added check to prevent alert creation form from being printed in alert cluster for step 5
See merge request artica/pandorafms!1854
2018-10-15 00:06:41 +02:00
vgilc
743c8a747e
Merge branch 'ent-2819-i6537-se-descuadran-etiquetas-en-link-publico-cons-visuales' into 'develop'
...
Fixed margin in public visual consoles
See merge request artica/pandorafms!1855
2018-10-15 00:04:34 +02:00
artica
35e1234b3c
Auto-updated build strings.
2018-10-15 00:01:24 +02:00
artica
44be4aea57
Auto-updated build strings.
2018-10-14 00:01:23 +02:00