Commit Graph

1058 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 354377a56a Changed the agent name by its alias 2017-02-20 17:28:38 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
Arturo Gonzalez 2cfce8979e Added new funtion to module cron interval with "from" and "to" forms. Ticket #246 2017-02-13 11:32:04 +01:00
Arturo Gonzalez 9a73cb56d7 Added module crontab to local modules with rc. Ticket #246 2017-02-10 11:43:12 +01:00
Arturo Gonzalez 47338f240f Fixed module cron interval seter. Ticket #246 2017-02-09 15:54:33 +01:00
enriquecd 294d95481c Enable fields in web modules created by policy when is unlinked - #237 2017-02-08 16:54:17 +01:00
daniel 188807c4cf change name modules create from wizard SNMP 2017-02-06 10:54:51 +01:00
daniel 0a26a31bd3 fixed errors in modules templates 2017-02-06 09:45:46 +01:00
enriquecd f9817a26ad Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41 2017-02-02 19:12:22 +01:00
enriquecd cf4283c632 Make agent manager search bar case insensitive - #33 2017-01-31 11:42:12 +01:00
artu30 20fcd7ef32 Merge branch 'feature/ux_modules_hierarchy' into 'develop'
Feature/ux modules hierarchy

See merge request !81
2017-01-25 15:35:09 +01:00
Arturo Gonzalez 42dc9d2522 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-01-25 14:00:03 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00
enriquecd 3cec295b9e Escape quotes in str_warning and str_critical fields in agent editor - #26 2017-01-24 11:55:46 +01:00
Arturo Gonzalez cfce014ad3 UX console in progress... (Fixed filter form in policy modules) 2017-01-19 10:13:59 +01:00
Arturo Gonzalez 55063a20dc UX console in progres... (Added hierachy mode in modules list) 2017-01-18 17:33:28 +01:00
daniel c8a33eb115 ip dinamic in policies 2017-01-18 17:20:55 +01:00
daniel 9e391e0210 Allow dinamic ip 2017-01-17 09:21:46 +01:00
daniel cf2c0a87b6 Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'"
This reverts merge request !31
2017-01-17 09:03:17 +01:00
daniel 7261b50a4e Allow automatic ip 2017-01-16 17:46:59 +01:00
m-lopez-f a78690ff6f Fixed problems with cron interval qhen type of module is a data server. Ticket: #4242
(cherry picked from commit 53c2558939)
2016-12-22 12:07:46 +01:00
Arturo Gonzalez 3e31f5d6e8 Operation netflow module. Ticket #4274 2016-12-20 13:26:34 +01:00
daniel 7056de8070 fixed minor error 2016-12-16 12:47:37 +01:00
Arturo Gonzalez e59dc3af21 Added new field to create and update modules (parent_module_id). Ticket #122 GitLab 2016-12-14 16:04:04 +01:00
m-lopez-f c98242e996 Fixed problems with text of definition and fixed other problems. Ticket: #4242 2016-11-30 13:05:37 +01:00
m-lopez-f 0763f09cc3 Fixed problems with 'Discard unknown events' Ticket: #4242
(cherry picked from commit 07b92fd38a)
2016-11-28 13:02:51 +01:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557"
This reverts commit e7021d8a0f.
2016-11-18 13:01:13 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: #3557 2016-11-07 09:12:58 +01:00
enriquecd 9523557145 Add remote agent filter in manage agent, add remote field in database #4121 2016-11-02 16:58:53 +01:00
enriquecd 43abce6393 Fix scheuled downtime recursive filter checkbox ,optional graph watermark #64 2016-10-27 17:30:45 +02:00
daniel 968654ee67 fixed change property disabled for readonly 2016-10-26 08:31:41 +02:00
daniel 32969076b5 fixed ticket 4124 and 4123 policys 2016-10-24 17:45:35 +02:00
daniel bc5f00a2e7 fixed ticket 4123 and 4124 2016-10-24 17:43:54 +02:00
daniel 93341a60e1 visual graph for critical and warning threshold 2016-10-20 16:26:05 +02:00
Arturo Gonzalez bab1a9f6f2 Removed some traces 2016-10-19 15:34:15 +02:00
enriquecd a70d840ea4 (cherry picked from commit 64486bc896) 2016-10-14 19:03:13 +02:00
daniel d5d1727fe7 add new field for modules 2016-10-14 10:16:21 +02:00
Daniel Maya 5283e35ae2 Change agent name in bulk operation 2016-10-13 09:55:53 +02:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
Daniel Maya 370f7ff373 Changed agent name 2016-10-03 12:24:15 +02:00
Daniel Maya 2014f51410 sort by alias. 2016-09-27 10:31:42 +02:00
Daniel Maya 9a39798f43 Changed agent name in tree view, alert status, agent/alert view and agent/modules view. 2016-09-26 10:58:42 +02:00
Daniel Maya 21dd508e53 Changed name by alias. Ticket #74. 2016-09-22 10:27:35 +02:00
daniel 89e3149479 fixed minor errors query view agents 2016-09-19 12:00:13 +02:00
Arturo Gonzalez f11a2ddff6 Added synchronization when updates an agent. Ticket #4017 2016-09-13 10:28:26 +02:00
Junichi Satoh 51519053b8 Fixed missing gettext. 2016-09-12 14:26:45 +09:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
Daniel Maya 1958f2b5e3 Added desc order in manage agents. Ticket #4004. 2016-09-05 15:32:40 +02:00
m-lopez-f c56da922df Fixed problems with password in WMI explorer when use specials characters. GitHub ticket: #60
(cherry picked from commit 15cf2b6f0b)
2016-09-05 08:54:42 +02:00
Daniel Maya b8306bbf00 Added search by multiple ips agents. Ticket #3949. 2016-08-31 15:34:05 +02:00
fbsanchez cdc683a1f8 Fixed double include (functions_modules.php)
(cherry picked from commit 77ed3ae3fc)
2016-08-30 13:57:29 +02:00
Daniel Maya 0e53477fa7 Fixed orders groups. Ticket #3926. 2016-08-29 12:04:44 +02:00
daniel 5727aca9d3 fixed minor error order name in modify agent 2016-08-17 17:39:54 +02:00
m-lopez-f 8e7f2cdd90 Delete html tag. Tiquet: #3246 2016-08-17 12:03:20 +02:00
m-lopez-f f3478168a7 Fixed problems with search form in Policies form. Tiquet: #3246 2016-08-17 11:59:06 +02:00
Daniel Maya c24b118398 Fixed allow create planned downtimes in the past. Ticket #3454. 2016-06-22 09:50:43 +02:00
Alejandro Gallardo Escobar a87de02e0b 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
(cherry picked from commit c4bbe38b69e9b076b45871bc35b8c861b8ed2cc9)
2016-06-08 19:17:39 +02:00
fermin831 8c30cbd756 Added AUTODISABLE mode to agents Tickets #3497 2016-06-03 11:58:13 +02:00
fermin831 2b5d58279d Fixed module selection in scheduled downtimes Tickets #3444 2016-05-30 15:25:48 +02:00
mdtrooper 5d650ef45d Fixed lost tooltip (about quiet) in the form of agents.
(cherry picked from commit a345dcc9eb)
2016-04-04 12:21:37 +02:00
fermin831 619404b08e Fixed ACL problems with create scheduled downtimes to AD bit 2016-03-04 12:13:46 +01:00
fermin831 e808ba7e76 Password field in SNMP wizard v3 TICKETS #3385 2016-02-16 13:00:42 +01:00
fermin831 ff3b61e3af Modified ACL bit from AW to AD in scheduled downtimes TICKETS #3280 2016-02-12 14:36:11 +01:00
fermin831 55140d06dd Fixed cron updating problem TICKETS #3329
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
2016-02-05 09:56:37 +01:00
mdtrooper ab64f9100c Added the snmp editor for other data uses in the form wizard snmp. TICKET: #1805 2016-01-25 16:31:02 +01:00
mdtrooper 1e0e18a399 Fixed PHP Warnings. 2016-01-19 15:31:27 +01:00
Arturo Gonzalez 359b0fd58c Increased time shows the snmp menu in manage agent. Ticket#2862 2016-01-04 15:34:50 +01:00
mdtrooper 96f77c7595 Fixed the form to search modules in an agent. TICKET: #3071 2015-12-30 11:16:11 +01:00
m-lopez-f baf8712d3e Add preview of icon group in create agent. Tiquet: #3008 2015-12-22 10:44:43 +01:00
m-lopez-f e3a06f4ff9 Fixed problems with recursions in manage agents. Tiquet: #3078
(cherry picked from commit a5779e6829)
2015-12-16 11:48:11 +01:00
m-lopez-f 66a2fe4420 Fixed count total agents when group have propagate acl. Tiquet: #3078
(cherry picked from commit c3e0ccb126)
2015-12-14 11:19:53 +01:00
m-lopez-f c972117e7a Add lost option when module not in policy and not linked. Tiquet: #2962
(cherry picked from commit 44f9b08a85)
2015-11-11 13:09:28 +01:00
Arturo Gonzalez Diaz e8cc3ccbf9 Fixed sql problemas in incidents section (oracle). Ticket#2902 2015-10-21 13:57:05 +02:00
m-lopez-f 0b1099e4c3 Fixed problems with remplace data when module is part of policy. Tiquet: #2853 2015-10-21 12:24:06 +02:00
m-lopez-f a59e770867 When module include in policy and not linked not modify with new data. Tiquet: #2889 2015-10-13 13:41:14 +02:00
Arturo Gonzalez Diaz de4b2897b0 Fixed error in post process value. Ticket#2739 2015-09-29 13:37:38 +02:00
Ramon Novoa 7a6a082bc4 Update the metaconsole agent cache when the group of an agent is
changed.
2015-09-23 18:31:38 +02:00
Ramon Novoa 913b125855 Fixed the help tip for quiet mode.
(cherry picked from commit acfd3c61d3)
2015-09-15 15:35:50 +02:00
Ramon Novoa aafd6d56ca Encrypt hidden plug-in module macros. 2015-09-02 16:20:51 +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 b5ba16e31f Fixed default show option in filter options in manage agents. Tiquet:#2513 2015-08-04 16:40:55 +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
mdtrooper a3cce922e3 Fixed PHP warnings 2015-07-21 13:04:27 +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
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 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
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
Akihiro Uchida 9fbe18a5d4 Disable modification of executed planned downtime 2015-07-10 11:02:21 +09:00
m-lopez-f 8c3056eb79 Add legal text in files and change data 2015-07-02 15:24:39 +02:00
m-lopez-f e16540a7e8 Restore column remote config 2015-07-02 12:38:45 +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 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
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00
Alejandro Gallardo Escobar c437797ef7 Fixes for oracle 2015-06-16 15:07:33 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar bcfd0237bb Improvements on the oracle compatibitily 2015-06-10 17:44:20 +02:00
Alejandro Gallardo Escobar 25dde2c836 Fixes to improve the oracle compatibility 2015-06-10 15:40:59 +02:00
Alejandro Gallardo Escobar c8806ef1dc Fixes to improve the oracle compatibility 2015-06-09 18:52:11 +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
mdtrooper 3ca9a23d0a Fixes for the Oracl€. 2015-06-03 15:53:52 +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
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
Alejandro Gallardo Escobar 760bc4a308 Many fixes, most of it related with the oracle support 2015-05-25 19:54:11 +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 4cb968782c Now the time to is different than the time from in the oncle time task 2015-05-11 14:14:30 +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
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +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 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +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
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
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +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
Akihiro Uchida 4e7fdcda53 Fixed codes to disable input datepicker. 2015-04-09 20:17:39 +09: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
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 0e29cc520e Change visual of node 2015-03-31 17:26:22 +02: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 37bff59e85 Fixed, now the tab of remote configuration is not visible. TICKET: #1884 2015-03-09 12:08:26 +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
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 584d00f321 Fixed the snmp wizard for uptime and added unit octets. TICKET: #1742 2015-02-13 15:32:28 +01:00