Commit Graph

448 Commits

Author SHA1 Message Date
alejandro-campos 77e465fff9 fixed errors in massive operations 2020-09-11 14:35:32 +02:00
alejandro-campos d4b44d33a0 fix snmp version update 2020-09-01 17:39:25 +02:00
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
Daniel Rodriguez d3a34c5f00 Merge branch 'ent-5779-open-aviso-de-exclusividad-de-enterprise-en-bulk-operations' into 'develop'
Fix #5779

See merge request artica/pandorafms!3233
2020-06-11 14:03:14 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez 37058537aa Fix #5779 2020-05-25 17:06:23 +02:00
Daniel Rodriguez 1dddb6d81a Merge branch 'ent-5509-Resumen-erroneo-de-borrado-en-OPERACIONES-MASIVAS' into 'develop'
Ent 5509 resumen erroneo de borrado en operaciones masivas

See merge request artica/pandorafms!3085
2020-03-23 13:01:34 +01:00
Tatiana Llorente e0b69bbe3e Ent 5101 9223 eliminacion de agentes en nodo no elimina agentes en politica de meta 2020-03-20 12:34:58 +01:00
Tatiana Llorente 13466536bd Show correct counter of deleted alerts - #5509 2020-03-02 11:23:20 +01:00
Tatiana Llorente d8e1786830 Added Save Operation Mode option in agents bulk operations 2019-11-26 16:44:53 +01:00
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
Tatiana Llorente fc0e4827ea No change interval if is empty in massive edit - #4784 2019-10-10 13:37:01 +02:00
alejandro-campos 646f2607ab added condition in agent massive edition 2019-10-07 19:02:19 +02:00
Alejandro Fraguas 3eadb07058 Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop'
Fixed bug in custom unit #4166

See merge request artica/pandorafms!2675
2019-09-11 16:47:40 +02:00
Tatiana Llorente d38f1f8aec Fixed bug in unit in massive operations - #4166 2019-08-27 12:21:00 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
Luis Calvo a8c351d177 Custom fields type hint BBCode updated 2019-08-21 09:55:53 +02:00
Daniel Rodriguez 4dc5ee2fca Merge branch 'ent-4318-Añadir-buscador-en-operaciones-masivas-vol2' into 'develop'
Added filter by agent - #4318

See merge request artica/pandorafms!2588
2019-07-16 14:05:39 +02:00
Alejandro Fraguas 8c55c1b287 Merge branch 'ent-4094-Error-al-cambiar-intervalo-de-agentes-por-masivas' into 'develop'
fixed bug: agent interval not being changed in agent config when changing its…

See merge request artica/pandorafms!2601
2019-07-15 16:56:41 +02:00
alejandro-campos 95254341ce add condition to check if agent interval token should be updated in massive operations based on previous result 2019-07-15 11:53:25 +02:00
alejandro-campos eb831dbbcd fixed bug: agent interval not being changed in agent config when changing its value through massive operations 2019-07-15 11:46:35 +02:00
Tatiana Llorente fd24398219 Fixed several minor visual bugs - #4347 2019-07-11 14:46:41 +02:00
Tatiana Llorente 3b23810323 Added filter by agent in massive copy - #4318 2019-07-10 16:37:24 +02:00
Tatiana Llorente 6d6c8fe197 Added filter by agent - #4318 2019-07-08 17:57:23 +02:00
Alejandro Fraguas 3a76f331c8 Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'
Add module filter by text -#2094

See merge request artica/pandorafms!2520
2019-07-02 11:37:01 +02:00
Alejandro Fraguas ce1231eae6 Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop'
Added option in massive delete alerts to show alerts on disabled modules

See merge request artica/pandorafms!2396
2019-06-24 09:55:44 +02:00
Tatiana Llorente c084adfa27 Add module filter by text -#2094 2019-06-20 09:31:36 +02:00
Tatiana Llorente 988eb2e257 Add module filter by text -#2094 2019-06-19 17:36:55 +02:00
Alejandro Fraguas b930588f84 Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
Ent 3892 bug en bulk operations de plugins

See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
manuel bf3ac73feb Removed empty help icons 2019-05-24 14:26:28 +02:00
Daniel Rodriguez 51f846af05 Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
Fixed visual bug in policies operations actions

