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

2856 Commits

Author SHA1 Message Date
m-lopez-f 05b6b6580f Fixed order of groups in create snmp alert. 2015-08-18 12:58:37 +02:00
mdtrooper e3628acb01 Fixed the lost id in the creation of 'static graph' in the visualmap. TICKET: #2536 2015-08-18 12:27:12 +02:00
mdtrooper d7a8453139 Added times and days in the availability report item. TICKET: #2474 
(cherry picked from commit 8f409cb5df)
 2015-08-17 18:07:15 +02:00
mdtrooper c062bd6a6f Fixed in the report item of sql query in metaconsole. TICKET: #2319 2015-08-17 14:54:48 +02:00
mdtrooper 6658104e84 Fixed some networks components (about mysql plugin) in the installation SQL. TICKET: #2485 2015-08-17 13:39:06 +02:00
Arturo Gonzalez Diaz e394eab3ce Changed visual errors in wizard (visual console). Ticket #2537 2015-08-17 11:28:21 +02:00
Alejandro Gallardo Escobar 5dbb268250 Error fix 2015-08-13 14:33:21 +02:00
Alejandro Gallardo Escobar 57d66bf073 Fixed some errors, improved the code and prepared for compatibility w/ the metaconsole 2015-08-13 10:59:38 +02:00
Arturo Gonzalez Diaz 6b82b9674a Fixed error in recontasks. Ticket#2594 2015-08-12 16:22:21 +02:00
mdtrooper 0a0d9fad25 Merge branch 'develop' into feature/ticket#2491-features-dashboard 2015-08-12 13:03:50 +02:00
m-lopez-f ce614178ad Fixed problems with icos in visual console 2015-08-06 11:09:48 +02:00
m-lopez-f 9ca0307742 Add preview of image of services in visual console. Tiquet: #2544 2015-08-06 09:42:36 +02:00
m-lopez-f dc035cc591 Fixed problems with add icon in visual console. Tiquet: #2528 2015-08-06 09:24:44 +02:00
mdtrooper e81b050e81 Added new report item 'historical data' for to get a raw data of module' (manual merge from pandora_5.1) 2015-08-05 14:58:00 +02:00
Alejandro Gallardo Escobar cc6d0932a3 Fixed the error that caused the create button dissapeared under certain circunstances 
(When no downtimes was retrieved)

TICKET #2580
 2015-08-05 14:38:07 +02:00
m-lopez-f 13b7bfca6e Fixed error with create line in visul console. Tiquet: #2483 2015-08-05 11:52:54 +02:00
Alejandro Gallardo Escobar 8fb71f8413 Fixes and improvements in the use of agents and monitors multiselects 2015-08-05 10:39:16 +02:00
m-lopez-f b5ba16e31f Fixed default show option in filter options in manage agents. Tiquet:#2513 2015-08-04 16:40:55 +02:00
m-lopez-f 1a20a5b025 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-08-04 12:51:44 +02:00
m-lopez-f 257782236e Add lost option in godmode. Fixed style. 2015-08-04 12:50:21 +02:00
Alejandro Gallardo Escobar 3eddf9dbdc Fixed another SQL injection point 2015-08-04 12:49:54 +02:00
Arturo Gonzalez Diaz 6089492209 Now the group of a module belonging to a policy does not go away by making some modification in the module. Ticket#2554 2015-07-29 13:53:39 +02:00
m-lopez-f dfcfc85303 Add new funcionality of remote login with Active Directory 2015-07-28 16:10:45 +02:00
mdtrooper c003bf344a Working in the center labels into the items in a visualmap. (not finished) 2015-07-27 16:24:04 +02:00
mdtrooper c4fc8586fd First commit with the changes. 2015-07-24 14:32:26 +02:00
Arturo Gonzalez Diaz 697357b0a3 Recon-task ACL changed. Ticket #2179 2015-07-23 16:30:15 +02:00
Arturo Gonzalez Diaz 0c161cf7e9 Merge branch 'develop' into feature/ticket#2179-recontask-view-acl-Pandora6.0 2015-07-23 16:07:19 +02:00
Arturo Gonzalez Diaz addd36a681 Merge branch 'develop' into feature/ticket#2179-recontask-view-acl-Pandora6.0 2015-07-23 16:06:20 +02:00
Arturo Gonzalez Diaz 49b0ef565b Update recon-task changed. Ticket #2179 2015-07-23 15:51:39 +02:00
Arturo Gonzalez Diaz 4629d46408 Permissions in recon-task changed. Ticket#2179 2015-07-23 11:57:06 +02:00
m-lopez-f a316419afa Add new options when render proc is active. Tiquet: #2503 2015-07-22 11:49:00 +02:00
mdtrooper a3cce922e3 Fixed PHP warnings 2015-07-21 13:04:27 +02:00
Arturo Gonzalez Diaz ad6c95413b Now is not possible create two recon task with the same name. Ticket #2179 2015-07-21 13:01:44 +02:00
Arturo Gonzalez Diaz 34a17df3b7 Permissions in recontask changed. Ticket #2179 2015-07-21 11:55:10 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +02:00
m-lopez-f f547985cd6 Fixed problems with visual console. Tiquets: #2465,#2483,#2482,#2486 2015-07-21 08:39:18 +02:00
m-lopez-f e8d99351e6 Fixed problems with visual console. Tiquets: #2465,#2483,#2482,#2486 2015-07-20 17:03:26 +02:00
mdtrooper 75873b02d4 Some fixes in the visualmap. 2015-07-16 15:12:47 +02:00
Alejandro Gallardo Escobar f14b07014f Merge pull request #34 from pandorafms/feature/ticket#2404-planned-downtimes-acl 
Ended, tested and aproved
 2015-07-16 13:48:41 +01:00
