Commit Graph

2103 Commits

Author SHA1 Message Date
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 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
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 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
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
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
m-lopez-f e0e531bf05 Add field to custom line widht to custom graph tiquet: #1875 2015-03-17 15:36:24 +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
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
m-lopez-f 01600cffb2 Changed visual of metaconsole 2015-03-13 10:52:49 +01:00
Alejandro Gallardo Escobar 28c9f19320 Added the monitor filter to the strict ACL users 2015-03-12 15:04:12 +01:00
Vanessa Gil 17a1fd38a9 Fixed ticket #1953. 2015-03-12 12:18:01 +01:00
m-lopez-f d673737e2d Changed visual of metaconsole 2015-03-12 10:27:28 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
m-lopez-f 6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
Vanessa Gil 041e9c00bc Fixed bug #1913. 2015-03-10 17:09:31 +01:00
Alejandro Gallardo Escobar e7f55390a1 Removed debug traces 2015-03-10 13:37:10 +01:00
Vanessa Gil 23b8a1930b Fixed bug #1914. 2015-03-10 11:37:46 +01:00
Vanessa Gil 73049cf0d1 Fixed bug #1918. 2015-03-10 11:16:28 +01:00
Alejandro Gallardo Escobar 756cf4cbf7 Added the posibility to filter by 1 group or tag. Useful when accessing the tree view from the group view 2015-03-09 19:29:45 +01:00
m-lopez-f e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper dba729a272 Fixed the lines in visualmaps with service items. TICKET: #1896
(cherry picked from commit 80bd7b0db2)

Conflicts:
	pandora_console/operation/visual_console/public_console.php
	pandora_console/operation/visual_console/render_view.php
