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

2525 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
Alejandro Gallardo Escobar a98be1cad9 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:28:42 +02:00
Alejandro Gallardo Escobar b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
m-lopez-f 19abac33c1 Add option to change image when is service and fixed error when updated data. Tiquet: #2175 2015-05-04 12:44:46 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
mdtrooper 5545e4e616 Fixed the SLA form editor for to set graphs. TICKET: #2172 
(cherry picked from commit e1e64b1a54)
 2015-04-30 16:49:17 +02:00
m-lopez-f 899759a3ca Change visual 2015-04-29 08:30:02 +02:00
m-lopez-f 0ed625f42e Merge branch 'develop' into feature/NewView 2015-04-28 14:02:17 +02:00
m-lopez-f 885db84bd5 Delete column and change for other in list of servers. Tqiuet: #2144 2015-04-28 14:01:48 +02:00
mdtrooper bc9918707a Working in the refactoring the code of reports (event_report_group) and added the filter by text. TICKET: #2066 2015-04-27 13:42:03 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
mdtrooper d947d62b51 Fixed show the widget 'show resume' in the 'availability' item in report. TICKET: #2149 
(cherry picked from commit 0f72fa8bbd)
 2015-04-24 19:05:45 +02:00
mdtrooper 184e705b8d Fixed the returning to item editor when it is availability item. TICKET: #2149 
(cherry picked from commit 29f4c1d7e7)
 2015-04-24 17:18:57 +02:00
mdtrooper d1bff5de92 Fixed the lost period in availability item. TICKET: #2149 
(cherry picked from commit 61aa789033)
 2015-04-24 17:10:29 +02:00
Alejandro Gallardo Escobar afc54630a8 Improved the code readability and added support to retrieve the agents from the new table of the metaconsole 2015-04-23 21:15:13 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
m-lopez-f 3d2adc315e Change siual of view in any view 2015-04-22 16:46:08 +02:00
m-lopez-f 514ab2556b Change visual of agents detail and admin agent 2015-04-21 17:41:33 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
mdtrooper 3578687aad Fixed the lost checkbox to show graphs in the event items in the report (Merge from the commit 5572b88574). 2015-04-21 16:08:29 +02:00
Alejandro Gallardo Escobar 18a58243a4 Error fixes and performance improvements 2015-04-21 14:51:27 +02:00
mdtrooper 5572b88574 Fixed the lost checkbox to show graphs in the event items in the report 2015-04-21 13:18:29 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
m-lopez-f 42e81ccc5a Fixed style in menu and views and upload new images 2015-04-15 17:35:36 +02:00
Vanessa Gil 802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
Vanessa Gil a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00
m-lopez-f 89fa37578a Changed rowspan size 2015-04-15 12:14:55 +02:00
m-lopez-f b78f39f420 Delete develop traces 2015-04-15 11:30:50 +02:00
m-lopez-f 25277eb550 Fixed menu smtp from agent detail and modify agent 2015-04-15 10:26:48 +02:00
Vanessa Gil 2af12537ed Ticket #2073. 2015-04-15 10:00:42 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
Vanessa Gil 4392958648 Ticket #2044. 2015-04-13 16:58:05 +02:00
m-lopez-f cc03dcd127 Fixed visual list of servers in administrations servers 2015-04-13 15:05:41 +02:00
m-lopez-f a34b16a938 Merge branch 'develop' into feature/NewView 2015-04-13 13:44:43 +02:00
m-lopez-f 8d8476118f reorganize menu and changed styles of menu 2015-04-13 13:44:29 +02:00
Vanessa Gil 6ed03f09dd Merge branch 'feature/sessions' into develop 2015-04-13 11:28:08 +02:00
Vanessa Gil a7f748b7be Ticket #1354. 2015-04-13 11:27:23 +02:00
m-lopez-f 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
m-lopez-f eac0f87405 Fixed menu and add new option in events sub_menu 2015-04-13 09:07:52 +02:00
Alejandro Gallardo Escobar ae080dc33b Merge branch 'feature/ticket#2047-New-acl-bits' into develop 2015-04-10 14:06:35 +02:00
Alejandro Gallardo Escobar 03f9f94e04 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-10 14:06:27 +02:00
Alejandro Gallardo Escobar 10c94d51d9 Error fixes 2015-04-10 12:34:42 +02:00
Alejandro Gallardo Escobar 488c4976b0 ACL fixes 2015-04-10 12:34:19 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
m-lopez-f 91556f8096 Add new funcionality to menu and fixed other problems 2015-04-10 09:29:33 +02:00
mdtrooper f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
m-lopez-f 01149f214a Changed lateral menu, order options and eliminate options 2015-04-09 15:04:23 +02:00
m-lopez-f a6af8ab18d Merge branch 'develop' into feature/NewView 2015-04-09 14:47:06 +02:00
Alejandro Gallardo Escobar d28cd4c172 Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
Akihiro Uchida 4e7fdcda53 Fixed codes to disable input datepicker. 2015-04-09 20:17:39 +09:00
Miguel 0781d1f981 Merge pull request #12 from uchida/enable-to-postpone-planned-downtime 
Enable to postpone planned downtime when in execution and its type is once
 2015-04-08 16:25:29 +02:00
