Commit Graph

1963 Commits

Author SHA1 Message Date
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
mdtrooper 27f70d34a1 Fixed, set the error level to other more low, and fixed unclosed tag. Ticket: #1499 2014-10-28 11:21:14 +01:00
mdtrooper edf25fe620 Fixed the style for the agents with a hudge list of ips 2014-10-24 11:03:45 +02:00
mdtrooper c66ca5251a Fixed the access (and listing in global search) to module with ACL tags. Ticket #1472 2014-10-20 16:45:47 +02:00
Alejandro Gallardo Escobar e650725439 Removed the definition of a javascript function 2014-10-20 13:18:31 +02:00
Alejandro Gallardo Escobar 0a72ae3032 Fixed the subtree load after login into Pandora FMS. Fixes the ticket #1467 2014-10-17 17:29:54 +02:00
mdtrooper 26ac085975 Fixed the exportation data with some dates. Ticket #1455 2014-10-16 16:10:53 +02:00
mdtrooper 0f4119246d Cleaned source code style 2014-10-16 14:02:02 +02:00
Alejandro Gallardo Escobar e873d134bb Fixed ACL errors 2014-10-16 12:21:59 +02:00
Alejandro Gallardo Escobar a15abe770c Fixed an error on the custom graphs section 2014-10-16 11:58:18 +02:00
mdtrooper 86655d1463 Show the form when it is empty the module. 2014-10-16 11:52:45 +02:00
mdtrooper 37b1e8522a Fixed the window sound events in chrome browsers. Ticket #1408 2014-10-13 15:43:36 +02:00
mdtrooper 0fe3237752 Added a tooltip for to explain the pagination in the list modules into agent view 2014-10-10 14:43:38 +02:00
mdtrooper e1349c8a68 Fixed the RSS for text (decriptions, names) with html entities non numeric. Ticket #1430 2014-10-09 19:43:03 +02:00
mdtrooper 1de9f8b051 Fixed and improved the function rss_error_handler for to show others errors 2014-10-09 15:03:54 +02:00
mdtrooper a072b59e98 Fixed the unset variables that show PHP warnings and break the RSS events 2014-10-09 13:50:05 +02:00
mdtrooper 77cb3adcce Fixed the entry of recon task in the menu, now it is showed only for user with PM profile 2014-10-07 20:40:13 +02:00
Vanessa Gil f76ca4ef6e Fixed link to event list in service map. 2014-10-07 16:33:54 +02:00
mdtrooper aab0934125 Fixed the lost name of group. Ticket #1419 2014-10-07 14:03:04 +02:00
Alejandro Gallardo Escobar f323ac9bfe Fixed an error with the event comments 2014-10-02 19:37:18 +02:00
Alejandro Gallardo Escobar 5edfc1afa5 Finally, the comments are showed correctly on the events list 2014-10-02 18:38:14 +02:00
Alejandro Gallardo Escobar b9ddd9ef08 Revert "Now the comments are showed correctly on the events list"
This reverts commit a7f42d753d.
2014-10-02 18:31:58 +02:00
Alejandro Gallardo Escobar b16b1753d9 Now the comments are showed correctly on the events list 2014-10-02 18:23:44 +02:00
Alejandro Gallardo Escobar 3c41de5238 Merge branch 'feature/ticket#1327-NetworkInterfaceReport' into develop 2014-10-01 13:55:51 +02:00
Alejandro Gallardo Escobar c2925695bf Minor fixes 2014-10-01 12:21:08 +02:00
mdtrooper 5e683f7b50 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-01 11:18:25 +02:00
mdtrooper 38d352ebe1 Fixed the limits of warnings/critical (the line) that freezed the legend. Ticket #1287 2014-10-01 11:18:03 +02:00
Vanessa Gil 0013090ad7 Resize statistics graph. Ticket #1345 2014-10-01 10:34:49 +02:00
Vanessa Gil b02e994701 Removed wildcards '%' from querys where its filtered by tag. Ticket #1363. 2014-09-30 15:11:20 +02:00
Vanessa Gil be31c5e400 Fixed bug in event filter. 2014-09-29 11:27:10 +02:00
mdtrooper dbaf806b12 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-25 16:56:01 +02:00
mdtrooper 07f62cc3e6 Fixed the link of edit module in Metaconsole 2014-09-25 16:55:48 +02:00
Alejandro Gallardo Escobar 301b1b5817 Now the interface information don't show duplicated interfaces 2014-09-25 16:02:21 +02:00
mdtrooper 299b6f6a31 Fixed the public visualmap error message 2014-09-25 15:01:05 +02:00
Alejandro Gallardo Escobar 32358b7c50 Fixed a regex of the interface information 2014-09-25 11:50:30 +02:00
mdtrooper 490abfecf7 Fixed the MySQL error in the policies tree. Ticket #1340 2014-09-24 16:56:40 +02:00
Alejandro Gallardo Escobar ef31093b00 Now the parent groups without modules appear on the group view table
* pandora_console/operation/agentes/group_view.php: Added the parent_id
	to the groups array.

* pandora_console/include/functions_groups.php: Fixed the function
	"groups_get_childrens". Improvements on the function
	"groups_get_group_row".
2014-09-24 13:09:15 +02:00
Vanessa Gil 18fc35c558 Changed view module detail in tree view. Ticket #1342. 2014-09-24 10:39:52 +02:00
Alejandro Gallardo Escobar c2f812db16 Big improvement on the SNMP statistics section
* pandora_console/operation/snmpconsole/snmp_view.php: Removed the code of
	the statistics section.

* pandora_console/operation/snmpconsole/snmp_statistics.php: Added file.
	Statistics section for SNMP.
2014-09-23 18:05:44 +02:00
Alejandro Gallardo Escobar 1258d87992 Merge branch 'feature/ticket#1331-CombinedGraph' into develop 2014-09-23 13:21:47 +02:00
Alejandro Gallardo Escobar 29eb11b696 Improved the items information of the module graphs
* pandora_console/godmode/setup/setup_visuals.php,
  pandora_console/include/functions_config.php: Added a
	new config token to choose if the module graphs
	data should be shortened.

* pandora_console/include/functions_custom_graphs.php:
	Added the unit list parameter to the function
	"custom_graphs_print".

* pandora_console/operation/agentes/interface_traffic_graph_win.php:
	Improved a function call.

* pandora_console/include/functions_graph.php: Modified
	the function "graphic_combined_module". Now is
	possible to add custom units for the items and
	short the data.
2014-09-23 13:20:50 +02:00