2015-03-09 13:16:53 +01:00
Ramon Novoa 0c0c823118 Merge branch 'feature/password-encryption' into develop 2015-03-06 17:10:25 +01:00
mdtrooper 178db6316b Fixed the counts and other things in the tactical view in metaconsole. TICKET: #1886 2015-03-06 16:58:21 +01:00
m-lopez-f a926ab1e64 Fixed error php 2015-03-06 15:14:10 +01:00
m-lopez-f f3b1351f8d Fixed error php 2015-03-06 13:49:04 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
Alejandro Gallardo Escobar b87e359050 Now the tags filter appear properly. Fixes ticket #1889 2015-03-05 13:20:55 +01:00
Ramon Novoa 4e4eb4df87 Merge branch 'develop' into feature/password-encryption 2015-03-04 15:39:37 +01:00
mdtrooper d7d1ab7e3f Fixed the ajax get modules in massive operations in editions. TICKET: #1850 2015-03-03 12:32:56 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper 8984904178 Fixed PHP warning 2015-02-23 15:52:55 +01:00
Alejandro Gallardo Escobar dc86f73538 Removed some debug traces 2015-02-19 20:22:38 +01:00
Alejandro Gallardo Escobar 415e67ebad Fixed an error which prevented an user with strict ACL to see some agents 2015-02-19 20:13:56 +01:00
Alejandro Gallardo Escobar 2bf3887bd7 A lot of ACL fixes 2015-02-19 19:09:36 +01:00
mdtrooper cddaea8477 Fixed period was undefined sometimes in ajax call to get list of module data dialog. 2015-02-18 18:29:39 +01:00
mdtrooper 90a4282d4a Added server in the advance filter in the metaconsole events 2015-02-17 17:06:12 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
mdtrooper b30044df4a Fixed SQL inyections. 2015-02-11 17:20:50 +01:00
m-lopez-f 16c0233434 Fixed problem when return false instead of data, variable not change and enter a infinite bucle 2015-02-11 09:54:44 +01:00
mdtrooper a265ec3383 Fixed the functions to get agents not normal or not init in cases of agents with normal status and some modules not init. TICKET: #1791 2015-02-10 18:24:00 +01:00
m-lopez-f 2cb4e4c200 Fixed problems with resolved require in call function 2015-02-10 15:48:41 +01:00
m-lopez-f c28fd1f4d8 Fixed problem with delete maps when user is admin and have all permisions and other user have RM and RW and delete with RW rule 2015-02-10 14:54:42 +01:00
m-lopez-f 85eda328a4 Fixed problems with export data when type equals csv, export less data Tiquet: #1756
(cherry picked from commit a6807034eb)
2015-02-10 13:18:29 +01:00
mdtrooper 2e2bc36138 Fixed the lost 'server_name' in the monitor view in a node console. 2015-02-06 14:44:16 +01:00
Alejandro Gallardo Escobar 4bb008b4eb Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-02-04 12:48:02 +01:00
Alejandro Gallardo Escobar 7405dffbb4 Now the filter form is hidden by default 2015-02-04 12:47:47 +01:00
m-lopez-f 84821a3729 Add help clippy in creation menus or views
Add clippy in:
Interval agent if this interval is < 300
Network maps>topology group
Create a new data server module in field 'Data Configuration'
In servers list, in column T/Q, when Q>200
2015-02-03 16:08:41 +01:00
Alejandro Gallardo Escobar 107b2bdb1c Improved the creation of the network interfaces table 2015-02-02 13:22:35 +01:00
Alejandro Gallardo Escobar f6e31d4a17 Modified the view to restrict some controls when the strict ACL is enabled 2015-01-30 20:41:54 +01:00
Alejandro Gallardo Escobar 4cf9accbd7 Merge branch 'feature/NewTreeView' into develop 2015-01-30 20:10:16 +01:00
Alejandro Gallardo Escobar 62cb13cd6c Removed the tree views test file 2015-01-30 20:09:38 +01:00
Alejandro Gallardo Escobar d35e6bd360 Updated the old file to show the new tree views 2015-01-30 20:07:50 +01:00
Vanessa Gil bf4b87258e Fixed bug #1733. 2015-01-30 11:33:04 +01:00
Alejandro Gallardo Escobar 81a844d1f3 Fixed the tree item detail output 2015-01-29 20:59:28 +01:00
Alejandro Gallardo Escobar 2a36e4b864 Merge branch 'develop' into feature/NewTreeView 2015-01-28 18:58:26 +01:00
m-lopez-f e879f6f755 Fixed problem in tree view with servername containt dot, tree not expand
Problem in loadSubTree in search field with id X
2015-01-28 11:56:38 +01:00
m-lopez-f 77b92758cc recovery timestamp filter in view 'Received data from modules' 2015-01-27 15:43:11 +01:00
m-lopez-f f4e1cee998 Fixed problems with view of data when click in binary image in tree view, monitor detail and list of monitors 2015-01-27 15:25:18 +01:00
Vanessa Gil dc4a6188a6 Fixed bug #1679. 2015-01-27 11:44:26 +01:00
Alejandro Gallardo Escobar c765f6c957 Merge branch 'develop' into feature/NewTreeView 2015-01-26 17:51:39 +01:00
Vanessa Gil 2908f09b01 Added strict ACL to agent detail view. 2015-01-26 13:50:58 +01:00
Vanessa Gil 9aff58ed33 Added Strict ACL mode to networmaps. 2015-01-23 08:59:42 +01:00
Alejandro Gallardo Escobar e812c55264 Added the modules filter 2015-01-22 16:55:31 +01:00
m-lopez-f f0c11a8280 Delete shortcut of remote configuration in agents 2015-01-22 14:58:45 +01:00
Alejandro Gallardo Escobar d6c51fb559 Rewrited all the data retrieving functionality of the different tree views 2015-01-21 17:37:51 +01:00
m-lopez-f db7680eb46 Add filter group module in general view of agents 2015-01-21 15:26:49 +01:00
mdtrooper 2d3f239789 Changes imprecise names and concepts in SNMP. Ticket: #1688 2015-01-21 14:47:54 +01:00
mdtrooper c76f8dd616 Uploaded lost change from yesterday. Added the text in the snmp console view 2015-01-21 12:45:48 +01:00
m-lopez-f d19ffc0dce fixed problems with validate alerts 2015-01-20 17:07:54 +01:00
m-lopez-f ac409f1b66 Fixed problems when ordering, Filters in 'Monitor detail' were lost. 2015-01-20 09:33:23 +01:00
m-lopez-f 43cadc3010 Fixed problems when ordering, Filters in 'Monitor detail' were lost.
(cherry picked from commit b215eefdf1)
2015-01-20 09:26:26 +01:00
Alejandro Gallardo Escobar 388c8f2b1b Fixed an URL 2015-01-19 12:28:25 +01:00
Alejandro Gallardo Escobar b55bb55ac5 Fixed some URLs 2015-01-19 12:20:37 +01:00
Alejandro Gallardo Escobar 265dda2a3f Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
Alejandro Gallardo Escobar 4d64cddcc1 Fixed some php notices 2015-01-16 17:14:49 +01:00
KIKUCHI Koichiro a9f80dd01b Fixed the bug that tree view in meta console does not work properly. 2015-01-16 19:12:45 +09:00
KIKUCHI Koichiro 9a236c3df8 Small cleanup to prepare for the next changes. 2015-01-16 18:38:17 +09:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
m-lopez-f 41bdb11c18 fixed little problem 2015-01-15 16:30:50 +01:00
m-lopez-f 5ca2a7ea3a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-01-15 15:45:29 +01:00
m-lopez-f 34c5ece58e Changed ACL's permission in Networkmaps
visualization: RR (Report Read)
Edition: RW (Report Write)
Deletion: RW (only yours networkmaps), RM(any of its group, although he did not create it.)
2015-01-15 15:45:00 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs"
This reverts commit 3d251fd035.
2015-01-15 15:11:26 +01:00
m-lopez-f c6b15f440f Fixed permissions error when validating alerts. 2015-01-15 10:34:55 +01:00
Alejandro Gallardo Escobar 49b5e1cfdd Modifications on the search filter 2015-01-12 11:04:16 +01:00
Alejandro Gallardo Escobar e1b34840b1 Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/functions_groups.php
2015-01-09 11:41:07 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
Alejandro Gallardo Escobar ed9cd8f999 Improved the search filter and added new info icons to the modules in the tree view 2015-01-08 11:45:31 +01:00
Alejandro Gallardo Escobar ffd7eb1a23 Added the policies tree tab 2015-01-05 13:24:17 +01:00
Alejandro Gallardo Escobar 39486ea9fc Error fixes 2014-12-30 16:23:31 +01:00
Alejandro Gallardo Escobar a062a68969 Added custom titles to the counters and minor fixes 2014-12-30 12:42:12 +01:00
Alejandro Gallardo Escobar 8d9ef4cc7c Removed the agent info table from the module detail table 2014-12-30 12:41:18 +01:00
mdtrooper 51c51e4fb2 Added the agents 2014-12-18 17:51:02 +01:00
Alejandro Gallardo Escobar 4f12ffce8c Minor fixes 2014-12-18 14:43:45 +01:00
Alejandro Gallardo Escobar 678755aa24 Removed the test code of the new tree view 2014-12-18 14:42:00 +01:00
Alejandro Gallardo Escobar 4c933c3434 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/operation/tree2.php
2014-12-18 11:54:11 +01:00
Alejandro Gallardo Escobar 677c8cfa0d Now the tree dissapear when a new search is done 2014-12-18 11:50:11 +01:00
mdtrooper 56119d0b28 Remove the double slash in the urls of ajax 2014-12-18 11:46:41 +01:00
mdtrooper 82851e146b Hide the old tree when loading a new filtered tree 2014-12-18 11:43:06 +01:00
Alejandro Gallardo Escobar cd560178c0 Fix 2014-12-18 11:09:46 +01:00
Alejandro Gallardo Escobar c647ae8048 Fixes 2014-12-18 11:04:41 +01:00
Alejandro Gallardo Escobar 76cc5d8a96 More fixes 2014-12-17 20:12:21 +01:00
Alejandro Gallardo Escobar 9b8f53691a Fixes 2014-12-17 19:45:09 +01:00
Alejandro Gallardo Escobar 530454ea72 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/javascript/tree/TreeController.js
2014-12-17 19:13:23 +01:00
Alejandro Gallardo Escobar 304b36b13a Too lazy to explain 2014-12-17 19:11:07 +01:00
mdtrooper 9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +01:00
Alejandro Gallardo Escobar 826dd6026a Improved the visual style 2014-12-17 13:47:40 +01:00
Alejandro Gallardo Escobar b628faaeac Added test code 2014-12-17 12:26:41 +01:00
mdtrooper 48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
mdtrooper 24101c00c1 First commit of new treeview 2014-12-16 13:08:02 +01:00
mdtrooper 95873d9356 Added api for metaconsole. Ticket: #1474 2014-12-15 19:39:05 +01:00
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
2014-12-15 15:06:29 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar 30f24ff583 Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 96511fe25a Now the user can enable and configure the 2 step auth 2014-12-11 16:17:35 +01:00
Alejandro Gallardo Escobar 4792299b5a Added a new tab to the agent view 2014-12-05 10:49:50 +01:00
Alejandro Gallardo Escobar 9ed9009596 Now the tree view tabs keep the 'pure' status 2014-12-04 17:48:02 +01:00
Alejandro Gallardo Escobar a706dfa917 Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:39:29 +01:00
Alejandro Gallardo Escobar 10bf2819d6 Now many network maps can be deleted at once 2014-12-04 12:19:52 +01:00
mdtrooper f25440d68a Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
mdtrooper e45b8183d8 Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
mdtrooper e2066a335c Fixed the description show in the table of agents. 2014-12-03 16:30:36 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 333781b203 Fixed the not init agents in the tree group view. Ticket: #1584 2014-12-01 16:37:40 +01:00
mdtrooper 3c76f41387 Fixed the group view for agents not init. Ticket: #1584 2014-12-01 13:56:40 +01:00
mdtrooper 5211c48643 Fixed the new autologin for the graph link and edit link 2014-11-26 19:51:50 +01:00
Vanessa Gil 815e974c0a Fixed links in monitor view. 2014-11-26 16:48:13 +01:00
Vanessa Gil af1b7c1f64 Fixed several bugs in events. 2014-11-25 16:58:20 +01:00
mdtrooper a70fc62af0 Fixed typo error in stat_win.php. 2014-11-25 14:30:30 +01:00
mdtrooper 631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
mdtrooper 7ba791f787 Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper 5cf7927240 Cleaned source code style 2014-11-19 16:30:00 +01:00
mdtrooper 45c33786e3 Erased the deprecated field 'fullscreen' in table 'tlayout' 2014-11-19 16:30:00 +01:00
Vanessa Gil 09f5956ee1 Fixed bug in event list. 2014-11-18 15:18:00 +01:00
Vanessa Gil e8f5fabeba Fixed tickets #1562, #1556. 2014-11-18 11:27:04 +01:00
mdtrooper a3939687ed Fixed the javascript code that uses the history reservate word 2014-10-30 18:48:37 +01:00