Akihiro Uchida 7e5bd7e22e Enable to postpone planned downtime when in execution and its type is once 
Based on the contribution of Hiroki Shimizu
 2015-04-08 17:40:58 +09:00
Alejandro Gallardo Escobar 9035eda57d Added the new access bits to the profiles list and editor 2015-04-06 18:51:24 +02:00
m-lopez-f da24887922 Merge branch 'develop' into feature/NewView 2015-04-06 12:33:26 +02:00
m-lopez-f 790c81a250 Add order in parent select in static graph in visual console, Tiquet: #2067 2015-04-06 10:25:03 +02:00
m-lopez-f a55fb5ec72 Change visual of console 2015-04-01 14:13:41 +02:00
m-lopez-f 0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
m-lopez-f 0e29cc520e Change visual of node 2015-03-31 17:26:22 +02:00
m-lopez-f a9bf3490fb Merge branch 'develop' into feature/NewView 2015-03-31 09:13:51 +02:00
m-lopez-f c7b3104224 In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:33:37 +01:00
m-lopez-f 220ad47b3f Change menu and visual any views, tiquets: #1815,#1702 2015-03-26 13:12:48 +01:00
m-lopez-f 7bca421a79 Fixed user list visual in metaconsole tiquet: #2042 2015-03-26 08:48:14 +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 0a0283df0c Delete submenu in massive operations. Tiquet: #2031 2015-03-24 14:20:10 +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
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 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
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 f43698bfe7 Fixed visual metaconsole tiquet: 2013 2015-03-23 12:02:48 +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
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
Vanessa Gil b1ebd56a1c Fixed search by group. 2015-03-13 12:56:28 +01:00
m-lopez-f d673737e2d Changed visual of metaconsole 2015-03-12 10:27:28 +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
mdtrooper db6e59c9bb Fixed the preview alert action in the form editor. TICKET: #1944 
(cherry picked from commit b7264f61c3)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
 2015-03-10 15:38:56 +01:00
mdtrooper 7883e08af5 Working in the files for the next cherry pick. 2015-03-10 15:36:23 +01:00
m-lopez-f e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper d2accaae68 Fixed the update of alert command usability. 
(cherry picked from commit f475dc80bd)

Conflicts:
	pandora_console/godmode/alerts/configure_alert_command.php
 2015-03-09 16:25:58 +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
mdtrooper 37bff59e85 Fixed, now the tab of remote configuration is not visible. TICKET: #1884 2015-03-09 12:08:26 +01:00
Ramon Novoa 0c0c823118 Merge branch 'feature/password-encryption' into develop 2015-03-06 17:10:25 +01:00
m-lopez-f 84de8b6a45 Fixed error php 2015-03-06 15:16:56 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
Ramon Novoa 4e4eb4df87 Merge branch 'develop' into feature/password-encryption 2015-03-04 15:39:37 +01:00
mdtrooper 50bbdf5590 Fixed the lost config data in modules from policy when update something in the module. TICKET: #1874 2015-03-04 14:55:44 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper 7b08fb47c1 Fixed the create new remote user in Active Directory (enterprise). TICKET: #1845 2015-02-26 12:27:18 +01:00
mdtrooper d636561383 Fixed PHP warning. 2015-02-26 10:09:16 +01:00
mdtrooper 8ed021b64d Fixed the inverse intervals in massive edition of modules. TICKET: #1831 2015-02-25 11:39:28 +01:00
mdtrooper 0952b96b49 Added the option 'last value' for the items 'general' and 'exception' in reports. TICKET: #1819 2015-02-23 13:43:26 +01:00
Alejandro Gallardo Escobar 2999c76fa8 Fixes ticket #1816. Now the SNMP interface wizard retrieves the interfaces ips properly 2015-02-18 15:07:07 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
Alejandro Gallardo Escobar ff2a10a4e8 Visual fixes 2015-02-13 19:41:03 +01:00
Alejandro Gallardo Escobar 12831ca3b1 Added a preview to the status sets 2015-02-13 19:32:34 +01:00
Alejandro Gallardo Escobar 7c89c42709 Added a preview to the gis icons 2015-02-13 19:18:51 +01:00
Alejandro Gallardo Escobar 45640c8c96 Fixed a visualization error 2015-02-13 18:59:31 +01:00
mdtrooper 584d00f321 Fixed the snmp wizard for uptime and added unit octets. TICKET: #1742 2015-02-13 15:32:28 +01:00
Alejandro Gallardo Escobar 53ee72c74d Added a preview button to the custom login background and header logo 2015-02-11 19:41:04 +01:00
mdtrooper 47ceb61515 Added a checks of PHP enviorement in Update Manager. 
(cherry picked from commit dbf3bedd3a)
 2015-02-11 15:41:11 +01:00
