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

495 Commits

Author SHA1 Message Date
vgilc 2d153c1074 Merge branch '1130-Nombres-de-agente-en-vista-táctica-dev' into 'develop' 
Extended number of characters allowed

See merge request !680
 2017-08-18 12:38:15 +02:00
Arturo Gonzalez 4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
Daniel Maya f060a2cdd8 Extended number of characters allowed 2017-07-19 16:12:09 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +02:00
Arturo Gonzalez b4c31df636 Fixed module events graph in vc 2017-07-13 16:57:53 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
vgilc 0fd6d38a6b Merge branch '853-Custom-SQL-que-afecten-a-BDD-de-histórico-enterprise-open' into 'develop' 
Add historical db check to reports template SQL items - #853

See merge request !640
 2017-07-05 11:45:18 +02:00
Arturo Gonzalez b282063325 Added changes to resolve bad history database data 2017-07-03 15:09:31 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
Arturo Gonzalez 687e970c8e Fixed more than 6 months charts 2017-06-16 14:42:16 +02:00
Arturo Gonzalez c506c9cce6 Added a condition to small charts 2017-06-13 09:45:08 +02:00
Arturo Gonzalez e237198d06 Added a final fix 2017-06-13 09:26:08 +02:00
Arturo Gonzalez 0af82fd69d Added some code to manage timestamps in chart data 2017-06-12 17:48:42 +02:00
Arturo Gonzalez e3443e044f Added some code to put all data in the chart 2017-06-12 16:39:46 +02:00
Arturo Gonzalez 00ac431216 Added code to manage timestamps in fullscale mode 2017-06-12 13:33:41 +02:00
Daniel Maya 5e099a0da3 added graph colors in dahsboard 2017-06-07 11:43:11 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
Arturo Gonzalez 77b5e74343 Added new condition to dashboard and non avg only in simple graphs 2017-06-01 11:24:59 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
enriquecd d33621ffa7 Fill empty data in graphs with last known data, no with nodata point - #937 2017-05-30 16:34:30 +02:00
Arturo Gonzalez 20c205fbc9 Added good styles to graphs 2017-05-24 13:12:47 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
Arturo Gonzalez d744cb9220 Added end date to fullscale chart view 2017-05-23 15:16:34 +02:00
Arturo Gonzalez 53f4c6edb8 Added fullscale setting in boolean chart 2017-05-23 15:15:28 +02:00
Arturo Gonzalez 5bb3cd2ad6 Added some code to fullscale graphs 2017-05-23 15:02:53 +02:00
Arturo Gonzalez 16fe10d1af Added fullscale to boolean charts. Continue with the tests. 2017-05-19 12:04:54 +02:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
Arturo Gonzalez 8141dac798 Added date format to long periods of time 2017-05-18 17:01:15 +02:00
vgilc eb7514dcd0 Merge branch '700-wrong_format_in_graphs' into 'develop' 
Added new ranges to graph period

See merge request !355
 2017-05-17 17:17:47 +02:00
Arturo Gonzalez 658ff78efb Added homedir lost reference to functions_html 2017-05-08 11:49:54 +02:00
Arturo Gonzalez 41b49770ee Added new ranges to graph period 2017-04-10 11:10:32 +02:00
fermin831 0660d28ed3 Fixed pdf netflow reports 2017-03-23 11:54:04 +01:00
fermin831 e3341ab15f Position watermark inside the static graphs 2017-03-21 12:33:00 +01:00
m-lopez-f ba423c93d8 Only view of system event of user that have admin powers. Gitlab: #455 2017-03-07 16:30:01 +01:00
daniel afecd9f4a4 fixed color in verical graph 2017-03-07 09:10:15 +01:00
daniel 24c4060ab1 fixed last in legend combined graph 2017-03-07 08:37:45 +01:00
enriquecd a0b87859c5 Resize incident by status graph to have similar size to other graphs - #89 2017-03-06 18:11:58 +01:00
daniel ed287b7cdb fixed errors in custom graph with percentile and pdf 2017-03-06 10:01:24 +01:00
Arturo Gonzalez c527aa243b Fixed font size reduction in graphs. Ticket #411 2017-03-02 09:35:28 +01:00
daniel 99bf29b667 fised errors in graph 2017-03-01 14:59:37 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
m-lopez-f 015890a18a Fixed problems with duplicade color in netflow graphs. Gitlab: #346 2017-02-22 13:08:39 +01:00
Alejandro Gallardo Escobar 6fc884d327 Changed the agent name by its alias in the events sections 2017-02-21 19:07:17 +01:00
Daniel Maya a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop' 
Feature/alias friendly name

