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
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
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
f39788d8ef
Auto-updated build strings.
2018-10-03 00:01:28 +02:00
ca67f52fb4
Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop'
...
2670 nuevo widget dashboard system group status
See merge request artica/pandorafms!1795
2018-10-02 17:25:19 +02:00
62548c7f94
Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status
...
Conflicts:
pandora_console/include/styles/pandora.css
2018-10-02 17:11:02 +02:00
7db6ae54ff
Merge branch '2857-Falta-imagen-de-fondo-para-preview-de-logo-en-visual-setup-de-meta' into 'develop'
...
edited css class ui-widget-content
See merge request artica/pandorafms!1822
2018-10-02 15:39:18 +02:00
5668857914
Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop'
...
2479 errores en vista de alertas de meta
See merge request artica/pandorafms!1821
2018-10-02 15:37:08 +02:00
f767474516
[Tags performance] Fixed indexed agents_get_modules with no details
2018-10-02 15:30:19 +02:00
8d5953ce50
Removed unused code
2018-10-02 15:01:40 +02:00
2d057f9ae9
Fixed tags problems with secondary groups in tree view
2018-10-02 13:35:48 +02:00
dc92a00b48
[Tags performance] Fixed performance of main agent view
2018-10-02 13:19:36 +02:00
2dd10a4328
Added number of times an alert is fired - #2827
2018-10-02 12:35:20 +02:00
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
08a3aabdf2
Auto-updated build strings.
2018-10-02 00:01:33 +02:00
1c2743797e
Revert "fixed conflict"
...
This reverts commit 1d726d59f3
2018-10-01 18:16:55 +02:00
e5e81e55d7
edited css class ui-widget-content
2018-10-01 17:58:29 +02:00
9a47d5325e
[Tags performance] Events improvements
2018-10-01 17:03:37 +02:00
1d726d59f3
fixed conflict
2018-10-01 15:34:36 +02:00
6b14754137
fixed conflict
2018-10-01 15:30:43 +02:00
b5ebd81b19
fixed error values negative
2018-10-01 15:24:29 +02:00
706a3ca4c0
Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop'
...
fixed bug in meta alert view: action field (other than default) not showing
See merge request artica/pandorafms!1621
2018-10-01 14:45:16 +02:00
0c899f5078
Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta
...
Conflicts:
pandora_console/include/functions_ui.php
2018-10-01 14:03:30 +02:00
600ee87149
Merge branch '2659-Usuarios-LDAP-no-se-actualizan-ante-cambio-de-permisos-dev' into 'develop'
...
Added check permissions in ldap login
See merge request artica/pandorafms!1785
2018-10-01 12:41:09 +02:00
62dcf0f342
Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop'
...
Fixed welcome icone
See merge request artica/pandorafms!1640
2018-10-01 12:38:49 +02:00
d9a8e30229
Merge branch '2138-En-la-API-se-esta-usando-el-nombre-del-agente-para-filtrar-en-lugar-del-alias' into 'develop'
...
Agent filtering by alias
See merge request artica/pandorafms!1627
2018-10-01 12:30:09 +02:00
f73b4a55e6
Merge branch '2741-Refactorizar_vista_module_groups' into 'develop'
...
refactoriced view module_groups
See merge request artica/pandorafms!1788
2018-10-01 10:59:09 +02:00
9977f1ddf9
Added code for function api_get_agent_alias for the API of the metaconsole - #2708
2018-10-01 09:51:58 +02:00
779f3c6c60
Auto-updated build strings.
2018-10-01 00:01:23 +02:00
46373616fa
Auto-updated build strings.
2018-09-30 00:01:22 +02:00
2606b73e57
Auto-updated build strings.
2018-09-29 00:01:27 +02:00
debf8db577
[Tags performance] Added some TODOs
2018-09-28 12:39:23 +02:00
015d7eea09
[Tags performance] Fixed acl propagation in child groups
2018-09-28 12:37:11 +02:00
2dac09435a
Merge branch '2040-Tags-en-operaciones-masivas' into 'develop'
...
fixed bug on bulk delete and bulk update module operation
See merge request artica/pandorafms!1613
2018-09-28 11:05:34 +02:00
7d3916fcb7
Merge branch '2436-Estadisticas-de-incidentes' into 'develop'
...
removed watermark from incidents statistics graphs
See merge request artica/pandorafms!1598
2018-09-28 10:51:36 +02:00
d5b9ddec46
Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop'
...
Added new funcionality to cluster alert configuration: update alert
See merge request artica/pandorafms!1634
2018-09-28 10:50:44 +02:00
d933a966eb
Merge branch '2478-Logo-meta' into 'develop'
...
changed background of meta visual setup logo previews
See merge request artica/pandorafms!1641
2018-09-28 10:50:13 +02:00
ad5581f0c2
Merge branch '2491-Alert-view-meta' into 'develop'
...
fixed bug in meta alert view: agent names not showing in table
See merge request artica/pandorafms!1618
2018-09-28 10:39:52 +02:00
d31a2f4cc4
Merge branch 'ent-2763-snmp-traps' into 'develop'
...
Added recalculate counters when a status module is forced by console
See merge request artica/pandorafms!1794
2018-09-28 10:29:14 +02:00
4d2413b39b
Merge branch '2501-Crear-SO-con-la-API' into 'develop'
...
added methods to api (metaconsole and node) to create and update operating systems
See merge request artica/pandorafms!1654
2018-09-28 10:26:47 +02:00
dec9021702
Merge branch '2548_Bug_edicion_modulos_operaciones_masivas' into 'develop'
...
Fixed tags in module bulk operations
See merge request artica/pandorafms!1639
2018-09-28 10:25:38 +02:00
f98e2ed1bf
Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations' into 'develop'
...
Fixed error in agents bulk operations with a normal status
See merge request artica/pandorafms!1709
2018-09-28 10:24:27 +02:00
eb5d169b53
Merge branch '2727-Link-publico-de-console-visual' into 'develop'
...
new parameter has been passed in to check whether or not we are at a public…
See merge request artica/pandorafms!1808
2018-09-28 10:04:52 +02:00
6a6bae10b1
Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop'
...
Ent 2782 ue agente software en modo standby
See merge request artica/pandorafms!1800
2018-09-28 10:04:12 +02:00
2fe350ed75
Merge branch '2816-Reports-de-custom-graphs-no-funcionan-si-le-ponemos-un-nombre-a-la-custom-graph' into 'develop'
...
fixed bug: reporting of custom graphs not showing graph when graph name is empty
See merge request artica/pandorafms!1809
2018-09-28 09:58:11 +02:00
81e15c4dc9
Fixed tags on Tree view
2018-09-28 09:37:16 +02:00
1a60aee7a6
Auto-updated build strings.
2018-09-28 00:01:25 +02:00
aceb67dd69
[Tags performance] Improve event view
2018-09-27 18:11:13 +02:00
712103c308
Fixed bug in csv export graph
2018-09-27 17:35:52 +02:00
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
631c38ca84
[Tags performance] Improve monitor detail (aka status_monitor)
2018-09-27 12:46:45 +02:00
79961b91d0
Auto-updated build strings.
2018-09-27 00:01:24 +02:00
896ba6051b
fixed issue with string data in visual map
2018-09-26 11:00:44 +02:00
643da5c993
Auto-updated build strings.
2018-09-26 00:01:28 +02:00
24de9d9119
fixed bug: reporting of custom graphs not showing graph when graph name is empty
2018-09-25 17:33:29 +02:00
tatiana.llorente@artica.es
artica
daniel
fermin831
danielmaya
artica
samucarc
manuel.montes
vgilc
alejandro-campos
fbsanchez
Ramon Novoa
Junichi Satoh
Ramón Novoa
enriquecd