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

279 Commits

Author SHA1 Message Date
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
Daniel Maya 95818e977e changed agent name by alias 2017-06-07 16:39:04 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
enriquecd 7ab1748be6 Change processGet jquery call get to post - #959 2017-06-01 15:27:55 +02:00
vgilc 31a1096119 Merge branch '902-Perfil-con-edicion-de-agentes-no-tiene-permisos-para-una-opción-en-masivas' into 'develop' 
Change permission filter for module bulk operations, PM change to AW - #902

See merge request !493
 2017-05-31 17:42:57 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc d493151527 Merge branch '811-massive-operations-error-verbosity-dev' into 'develop' 
Added more specified alert to update modules and agents when no one field change

See merge request !458
 2017-05-31 17:37:43 +02:00
vgilc 24ae080f5a Merge branch '840-No-hay-selector-de-postproceso-en-bulk-operations-v7-#4005-com1' into 'develop' 
Show preset options in post process selector for modules massive operations - #840

See merge request !447
 2017-05-31 17:14:51 +02:00
Arturo Gonzalez 463c393c00 Added changes to encrypt custom values with a new token 2017-05-29 11:48:50 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
enriquecd 3e230572ad Change permission filter for module bulk operations, PM change to AW - #902 2017-05-19 14:58:34 +02:00
Arturo Gonzalez 33ff4f8aba Added tags filter to copy modules in massive operations 2017-05-17 11:11:27 +02:00
Arturo Gonzalez 4a6b1a0daf Added tags filter to massive module deletion (anget first and module first selection) 2017-05-17 10:56:42 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 4b94e7ce2b Added tag filter to module massive operations (edit and modules selection first) 2017-05-17 09:59:10 +02:00
Arturo Gonzalez 1361ecd2e9 Added tags select field 2017-05-16 16:37:48 +02:00
Arturo Gonzalez 1f4b7fddc0 Added more specified alert to update modules and agents when no one field change 2017-05-11 09:29:08 +02:00
enriquecd e8ccd7a309 Show preset options in post process selector for modules massive operations - #840 2017-05-09 16:35:58 +02:00
enriquecd d87dae44db Select user_id(name inserted manually by user) info to show and order (fullname is empty often) - 92 2017-03-13 11:50:37 +01:00
enriquecd 1dce7623f8 Massive operation profile actions - users select box now is ordered by user_id(primary name) - #92 2017-03-10 13:58:36 +01:00
m-lopez-f a06389b652 Change size of rows in bulk add alerts. Gitlab: #490 2017-03-09 16:09:50 +01:00
m-lopez-f 0b943fcf08 Remove debug traces 2017-03-03 13:27:02 +01:00
Alejandro Gallardo Escobar 430ae3e201 Merge branch 'develop' into feature/alias_friendly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-21 15:23:44 +01:00
enriquecd 5dbca6eeca Insert newline between module first and agent first in module massive op /2 - #62 2017-02-21 12:52:48 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
enriquecd 87e8088c92 Insert newline between module first and agent first in module massive op - #62 2017-02-17 12:08:07 +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
enriquecd 363c147043 Disabled and enabled or all agents selector in agent massive operations - #37 2017-02-01 17:31:39 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +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 7403890e6c Add selection modules in bulk operations: Add action alerts. 2017-01-12 15:51:59 +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 88879e8e6e Feature: Search by status module in bulk module delete/edit actions. Ticket: #4190 2016-11-17 12:55:29 +01: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
enriquecd b722e70620 Changes on enterpise alert icons, limit screens and favicons 2016-09-28 13:26:58 +02:00
enriquecd a051243b64 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 2016-09-19 16:20:18 +02:00
Arturo Gonzalez 26e43e5252 Added new checkbox in massive agents deletion to select only the disabled agents 2016-09-09 16:26:29 +02:00
daniel 4375feab72 ticket integria: 3996 fixed minor error in maxlenght #30 2016-08-25 11:49:23 +02:00
m-lopez-f 77758f993a Fixed problem with charge agents when select 'Agents firts in module bulk actions'. Tiquet: #3568 2016-08-17 10:27:55 +02:00
Daniel Maya e4cdef363e show unknown and not init modules. Ticket #3844. 2016-06-29 10:41:34 +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
Hirofumi Kosaka 38ba2cfcbd Fixed massive-edit-plugins to show multi-byte string values properly. 2016-02-22 17:44:27 +09:00
m-lopez-f a837e110d0 Fixed bulk deleted action alerts. Tiquet: #3268 
(cherry picked from commit aac2460c85)
 2016-01-28 09:46:06 +01:00
