Commit Graph

2347 Commits

Author SHA1 Message Date
m-lopez-f 71a3014ec2 Fixed problems with label and title in simple graph of monitor status 2016-09-14 10:31:35 +02:00
m-lopez-f bb5b685508 Fixed problems with label in graphics on monitors view 2016-09-13 15:20:51 +02:00
Arturo Gonzalez eaa98269b2 Fixed monitor details search by module name and module group. Ticket #4025 2016-09-12 12:08:25 +02:00
Arturo Gonzalez 9ea430cfc1 Revert "Fixed monitor details search by module name and module group. Ticket #4025"
This reverts commit ed4693a6fe.
2016-09-12 12:06:38 +02:00
Arturo Gonzalez 2de8122edc Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-12 11:58:29 +02:00
Arturo Gonzalez ed4693a6fe Fixed monitor details search by module name and module group. Ticket #4025
(cherry picked from commit dbb5aeee4c)
2016-09-12 11:58:20 +02:00
m-lopez-f 82b21020f2 Fixed problems with acl's. Ticket: #3912 2016-09-08 14:40:01 +02:00
m-lopez-f f3b9703242 Fixed problems with acl's. Ticket: #3912 2016-09-08 12:59:41 +02:00
m-lopez-f 3d24f0ecba Fixed problems with ACL's permissions. Ticket: #3912 2016-09-08 11:26:59 +02:00
m-lopez-f 18d3f1e7a0 Fixed problems with auto-refresh 2016-09-08 09:50:13 +02:00
Daniel Maya 5f830a48ad Added search by multiple ips agents. Ticket #3949.
(cherry picked from commit d39123eb0a)
2016-09-05 13:53:55 +02:00
m-lopez-f fb4a1b263a Add style css to image and fixed problems in metaconsole when grouped by agents in events. Internal ticket: #3079
(cherry picked from commit 02388ff31f)
2016-09-01 10:51:10 +02:00
m-lopez-f 498ad5f42c Fixed problems with line father when use pure in visual console. Internal ticket: #3936
(cherry picked from commit e815ea022b)
2016-08-31 14:40:30 +02:00
fermin831 3ef4ea3215 Changed require for include 2016-08-31 12:08:50 +02:00
fermin831 c903e45ff0 RSS menu does not appear if IP is not in white API IP list
(cherry picked from commit 7462ff1ece)
2016-08-30 10:49:56 +02:00
m-lopez-f 1f762f89e5 Fixed problems with ACL permmisions. Internal Tiquet: #3912 2016-08-29 09:48:08 +02:00
m-lopez-f ac25696355 Fixed search form. Tiquet: #3988 2016-08-29 09:47:29 +02:00
m-lopez-f f0c34fb301 Fixed search form. Tiquet: #3988 2016-08-24 15:38:20 +02:00
m-lopez-f 5d89aea854 Fixed problems with times of execution and load page. Tiquet: #3988 2016-08-24 11:03:17 +02:00
Daniel Maya b52223a7ea Added new check to equalize maximum thresholds. Ticket #3732.
(cherry picked from commit bb26f4b82d)

Conflicts:
	pandora_console/include/functions_graph.php