mdtrooper 6c1d958f73 Added the proxy configuration in the update manager. 2015-02-10 16:40:44 +01:00
mdtrooper 2842970c83 Added feature of custom post process values. TICKET: #1743 2015-02-09 19:35:03 +01:00
mdtrooper 39780da045 Added check for the profile is used by admin users before to delete. TICKET: #1753 2015-02-06 18:00:57 +01:00
Alejandro Gallardo Escobar a3783f70e1 Now the alert action command fields can have a HTML wysiwyg editor 2015-02-04 16:52:28 +01:00
mdtrooper 7628ddb5c6 Set a data limit in the forms of massive operations. TICKET: #1700 2015-02-04 11:19:11 +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
m-lopez-f 87ebc49dc9 Changed location of servers down clippy 2015-02-03 15:43:44 +01:00
Alejandro Gallardo Escobar 0023caf6ea Fixed an error that prevented the creation of a template when a template was selected 2015-02-02 19:53:08 +01:00
mdtrooper 45d036acdb Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2015-02-02 14:18:32 +01:00
mdtrooper 9bed03aefd Fixed PHP warnings. 2015-02-02 14:18:05 +01:00
m-lopez-f 59e4fd13bf Change visual in 'Tactical server information' in third column 
(cherry picked from commit 10993ef0f5)
 2015-01-30 13:13:00 +01:00
m-lopez-f bfc250433a Fixed problems with absolete paths 2015-01-30 11:48:20 +01:00
m-lopez-f fea686dfc5 Change order to show info in 'Tactical server information' about data server 
(cherry picked from commit f1f1e7ba94)
 2015-01-30 10:08:04 +01:00
mdtrooper e4d26b0bd6 Added a checkboxes in the list of elements for to make more easy the deletion of item in visual map. TICKET: #1687 2015-01-29 16:53:52 +01:00
m-lopez-f 340c965f92 Fixed alert command previews in 'Configure alert action' when variable contained a double or single quotes 
(cherry picked from commit 443440f998)
 2015-01-29 13:41:33 +01:00
m-lopez-f f38f5f052d Fixed problem with previous commit 2015-01-28 10:34:41 +01:00
m-lopez-f 82c794a14e add links in agent name and alert name 2015-01-23 12:21:57 +01:00
mdtrooper 23f14f4c02 Finish the feature of massive operations with tags. TICKET: #1632 2015-01-21 18:58:17 +01:00
mdtrooper 531a7750bb First commit with the new feature for massive operations intags. Ticket: #1632 2015-01-21 18:58:17 +01:00
mdtrooper 2d3f239789 Changes imprecise names and concepts in SNMP. Ticket: #1688 2015-01-21 14:47:54 +01:00
m-lopez-f 08dbba5ad6 Change name field in custom events from Criticity to Severity. 2015-01-20 09:09:27 +01:00
m-lopez-f dde19b79d9 Added erased when a plugin is also deleted in the policies. 2015-01-19 10:52:25 +01:00
m-lopez-f cd589658f7 Fixed problem with create agent and not asigned ip address 
create record in taddress and ip is ''
 2015-01-16 14:08:49 +01:00
m-lopez-f fbf5ffcd0f Fixed error creating the url in, en Reporting>>Visual Console>>Show link to public Visual Console 2015-01-16 13:11:52 +01:00
m-lopez-f 3950c08587 Change help hint in Create user in field 'Global Profile' 
(cherry picked from commit 9e14c5fb20)
 2015-01-16 12:11:13 +01:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs" 
This reverts commit 3d251fd035.
 2015-01-15 15:11:26 +01:00
m-lopez-f 9343a3dae9 Changed text 'Module macros' to 'Custom macros' 2015-01-14 12:11:33 +01:00
m-lopez-f b856056f55 Added new tooltip to the field filter in SNMP-> SNMP Filters-> create 2015-01-13 11:37:22 +01:00
m-lopez-f e39415e681 Add combox filter in search form, view: Manage Agents in Admistration 2015-01-12 16:20:07 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +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 9277ea1b80 Added info dialog with the modules and components that lock a server plugin 2014-12-12 15:01:50 +01:00
mdtrooper b42d643968 Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar 33c6789144 Added an option to allow the users to enable the 2 step auth 2014-12-11 16:14:55 +01:00
Ramon Novoa 26c9184f85 Fixed a string (needs translations too). 2014-12-05 15:29:12 +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 673d0bd34f Added the lost fields for item group in the editor. 2014-12-02 11:40:27 +01:00
mdtrooper b0ee3ed266 Added the lost fields for item group in the element list. 2014-12-02 11:40:27 +01:00
mdtrooper 352c63087c The last work for the new elements into the visualmap. Ticket #1478 2014-11-26 16:03:40 +01:00
mdtrooper 61ecef9ef9 Working in the new elements for the visualmap. Ticket #1478 2014-11-26 15:33:07 +01:00