Alejandro Gallardo Escobar 4d43033d46 Fixed some general and ACL errors and improved some pieces of code 
Downtime editor.
Some of the ACL checks added are:
-Permission check on downtime before adding an agent
-Permission check on agent before adding an agent
-Permission check on downtime before deleting an agent
-Permission check on agent before deleting an agent
-Permission check on downtime before creating or updating the downtime
-Removed the ACL check for every result item (it is done before, into the query)
-Permission check on the query for the agents added to the downtime

Downtime editor ajax.
Some of the ACL checks added are:
-Permission check on downtime before retrieving the modules
-Permission check on agent before retrieving the modules
-Permission check on downtime before deleting the modules
-Permission check on agent before deleting the modules
-Permission check on downtime before adding the modules
-Permission check on agent before adding the modules
 2015-07-16 13:53:57 +02:00
Alejandro Gallardo Escobar 95d0794ae0 Fixed syntax and ACL errors and improved some pieces of code 
Some of the ACL checks added are:
-Permission check before stopping.
-Running check before deleting.
-Permission check before deleting.
-Permission check before adding specific table columns.
 2015-07-15 18:47:58 +02:00
Alejandro Gallardo Escobar 970be457d6 Minos changes and improvements 2015-07-15 18:39:47 +02:00
mdtrooper 04b6621da5 Now the recon task editor avoid edit the ipam recons. TICKET: #2428 2015-07-15 18:15:30 +02:00
Alejandro Gallardo Escobar df50d6e343 Fixed the tags and module tags counters on the metaconsole and many more 
Like the ui when a user search does not return items.
 2015-07-15 16:09:07 +02:00
Arturo Gonzalez Diaz cbfab4781b The post process value in module options no longer take repeated numbers. Ticket #2431 2015-07-15 15:30:05 +02:00
Arturo Gonzalez Diaz e423d20dff "General setup" menu now is "Setup" and this icon no longer does anything. Ticket #2410 2015-07-15 13:00:22 +02:00
Alejandro Gallardo Escobar 3c08c32482 Fixed an ajax error 2015-07-14 18:34:16 +02:00
Arturo Gonzalez Diaz 52619f4e7c Planned downtime editor changed. Ticket #2404 2015-07-14 18:34:08 +02:00
Arturo Gonzalez Diaz 12334a3cd1 Planned downtime list and edit changed. Ticket #2404 2015-07-14 16:15:04 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
mdtrooper 46516385e9 Fixed adition of the snmp actions alerts. TICKET: #2417 2015-07-14 14:07:04 +02:00
Arturo Gonzalez Diaz ca1c6c0bf2 Planned downtime export csv changed. Ticket #2404 2015-07-14 12:31:49 +02:00
Arturo Gonzalez Diaz 595ffe8f5c Planned downtime list changed. Ticket #2404 2015-07-14 12:10:46 +02:00
Alejandro Gallardo Escobar a097aabf80 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property. 
The 'attr' function is going to be deprecated an may cause errors in Firefox.
 2015-07-14 11:11:22 +02:00
