dcacd53d5b
Merge branch 'fix/graphs_in_alerts' into 'develop'
...
fixed related changes in phantomjs interface
See merge request artica/pandorafms!2029
2018-11-30 12:47:24 +01:00
f463c44e9c
Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop'
...
fixed minor error slicebar
See merge request artica/pandorafms!2028
2018-11-30 12:46:54 +01:00
ce8e33ba29
Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop'
...
2517 api listar y crear perfiles de usuario en meta 6168 eucomm
See merge request artica/pandorafms!1905
2018-11-30 12:22:37 +01:00
3cbb75b551
Merge branch '3044-Visualización-rara-en-agent-view' into 'develop'
...
Changed ORDER BY in SQL query - #3044
See merge request artica/pandorafms!1938
2018-11-30 11:02:14 +01:00
b8b43b33d7
Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm' into 'develop'
...
Ent 2520 api listar y crear repuestas de eventos 6165 eucomm
See merge request artica/pandorafms!1896
2018-11-30 10:50:59 +01:00
2249ac4d8e
Auto-updated build strings.
2018-11-30 00:01:26 +01:00
c728cb1412
fixed related changes in phantomjs interface
2018-11-29 17:26:41 +01:00
3bf215782e
fixed minor error slicebar
2018-11-29 17:00:55 +01:00
dc7176585e
new API get_all_alerts_command
2018-11-29 16:57:17 +01:00
8d2daf3948
fixed bug: pie graph not showing in mobile's tactical view dashboard widget
2018-11-29 16:08:41 +01:00
9bdd1af488
fixed errors in visual console
2018-11-29 13:24:12 +01:00
4b1649d5f8
Auto-updated build strings.
2018-11-29 00:01:26 +01:00
f0ff20fda1
Add commands alert
2018-11-28 21:38:02 +01:00
9006a47650
fixed bug in function __()
2018-11-28 12:32:19 +01:00
590cef50f4
Fixed Automatic combined Graph in metaconsole
2018-11-28 09:48:58 +01:00
c48a0ffc49
Auto-updated build strings.
2018-11-28 00:01:25 +01:00
1cdc9c0d7f
fixed label not showing on reload in visual console builder's percentile item for types bubble, circular progress bar interior and percentile
2018-11-27 18:23:18 +01:00
0460b465f0
fixed warnings and font chart for pdf report
2018-11-27 17:43:59 +01:00
89d2f831ba
fixed labels not showing for percentile item in visual console builder
2018-11-27 11:35:59 +01:00
ad743d332e
Auto-updated build strings.
2018-11-27 00:01:24 +01:00
b7546a5019
Auto-updated build strings.
2018-11-26 00:01:25 +01:00
6bfe880dc8
Auto-updated build strings.
2018-11-25 00:01:24 +01:00
53401e1f4d
Auto-updated build strings.
2018-11-24 00:01:28 +01:00
bc70922acf
Merge branch 'ent-2221-saml-php7-issues' into 'develop'
...
Patch to SAML login. It wont pass for pandora session handlers
See merge request artica/pandorafms!2015
2018-11-23 15:04:50 +01:00
8f988dfb16
Merge branch 'ent-3144-mobile-console-event-detail-bugfix' into 'develop'
...
Fixed the event detail view on the mobile console
See merge request artica/pandorafms!2016
2018-11-23 12:42:27 +01:00
de08451c84
Bugfix
2018-11-23 12:21:35 +01:00
cb9c6e35ba
Patch to SAML login. It wont pass for pandora session handlers
2018-11-23 11:37:05 +01:00
cfeaea57ff
Merge branch '3132-No_aparecen_campos_recon_task' into 'develop'
...
fixed minor error jquery
See merge request artica/pandorafms!2014
2018-11-23 11:11:39 +01:00
726cabb578
fixed minor error jquery
2018-11-23 10:47:57 +01:00
557002d7fd
fixed error events graphs
2018-11-23 10:32:58 +01:00
c8969582a0
Auto-updated build strings.
2018-11-23 00:01:28 +01:00
62ad6b9a35
Added check of tags in report wizard
2018-11-22 10:39:48 +01:00
b4f3ce251b
Merge branch '2615-Bug_Session_Timeout' into 'develop'
...
fixed errors in session with send mail alerts graph API
See merge request artica/pandorafms!2004
2018-11-22 09:01:47 +01:00
de77e52297
Auto-updated build strings.
2018-11-22 00:01:28 +01:00
a5346a7ae3
fixed error login double
2018-11-21 17:38:11 +01:00
322c76b5e1
Merge remote-tracking branch 'origin/develop' into 2615-Bug_Session_Timeout
2018-11-21 16:52:20 +01:00
a3aa84bf92
fixed errors in session with send mail alerts graph API
2018-11-21 15:16:52 +01:00
7be5225429
Merge branch '2615-Bug_Session_Timeout' into 'develop'
...
fixed errors session_start
See merge request artica/pandorafms!2003
2018-11-21 13:13:47 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
0344a5c2b0
Merge branch '2615-Bug_Session_Timeout' into 'develop'
...
fixed minor error session
See merge request artica/pandorafms!2000
2018-11-21 09:41:59 +01:00
3f6384c690
fixed minor error session
2018-11-21 09:36:37 +01:00
fd6d830de3
Auto-updated build strings.
2018-11-21 00:01:25 +01:00
a089a93477
fixed session bugs
2018-11-20 18:07:43 +01:00
20cbe0d767
Merge branch 'ent-3109-no-se-ven-los-agentes-en-la-creacion-de-clusters' into 'develop'
...
Fixed query on function agents_get_group_agents
See merge request artica/pandorafms!1997
2018-11-20 17:37:07 +01:00
80b39782e4
Fixed function report_value in reports
2018-11-20 14:16:25 +01:00
5ac947c2fd
Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
...
Ent 2169 rediris modificacion de comandos en alertas
See merge request artica/pandorafms!1878
2018-11-20 11:33:00 +01:00
8a00fe5a30
Fixed query on function agents_get_group_agents
2018-11-20 10:58:58 +01:00
6302dc634d
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!1996
2018-11-20 09:22:17 +01:00
2078014406
fixed minor error
2018-11-20 09:14:36 +01:00
01ba290a68
Auto-updated build strings.
2018-11-20 00:01:29 +01:00
522a098d24
Merge branch '2615-bug-session-timeout' into 'develop'
...
time used for session cookie expiration set to gmt time
See merge request artica/pandorafms!1995
2018-11-19 17:30:11 +01:00
ee22d3988c
fixed error ldap
2018-11-19 16:33:27 +01:00
2c5cd6627b
time used for session cookie expiration set to gmt time
2018-11-19 16:33:27 +01:00
34aea47449
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
...
2784 pantalla por dispositivos filtrado por custom fields
See merge request artica/pandorafms!1993
2018-11-19 16:24:58 +01:00
9d80e940bf
fixed minor error cfv
2018-11-19 16:17:20 +01:00
8e72f53aff
Removed unnecessary loop - #3096
2018-11-19 16:07:45 +01:00
c499a21cc2
Merge branch '2615-bug-session-timeout' into 'develop'
...
time used for session cookie set to timezone current time instead of gmt time
See merge request artica/pandorafms!1991
2018-11-19 13:29:01 +01:00
3ffab647cb
time used for session cookie set to timezone current time instead of gmt time
2018-11-19 13:21:25 +01:00
24fe48d5c5
Added token metaconsole_deploy_collection in the config
2018-11-19 12:12:10 +01:00
04ebb6b2c5
Added delete function in the api
2018-11-19 11:28:35 +01:00
105e93d069
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-19 08:42:30 +01:00
96a36615cc
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
...
2784 pantalla por dispositivos filtrado por custom fields
See merge request artica/pandorafms!1987
2018-11-19 08:39:16 +01:00
ce5c679ad6
Auto-updated build strings.
2018-11-19 00:01:29 +01:00
f2bf27d367
Auto-updated build strings.
2018-11-18 00:01:28 +01:00
4021af48f9
Auto-updated build strings.
2018-11-17 00:01:31 +01:00
2eb47c1251
fixed errors in custom fields view
2018-11-16 15:00:09 +01:00
b2ed4a9d2c
standby software agent while disabling
2018-11-16 14:26:11 +01:00
d0d989ab19
Merge branch 'fix/db-retry-lock' into 'develop'
...
retried db query on error 1205 - lock
See merge request artica/pandorafms!1981
2018-11-16 13:15:06 +01:00
f99dadca39
Merge branch 'fix/ux-panel-historical-images' into 'develop'
...
Fix/ux panel historical images
See merge request artica/pandorafms!1984
2018-11-16 12:51:31 +01:00
5c3b3a0e66
adjusted replication_interval default
2018-11-16 12:46:10 +01:00
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
8956ebd3c0
Changed the font styles of the labels - #3047
2018-11-16 11:46:41 +01:00
50c3453415
change default values for event synch
2018-11-16 11:27:32 +01:00
e6cd8c5471
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-16 09:11:49 +01:00
a0fde9503f
Auto-updated build strings.
2018-11-16 00:01:29 +01:00
e21fde537a
fixed css errors custom field view and new features
2018-11-15 19:16:49 +01:00
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
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
7700ee85ca
Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7
2018-11-15 15:34:08 +01:00
d12a25866d
fixed translate php7 warning
2018-11-15 15:33:46 +01:00
1edb7fda03
Merge remote-tracking branch 'origin/develop' into 3072-Problemas_jquery
2018-11-15 15:20:02 +01:00
34ea7cfbcb
fixed position select autocomplete agent jqui
2018-11-15 15:19:43 +01:00
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
aee12e6bf9
Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7
2018-11-15 13:23:09 +01:00
b78c52caa4
fixed error Acess for Access
2018-11-15 13:22:54 +01:00
b786c6c3ab
Fixed snmptrap binary in windows trap generator
2018-11-15 13:04:35 +01:00
a1846a6e22
removed hide not init modules from sla and availability report
2018-11-15 12:00:25 +01:00
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
e9e132589c
Auto-updated build strings.
2018-11-15 00:01:29 +01:00
6174e622c8
create alert php7
2018-11-14 18:15:48 +01:00
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
60212dae50
fixed errors cv
2018-11-14 16:38:44 +01:00
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
a20d541fb4
removed default charset, set to auto
2018-11-14 12:31:35 +01:00
dc6a293b52
Fixed error in agent table in GIS map
2018-11-14 11:53:12 +01:00
22a26aa072
fixed error upgrade jquery
2018-11-14 11:40:01 +01:00
633d6987eb
Auto-updated build strings.
2018-11-14 00:01:29 +01:00
dd7e623782
Fixed overflow in module data view
2018-11-13 17:04:14 +01:00
b2996e59d5
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 16:50:35 +01:00
a6b8929a37
Added jquery-ui styles to css - #2784
2018-11-13 16:48:06 +01:00
719e502a27
Revert "Added jquery-ui styles to css - #2784"
...
This reverts commit fdda5793d2
2018-11-13 16:34:27 +01:00
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
fdda5793d2
Added jquery-ui styles to css - #2784
2018-11-13 16:27:57 +01:00
f308e1f590
Updated version and build strings.
2018-11-13 15:59:16 +01:00
ac671d041c
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 15:47:07 +01:00
4dbcecb951
WIP custom fields view
2018-11-13 15:46:44 +01:00
06830c9f69
Added profiller to docker
2018-11-13 12:55:25 +01:00
ea9cbb6973
Changed visual styles - #2784
2018-11-13 11:20:27 +01:00
66448673c1
Fixed no data to show in not init modules with TIP graphs
2018-11-13 09:00:42 +01:00
2a0d2e6c46
collection management from metaconsole
2018-11-13 08:33:47 +01:00
e29160f34d
Auto-updated build strings.
2018-11-13 00:01:29 +01:00
a201262737
Fixed php errors on radial networkmap
2018-11-12 16:29:31 +01:00
406bf08e2e
Changed images for status modules and agents - #2784
2018-11-12 15:43:23 +01:00
e9627949a8
Fixed link in static graph
2018-11-12 13:12:52 +01:00
3d04a742a3
Merge remote-tracking branch 'origin/develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
2018-11-12 13:10:53 +01:00
69df02da48
Fixed bug in agent graph view
2018-11-12 10:45:50 +01:00
afaa6ad2ba
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-12 09:07:56 +01:00
0dd6c54651
Auto-updated build strings.
2018-11-12 00:01:25 +01:00
4f928c8c22
Auto-updated build strings.
2018-11-11 00:01:25 +01:00
76b24c3214
Auto-updated build strings.
2018-11-10 00:01:28 +01:00
2ed98eac77
Auto-updated build strings.
2018-11-09 00:01:27 +01:00
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
8a2e82371d
Fixed stacked area graph error when opened in PDF format
2018-11-08 17:07:47 +01:00
80d3299b2b
Removed unused code (meta static graphs)
2018-11-08 16:46:34 +01:00
c4c0cc59d4
fixed error automatic combined graph
2018-11-08 15:05:57 +01:00
bb15c39ef5
WIP Custom view fields
2018-11-08 15:03:40 +01:00
9c2e67f364
avoid sql injection in visual_map_get_user_layouts function
2018-11-08 14:01:18 +01:00
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
059ca855f9
Added cache to agents_get_alias
2018-11-08 13:03:04 +01:00
a144dd0cbd
Removed text for modules with images - #2838
2018-11-08 09:32:38 +01:00
d28b229423
Auto-updated build strings.
2018-11-08 00:01:29 +01:00
1c1df4b5f7
fixed errors css jqueryui
2018-11-07 17:09:42 +01:00
46a7d4c5f5
Fixed minor visual error in planned downtimes
2018-11-07 16:19:54 +01:00
58aa334798
fixed minor errors in graphs an license diag
2018-11-07 13:33:07 +01:00
218bf81fa1
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-07 13:30:19 +01:00
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
267f83cc4c
add datatabes
2018-11-07 13:25:02 +01:00
7d54858b45
delete files dont use
2018-11-07 13:24:07 +01:00
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
3ffd976365
resolved conflicts in ver_agente
2018-11-07 12:31:54 +01:00
2a616e1448
fixed agent name and go to agent edition links in meta tree view
2018-11-07 12:29:37 +01:00
aa19640497
Changed ORDER BY in SQL query - #3044
2018-11-07 10:34:14 +01:00
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
a01f79d294
Auto-updated build strings.
2018-11-07 00:01:31 +01:00
a80c7e493e
Added check for the creation of planned downtimes by pandora manage
2018-11-06 16:42:03 +01:00
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
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
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
bfc669225c
Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash
2018-11-06 14:48:14 +01:00
df8c5e8bf9
Fixed bug in deleted policies
2018-11-06 13:52:03 +01:00
26a4880f64
Removed duplicated code - #3021
2018-11-06 13:49:47 +01:00
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
9448111927
Fixed SQL query - #2973
2018-11-06 11:14:12 +01:00
3ffad9fda8
Auto-updated build strings.
2018-11-06 00:01:27 +01:00
7a7fcaa6a8
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-05 09:35:38 +01:00
b71d396c84
WIP custom fields view
2018-11-05 09:35:17 +01:00
50b8886916
Auto-updated build strings.
2018-11-05 00:01:25 +01:00
f9e2936df5
Auto-updated build strings.
2018-11-04 00:01:25 +01:00
afd922426e
Auto-updated build strings.
2018-11-03 00:01:27 +01:00
e2fabb6167
WIP custom fields view
2018-11-02 13:37:30 +01:00
233b9c2c70
Well centered message modal window - #2768
2018-11-02 13:07:38 +01:00
0f3717a268
Be able to change the subject and body of the report message when necessary
2018-11-02 12:57:52 +01:00
ec194208f5
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-02 08:20:39 +01:00
fc82a9d172
Auto-updated build strings.
2018-11-02 00:01:26 +01:00
f47918b4cc
Auto-updated build strings.
2018-11-01 00:01:31 +01:00
b5045d522e
WIP custom fields view
2018-10-31 18:02:36 +01:00
9f0e43623b
Fixed agent popup with secondary groups privileges in tree view
2018-10-31 16:16:32 +01:00
879b1cfecb
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-10-31 09:23:58 +01:00
7f22e2b067
Fixed disabled modules on agent view
2018-10-31 08:57:34 +01:00
d9f8616b2c
Auto-updated build strings.
2018-10-31 00:01:26 +01:00
39b6164526
snapshot viewer fix
2018-10-30 18:20:10 +01:00
8fe82add30
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options
2018-10-30 17:53:57 +01:00
78a1c72eac
fixed warnings php7
2018-10-30 17:38:46 +01:00
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
a58bde2118
fixed UX historical snapshot viewer
2018-10-30 16:12:48 +01:00
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
743a41d29c
fixed changes in pandora mobile
2018-10-30 12:30:10 +01:00
74016c928f
fixed bug: failing load of post process and unit fields in plugin component in module creation
2018-10-30 10:20:31 +01:00
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
5a057490ad
Auto-updated build strings.
2018-10-30 00:01:29 +01:00
8e206eeeef
fixed errors php7
2018-10-29 18:20:56 +01:00
c7a624000e
Added API function set delete_user_profile_info
2018-10-29 13:34:30 +01:00
6353af0482
Merge remote-tracking branch 'github/develop' into develop
2018-10-29 13:20:48 +01:00
bf7cdcc7ff
Added API function set update_user_profile_info
2018-10-29 12:45:03 +01:00
4f02d72630
Added API function set create_user_profile_info
2018-10-29 12:22:08 +01:00
29fb922b70
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-10-29 11:06:57 +01:00
c211433321
Added API function get user_profiles_info
2018-10-29 11:02:43 +01:00
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
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
696abbdead
Auto-updated build strings.
2018-10-29 00:01:25 +01:00
507bbcff56
Auto-updated build strings.
2018-10-28 00:01:22 +02:00
01e9251a88
Auto-updated build strings.
2018-10-27 00:01:26 +02:00
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
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
ecf5ca3bb2
Updated Japanese help files.
2018-10-26 17:28:24 +09:00
dba51e07b3
Auto-updated build strings.
2018-10-26 00:01:33 +02:00
7634a41e04
Api meta functions new,update,delete,get users - #2523
2018-10-25 20:01:04 +02:00
2849d62faa
Add generic API functions set access control and traps functions - #2978
2018-10-25 19:48:23 +02:00
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
f78e86b925
view cusatom field
2018-10-25 17:08:56 +02:00
c06bd4207e
estilos popup
2018-10-25 16:40:45 +02:00
172ac187a2
estilos popup
2018-10-25 15:58:06 +02:00
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
f831e59ac3
Added documentation and minor fixes related with API event responses functions
2018-10-25 15:42:45 +02:00
8619adbf4c
estilos popup
2018-10-25 15:42:20 +02:00
8cc68185d9
Added set delete_event_response to API
2018-10-25 15:34:02 +02:00
1bd492307a
Added set update_event_response to API
2018-10-25 15:25:27 +02:00
6b93cba119
Added set create_event_response to API
2018-10-25 15:03:07 +02:00
85051924b7
estilos popup
2018-10-25 14:01:12 +02:00
ad652c82fa
fixed english and spanish version of plugin-in macros help dialog
2018-10-25 13:56:17 +02:00
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
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
4b522d3f03
Added disabled field in sql query - #2955
2018-10-25 13:18:28 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c0afbf0b6f
Added get event_responses to API
2018-10-25 11:49:39 +02:00
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
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
bbde9c70b6
conflict resolved
2018-10-25 11:13:57 +02:00
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
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
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
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
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
db802c5a2e
Auto-updated build strings.
2018-10-25 00:01:22 +02:00
87abf1dc02
added event time filter in tactical view
2018-10-24 16:36:44 +02:00
f0dbff1885
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-24 12:22:12 +02:00
ca75cff3f7
Fixed bug in alert details
2018-10-24 10:25:45 +02:00
7a64bb4855
Auto-updated build strings.
2018-10-24 00:01:28 +02:00
8cb2ff1d1b
Fixed tactical view graph on mobile metaconsole
2018-10-23 17:41:14 +02:00
9e452993cf
Tip added - #2904
2018-10-23 15:19:15 +02:00
9765a8c113
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-23 14:43:39 +02:00
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
9a77256198
Auto-updated build strings.
2018-10-23 00:01:29 +02:00
f537dbb961
Validate the group command on action creation
2018-10-22 16:19:29 +02:00
aaa2c6aa10
fixed bug: calling api method create event not inserting agent name
2018-10-22 10:31:10 +02:00
f899910dd0
Updated version and build strings.
2018-10-22 09:45:06 +02:00
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
1d0d656996
Auto-updated build strings.
2018-10-22 00:01:23 +02:00
b01362a873
Auto-updated build strings.
2018-10-21 00:01:26 +02:00
5ced50863c
Auto-updated build strings.
2018-10-20 00:01:25 +02:00
972f4b1e89
Added unit in label graphs
2018-10-19 14:03:15 +02:00
bd2a3a82ec
silence error php7(not solution)
2018-10-19 12:25:01 +02:00
81ebfc755e
fixed gdgraph
2018-10-19 12:01:22 +02:00
8c49b26a91
php7 version
2018-10-19 11:37:11 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
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
0a1bee92a5
fixed slicebar to php7
2018-10-19 10:49:13 +02:00
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
b736746e1c
php version upgrade
2018-10-19 10:04:26 +02:00
f340a3dda0
Auto-updated build strings.
2018-10-19 00:01:26 +02:00
4d3c74ed37
Minor typo fix in events responses
2018-10-18 19:20:37 +02:00
40ceec6561
Fixed macro _agent_adress_ on events responses
2018-10-18 18:45:11 +02:00
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
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
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
0c39e321e4
Auto-updated build strings.
2018-10-18 00:01:24 +02:00
2d2c465ff6
Removed unwanted traces
2018-10-17 15:43:26 +02:00
aa0c4b41e7
Fixed bug in the data collection of network component when creating its corresponding module
2018-10-17 13:31:14 +02:00
7a44f9dcdd
Minor fix in cde cluster api methods
2018-10-17 13:26:41 +02:00
14afe2ff88
Added message 'Please, select an agent first'
2018-10-17 12:35:11 +02:00
060e46868d
Fixed tags filter on bulk operation (select module first)
2018-10-17 11:57:22 +02:00
fd53704dc0
Auto-updated build strings.
2018-10-17 00:01:34 +02:00
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
3c62388f0e
fixed errors php and slicebars change version php7
2018-10-16 15:32:31 +02:00
0ca34c744d
Fixed tags filter on Tree tags
2018-10-16 13:29:00 +02:00
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
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
9675c6ce52
Auto-updated build strings.
2018-10-16 00:01:27 +02:00
dd4e1c9994
Fixed modules tags acl with to tagged modules with an user without tags
2018-10-15 16:50:23 +02:00
6adcba4b39
Changed url for widgets in public dashboard - #2888
2018-10-15 16:12:16 +02:00
41d104ae2c
Improve performance on tactical view with a lot of events
2018-10-15 12:23:51 +02:00
d84427b014
fixed errors php
2018-10-15 10:32:24 +02:00
d28bc79b79
upgrade php
2018-10-15 09:05:04 +02:00
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
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
35e1234b3c
Auto-updated build strings.
2018-10-15 00:01:24 +02:00
44be4aea57
Auto-updated build strings.
2018-10-14 00:01:23 +02:00
b0e56cd506
Auto-updated build strings.
2018-10-13 00:01:24 +02:00
179f3f0526
Auto-updated build strings.
2018-10-12 00:01:28 +02:00
0747a5b263
Fixed secondary groups privileges in agent popup in tree view
2018-10-11 16:00:49 +02:00
e5a2284b8b
Fixed margin in public visual consoles
2018-10-11 14:51:52 +02:00
16be9488c8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/include/functions_graph.php
2018-10-11 13:06:17 +02:00
1f56054f6c
fixed changes php7
2018-10-11 12:57:48 +02:00
edadc60957
Merge branch '2737-Optimización-de-tags-dev' into 'develop'
...
2737 optimización de tags dev
See merge request artica/pandorafms!1815
2018-10-11 12:14:10 +02:00
3e584747b3
Merge pull request #104 from sofwerx/https-proxy
...
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
2018-10-11 09:34:26 +02:00
d087665d1e
Auto-updated build strings.
2018-10-11 00:01:56 +02:00
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
18ad7a2ce9
[Tags performance] Fixed not init filter
2018-10-10 19:14:24 +02:00
4ac4f46daf
Fixed html_print_autocomplete_modules
2018-10-10 18:02:10 +02:00
496f99e42f
[Tags performance] Fixed tags counters in tags view
2018-10-10 17:43:02 +02:00
de10de03f7
[Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first
2018-10-10 17:42:33 +02:00
8339eecacc
Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev
2018-10-10 16:57:15 +02:00
4558c909ef
Changed source filter in event list
2018-10-10 16:57:04 +02:00
ba419ad246
Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-fix' into 'develop'
...
Fix returnData - #2881
See merge request artica/pandorafms!1849
2018-10-10 09:10:27 +02:00
1694fccd83
Auto-updated build strings.
2018-10-10 00:01:47 +02:00
3d6451d64b
Fix returnData - #2881
2018-10-09 20:03:49 +02:00
159d7466cd
Merge branch 'develop' into 2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail
...
Conflicts:
pandora_console/include/functions_agents.php
2018-10-09 17:01:08 +02:00
2083733329
Fix id for agent status - #2881
2018-10-09 16:33:07 +02:00
8f2472dcf8
Added css rule for links in the th tables with databox class- #2890
2018-10-09 12:38:59 +02:00
ec7c645d1b
[Tags performance] Fixed problems when there is not using secondary groups
2018-10-09 11:45:55 +02:00
28f9e152e7
[Tags performance] Fixed tags filter and removed unwanted code
2018-10-09 10:56:02 +02:00
bc90e77a3d
Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-2' into 'develop'
...
api function api_get_all_agents for meta - #2881
See merge request artica/pandorafms!1840
2018-10-09 08:53:16 +02:00
6ea8bee8ca
Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations_2' into 'develop'
...
Fixed error in agents bulk operations
See merge request artica/pandorafms!1841
2018-10-09 08:52:26 +02:00
51c4fbece2
Auto-updated build strings.
2018-10-09 00:01:25 +02:00
61a82337c3
Fixed error in agents bulk operations
2018-10-08 17:57:05 +02:00
f952d5c70e
tags_get_acl_tags revision
2018-10-08 17:45:26 +02:00
441458843f
[Tags performance] Fixed check acl tags by module and removed unused code
2018-10-08 17:19:46 +02:00
f7700874a5
api function api_get_all_agents for meta - #2881
2018-10-08 16:45:44 +02:00
099f01a4ba
[Tags performance] Fixed select modules from Agent/Module dashboard widget
2018-10-08 13:45:30 +02:00
11679461cd
Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents' into 'develop'
...
Add status data to get_all_agents API response - #2881
See merge request artica/pandorafms!1835
2018-10-08 13:24:35 +02:00
d2b8939804
[Tags performance] Fixed select_modules_for_agent_group function (failed with several secondary groups).
2018-10-08 12:33:40 +02:00
918ba8ed77
Added text for nodata in graph and resized image - #1804
2018-10-08 11:53:30 +02:00
76da7384b6
Auto-updated build strings.
2018-10-08 00:01:23 +02:00
5171ef79b0
Auto-updated build strings.
2018-10-07 00:01:23 +02:00
a40057b3ff
Auto-updated build strings.
2018-10-06 00:01:29 +02:00
112b4e3097
Add get_group_id_by_name and get_timezone to api functions - #2756
2018-10-05 17:01:11 +02:00
a72b9b0515
[Tags performance] Fixed agents_get_modules to ajax calls
2018-10-05 13:32:14 +02:00
c0dd2bcab6
Add status data to get_all_agents API response - #2881
2018-10-05 12:57:25 +02:00
1e4c570541
[Tags performance] check agents_get_modules in networkmap and removed unused code
2018-10-05 10:44:24 +02:00
5fd76bf8cb
Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev
2018-10-05 09:42:09 +02:00
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
ec8d36f8eb
Auto-updated build strings.
2018-10-05 00:01:30 +02:00
7766881da6
Added option charset to db_connect
...
Removed unused function db_get_table_count
2018-10-04 17:07:34 +02:00
07e476a740
Fixed bug in agent status filter
2018-10-04 16:35:37 +02:00
979e443824
Removed unused code
2018-10-04 16:31:24 +02:00
75768c9eaa
[Tags performance] Open reporting checks
2018-10-04 16:23:36 +02:00
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
7ac581ac1e
Auto-updated build strings.
2018-10-04 00:01:27 +02:00
f3eae5e111
[Tags performance] Some agents_get_modules checks
2018-10-03 17:00:57 +02:00
a33cae9e8f
[Tags performance] Check functions_agents agents_get_modules
2018-10-03 16:33:56 +02:00
0ca13b8e98
Removed unused code
2018-10-03 15:04:45 +02:00
36fade6b37
Removed unwanted traces
2018-10-03 13:55:06 +02:00
7bd0615681
[Tags performace] Check visual consoles
2018-10-03 13:53:59 +02:00
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
958930931e
Fixed filter group in agents/modules view
2018-10-03 10:42:59 +02:00
46830a4cbe
Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop'
...
fixed issue with string data in visual map
See merge request artica/pandorafms!1811
2018-10-03 09:31:02 +02:00
vgilc
artica
fbsanchez
daniel
samucarc
alejandro-campos
danielmaya
Alejandro Gallardo Escobar
fermin831
tatiana.llorente@artica.es
nramon
manuel.montes
artica
Junichi Satoh
enriquecd
Ramón Novoa