mdtrooper 992eacee38 Fixed the massive operations in plugins. TICKET: #3221 2016-01-22 12:25:05 +01:00
Arturo Gonzalez 3705b83cc7 Fixed some things in delete massive modules (oracle). 2016-01-05 09:54:31 +01:00
Arturo Gonzalez 9407f5d9b7 Fixed problems with oracle in "bulk module delete". Ticket#2926 2016-01-04 14:24:14 +01:00
Arturo Gonzalez 54e0f25947 Fixed "agents with templates" box in bulk alert actions add. Ticket#3087 2015-12-23 16:20:58 +01:00
m-lopez-f d42c7f6df2 Fixed problems with form in view. 2015-12-21 09:12:48 +01:00
m-lopez-f 6cafa4dc70 Fixed problems with show groups in bulk alerts actions. Tiquet: #3078 2015-12-16 11:40:24 +01:00
m-lopez-f 579793fa66 Fixed problems with bulk actions with modules. Tiquet: #2963 
(cherry picked from commit ca0ec7364c)
 2015-11-17 08:32:45 +01:00
m-lopez-f e35401566a add select option in bulk edit agent in cascade protecction. Tiquet: #2813 and fixed style 2015-10-06 13:52:45 +02:00
Arturo Gonzalez Diaz 9f0de9526f Fixed problem with massive operations (modules section) 2015-09-29 10:17:35 +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
m-lopez-f 159ac9c366 Fixed bulk actions, when engine DB is Oracle. Tiquet: #2666 2015-09-02 09:39:04 +02:00
m-lopez-f 2364359181 Fixed error with agent containts space. Tiquet: #2656 2015-08-31 15:21:45 +02:00
Alejandro Gallardo Escobar 3eddf9dbdc Fixed another SQL injection point 2015-08-04 12:49:54 +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
Alejandro Gallardo Escobar 2f97ef3c36 Fixed an error which causes a weird update counter 2015-07-07 17:38:24 +02:00
Alejandro Gallardo Escobar 8e8de1f706 Some fixes and improvements 2015-07-06 11:49:48 +02:00
Alejandro Gallardo Escobar f68ff57490 New feature: bulk operations with plugins. Ticket #2301. 2015-06-29 18:46:22 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +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 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +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 b8d10749b0 Changed name of labels menu and options in bulk operations 2015-05-28 13:42:34 +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 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 c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +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
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
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper 8ed021b64d Fixed the inverse intervals in massive edition of modules. TICKET: #1831 2015-02-25 11:39:28 +01:00
mdtrooper 2842970c83 Added feature of custom post process values. TICKET: #1743 2015-02-09 19:35:03 +01:00
mdtrooper 7628ddb5c6 Set a data limit in the forms of massive operations. TICKET: #1700 2015-02-04 11:19:11 +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 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 8f28fa55e6 Fixed the ajax to get agents filtered by group. Ticket #1461 2014-10-16 14:50:55 +02:00
mdtrooper 6b577bed8d Added the field timeout in edition massive modules. TICKET #932 2014-09-15 11:45:05 +02:00
jsatoh dc1f1bb8c0 2014-06-22 Junichi Satoh <junichi@rworks.jp> 
* godmode/massive/massive_edit_modules.php: Fixed unexpected update
	of 'module_interval'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10255 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-22 14:49:33 +00:00
alexhigh 7f0ce35f40 2014-06-16 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* godmode/massive/massive_copy_modules.php: Error fixes.
	
	* include/functions_agents.php: Fixed some returns on the
	function "agents_process_manage_config".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10203 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-16 17:22:56 +00:00