Arturo Gonzalez Diaz 8906e050ae Change permissions to a non-privilege user in planned-downtimes-acl Ticket #2404 2015-07-13 18:03:16 +02:00
Arturo Gonzalez Diaz bbbddf2fff Acces to non-privilege user to planned downtime 2015-07-13 15:59:08 +02:00
Alejandro Gallardo Escobar b3e977a40a Fixed an error related with the creation of a report after an invalid creation 
Ticket #2397.
 2015-07-13 12:45:36 +02:00
Alejandro Gallardo Escobar dd21d82046 Now the name input field has validation for the required property 2015-07-13 12:45:36 +02:00
Akihiro Uchida 9fbe18a5d4 Disable modification of executed planned downtime 2015-07-10 11:02:21 +09:00
m-lopez-f 6826a1e56e Merge branch 'develop' into feature/NewView 2015-07-09 17:49:16 +02:00
mdtrooper b3a619d0ea Re-added the checkbox for multiple deletion of items in a visualmap into a metaconsole. TICKET: #2135 2015-07-08 17:01:20 +02:00
mdtrooper 3d46327f55 Rewrote the ajax call 'get_agent_modules_json_for_multiple_agents' for to run with the agents cache in new metaconsole in 6 version. 2015-07-08 16:40:12 +02:00
m-lopez-f 606e29684b Add pagination in custom reports and visual console. Tiquet: #2398 2015-07-08 16:09:00 +02:00
m-lopez-f 1fa83a35dc Solver problems with columns in list view reports. Tiquet: #2401 2015-07-08 10:35:52 +02:00
Alejandro Gallardo Escobar 0e0c8e4480 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-07 17:39:09 +02:00
Alejandro Gallardo Escobar 2f97ef3c36 Fixed an error which causes a weird update counter 2015-07-07 17:38:24 +02:00
m-lopez-f f6e9cf37b0 Fixed error styles 2015-07-07 16:05:23 +02:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
mdtrooper 3e2fd15302 Fixed, now the first task for visualmap does not show in metaconsole. 2015-07-06 18:18:52 +02:00
m-lopez-f 6b5df1983b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-06 17:11:11 +02:00
m-lopez-f d053f5515a Fixed styles in metaconsole 2015-07-06 17:10:51 +02:00
Alejandro Gallardo Escobar 8e8de1f706 Some fixes and improvements 2015-07-06 11:49:48 +02:00
m-lopez-f 4f789f268d Fixed error when filter fot SLA Monthly and dont show this items in report list items. Tiquet: #2240 2015-07-06 10:06:33 +02:00
m-lopez-f 942333530c Not show navigation menu in others view. Restore nav 2015-07-03 16:02:43 +02:00
m-lopez-f 98d51e7548 Change visual of nodo 2015-07-03 11:13:10 +02:00
m-lopez-f d6f5d52a65 Fixed problems with extension in new menu. Tiquet: #2364 2015-07-03 11:12:35 +02:00
m-lopez-f f3dd19a06d Change visual of nodo 2015-07-02 15:31:53 +02:00
m-lopez-f 8c3056eb79 Add legal text in files and change data 2015-07-02 15:24:39 +02:00
m-lopez-f 224f95466c Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-02 12:41:29 +02:00
m-lopez-f e16540a7e8 Restore column remote config 2015-07-02 12:38:45 +02:00
m-lopez-f 1ee4df2d3a Delete nav in create reports, is useless 2015-07-02 11:44:59 +02:00
m-lopez-f d7bd4773db Change visual of metaconsole 2015-07-02 08:54:21 +02:00
m-lopez-f 03b617908b Change visual of metaconsole 2015-07-01 17:05:53 +02:00
m-lopez-f 78e60249a7 Change visual of metaconsole and console 2015-07-01 14:50:00 +02:00
m-lopez-f 6f89828c76 Fixed problems to show groups fathers-childs in custom reports. Tiquet: #2351 2015-06-30 15:47:58 +02:00
Alejandro Gallardo Escobar ff55ac9d25 Error fix 2015-06-30 13:37:53 +02:00
Alejandro Gallardo Escobar 0549196ee5 Improved the styles of the offline update manager control to make it more pandora like 2015-06-30 13:20:20 +02:00
Alejandro Gallardo Escobar a719100855 Improvements to add better compatibility with the metaconsole 2015-06-30 12:59:23 +02:00
Alejandro Gallardo Escobar f68ff57490 New feature: bulk operations with plugins. Ticket #2301. 2015-06-29 18:46:22 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
m-lopez-f f88c2b4ce1 Only charge firts task when is console and not metaconsole 2015-06-29 10:43:03 +02:00
m-lopez-f 1b4ae0d26e Merge to feature/Newview 2015-06-29 10:39:05 +02:00
m-lopez-f 806962f2e5 Add new firts task and change text in other 2015-06-29 10:33:01 +02:00
m-lopez-f 06b56d80c8 Add new view when no have data in this view 
(cherry picked from commit 15fb6f20a4)
 2015-06-26 14:52:50 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 70db852326 Merge branch 'feature/NewView' into develop 2015-06-26 12:22:14 +02:00
