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

671 Commits

Author SHA1 Message Date
vgilc a7e1e877e7 Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop' 
654 cambios en informes de maximo minimo y media 4480 cherry

See merge request artica/pandorafms!994
 2017-10-31 12:13:55 +01:00
nramon 4e672cc758 Merge branch '655-module_data_increment_new_type_of_report' into 'develop' 
655 module data increment new type of report

See merge request artica/pandorafms!519
 2017-10-31 08:18:26 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" 
This reverts merge request !871
 2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' 
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
 2017-10-30 15:51:51 +01:00
vgilc 0604dfedbf Merge branch '1433-Mensaje-No-data-to-show-diferentes-en-graficas-de-modulos-y-de-interfaces' into 'develop' 
Change image_problem no data sign to image_problem_area_small - #1433

See merge request artica/pandorafms!908
 2017-10-26 11:13:31 +02:00
enriquecd bd47d5362a Change image_problem no data sign to image_problem_area_small - #1433 2017-10-09 18:31:42 +02:00
fermin831 4530f2213c Fixed last value on general template reports and individual reports 2017-10-06 15:45:40 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
Arturo Gonzalez f5e1410406 Added fix to macros in pdf view 2017-09-20 17:09:50 +02:00
Arturo Gonzalez 3f253b9db4 Added restriction when report comes from template 2017-09-20 15:44:30 +02:00
Arturo Gonzalez 36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +02:00
Arturo Gonzalez e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
Arturo Gonzalez e3d42a878a Added changes to NODE 2017-09-15 13:21:51 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
vgilc c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
allow UNION sql reports

See merge request !704
 2017-08-18 13:01:53 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +02:00
Daniel Maya 78d4eb68bc Fixed problem in node 2017-08-03 13:29:18 +02:00
Daniel Maya 0932004781 Fixed label in automatic graph in node 2017-08-03 13:13:34 +02:00
Daniel Maya 362ab94781 Added label in automatic graph 2017-08-03 12:41:47 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +02:00
enriquecd 39fb79bbb4 Fix automatic combined graph macros in name and labels - #1088 2017-07-11 18:22:25 +02:00
fbsanchez ff6173ae54 Fixes boolean modules threshold calc 2017-07-06 14:10:08 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
artu30 01f6f6ef5b Merge branch 'develop' into '851-new-report-type-max+min+avg-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
#   pandora_console/include/functions_reporting_html.php
 2017-06-07 14:56:44 +02:00
vgilc 1c4f64ac2a Merge branch '936-weird-general-item-in-reports-dev' into 'develop' 
Fixed general item in reports

See merge request !526
 2017-06-02 10:59:02 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez 33534244c8 Fixed general item in reports 2017-05-29 17:03:52 +02:00
Arturo Gonzalez 77a563eb29 Added new general table view to html 2017-05-11 14:00:59 +02:00
Arturo Gonzalez d499cc1b84 Added modification to new report item in meta 2017-04-12 17:12:16 +02:00
Arturo Gonzalez cc1ab47a65 Added fixes to new report item 2017-04-12 15:53:36 +02:00
Arturo Gonzalez b912834ce7 Added the new item to item editor builder and to html view 2017-04-12 15:00:09 +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
enriquecd 00f0a171b4 Show agent - module in pdf reports item - #528 2017-03-15 18:45:52 +01:00
Daniel Maya cdd2363912 ticket 348. Fixed problem of access to the database 2017-03-14 13:14:39 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
enriquecd db370619b4 Change url and params on hbar_graph, now show grpah in html and pdf - #87 2017-03-06 13:52:28 +01:00
fermin831 395a73a868 Order top N ascending pie chart 2017-03-06 12:37:23 +01:00
daniel 7b97b30cfa fixed error in report custam graphs 2017-03-06 10:58:15 +01:00
m-lopez-f 10078287c7 Reports, Prediction date: Change position of inputs in create items. And change code of creation data. Gitlab: #414 2017-03-06 10:06:51 +01:00
Ramon Novoa 540d076c9f Merge branch 'develop' into feature#new-iface-names 2017-03-03 08:32:31 +01:00
fermin831 9883be0302 Deleted graph name on projection graphs 2017-03-02 13:18:13 +01:00
fermin831 c8ebcafc13 Fixed monitor report (using reporting_advanced_sla function) 2017-03-02 11:12:19 +01:00