hkosaka a8bcd7cd10 2014-06-12 Hirofumi Kosaka <kosaka@rworks.jp> 
* godmode/massive/massive_delete_modules.php,
	operation/agentes/ver_agente.php: Fixed bug that all
	agents' module could be target of deletion,
	if the user has an AW privilege for any.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10172 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-12 10:43:25 +00:00
zarzuelo ac61a3a226 2014-06-12 Sergio Martin <sergio.martin@artica.es> 
* godmode/massive/massive_copy_modules.php: Delete the 
	source agent from the target agents lists in massive
	copy form to avoid errors for ticket: #869



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10171 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-12 09:41:29 +00:00
hkosaka 13c6786a40 2014-06-10 Hirofumi Kosaka <kosaka@rworks.jp> 
* operation/agentes/ver_agente.php,
	godmode/massive/massive_delete_modules.php: Fixed bug that all
	agents' module the user can view could be targets of deletion,
	if the user has an AW privilege for any.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-10 10:17:15 +00:00
hkosaka c8083656ce 2014-06-06 Hirofumi Kosaka <kosaka@rworks.jp> 
* godmode/massive/massive_copy_modules.php,
	godmode/massive/massive_delete_modules.php: Fixed bug that all
	agents the user can view could be targets of the operation, if
	the user has an AW privilege for any.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10129 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-06 10:59:24 +00:00
hkosaka 072958e099 2014-06-06 Hirofumi Kosaka <kosaka@rworks.jp> 
* godmode/massive/massive_delete_agents.php,
	godmode/massive/massive_edit_agents.php: Fixed bug that all
	agents the user can view could be targets of the operation, if
	the user has an AW privilege for any agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10127 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-06 09:25:55 +00:00
hkosaka 2a8e18fc9a 2014-06-06 Hirofumi Kosaka <kosaka@rworks.jp> 
* godmode/massive/massive_add_alerts.php: Fixed bug that all
	agents the user can view would be target of the operation, if
	the user has an AW privilege for any agent group.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10126 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-06 07:34:08 +00:00
jsatoh a05a644b64 2014-06-01 Junichi Satoh <junichi@rworks.jp> 
* godmode/massive/massive_edit_modules.php: Improved to support
	'FF interval' and 'FF timeout'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10066 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-01 02:25:20 +00:00
hkosaka af80ec25aa 2014-05-30 Hirofumi Kosaka <kosaka@rworks.jp> 
* include/javascript/jquery.pandora.controls.js,
	godmode/groups/group_list.php,
	godmode/massive/massive_add_alerts.php,
	godmode/massive/massive_add_action_alerts.php
	godmode/massive/massive_delete_action_alerts.php,
	godmode/massive/massive_delete_alerts.php,
	godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_standby_alerts.php: fixed bug that all
	agents would be shown in the target for masssive operations, if
	the user has an AW privilege for any agent (group).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-30 11:01:22 +00:00
jsatoh 844b099c7d 2014-05-25 Junichi Satoh <junichi@rworks.jp> 
* godmode/massive/massive_edit_modules.php: Improved to support
	each state changing of 'FF threshold'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10001 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-25 06:35:37 +00:00
zarzuelo 288a4789f7 2014-05-08 Sergio Martin <sergio.martin@artica.es> 
* operation/agentes/ver_agente.php
	godmode/menu.php
	godmode/massive/massive_operations.php
	include/javascript/pandora.js: Add massive operation for
	satellite agents threshold edition. This is the part on the 
	open side that hooks with enterprise code.

	* extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
	pandoradb_data.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql: 
	images/networkmap/satellite.png
	images/os_icons/satellite_small.png
	images/os_icons/satellite.png
	images/op_satellite.png: Add icon to satellite OS



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9888 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-08 07:54:51 +00:00
hkosaka fe1aee9332 2014-04-21 Hirofumi Kosaka <kosaka@rworks.jp> 
* godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_standby_alerts.php: Long agent/module
	name with multi-byte chars could be shown as 'null' on alert
	list at the massive alert enable/disable/standby operations
	screen (because LEFT() in SQL does not consider multi-byte
	chars, neither SUBSTR() for alternative).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9791 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-04-21 08:19:46 +00:00