m-lopez-f ba091112f6 Change visual and login page 2015-06-26 12:21:25 +02:00
m-lopez-f 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +02:00
m-lopez-f 964b17644a Change visual 2015-06-26 11:20:08 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
Alejandro Gallardo Escobar 7fac872fb8 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-25 16:17:32 +02:00
Alejandro Gallardo Escobar 4e8c85ec10 Fixes to the 'key' column of the 'tupdate_settings' table 2015-06-25 16:16:01 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
mdtrooper d0a0b11440 Fixed call a oracle function. 
(cherry picked from commit 66f982d22f)
 2015-06-23 15:30:10 +02:00
mdtrooper 8b518ae9b2 Fixed the masive operations for modules when the name has white spaces. TICKET: #2328 
(cherry picked from commit 737e085a81)
 2015-06-23 12:16:07 +02:00
Alejandro Gallardo Escobar 4f9f8d2449 Fixed the title of the locked button dialog 2015-06-23 12:07:18 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
m-lopez-f 2754bfeeb0 Fixed inserts paths in DB. Tiquet: #2325 2015-06-22 10:30:57 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper d8e9a2406d Some fixes in the visual console. 2015-06-17 19:14:25 +02:00
mdtrooper 062817ca09 Some fixes in the visual console. 2015-06-17 17:37:23 +02:00
mdtrooper f1185c6db9 Some fixes in the visual console. 2015-06-17 17:36:41 +02:00
mdtrooper b2e31d9ca2 Some fixes in the visual console. 2015-06-17 17:04:14 +02:00
mdtrooper 6faa522187 Some fixes in the visual console. 2015-06-17 17:03:05 +02:00
mdtrooper bf0e89be3a Some fixes in the visual console. 2015-06-17 16:45:21 +02:00
mdtrooper ab032aa17a Some fixes in the visual console. 2015-06-17 15:55:16 +02:00
mdtrooper 43e8edc049 Some fixes in the visual console. 2015-06-17 12:42:52 +02:00
mdtrooper b7c6998fda Some fixes in the visual console. 2015-06-17 12:18:52 +02:00
mdtrooper ff1a35cb92 Some fixes in the javascript visualmap. 2015-06-16 18:02:58 +02:00
mdtrooper 5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
Alejandro Gallardo Escobar c437797ef7 Fixes for oracle 2015-06-16 15:07:33 +02:00
mdtrooper 72ee6158fa Fixes for the Oracl€. 2015-06-16 14:42:17 +02:00
mdtrooper fad6a1e52d Fixes for the Oracl€. 2015-06-15 17:43:02 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f 2f5596ed9e Merge branch 'develop' into feature/NewView 2015-06-15 13:23:12 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar 05f27a4bdc Fixed an error retrieving data with oracle 2015-06-12 14:25:43 +01:00
mdtrooper 8cf8a65bd3 Fixes for the Oracl€. 2015-06-12 14:39:18 +02:00
mdtrooper 9789eca1e1 Added the feature to set module charts painting with lines or area. TICKET: #1849 2015-06-11 21:24:14 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
mdtrooper a364542454 Sort and structure the code and result form with a huge fields of visual pandora setup. 2015-06-11 19:08:57 +02:00
Alejandro Gallardo Escobar 5963f47432 Removed some jQuery.ajax() timeouts 2015-06-11 18:39:02 +02:00
Alejandro Gallardo Escobar 11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00
Alejandro Gallardo Escobar e2281d6bc8 Debug trace removed 2015-06-11 12:07:27 +02:00
Alejandro Gallardo Escobar bcfd0237bb Improvements on the oracle compatibitily 2015-06-10 17:44:20 +02:00
Alejandro Gallardo Escobar b02d381205 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-10 15:41:27 +02:00
Alejandro Gallardo Escobar 25dde2c836 Fixes to improve the oracle compatibility 2015-06-10 15:40:59 +02:00
mdtrooper dbc6893747 Fixed the list of items in the report editor. 2015-06-10 15:20:48 +02:00
mdtrooper f9b6290413 Fixed the list of items in the report editor. 2015-06-10 15:14:48 +02:00
Alejandro Gallardo Escobar c8806ef1dc Fixes to improve the oracle compatibility 2015-06-09 18:52:11 +02:00
Alejandro Gallardo Escobar 7864e993d4 Error fixes 2015-06-09 12:43:12 +02:00
mdtrooper 0eafdac3ff Fixed the javascript to check a numeric field when it is empty. TICKET: #2176 
(cherry picked from commit 905d768322)
 2015-06-09 11:49:03 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper b96fdad6d8 Sanitized the project (clean code and removed the deprecated htmLaWed) 2015-06-08 09:18:00 +02:00
