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

7087 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 3b06988082 Fixed an ACL error on the 'tags_check_acl' and 'tags_check_acl_events' functions 2015-03-25 19:19:20 +01:00
mdtrooper 4924556a21 Working in the refactoring the code of reports (fixed max_value, added min_value and avg_value). 2015-03-25 18:28:58 +01:00
mdtrooper 13e78e44eb Working in the refactoring the code of reports (max_value). 2015-03-25 18:14:05 +01:00
mdtrooper 958b9c8ce3 Working in the refactoring the code of reports (url). 2015-03-25 17:19:13 +01:00
mdtrooper bc791ad3be Working in the refactoring the code of reports (text). 2015-03-25 16:58:53 +01:00
mdtrooper 803c03956d Working in the refactoring the code of reports (custom_graph). 2015-03-25 16:44:39 +01:00
m-lopez-f 75d9d58c48 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 16:15:04 +01:00
m-lopez-f c7fa8710ec Changed histogram of events in tactical view to metaconsole, tiquet: #2029 2015-03-25 16:14:47 +01:00
mdtrooper d17fbbc3a9 Working in the refactoring the code of reports. 2015-03-25 15:30:36 +01:00
mdtrooper b49b67be4d Working in the refactoring the code of reports. 2015-03-25 15:25:21 +01:00
mdtrooper 9d18fd6910 Fixed lost variable. 2015-03-25 13:04:11 +01:00
mdtrooper 786c6efa4b Fixed the style of status message when edit a filter and added more information in the messages. 
(cherry picked from commit 085c4521d0)
 2015-03-25 11:24:08 +01:00
Alejandro Gallardo Escobar b945ee8892 ACL improvements for the module graphs 2015-03-25 12:26:16 +01:00
Alejandro Gallardo Escobar de65702f9a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 12:25:13 +01:00
mdtrooper 085c4521d0 Fixed the style of status message when edit a filter and added more information in the messages. 2015-03-25 11:22:22 +01:00
m-lopez-f 00ae340c87 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 10:31:50 +01:00
m-lopez-f 97bfae819c Change message when search and no find data. Tiquet: #2039 2015-03-25 10:31:32 +01:00
Vanessa Gil ede2e3794a Merge branch 'feature/translations' into develop 2015-03-25 10:20:11 +01:00
Vanessa Gil 6987d75b41 Update translations. 2015-03-25 10:18:48 +01:00
m-lopez-f ee17fad784 Add message when search in custom report and not found data, tiquet: #2030 2015-03-25 10:01:11 +01:00
m-lopez-f f450d95278 Change title to events in tactical view in metaconsole, tiquet: #2005 2015-03-25 09:26:04 +01:00
artica 9994e08d7a Auto-updated build strings. 2015-03-25 00:01:13 +01:00
Alejandro Gallardo Escobar b8282a5cb1 Added support to show the interface traffic graphs through the metaconsole and improved the ACL 
(cherry picked from commit fa9db9010c)
 2015-03-24 19:15:46 +01:00
Alejandro Gallardo Escobar 481addb514 ACL improvements 2015-03-24 19:10:09 +01:00
Alejandro Gallardo Escobar 9b1a57a89d Fixed an error on the check acl functions 2015-03-24 19:08:43 +01:00
mdtrooper 62c5d57ca6 Working in the refactoring code of reporting. Added some items in html 2015-03-24 18:03:08 +01:00
mdtrooper ceca482158 Working in the refactoring code of reporting. 2015-03-24 17:52:57 +01:00
mdtrooper a5eaeb3ec9 Working in this feature (refactoring code of reporting) 2015-03-24 15:06:10 +01:00
m-lopez-f 0a0283df0c Delete submenu in massive operations. Tiquet: #2031 2015-03-24 14:20:10 +01:00
Ramon Novoa 0846236dd2 Show the translated enterprise string by default on the SNMP console. 
(cherry picked from commit b3f5e76009)
 2015-03-24 13:19:07 +01:00
mdtrooper 34caeb13c2 Working in the new feature. 2015-03-24 11:47:39 +01:00
mdtrooper 0cadefa2f0 Fixed the previous merge with the 'develop' branch. 2015-03-24 11:36:40 +01:00
mdtrooper fdaa8865b2 Working in the code refactoring. 2015-03-24 11:01:19 +01:00
mdtrooper bd607c0e61 Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/include/functions_reporting.php
 2015-03-24 10:50:13 +01:00