2016-08-23 09:01:41 +02:00
m-lopez-f 2294d825e3 Fixed problems with parents lines objects. Tiquet: #3936
(cherry picked from commit 0d8761d009)
2016-08-16 12:16:50 +02:00
m-lopez-f 774b0f9cab Fixed problems with group agents. Tiquet: #3079 2016-08-16 10:43:29 +02:00
Daniel Maya a7f16ea182 Fixed modules ordination. Ticket #3885.
(cherry picked from commit 5928f22d8d)
2016-08-11 11:56:49 +02:00
m-lopez-f 924281e162 Fixed problems with group agents. Tiquet: #3079
(cherry picked from commit 2217e9f908)
2016-07-22 16:09:31 +02:00
Daniel Maya f3b1de0472 Fixed icon in graphs. Ticket #3830.
(cherry picked from commit 24a9eee6e8)
2016-07-19 15:58:23 +02:00
Axel 38af0fe510 Update menu.php
Fixed a call to the translation function
2016-06-29 15:14:31 +02:00
Daniel Maya 6bb5b93a7f show unknown and not init modules. Ticket #3844.
(cherry picked from commit e4cdef363e)
2016-06-29 10:44:00 +02:00
Daniel Maya e9dc54360e Fixed issue. Ticket #3844.
(cherry picked from commit 2f5457d938)
2016-06-28 16:11:45 +02:00
Daniel Maya ee35e98fed New filter actions. Ticket #3893.
(cherry picked from commit ec073eb8b4)
2016-06-28 15:34:45 +02:00
Alejandro Gallardo Escobar 8b0ee05bb7 Changed the name of an ehorus integration tab 2016-06-22 16:10:38 +02:00
Alejandro Gallardo Escobar b74267676d Fixes on the ehorus integration ACL 2016-06-22 15:28:32 +02:00
Alejandro Gallardo Escobar 55fee7bf8f Improved the ACL of the ehorus integration 2016-06-22 14:50:57 +02:00
Alejandro Gallardo Escobar bfa028cc2d Now the permission to access the eHorus client is Agents Manager (AM)
(cherry picked from commit 8af8b6a480)
2016-06-21 18:32:35 +02:00
Alejandro Gallardo Escobar 8943ffd7b2 Changed the temporal images of the menus for eHous with their definitive version
(cherry picked from commit 853ef78168)
2016-06-21 18:31:51 +02:00
Alejandro Gallardo Escobar faaf3df492 Added a token expiration check to warn users they should request another
(cherry picked from commit 2b88b58448)
2016-06-21 18:31:27 +02:00
Alejandro Gallardo Escobar 7e3f7adff4 Almost finished the eHorus integration
(cherry picked from commit efc5642aa2)
2016-06-21 18:31:05 +02:00
Alejandro Gallardo Escobar 29420c7141 Added subtabs for the ehorus tab
(cherry picked from commit 63fb20ed95)
2016-06-21 18:30:59 +02:00
Alejandro Gallardo Escobar 71a20bd286 More work on the visualization section of the eHorus integration
(cherry picked from commit 7f72a089e0)
2016-06-21 18:30:36 +02:00
Alejandro Gallardo Escobar d990d11970 Added a new agent tab to launch the eHorus Client
(cherry picked from commit 8fa87e7e1e)
2016-06-21 18:30:15 +02:00
Ramon Novoa e84cf3efb0 Temporarily disabled iface info from network maps.
Network maps became too cluttered when layer 2 interface information was
displayed. They will probably be merged with the network console.
2016-06-16 19:00:41 +02:00
Daniel Maya 390942dcbc button inserted Agent_detail. Ticket #3831.
(cherry picked from commit 2c0dae13b1)
2016-06-15 10:55:17 +02:00
fermin831 e4314cbe8b Definitive messages to update manager and solved some issues. 2016-06-14 18:33:39 +02:00
fermin831 27cebafd02 Merge branch 'feature/identification_wizard' into pandora_6.0
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
2016-06-13 18:36:35 +02:00
Sancho Lerena 1fbe092a48 Show the gauge custom graphs with the defined height. If the user can choose the graph height he should be able to see how is used. 2016-06-10 11:42:37 +02:00
Alejandro Gallardo Escobar 6e8d57f3be Fixed the error which prevented the opening of the QR dialog on the public console section 2016-06-09 17:00:57 +02:00
Alejandro Gallardo Escobar ac5c29b190 Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections. Ticket #3783 2016-06-08 19:15:50 +02:00
fermin831 bdbb74e6db Added connection with update manager and some design changes 2016-06-08 13:51:34 +02:00
Alejandro Gallardo Escobar 3daf59701a Reduced the width of the graph to avoid the horizontal overflow. Ticket #3778 2016-06-07 14:48:20 +02:00
Alejandro Gallardo Escobar 679b0c6749 Fixed the huge space between legend elements on the pie graphs. Ticket #3785 2016-06-07 13:10:08 +02:00
Alejandro Gallardo Escobar b32172651d Removed the zoom. Now the graph is loaded with the page width after the page load 2016-06-07 11:39:47 +02:00