Alejandro Gallardo Escobar ce75ea467a Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-03 15:57:09 +02:00
Alejandro Gallardo Escobar 33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +02:00
mdtrooper 3ca9a23d0a Fixes for the Oracl€. 2015-06-03 15:53:52 +02:00
mdtrooper 9bba19235e Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-02 19:10:15 +02:00
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00
mdtrooper f2539395c3 Fixes for the Oracl€. 2015-06-01 17:04:02 +02:00
m-lopez-f 589f054928 Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261 2015-06-01 13:41:31 +02:00
m-lopez-f 84fb973c6f Change privilege in call function to return groups of view this user. Tiquet: #2259 
(cherry picked from commit 73ae001a3f)
 2015-06-01 10:13:42 +02:00
mdtrooper 0297e38361 Fixes for the Oracl€. 2015-05-29 16:48:40 +02:00
mdtrooper 5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +02:00
m-lopez-f 2d646ce620 Fixed problems with list of interfaces in snmp walk wizard of interfaces. Tiquet: #2288 
(cherry picked from commit cc861fd3a1)
 2015-05-29 10:18:38 +02:00
m-lopez-f b8d10749b0 Changed name of labels menu and options in bulk operations 2015-05-28 13:42:34 +02:00
Alejandro Gallardo Escobar 185a101132 Removed a require of a deleted file 2015-05-27 16:02:22 +02:00
Alejandro Gallardo Escobar d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
 2015-05-26 10:29:38 +02:00
Alejandro Gallardo Escobar 760bc4a308 Many fixes, most of it related with the oracle support 2015-05-25 19:54:11 +02:00
mdtrooper 2f23441516 Fixed the 'inventory' and 'inventory_changes' items in metaconsole reports. TICKET: #2249 2015-05-25 16:01:33 +02:00
mdtrooper 22ce2d8902 Fixed the 'group_configuration' and 'agent_configuration' items in metaconsole reports. TICKET: #2249 2015-05-25 13:39:27 +02:00
mdtrooper d943fa5b78 Fixed the 'alert_report_agent', 'alert_report_group' and 'alert_report_module' item in metaconsole reports. TICKET: #2249 2015-05-25 12:46:32 +02:00
mdtrooper 3a213df637 Fixed PHP Warnings 2015-05-22 17:28:44 +02:00
Alejandro Gallardo Escobar 7555963297 Now the user can delete filters with an empty name 2015-05-22 14:12:01 +02:00
m-lopez-f 50044050e1 Fixed problems with not variable initialized, tiquet: #2238 2015-05-22 12:13:22 +02:00
mdtrooper 1cb3399425 Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.) 2015-05-21 12:18:40 +02:00
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00
mdtrooper 34b3557e9e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 10:46:27 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
Junichi Satoh 8a63bc171d Fixed module configuration error with open version (without enterprise). 2015-05-13 21:56:43 +09:00
Alejandro Gallardo Escobar 11fb9fb6e2 Many fixes and improvements in the management of the recontasks 2015-05-12 18:20:00 +02:00
Alejandro Gallardo Escobar 4cb968782c Now the time to is different than the time from in the oncle time task 2015-05-11 14:14:30 +02:00
Alejandro Gallardo Escobar 6af3133d42 Fixed some error 2015-05-08 16:09:12 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
mdtrooper 174726e253 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-06 16:39:37 +02:00
m-lopez-f 50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +02:00
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