m-lopez-f c2dbc40155 same unit to snmp modules when unit not correct to module type, tiquet: #2025 
(cherry picked from commit 471492807d)
 2015-03-24 10:36:57 +01:00
artica 9915e22a11 Auto-updated build strings. 2015-03-24 00:01:11 +01:00
Alejandro Gallardo Escobar bbb41ddff5 Fixed a PHP syntax error 2015-03-23 21:05:18 +01:00
Alejandro Gallardo Escobar 857d9e2e11 Fixed a PHP syntax error 2015-03-23 21:02:06 +01:00
Alejandro Gallardo Escobar e3c1acfcf4 Merge branch 'feature/ticket#1981-Direct-graphs' into develop 2015-03-23 20:58:41 +01:00
Alejandro Gallardo Escobar da8570d3b9 Added support to show the interface traffic graphs through the metaconsole and improved the ACL 2015-03-23 20:51:44 +01:00
Alejandro Gallardo Escobar 9b9a3797cd Added support to show the module graphs through the metaconsole 2015-03-23 20:05:07 +01:00
Alejandro Gallardo Escobar 7b2f02571c Now the metaconsole can show the graphs of their nodes 2015-03-23 19:51:59 +01:00
mdtrooper 2a832e5758 Fixed the querys with the string '0'. 2015-03-23 19:18:08 +01:00
mdtrooper b4e74e8502 Fixed the insert duplicate event filter. 2015-03-23 19:18:08 +01:00
m-lopez-f 75dbb4dcb9 Changed visual of metaconsole 2015-03-23 17:28:38 +01:00
m-lopez-f 97c39b5e12 Fixed problems when save a variable in visual setup and save text. Tiquet: #2002 2015-03-23 16:14:17 +01:00
mdtrooper bac907638f Fixed the list of custom fields in the fields event form editor after the update. 2015-03-23 15:42:12 +01:00
m-lopez-f 57d9c66b78 Fixed error php 2015-03-23 14:50:43 +01:00
m-lopez-f a22d3f5434 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-23 14:48:45 +01:00
m-lopez-f 581d5e9c5f Fixed list of data in report when user have strict_acl, tiquet: #2014 2015-03-23 14:48:27 +01: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
mdtrooper 118b980f4e Fixed the view of list event filters with a user is setted strict_acl. #2017 2015-03-23 14:17:06 +01:00
mdtrooper 4d70cdd24a Fixed the view of list event filters with a user is setted strict_acl. #2017 2015-03-23 14:12:19 +01:00
m-lopez-f 5f32d18f06 Not show correct color in histogram, tiquet: #2008 2015-03-23 14:02:22 +01:00
m-lopez-f da659a1e84 Fixed problems with visual in metaconsole 2015-03-23 13:48:12 +01:00
m-lopez-f 03c961f239 Change Visual metaconsole, simplify criteria tiquet: 2010 (Fixed problems php) 2015-03-23 13:38:59 +01:00
m-lopez-f af2722ac51 Change Visual metaconsole, simplify criteria tiquet: 2010 (Fixed problems php) 2015-03-23 12:37:27 +01:00
m-lopez-f c8e48dcbe3 Change Visual metaconsole, simplify criteria tiquet: 2010 2015-03-23 12:25:02 +01:00
m-lopez-f f43698bfe7 Fixed visual metaconsole tiquet: 2013 2015-03-23 12:02:48 +01:00
mdtrooper e7b79a0a8f Working in the new feature. 2015-03-23 11:08:58 +01:00
artica 683f8b500c Auto-updated build strings. 2015-03-23 00:01:10 +01:00
artica f9b652867a Auto-updated build strings. 2015-03-22 00:01:09 +01:00
artica 9a9102d0ea Auto-updated build strings. 2015-03-21 00:01:11 +01:00
mdtrooper 21e0d423dc Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-03-20 15:59:34 +01:00
Vanessa Gil 52d16c9676 Merge branch 'feature/2017' into develop 2015-03-20 13:19:44 +01:00
Vanessa Gil da3429bbce Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-20 13:19:11 +01:00
Vanessa Gil dde47123ba Fixed bug #2017. 2015-03-20 13:18:22 +01:00
m-lopez-f ecaf565bbc Fixed visual metaconsole in list of events 2015-03-20 08:33:53 +01:00
artica a4084db68d Auto-updated build strings. 2015-03-20 00:01:07 +01:00
artica b5eed86c42 Auto-updated build strings. 2015-03-19 00:01:10 +01:00
Vanessa Gil 819ee73a28 Fixed bug #2007 2015-03-18 18:07:14 +01:00
mdtrooper c525de71fd Fixed the delete events in metaconsole. TICKET: #2016 2015-03-18 17:57:04 +01:00
mdtrooper 10156ffa77 Working in the refactor the code of reports. 2015-03-18 13:51:14 +01:00
m-lopez-f c287a2064a Changed style to visualice data in 'Group view' tiquet: #1879 2015-03-18 13:11:30 +01:00
m-lopez-f 6c1b434565 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-18 11:46:49 +01:00
m-lopez-f 912462c71a Solvented visualization of group in few views, tiquet: #1946 2015-03-18 11:46:27 +01:00
mdtrooper 868d1d5b39 Cleaned source code style. 2015-03-18 10:58:31 +01:00
Alejandro Gallardo Escobar a19f3939e9 Fixed an SQL error when serving the agent status tooltip 
(cherry picked from commit 554fb7aa2c)
 2015-03-18 12:27:25 +01:00