See merge request artica/pandorafms!2369
2019-05-23 17:24:59 +02:00
manuel 00b5fc0a2c Added helps
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
Luis Calvo e9e24505fe Added option in massive delete alerts to show alerts on disabled modules
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
2019-04-30 10:29:42 +02:00
manuel 6bd8221bc0 changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
marcos.alconada 4347502f84 Se arregla error en el editor de plugin
Former-commit-id: c2fb78ac02e27cffcefc843a241ed13df2077b92
2019-04-29 11:56:48 +02:00
Daniel Barbero Martin ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
manuel 20058be56a Fixed visual bug in policies operations actions
Former-commit-id: c47606c0c53e74b1ac8610f0be6bd0228e14d42a
2019-04-22 16:37:06 +02:00
Daniel Barbero Martin c679751f94 fixed error add ff_type
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
Daniel Barbero b2e16848f9 add new ff type
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
daniel 15ca89068d Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
Conflicts:
	pandora_console/godmode/servers/manage_recontask_form.php
	pandora_console/include/functions_events.php


Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
Daniel Rodriguez b19161ed3c Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
Added custom field combo values in agent custom field

See merge request artica/pandorafms!2246

Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
manuel d4f5482e99 Added custom field combo values in agent custom field
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
daniel fadf75a626 fixed minor error lenght str.warning and str.critical 1024 charts
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
daniel 504a8e9d1a fixed warnings php
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
Alejandro Fraguas 4c94956b91 Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop'
Fixed slow query in template item

See merge request artica/pandorafms!2151

Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
2019-02-14 16:15:01 +01:00
Ramon Novoa fa7f519d34 Merged from develop.
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
2019-02-12 14:52:18 +01:00
Ramon Novoa 92e2262440 Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
Daniel Maya 152d55fa8c Merge branch 'develop' into 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada'
# Conflicts:
#   pandora_console/godmode/massive/massive_edit_modules.php

