2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
7e345035e1
add height and round border in d3 graph progress
...
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
cf8915af36
[Netflow live] Removed unit from circular mesh
...
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
2019-03-14 10:05:21 +01:00
98ec2f31e6
Restored width in % and forced Agent SNMP view to enter if with widget=true
...
Former-commit-id: 25ca763789d5d30d298b6bf77bd5f0630aff526f
2019-03-07 18:05:03 +01:00
d4b79179d9
Fixed width unit on graph, setted to px instead of %
...
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
218e90a663
Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
...
Fixed minor bug in pandora flot js
See merge request artica/pandorafms!1897
Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
f14684b22d
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +01:00
9c623148f5
Fixed conflict
...
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
2019-02-06 19:14:46 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
b2434229db
Merge branch '1851-Grafica_de_widget_de_WUX_se_descoloca_si_falla_la_primera_fase' into 'develop'
...
fixed error widgets wux
See merge request artica/pandorafms!2102
Former-commit-id: c47bc3fc71f671b9ae4d668a6f81711683bb43a2
2019-01-16 11:03:02 +01:00
0cb7aa3d0e
Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
...
Changed the font styles of the labels - #3047
See merge request artica/pandorafms!1982
Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
a789b3350e
fixed minor error pie chart
...
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
ee7ff52a04
fixed error widgets wux
...
Former-commit-id: 149cfea6dc0d427b57f05594214374d220111031
2018-12-24 14:25:19 +01:00
7de36e1631
Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop'
...
fixed error template availability
See merge request artica/pandorafms!2086
Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
2018-12-24 09:23:35 +01:00
411c815f19
Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop'
...
Removed unnecessary loop - #3096
See merge request artica/pandorafms!1992
Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
2018-12-21 10:23:09 +01:00
4f43396d81
Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop'
...
fixed bug: pie graph not showing in mobile's tactical view dashboard widget
See merge request artica/pandorafms!2027
Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
2018-12-21 10:22:41 +01:00
84a0f227b9
fixed error template availability
...
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
05e94ece90
Merge remote-tracking branch 'origin/develop' into 3190-Bugarro_en_informe_servicios_SLA
2018-12-04 10:20:09 +01:00
c63be5b4cc
fixed error print pdf chart slice bars
2018-12-04 10:19:26 +01:00
5a3911d185
Merge branch '2939-Bug-en-la-vista-de-graficas-de-un-agente' into 'develop'
...
Fixed bug in agent graph view
See merge request artica/pandorafms!1955
2018-11-30 13:07:03 +01:00
4bdc7d5303
Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop'
...
fixed errors in visual console
See merge request artica/pandorafms!2026
2018-11-30 13:04:31 +01:00
3bf215782e
fixed minor error slicebar
2018-11-29 17:00:55 +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
8e72f53aff
Removed unnecessary loop - #3096
2018-11-19 16:07:45 +01:00
8956ebd3c0
Changed the font styles of the labels - #3047
2018-11-16 11:46:41 +01:00
69df02da48
Fixed bug in agent graph view
2018-11-12 10:45:50 +01:00
58aa334798
fixed minor errors in graphs an license diag
2018-11-07 13:33:07 +01:00
8e206eeeef
fixed errors php7
2018-10-29 18:20:56 +01: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
74b80f68a5
Fixed minor bug in pandora flot js
2018-10-25 16:52:39 +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
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
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
81ebfc755e
fixed gdgraph
2018-10-19 12:01:22 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
0a1bee92a5
fixed slicebar to php7
2018-10-19 10:49:13 +02:00
b736746e1c
php version upgrade
2018-10-19 10:04:26 +02:00
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
3c62388f0e
fixed errors php and slicebars change version php7
2018-10-16 15:32:31 +02:00
1f56054f6c
fixed changes php7
2018-10-11 12:57:48 +02:00
b5ebd81b19
fixed error values negative
2018-10-01 15:24:29 +02:00
712103c308
Fixed bug in csv export graph
2018-09-27 17:35:52 +02:00
b66f3a9f6f
Fixed SQL graphs in reports
2018-09-20 19:18:45 +02:00
c5b942f13f
fixed minor error legend graph and value avg
2018-09-12 15:57:22 +02:00
b0257eb3f4
fixed minor error refresh graph pie
2018-09-12 11:23:26 +02:00
7eed209339
fixed error size graph in dashboard
2018-09-11 11:37:11 +02:00
271466fb66
fixed errors automatic combined graph report metaconsole
2018-08-20 13:52:01 +02:00
9d4297356e
Fixed bullet charts (7 pixels for tickline)
2018-08-13 10:59:38 +02:00
6142fa1b05
Added thresholds to comb/interface graphs
2018-08-09 16:33:29 +02:00
d84a945daa
Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop'
...
Fix incremental realtime charts
See merge request artica/pandorafms!1658
2018-08-03 09:00:31 +02:00
f5304af062
Removed unused code which was causing an error
2018-08-02 14:59:56 +02:00
8f1fa78955
fixed minor error
2018-07-30 16:16:08 +02:00
f05ba656e1
add functions api for policies node
2018-07-23 08:59:08 +02:00
fce669ae21
fixed minor errors in legend charts
2018-07-10 17:53:19 +02:00
c26a50e838
fixed errors in graphs
2018-07-06 11:56:38 +02:00
0dd39f1f00
fixed errors in graph slice for uncompresed
2018-07-05 11:52:52 +02:00
aa4f13d17a
fixed errors in graphs
2018-06-20 11:31:43 +02:00
80ddcbe1b6
fixed security error phantomjs
2018-06-14 16:47:23 +02:00
46c23f9deb
fixed minor errors in graphs: tree, labels, tocken meta
2018-06-14 12:17:16 +02:00
9d2f069d20
fixed font and font-family
2018-06-14 10:02:26 +02:00
05d8d0ccf5
fixed errors graph
2018-06-13 19:13:42 +02:00
9ecc770519
remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces
2018-06-13 11:02:58 +02:00
dfc43a35ab
fixed errors grid black in vbars and hbars
2018-06-12 16:37:41 +02:00
632fc26be2
Thermometer graph only for intracom - #2214
2018-06-12 12:39:05 +02:00
6eba3250da
fixed errors agent access and other fix
2018-06-12 12:08:04 +02:00
abad4f4f4b
fixed minor errorstime graphs
2018-06-11 15:35:04 +02:00
adf9e4d1fe
fixed minor errors
2018-06-11 13:53:10 +02:00
f85a8b513a
fixed errors
2018-06-08 14:30:15 +02:00
eb7cdc7c90
fixed errors in graph delete to image pdf
2018-06-08 08:58:18 +02:00
7834869977
fixed water mark in graphs
2018-06-07 09:15:45 +02:00
d7da009804
fixed errors in graphs
2018-06-06 17:23:32 +02:00
badfd83b0d
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
dbb802fb31
Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop'
...
New graph thermometer - #2214
See merge request artica/pandorafms!1465
2018-06-04 10:19:21 +02:00
02a442a8db
fixed errors in graph add phantom js
2018-05-28 17:47:40 +02:00
3accc31372
add zoom graphs xy
2018-05-22 15:57:36 +02:00
727b173392
fixed error library pdf example
2018-05-22 13:15:09 +02:00
9f140e6197
Applied lukasr patch for pchart
2018-05-22 10:51:03 +02:00
25666e1bff
fixed errors
2018-05-22 10:50:38 +02:00
b323d524d6
fixed errors in graph update version
2018-05-21 17:25:09 +02:00
79354a0ebf
fixed graphs
2018-05-18 14:22:39 +02:00
123d49d604
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/styles/pandora.css
2018-05-10 08:52:45 +02:00
f758124531
fixed treshold graph
2018-05-10 08:43:09 +02:00
734c52d8bd
New graph thermometer - #2214
2018-05-04 11:13:26 +02:00
2885885cc4
Fixed a JS error (invalid parameter in pandoraAreaGraph)
2018-05-03 13:02:17 +02:00
b11e256c8b
fixed custom graph
2018-04-27 13:51:13 +02:00
30dc841bae
custom graph
2018-04-27 10:03:05 +02:00
2a81703a68
fixed minor error custom graph
2018-04-26 10:24:37 +02:00
3fbd9adc38
fixed graph
2018-04-24 13:19:24 +02:00
e7a8706434
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/graphs/flot/pandora.flot.js
pandora_console/include/graphs/functions_flot.php
2018-04-23 12:21:11 +02:00
f7ae6f78b1
Merge branch '1980-error-en-dashboards-con-custom-graphs-dev' into 'develop'
...
Fixed issue in dashboard with firefox
See merge request artica/pandorafms!1431
2018-04-18 11:11:35 +02:00
e6dc7799c8
Fixed issue in dashboard with firefox
2018-04-18 10:30:24 +02:00
4d78256937
Fixed Y-axis label decimals
2018-04-17 11:54:52 +02:00
dcaae924fc
Decreased limit to reduceText call in some graphs
2018-04-03 16:41:21 +02:00
09d712d1ab
Not blink separatos points in visual console digital clock - #2026
2018-03-28 18:42:59 +02:00
526bd5f8c5
Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars
2018-03-23 11:08:48 +01:00
9e276aa8a2
Merge branch '2026-5413-Quitar-el-parpadeo-del-reloj-digital' into 'develop'
...
Not blink separator dots for digital clocks - #2026
See merge request artica/pandorafms!1356
2018-03-22 10:04:04 +01:00
835e791ef1
Fixed label shortener in hbar
2018-03-21 13:40:15 +01:00
d38df88c79
[Pie charts] Adding more space in legend
2018-03-13 19:07:31 +01:00
64b62edd90
Fixed shorten axis units
2018-03-09 10:18:02 +01:00
97bcaec720
Not blink separator dots for digital clocks - #2026
2018-03-08 11:58:31 +01:00
52e6503018
[Vertical Bar Charts] Fixed strpos check
2018-03-01 17:07:55 +01:00
b6688dda1c
[SQL charts reports] Added top n report to set the maximum number of elements
2018-03-01 16:49:50 +01:00
4719742ba2
[Pie Charts] Maximized the number of elements
2018-03-01 13:19:58 +01:00
287d28de4e
[Vertical Bar Charts] Preserve order after truncate label
2018-03-01 13:16:36 +01:00
d0bf68888e
[SQL charts] Fixed SQL vertical chart
2018-03-01 12:02:08 +01:00
738776ef7e
merge develop
2018-03-01 10:13:55 +01:00
815e9c6759
fixed errors graph
2018-03-01 09:46:52 +01:00
9d36887a02
Fixed graph precision
2018-02-28 14:33:22 +01:00
3910b455ca
fixed errors
2018-02-28 10:02:06 +01:00
51f22413a8
fixed errors in graphs
2018-02-28 08:46:51 +01:00
d2390528ac
fixed errors in graphs
2018-02-27 16:28:00 +01:00
688acb8a4b
fixed error graphs
2018-02-23 14:31:00 +01:00
f69fb8a5f9
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
2018-02-21 14:00:14 +01:00
4b654bd87d
fixed errors grapgh
2018-02-21 11:54:24 +01:00
9a525f3b2e
Change visual console digital clock colors - #1403
2018-02-19 19:17:53 +01:00
8be776e3ea
fixed errrors graphs
2018-02-19 09:31:45 +01:00
b6798bf31c
update flot.js
2018-02-16 13:41:31 +01:00
2417cae01d
Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
2018-02-12 12:47:53 +01:00
af9e11ffca
reconfigure charts
2018-02-08 15:47:12 +01:00
a04f941a55
Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
...
Conflicts:
pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
63e5d23288
change xasis to time
2018-02-02 12:25:23 +01:00
d79bd6973f
Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
2018-01-31 15:29:37 +01:00
d9825c08b5
Merge branch '1660-WUX-stats-charts-dev' into 'develop'
...
Fixed jquery error
See merge request artica/pandorafms!1151
2018-01-29 13:31:19 +01:00
2e486ffac0
Merge branch '1727-Gráficas-horizontales-texto' into 'develop'
...
Fix hbar grpahs label - #1727
See merge request artica/pandorafms!1246
2018-01-29 13:25:04 +01:00
94e2e0b908
Merge branch 'fix-module-graph-decimals' into 'develop'
...
Resolve: "Fix module graph decimals"
See merge request artica/pandorafms!1121
2018-01-29 12:58:13 +01:00
f3855ac7e9
Added flot.time plugin
2018-01-25 13:14:21 +01:00
6e10baac32
Fix hbar grpahs label - #1727
2018-01-11 11:12:41 +01:00
097bc3df32
Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop'
...
Added resize functionality to flot graphs and fix overview in container graphs
See merge request artica/pandorafms!1068
2017-12-21 10:46:42 +01:00
d7d1cfe81b
Merge branch 'develop' into 1632-Pandora_FMS_charts
2017-12-13 17:18:36 +01:00
4a1a0ae8b7
fixed errors in graphs
2017-12-13 17:17:45 +01:00
43e697a1cb
Added hint in field Add summatory series
2017-12-13 11:50:15 +01:00
e01f00ac3d
code backup
2017-12-13 10:36:08 +01:00
06c1c4f243
fixed errors in fullscale graph and normal graph
2017-12-05 13:44:42 +01:00
dab2525355
Fixed jquery error
2017-12-01 13:32:50 +01:00
521eb8f4cb
Add clocks to visual console - #1403
2017-12-01 12:14:56 +01:00
82012959af
[Console > Module area graph] Now the value shown into the legend uses the config value to show shortened of full data
2017-11-27 12:41:10 +01:00
b26c46a7c6
[Console > Module area graph] Now the value shown into the legend has 2 decimals instead of 1
2017-11-27 12:31:40 +01:00
b431f4afd3
[Console > Module area graph] Now the Y legend values are rounded properly to 2 dec when 'Shortened module graph data' is enabled
2017-11-27 11:56:52 +01:00
0ea2475d60
minor fix pandora.flot.js
2017-11-14 19:02:13 +01:00
78ef64ead2
Added resize functionality to flot graphs and fix overview in container graphs
2017-11-14 18:44:29 +01:00
958ef2bd38
Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479
...
Added max/min thresholds to hbar graphs
2017-11-14 10:49:15 +01:00
833983e34e
Added visual changes to donut graph
2017-11-13 12:54:28 +01:00
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
86a5599aad
Revert "Fixed traces"
...
This reverts commit 173efae22d
2017-11-13 10:20:58 +01:00
fermin831
Daniel Barbero
Luis Calvo
fbsanchez
Alejandro Fraguas
samucarc
artica
Daniel Rodriguez
Tatiana Llorente
vgilc
alejandro-campos
manuel.montes
Alejandro Gallardo Escobar
enriquecd
danielmaya
daniel
Alejandro Gallardo Escobar
Arturo Gonzalez