artica d967b4eed9 Auto-updated build strings. 2015-03-18 00:01:12 +01:00
mdtrooper 5f57ca716b Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP) 2015-03-17 16:48:52 +01:00
m-lopez-f e0e531bf05 Add field to custom line widht to custom graph tiquet: #1875 2015-03-17 15:36:24 +01:00
Alejandro Gallardo Escobar f0dc044d37 Removed the the event checkboxes 
(cherry picked from commit aad9e08700)
 2015-03-17 14:22:32 +01:00
Vanessa Gil 9512be8483 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-17 12:36:28 +01:00
Vanessa Gil 7f542c1093 Fixed bug in event list. 2015-03-17 12:36:10 +01:00
m-lopez-f 41863d37e8 Increase maxlenght of field custom raw url, tiquet: #1798 2015-03-17 10:09:28 +01:00
artica a67d1444c9 Auto-updated build strings. 2015-03-17 00:01:10 +01:00
mdtrooper 1b5779eb57 Fixed the bug when the group name is showed instead the icon 2015-03-16 17:47:19 +01:00
m-lopez-f c873fd6993 Delete includes of javascript because this includes are exists in header, tiquet #1878 2015-03-16 15:21:18 +01:00
Alejandro Gallardo Escobar d58493a2b7 Minor fix 2015-03-16 14:50:06 +01:00
mdtrooper c57f1cac33 Fixed the massive edition of modules with white spaces in name modules. TICKET: #1832 
(cherry picked from commit 35a9e7c591)
 2015-03-16 12:52:35 +01:00
mdtrooper 2646d92b86 Added the function 'modules_is_disable_agent' and fixed the show disabled agents in reports into items 'general' 'sla'. 
(cherry picked from commit cf9c53f220)
 2015-03-16 11:59:11 +01:00
m-lopez-f b58bd83523 Fixed problems when filter by 'Specify time range' and lost filter and not show data 2015-03-16 11:58:12 +01:00
m-lopez-f 93a2d15b2c display data changed depending if compare dates or show date directly in the tree view #1976 2015-03-16 11:47:12 +01:00
artica 763f291ee9 Auto-updated build strings. 2015-03-16 00:01:10 +01:00
artica c7beabc9d4 Auto-updated build strings. 2015-03-15 00:01:11 +01:00
artica a0b924218e Auto-updated build strings. 2015-03-14 00:01:12 +01:00
Alejandro Gallardo Escobar 8fd7830856 Fixed a timepicker include 2015-03-13 14:57:58 +01:00
Alejandro Gallardo Escobar 7fda8a296d Now some monitor graphs are shown in 'only average' mode when accessing it from the metaconsole 2015-03-13 14:43:30 +01:00
Alejandro Gallardo Escobar bc6495412e Minor fixes 2015-03-13 14:41:47 +01:00
Vanessa Gil b1ebd56a1c Fixed search by group. 2015-03-13 12:56:28 +01:00