Former-commit-id: 6d14e617f32575291898c9ce1bebde1e8b212691
2019-02-06 17:04:02 +01:00
Daniel Maya c1ee43a064 resolved conflicts
Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a
2019-02-06 17:00:15 +01:00
manuel.montes 0a94ac9eb0 Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations
Conflicts:
	pandora_console/godmode/massive/massive_operations.php


Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
2019-02-04 11:00:50 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
Ramon Novoa 2626605030 Validate alerts at the time agents/modules are modified.
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
Daniel Maya 0adf941008 Fixed slow query in template item
Former-commit-id: 97c9abbd6a4c86bd3de4294e7012ded98ecb5ff1
2019-01-29 15:44:34 +01:00
manuel.montes e8497bb80c Changed the order of actions
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +01:00
daniel ac228a7fad fixed error in massive operation
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
daniel 7e2fb25e27 fixed errors in massive operation edit modules
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
samucarc 6b940d07d5 Fixed
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
samucarc eab744f65d Fixed minor error
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
alejandro-campos a2909db631 Revert "Eliminadas entidades html de vista de auditoria"
This reverts commit 530017a79d.


Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
2018-12-10 13:42:29 +01:00
daniel c4eeb3cc76 fixed error edit modules in massive operation php7 error select 2018-11-02 10:18:33 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
danielmaya a1f28480ae Fixed force_type check in delete/edit modules in bulk 2018-10-23 15:46:48 +02:00
fermin831 14afe2ff88 Added message 'Please, select an agent first' 2018-10-17 12:35:11 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
fermin831 de10de03f7 [Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first 2018-10-10 17:42:33 +02:00
Fermin 052d888ac4 Fixed a minor warning 2018-10-08 18:53:21 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
fermin831 b277c71c44 [Tags performance] Check massive operations 2018-10-03 13:02:51 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc e979de64b3 Merge branch '2454-Borrado-de-modulos-masivo-filtrado-por-no-inicilizado-elimina-todos-los-modulos-con-el-mismo-nombre' into 'develop'
fixed bug in modules massive deletion to avoid deletion of modules with the same…

See merge request artica/pandorafms!1629
2018-10-01 10:58:06 +02:00
vgilc 2dac09435a Merge branch '2040-Tags-en-operaciones-masivas' into 'develop'
fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613
2018-09-28 11:05:34 +02:00
fermin831 8fe3e1606f Fixed string (avoiding macaronic English) 2018-09-26 10:50:16 +02:00
fermin831 90bbd31b66 Added tip to disabled radiobutton in agent edition and massive operations 2018-09-25 16:00:37 +02:00
fermin831 823b32ac63 Added update standby token in massive operations 2018-09-24 17:32:58 +02:00
danielmaya 8247df6d65 Fixed edit snmp modules in bulk 2018-07-27 10:42:45 +02:00
alejandro-campos e4b74cffc8 fixed bug in modules massive deletion to avoid deletion of modules with the same name in distinct agents regardless of their status when module status filter has been applied 2018-07-24 13:04:31 +02:00
alejandro-campos 213a59d26e fixed bug on bulk delete and bulk update module operation 2018-07-16 18:14:18 +02:00
daniel 85897315cd cascade protection services 2018-06-27 15:03:46 +02:00
daniel 76cd718262 add cps for agent, module, policies and bulk opertaion 2018-06-26 13:23:12 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop'
Implement function io_safe_output

See merge request artica/pandorafms!1499
2018-06-05 09:44:00 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
vgilc 7be55b4427 Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop'
Add new fileds to massive module edition - #1735

See merge request artica/pandorafms!1295
2018-02-26 10:42:55 +01:00
danielmaya 32fa032faa Fixed unit in bulk operations 2018-02-14 12:41:32 +01:00
enriquecd 7f7916a18d Add new fileds to massive module edition - #1735 2018-02-13 12:29:55 +01:00
danielmaya 95c92efc6f Fixed disabled agent in bulk operations 2018-02-12 17:14:54 +01:00
vgilc bc6b660592 Merge branch '1674-Sincronizacion-de-agentes-inmediata-con-metaconsola-en-operación-masiva' into 'develop'
Update metaconsole after agent bulk operations for update - #1674

See merge request artica/pandorafms!1174
2018-01-29 13:29:40 +01:00
vgilc 34ccc01c7b Merge branch '1656-Group-recursion-no-funciona-correctamente-en-operaciones-masivas-dev' into 'develop'
Fixed group recursion in bulk operation

See merge request artica/pandorafms!1133
2018-01-29 12:52:35 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
vgilc 97fc2dc4d1 Merge branch '1532-edición-de-módulos-a-través-de-operaciones-masivas-dev' into 'develop'
Hide and show fields in edit modules bulk

See merge request artica/pandorafms!1102
2017-12-21 10:47:53 +01:00
enriquecd 4ad0085602 Update metaconsole after agent bulk operations for update - #1674 2017-12-12 17:58:06 +01:00
danielmaya caa3539c4f Fixed group recursion in bulk operation 2017-11-29 15:54:00 +01:00
danielmaya 53ff51d5bf Hide and show fields in edit modules bulk 2017-11-21 11:56:32 +01:00
danielmaya 16eaf31c70 Added Autodisable mode in bulk operation 2017-11-14 10:21:55 +01:00
enriquecd 32f5db5934 Merge branch 'develop' into 1205-Editar-OID-desde-operaciones-masivas-4406-Northern
Conflicts:
	pandora_console/godmode/massive/massive_edit_modules.php
2017-10-30 15:19:49 +01:00
vgilc 89f5af3b52 Merge branch '1282-Errores-en-selectores-de-agentes-y-módulos-dev' into 'develop'
Fixed ordering and repetition modules

See merge request artica/pandorafms!820
2017-10-26 12:29:00 +02:00
enriquecd 8525426763 Only unselect any option in mulselect when select any and others at the same time - #1266 2017-10-10 12:36:47 +02:00
vgilc d181edc471 Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop'
New feature. Dynamic units

See merge request !818
2017-10-04 17:41:37 +02:00
Daniel Maya 237755a84c Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev'
# Conflicts:
#   pandora_console/include/functions_graph.php
2017-09-25 15:34:39 +02:00
Daniel Maya f67a4d90ae Dynamic unit in massive edit modules 2017-09-25 14:51:45 +02:00
enriquecd 4aa4d44d0f Prevent select any and others options at the same time for agents/modules multiselect in modules bulk operations - #1266 2017-09-19 19:14:25 +02:00
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop'
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
2017-09-18 10:12:41 +02:00
Daniel Maya 44623f780e Fixed ordering and repetition modules 2017-09-14 17:34:00 +02:00
enriquecd 3919edcbd8 Add snmp oid field in module bulk operations - #1205 2017-09-08 13:39:20 +02:00
daniel 8f9fd4cf3d fixed snmp comunity field 2017-09-05 14:39:36 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop'
Do the autocomplete field correct

See merge request !761
2017-08-31 11:36:44 +02:00
slerena 0a11d3d086 Merge branch '1228-massive-module-deletes-all-modules-with-any-tag-dev' into 'develop'
Fixed "any" filter with selects unknown and not init modules in massive delete operation

See merge request !756
2017-08-30 17:50:15 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
Arturo Gonzalez 32ad745c62 Added filter when id groups comes empty 2017-08-29 11:32:25 +02:00
Arturo Gonzalez fc0db16d5e Fixed "any" filter with selects unknown and not init modules in massive delete operation 2017-08-28 15:47:16 +02:00
Hirofumi Kosaka 70a226540e "Massive Operations" had remained at Pandora Console. #161 2017-08-14 12:03:35 +09:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
# Conflicts:
#   pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Daniel Maya c13644951f update agent 2017-07-17 09:22:28 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
vgilc 8f693ee9c8 Merge branch '995-Agent-name-en-operaciones-masivas-de-plugins-dev' into 'develop'
changed agent name by alias

See merge request !566
2017-06-14 11:46:13 +02:00
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