See merge request !188
 2017-02-21 16:46:05 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
daniel 40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Arturo Gonzalez 3976a45e89 Now times under 1 day will be shown in a correct format. Ticket #215 2017-01-31 15:46:56 +01:00
daniel e4f8fa8341 fixed error in legend graph selected 2017-01-20 11:15:50 +01:00
daniel 1b26423867 Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open 2017-01-18 17:39:04 +01:00
Arturo Gonzalez d3f5a62814 Fixed threshold in interface graphs. Ticket #156 2017-01-17 14:29:42 +01:00
daniel 993bad314d fixed errors in events reports #135 2017-01-11 13:26:50 +01:00
Arturo Gonzalez b683d5d50c Added things to interface thressold. Ticket #4113 2016-12-30 12:56:48 +01:00
daniel 50c9763720 Add percentil dinamic custom graph 2016-12-27 13:10:33 +01:00
daniel e9fc39b53b add percentil dinamic ticket: 4262 2016-12-23 09:36:44 +01:00
daniel b28fe4cef4 Merge branch 'develop' into feature/report_SLA_new 2016-12-14 15:42:18 +01:00
Arturo Gonzalez 00c81d5863 Added new radio button to interface graphs (area or line graph) and fix agents graph section type (now get the stack value from the visual config). Ticket #4110 2016-11-30 10:23:06 +01:00
daniel 9fc797ae9e reports availability and SLA change new function 
(cherry picked from commit 7faa1eff1e)
 2016-11-30 08:57:17 +01:00
Arturo Gonzalez 2391e7ae78 Added threshold graph to interface monitors graph (Only when monitors have the same warning or critical min value). Ticket #4113 2016-11-28 10:53:05 +01:00
Arturo Gonzalez bb0950ec03 Added new graph to "no data" values in monitors graph. Ticket #4202 2016-11-17 09:12:12 +01:00
enriquecd 76c1f7cd82 Visual console improvements - Add: font style/size setting - map size setting - back color map - graph function a type graph line/area - Improve wizard - Back graph color... #110 2016-11-16 18:58:27 +01:00
m-lopez-f 5088beedc5 Fixed problems with legend when no interactive charts is activated 
(cherry picked from commit fc0dc53730)
 2016-11-10 16:55:53 +01:00
enriquecd 43abce6393 Fix scheuled downtime recursive filter checkbox ,optional graph watermark #64 2016-10-27 17:30:45 +02:00
m-lopez-f 76a7b7102c Fixed styles legend in custom graphs 2016-10-21 14:47:38 +02:00
Arturo Gonzalez 26862b5f9d Added a function to remove right zeros in precision data feature 2016-10-20 10:47:12 +02:00
m-lopez-f a10b9cbc28 Fixed problems with styles in graphs. 2016-10-19 12:45:40 +02:00
Arturo Gonzalez 3b7cad9654 Data precision (So much precision) 2016-10-18 16:32:39 +02:00
Arturo Gonzalez d5f82b568c New data precision... (Init) 2016-10-18 10:32:10 +02:00
Arturo Gonzalez 13a19c42c2 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:30 +02:00
m-lopez-f 97428f0771 Fixed problems with graphs, show percentil whn this option not is valid. 2016-10-17 09:49:31 +02:00
m-lopez-f 2f93fddb6e Add percentil 95 in snmp graphics. internal ticket: 3 2016-10-03 12:48:48 +02:00
enriquecd 359f0aaac1 add qr icon, separate menu bar, favicon and optional graph logo 46,64,45,80,55 2016-10-03 12:31:23 +02:00
daniel 5055f8290f show the title of the graphics 2016-09-30 13:12:42 +02:00
Daniel Maya 54dcadfe33 changed agent name by alias in visual console,custom reports,view events and csv files. 2016-09-29 13:09:50 +02:00
Daniel Maya be2bbb262a Changed agent name in custom graphs. 2016-09-26 13:36:53 +02:00
Arturo Gonzalez b441f1a2d4 New networkmaps in progress... (Added Alex super mega ultra street fighter maps) 2016-09-21 15:01:53 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
Daniel Maya bb26f4b82d Added new check to equalize maximum thresholds. Ticket #3732. 2016-08-23 08:50:23 +02:00
daniel dcb18bcbd2 add graph agent new feature ticket integria: 3722 2016-08-19 12:46:27 +02:00
m-lopez-f 53353651c9 Fixed problems with bullet charts. Tiquet: #3822 2016-07-21 11:05:10 +02:00
Daniel Maya 834612f125 Fixed labels in pie custom graphs. Ticket #3873. 2016-06-30 10:45:41 +02:00
m-lopez-f a4767fca1d Fixed Pie charts and legend. Tiquet: #3742 2016-06-13 09:04:02 +02:00
m-lopez-f 54c6de6a41 Fixed Pie charts and legend. Tiquet: #3742 2016-06-13 09:00:11 +02:00
m-lopez-f 8aac162cd4 Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742 
(cherry picked from commit d058d096d7)
 2016-06-10 11:19:44 +02:00
m-lopez-f b39802b2f1 Revert "Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742" 
This reverts commit cbe624d25b.
 2016-06-10 11:16:07 +02:00
m-lopez-f cbe624d25b Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742 
(cherry picked from commit d058d096d7)
 2016-06-10 11:15:17 +02:00
Arturo Gonzalez 9f0208e570 Fixed agent name and module name in interfaces module graphs. Ticket #3768 2016-06-06 13:28:46 +02:00
Alejandro Gallardo Escobar ebf11e0473 Now the dashboard and visual console area graphs show the last and avg value in their legend 
(cherry picked from commit 554e592275cda6c4adffc5bdb5b5779b86a1d192)
 2016-05-31 11:27:38 +02:00
Alejandro Gallardo Escobar 267290a5dc Improved the graphs behaviour when rendered into the dashboard or the visual console 
(cherry picked from commit 20128621395cf381d62f1e1b35064b2fb3a67ac1)
 2016-05-30 15:26:29 +02:00
Alejandro Gallardo Escobar e4758e9731 Fixed an error which affected to the values of the custom graphs 2016-05-25 17:41:19 +02:00
Alejandro Gallardo Escobar e47f6d9968 Now is possible to print multiple gauge graphs without errors 
Fixes ticket #3635
 2016-05-17 15:35:26 +02:00
fermin831 5756d7281e Substituted lines for intervals in modules graphs TICKETS #3392 2016-04-04 10:12:37 +02:00
m-lopez-f 368a96222e Fixed problems with dashboard performance when include users maps. Tiquet: #3438 
(cherry picked from commit e3e549cbe8)
 2016-03-15 09:26:24 +01:00
fermin831 38e7a4277f Modified SLA to work only in working time properly. TICKETS #3370 
Graphs are modified to show without having consideration of working time
 2016-03-14 10:57:03 +01:00
m-lopez-f 4af3b2b1aa Fixed problems with order data in custom graphs 
(cherry picked from commit 093d9ad313)
 2016-03-09 16:01:20 +01:00
fbsanchez ee35f9aa35 Erased Projection for text from graphs 2016-03-03 13:28:51 +01:00
m-lopez-f a33c69d5cf Fixed problems with custom graphs. Ticket: #3413 2016-03-03 10:18:20 +01:00
mdtrooper 8d54a6762a Added the 'automatic custom graphs' in the template reports in metaconsole. 2016-02-02 14:55:03 +01:00
m-lopez-f af8b3c6e57 Fixed vertical and horizontal bars when print PDF. Tiquet: #3255 2016-01-25 09:53:05 +01:00
m-lopez-f 414cc1c6ee Fixed legend of custom vertical/horizontal graphs. Tiquet: #3180 2016-01-21 11:56:15 +01:00
mdtrooper 836b3a125a Killing some unicorns and magic numbers. 
(cherry picked from commit 4772b25f5d)
 2016-01-08 10:25:49 +01:00
Arturo Gonzalez b7de284180 Fixed graph event position in modules graph when resizes the window. Ticket#3070 2015-12-31 12:04:23 +01:00
m-lopez-f 6e3a7c07e2 Fixed problems with legend when module no containt data. Tiquet: #3003 2015-12-21 09:14:10 +01:00
m-lopez-f 25aa41ae7a Fixed problems with gauges in custom graphs/dashboard. Tiquet: #3025 
(cherry picked from commit ede441cb3b)
 2015-12-01 09:00:21 +01:00
m-lopez-f 377cec00e7 When no data, print only label. Tiquet: #2966 
(cherry picked from commit 00d25bc9dd)
 2015-11-25 16:03:52 +01:00
m-lopez-f 2cfbe1014f Fixed many errors in custom graphs and this items in dashboard. Tiquet: #2984,part of #2966 
(cherry picked from commit 60f0f3378d)
 2015-11-25 14:26:02 +01:00
m-lopez-f f705fa2563 Fixed label of Pie Custom Graph. Tiquet: #2965 2015-11-25 12:50:38 +01:00
m-lopez-f 0ba80f3d3f Fixed gauges in custom and dashboard. Tiquet: #2967 2015-11-17 15:02:53 +01:00
m-lopez-f c72f024610 Add new custom graphs and fixed others graphs. 
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges
 2015-11-04 17:42:45 +01:00
Arturo Gonzalez Diaz d54b8eb5e1 Fixed data in db information. Tickets#2851 & #2850 2015-10-26 10:58:31 +01:00
Arturo Gonzalez Diaz d096263bb3 Fixed data in db information 2015-10-26 10:03:42 +01:00
Arturo Gonzalez Diaz e8cc3ccbf9 Fixed sql problemas in incidents section (oracle). Ticket#2902 2015-10-21 13:57:05 +02:00
m-lopez-f 8bb6cf069d Fixed text and delete text from export data csv. Tiquet: #2868 2015-10-15 11:28:44 +02:00
Arturo Gonzalez Diaz 29174e6368 Fixed module graphs in visual console. 2015-10-01 13:42:37 +02:00
Arturo Gonzalez Diaz 2f1ce917c9 Visual parameter ambiguous in the legend of module graph changed. Ticket #2684 2015-09-09 13:10:47 +02:00
mdtrooper 1577621b5b Now the boolean charts is showed as digital signal charts (only with dinamic flot charts engine) 
(cherry picked from commit 3d014c6ab5)

Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2015-08-25 13:42:38 +02:00
mdtrooper 56bf721446 Fixed the charts (boolean and sparse) added lost time interval. TICKET: #2511 
(cherry picked from commit fab99a416e835a0824e0a67449d4c6bddf9e454f)

Conflicts:
	pandora_console/include/functions_graph.php
 2015-08-24 17:20:21 +02:00
Arturo Gonzalez Diaz 016584832e Fixed number format in graphs legend, now it looks with "," in thousands and "." in decimals. 2015-08-24 16:59:03 +02:00
Arturo Gonzalez Diaz 596a20b19d Y axis fixed in custom graphs, now show correctly the numeration. Ticket#2578 2015-08-24 13:14:48 +02:00
mdtrooper 63498fdbf7 Added percentile 95º in the stat win of module. TICKET: #2613 2015-08-20 17:55:10 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
Alejandro Gallardo Escobar a512065c22 Now the modules SLA slicebar has a different color in the planned downtimes period 
Ticket #2341
 2015-07-03 13:16:30 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 9789eca1e1 Added the feature to set module charts painting with lines or area. TICKET: #1849 2015-06-11 21:24:14 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +02:00
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00
Alejandro Gallardo Escobar 7e67287ee0 Fixed errors related with the oracle compatibility 2015-05-18 19:06:21 +02:00
Alejandro Gallardo Escobar f7867e3ce0 Fixed errors related with the oracle compatibility 2015-05-18 18:33:31 +02:00
Alejandro Gallardo Escobar 24aa40a726 Fixed errors related with the oracle compatibility 2015-05-18 18:08:14 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
mdtrooper 7ce25e9627 Some changes and fixed for the reports in PDF. 2015-05-12 16:41:08 +02:00
m-lopez-f f5b26f69e6 Add unit to legend left in graph of interface information, tiquet: #2194 
(cherry picked from commit 277eb655a1)
 2015-05-06 13:04:45 +02:00
Alejandro Gallardo Escobar 64466e4557 Error fix 2015-04-30 12:46:43 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
m-lopez-f eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
mdtrooper 3dbd433285 Fixed the history data in boolean and string charts. 
(cherry picked from commit f24919fe4b)
 2015-04-16 15:38:59 +02:00
m-lopez-f db3e276195 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 2015-04-16 10:50:43 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f 85b00c080c Draw pie with filter results and changed label, tiquet: #2076 2015-04-13 15:50:49 +02:00
m-lopez-f b533897415 Fixed problems with print pie, show more data that data in list event,Nodo and Meta, tiquet: #2076 2015-04-13 12:47:49 +02:00
Alejandro Gallardo Escobar 7360171bd7 Adapted the functions to work with the metaconsole 
(cherry picked from commit 567b5125bd)
 2015-03-23 14:34:04 +01:00