Commit Graph

1645 Commits

Author SHA1 Message Date
vgilc 0a7f24192e Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop'
Fixed bug in module creation view

See merge request artica/pandorafms!2954
2019-12-12 17:07:35 +01:00
Daniel Rodriguez 3223e0a8e1 Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop'
Fixed snmp input

See merge request artica/pandorafms!2914
2019-12-12 17:01:12 +01:00
manuel 2504a3dc09 Fixed bug in module creation view 2019-12-12 13:50:35 +01:00
Daniel Rodriguez ab1c6e17ca Merge branch 'ent-4508-desajustes-y-bug-en-open' into 'develop'
fixed minnor error

See merge request artica/pandorafms!2929
2019-12-12 11:03:22 +01:00
vgilc 0d16bc3188 Merge branch '4605-Bug-Wizard-SNMP' into 'develop'
Modified type of module when use SNMP Agent Wizard

See merge request artica/pandorafms!2947
2019-12-11 16:24:29 +01:00
Jose Gonzalez 62de2fe396 Modified type of module when use SNMP Agent Wizard 2019-12-10 15:37:04 +01:00
vgilc 7a616018a1 Merge branch 'ent-4619-fallos-css-advanced-options-agentes-open' into 'develop'
fixed visual error

See merge request artica/pandorafms!2758
2019-12-10 11:48:45 +01:00
marcos d7288114ad fixed minnor error 2019-12-02 18:17:54 +01:00
Daniel Maya d89ec20c52 Fixed snmp input 2019-11-25 17:24:28 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
fbsanchez 0b610cd8ba Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 13:39:08 +01:00
fbsanchez 430af38fa6 minor fixes in flow control 2019-11-11 13:38:27 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
Alejandro Fraguas cf3bcefddf Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
Fixed planned downtime acl

See merge request artica/pandorafms!2829
2019-11-04 11:25:17 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
fbsanchez 6d21f71617 removed trace 2019-10-28 18:38:56 +01:00
fbsanchez 7d5b845e1f minor fixes 2019-10-28 18:37:01 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
marcos b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
Luis Calvo 33d26144f1 Fixed planned downtime acl 2019-10-22 16:00:01 +02:00
marcos ca49cefb0d fixed 2019-10-22 12:19:25 +02:00
marcos ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Alejandro Fraguas 8407d7fe9a Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop'
Added current gis location to agent gis view list

See merge request artica/pandorafms!2772
2019-10-14 15:57:27 +02:00
Luis Calvo a1c4b3eaeb Fixed minor bug 2019-10-14 13:38:10 +02:00
fbsanchez 4c6d924495 Review remote execution modules 2019-10-11 12:50:29 +02:00
Daniel Barbero 4fedfe92fc fix is enterprise 2019-10-11 09:39:20 +02:00
Daniel Barbero 40076b0a55 remove debug 2019-10-09 17:33:06 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Daniel Rodriguez 0b14cb64b6 Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop'
Fixed module update bug

See merge request artica/pandorafms!2769
2019-10-08 14:30:49 +02:00
Luis Calvo 941362776e Fixed keepcounters ckbox bug 2019-10-08 14:06:30 +02:00
Luis Calvo 1eb0b27da3 Fixed module update bug 2019-09-27 16:09:11 +02:00
marcos.alconada df7f4553c0 fixed visual error 2019-09-25 17:52:06 +02:00
Daniel Maya 4e47aede4c Fixed modules_get_relations 2019-09-23 16:55:43 +02:00
Daniel Rodriguez 66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop'
fixed visual error

See merge request artica/pandorafms!2669
2019-09-17 11:36:07 +02:00
Tatiana Llorente 33296f448c Hidden field module in edit agent view - #4620 2019-09-12 10:29:14 +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
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop'
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
2019-09-05 18:29:43 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Rodriguez 81511d1ac4 Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop'
Fixed empty http_auth_user and pass

See merge request artica/pandorafms!2656
2019-09-03 12:09:04 +02:00
Tatiana Llorente a9a2ca5178 Change label for disabled status - #4573 2019-08-30 11:58:50 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
2019-08-30 09:46:27 +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
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00
Tatiana Llorente d515e510f3 Fixed bug in custom unit #4166 2019-08-21 13:38:53 +02:00
Luis Calvo a8c351d177 Custom fields type hint BBCode updated 2019-08-21 09:55:53 +02:00
marcos.alconada ff44666e41 fixed visual error2 2019-08-21 09:49:17 +02:00
marcos.alconada a77a72cea5 fixed visual error on Open 2019-08-20 13:07:47 +02:00
marcos.alconada d46e013567 fixed visual error!
ç2
2019-08-19 14:29:04 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
marcos.alconada b7009657f5 fixed visual ID agent error 2019-08-07 10:32:00 +02:00
marcos.alconada 9cfa8be1e9 font size for jap and chinese adjusted agents 2019-08-06 14:35:15 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
Daniel Barbero Martin 6b6d852ceb Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server
Conflicts:
	pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
2019-07-17 15:06:38 +02:00
Daniel Barbero Martin 7f4701f22e exec server error wizard 2019-07-17 11:11:38 +02:00
Tatiana Llorente 0fbe7e0128 Merge branch 'develop' into 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard'
Conflicts:
  pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
2019-07-16 11:57:36 +02:00
Daniel Rodriguez ab7743b578 Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop'
Changed disabled to readonly in agent name and id- #4307

See merge request artica/pandorafms!2578
2019-07-16 11:52:12 +02:00
Daniel Rodriguez 5f3684fb4e Merge branch 'ent-3786-evitar-cambio-tipo-modulo-politicas' into 'develop'
Modified control for module edition

See merge request artica/pandorafms!2563
2019-07-15 14:09:32 +02:00
Daniel Rodriguez 6765544b66 Merge branch 'ent-3382-comprobacion-de-grupos-secundarios-y-primarios-al-creareditar-un-agente' into 'develop'
Added advice when a primary group will be selected when is currentl a secondary group

See merge request artica/pandorafms!2353
2019-07-15 13:59:29 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
Created black theme - #4194

See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
Daniel Rodriguez f864573486 Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop'
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias

See merge request artica/pandorafms!2577
2019-07-10 09:33:41 +02:00
Tatiana Llorente eaf29b798a Fixed minor visual bugs in black theme- #4194 2019-07-09 15:03:38 +02:00
Daniel Barbero 127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Tatiana Llorente de6a0c2192 Changed disabled to readonly in agent name and id- #4307 2019-07-04 16:20:01 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
Alejandro Fraguas 04cd368410 Merge branch 'ent-4152-excec-satellite-serever-warn-remote-conf-needed' into 'develop'
Added satellite remote conficg check in snmp wizard

See merge request artica/pandorafms!2539
2019-07-03 16:54:39 +02:00
Alejandro Campos ffbaac6edc Merge branch 'develop' into 'ent-3742-Perdida-de-recursion-en-paginacion-inferior'
# Conflicts:
#   pandora_console/godmode/agentes/modificar_agente.php
2019-07-02 18:22:49 +02:00
Alejandro Fraguas 86610ebe96 Merge branch 'ent-4294-7984-Desplegable-de-grupos-desordenados' into 'develop'
Fixed unordered groups

See merge request artica/pandorafms!2559
2019-07-02 16:06:33 +02:00
Jose Gonzalez 52025efbee Modified control for module edition 2019-07-01 13:55:44 +02:00
Alejandro Fraguas 39ac83ae5e Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop'
Style changes - #4250

See merge request artica/pandorafms!2557
2019-07-01 10:02:02 +02:00
Alejandro Fraguas 47838a1134 Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
Ent 4213 snmp walk dede modulo creado no muestra parametros v3

See merge request artica/pandorafms!2511
2019-07-01 09:48:33 +02:00
Daniel Maya 63e0df4434 Fixed unordered groups 2019-06-28 12:11:25 +02:00
Tatiana Llorente 52f391667a Style changes - #4250 2019-06-28 10:24:53 +02:00
Daniel Rodriguez d68617eda1 Merge branch 'ent-4265-array-en-valor-min' into 'develop'
Changed variable that modify min values

See merge request artica/pandorafms!2538
2019-06-26 12:04:41 +02:00
fbsanchez f66e5b5ef8 Fix class names to avoid addblock hide them 2019-06-26 11:11:21 +02:00
Tatiana Llorente 04d3f315b0 Added selector for all or common modules- #2140 2019-06-25 15:19:40 +02:00
Luis Calvo f69fea81c2 Added satellite remote conficg check in snmp wizard 2019-06-25 14:28:33 +02:00
Jose Gonzalez afd72eff42 Changed variable that modify min values 2019-06-25 13:37:44 +02:00
Daniel Rodriguez 569bfa2329 Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop'
Pending Q&A

See merge request artica/pandorafms!2262
2019-06-25 12:06:07 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
Luis Calvo 9bdf048fae Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers 2019-06-17 16:39:27 +02:00
Daniel Rodriguez 2401ac5c6e Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop'
Change module type ifOperStatus on Interface Wizard

See merge request artica/pandorafms!2473
2019-06-17 16:34:14 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
fbsanchez a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez 974db824a8 style review 2019-06-03 19:13:29 +02:00
Daniel Rodriguez efd7abfc66 Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop'
ticket resolved

See merge request artica/pandorafms!2207
2019-06-03 18:16:32 +02:00
fbsanchez 31257c02a4 style review 2019-06-03 14:50:22 +02:00
ismael.moreno 1aa6d8c298 Change module type ifOperStatus on Interface Wizard 2019-05-31 10:39:48 +02:00
fbsanchez 69054571ab Style review 2019-05-31 09:50:59 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 30320b7897 Fixed login button style and removed help icons from agent_management 2019-05-30 11:12:37 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
fbsanchez 32424ddae1 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 10:50:38 +02:00
Daniel Rodriguez 9096444f8f Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop'
Do not add disabled modules to the execution queue.

See merge request artica/pandorafms!2456
2019-05-29 09:53:38 +02:00
Daniel Barbero Martin c35cb56699 fixed errors 2019-05-29 08:50:46 +02:00
Daniel Barbero Martin 3b943ae902 fixed errors disabled/enabled module from list agents because not write in conf 2019-05-28 17:11:14 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
fbsanchez 0280547465 some changes 2019-05-27 15:41:23 +02:00
Daniel Barbero Martin bc64589046 fixed error create modules 2019-05-27 15:27:46 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
manuel bf3ac73feb Removed empty help icons 2019-05-24 14:26:28 +02:00
manuel 0ee2ed6f5e Removed empty help icons in modules 2019-05-24 12:59:25 +02:00
alejandro-campos 0728c73844 fixed bug in macros of plugin modules 2019-05-22 19:14:01 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
Tatiana Llorente b6e8578d1d Fixed a minor sintax error - #3611
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
2019-05-13 15:54:06 +02:00
Tatiana Llorente e6fa42ddca Fixed a minor bug in remote config - #3611
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
2019-05-13 15:02:13 +02:00
Tatiana Llorente e9082c5d8a Fixed a minor bug in remote config - #3611
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
2019-05-13 14:55:15 +02:00
Tatiana Llorente 5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
2019-05-13 13:17:17 +02:00
manuel 43ce4f9883 Added helps 2019-05-09 17:20:27 +02:00
manuel 143def5d87 Added helps 2019-05-09 13:43:53 +02:00
marcos.alconada 23b3d07f37 Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated 2019-05-09 09:29:27 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
manuel b2b4372c9d Added helps
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
2019-05-07 11:34:09 +02:00
marcos.alconada fff3a783a1 Se restablece archivo modificado
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
marcos.alconada e1951c45a4 Se añade al 28
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
Tatiana Llorente 7da5f518d8 Fixed the form when you try to create an agent without alias - #3611
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
2019-05-03 14:00:24 +02:00
Tatiana Llorente b3a4d9edf1 New View Create/Update Agent - #3611
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
2019-05-03 13:24:15 +02:00
Tatiana Llorente 9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
Daniel Rodriguez 16f687574e Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
Fixed bug in unlinked modules

See merge request artica/pandorafms!2347

Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
manuel e424a2a684 Fixed bug in unlinked modules edition
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
manuel b1dd6edc64 Added changes in helps
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
2019-04-30 12:28:11 +02:00
manuel 6bd8221bc0 changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
Daniel Barbero Martin ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
Tatiana Llorente 274c78f647 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
Tatiana Llorente ed3155c053 New View Create/Update Agent - #3611
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
Tatiana Llorente cfff9c065d New View Create/Update Agent - #3611
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
manuel bac1e44608 Removed autofill proxi in auth server
Former-commit-id: 448622c39e6697ead1a3a515da3e573abfc0384d
2019-04-16 12:37:06 +02:00
fermin831 7a1a682248 Added advice when a primary group will be selected when is currentl a secondary group
Former-commit-id: ca23bc1f24b901c2300385ee6d3468dc5059d51d
2019-04-12 13:09:26 +02:00
Tatiana Llorente fd7cbf14cd Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
manuel 021fc1dbfd Fixed bug in unlinked modules
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
2019-04-09 10:46:37 +02:00
Tatiana Llorente d91631e0e1 New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Tatiana Llorente 9fe8dcdda3 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
2019-04-02 13:49:51 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
daniel 431c807f61 Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
# Conflicts:
#   pandora_console/extras/mr/27.sql

Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
Luis Calvo 343c6a6edf Fix agent name input to allow '-'
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
Daniel Barbero b2e16848f9 add new ff type
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
samucarc 1a01c311d6 Fixed down paginations in manage agents
Former-commit-id: 28f7546b2d0cc8f4e1d13763e9c92ac99c2de2f9
2019-03-20 18:30:52 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
Alejandro Campos 5cdf2dffa7 Merge branch 'develop' into 'ent-3706-No-se-incluyen-parametros-de-autenticacion-y-privacidad-en-wizard-interfaces-para-modulos-satelite'
# Conflicts:
#   pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php

Former-commit-id: f15c507347700205a081d010a9c6f58c0e2e5720
2019-03-19 14:47:32 +01:00
alejandro-campos 120706248b fix auth parameters not being included in agent config file when creating module through SNMP interface wizard using SNMP version 3
Former-commit-id: 86cfc2f9573ecba48af68ca01c43394cd2c23390
2019-03-19 13:24:06 +01:00
marcos.alconada 97df41245e Para revision
Former-commit-id: 5823cfd9976382ad8074d2ed8cf0340e24181693
2019-03-13 16:36:30 +01:00
marcos.alconada faee7b7b14 Pending Q&A
Former-commit-id: f41aafc6077f1b725cf7c9f360974ba62609eedd
2019-03-13 16:32:58 +01:00
Daniel Rodriguez e0c63e17d7 Merge branch 'ent-3692-No-esta-incluyendo-version-en-wizard-interfaces-para-modulos-satelite' into 'develop'
Add module version line to config module configuration data

See merge request artica/pandorafms!2259

Former-commit-id: 5595b821efd2c15e25458cbe8f5d52ab708c533a
2019-03-13 14:05:08 +01:00
alejandro-campos 1276eb3ecf Add module version line to config module configuration data
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
samucarc a8af2f89d1 Fixed data type to remote_snmp_proc in modules IfOperSttus
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +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
samucarc 9db9d1644c Eliminated the cache when update agents
Former-commit-id: 4e52c0f85ae68a5658c8cd40e72064b48c644934
2019-03-06 11:25:47 +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
marcos.alconada 36b58d0db8 ticket resolved
Former-commit-id: 18e461d26d516a4b58f65ee916e3950b2e85d312
2019-02-26 16:45:54 +01:00
fbsanchez d8ee90c285 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
Daniel Rodriguez 7f01e47e1f Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar

See merge request artica/pandorafms!2132

Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
alejandro-campos be7eadeb2c extend status change functionality in monitor detail view custom fields
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
Alejandro Fraguas e55915e1e2 Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop

See merge request artica/pandorafms!2193

Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
alejandro-campos 45bba4faa8 fix agent name input
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
Daniel Rodriguez 36410a26d1 Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
Add support for column macros.

See merge request artica/pandorafms!2182

Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
Daniel Rodriguez 1c7c0ebe8f Merge branch '3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
remove special characters from agent alias string on creation and trim blank…

See merge request artica/pandorafms!2100

Former-commit-id: 2e2268eef1c2a45f8c6bc046e9e21d0101d456c0
2019-02-20 11:02:24 +01:00
Alejandro Fraguas 63c00f00a8 Merge branch '3231-Mensaje_erroneo_al_aplicar_grupos_secundarios' into 'develop'
Eliminated message when secondary groups are added

See merge request artica/pandorafms!2124

Former-commit-id: 8c96030a463fa3b95ee2eabe3ee13c1852f60ffd
2019-02-19 18:09:38 +01:00
alejandro-campos c80a1fc3dd add tooltip to agent alias on creation
Former-commit-id: 8724f37e286080e58d9666fceec2e016fa741138
2019-02-19 16:25:19 +01:00
Ramon Novoa 7bd5851667 Add support for column macros.
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
alejandro-campos 0c99fe279f Merge branch 'develop' into 3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola
Former-commit-id: 2b9c06e16291022e626c42503c45776193a0c5ce
2019-02-15 15:13:45 +01:00
alejandro-campos e4ca9b7fc8 Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
2019-02-15 14:22:55 +01:00
Tatiana Llorente 6c9ce7e65b Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
Conflicts:
	pandora_console/godmode/setup/setup_general.php
	pandora_console/include/styles/pandora.css
	pandora_console/install.php


Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
manuel 40419ea587 Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_wmi.php


Former-commit-id: ec88c5b6ff36318db9a1f9ca98651bb49aa6eb9d
2019-02-13 14:55:21 +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
samucarc d82529438c Fixed commit
Former-commit-id: 6b2f2ee955c63da4e73fa0e2bef4c10496ea42eb
2019-02-06 20:12:17 +01:00
Tatiana Llorente 9568cc9aba Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
Conflicts:
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/include/functions_config.php


Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
Alejandro Gallardo Escobar d38236091b Format fixes
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +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
alejandro-campos 2155420d71 implement custom fields for node monitor view
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
2019-01-18 11:13:29 +01:00
samucarc ff85a4a8d5 Eliminated message when secondary groups are added
Former-commit-id: 07a6e423a66830543126444a5b4f54c196818e63
2019-01-15 13:10:13 +01:00
daniel 4e6cf0182a fixed error create modules network
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
tatiana.llorente@artica.es 6f65c9876f Added option in setup for unique main IP in agents - #1744
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
Alejandro Campos 4f7733d8e8 Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
fixed bug: failing load of post process and unit fields in plugin component in module creation

See merge request artica/pandorafms!1912

Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
Samuel Carcases a96606088a Merge branch 'Tipo_de_datos_en_Module_Data_server' into 'develop'
Removed Web Analysis and Log4x from data server module

See merge request artica/pandorafms!1985

Former-commit-id: 53756c67551aba928a0bb545386eceeb870fc8d0
2019-01-04 16:52:28 +01:00
fbsanchez fc5d3170b5 fixed warn/err messages in module_manager_editor
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
fbsanchez 17e773adcb Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo
Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +01:00
manuel.montes 5b7f796510 Changed popup windows by tooltips
Former-commit-id: 478e63e4bf81bb663898bba1afa76c7ab02ac6d9
2018-12-28 11:45:48 +01:00
fbsanchez c6b9122cfc minor fix in control messages format and processing
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
daniel 6d8b73f72e fix minor error module editor network
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
daniel c0869b3c9e fixed error module editor
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
vgilc d4061641ec Merge branch '3061-Mensaje-de-error-al-crear-un-modulo-sin-nombre' into 'develop'
fixed error message

See merge request artica/pandorafms!1964

Former-commit-id: 55944da11dcd55a19e9147bc4520431dedc3a19a
2018-12-21 10:29:14 +01:00
alejandro-campos 91e90a1b26 remove special characters from agent alias string on creation and trim blank spaces from beginning and end of alias string
Former-commit-id: 2294ef705ac0df638bc897f56ff9e9beff8379fc
2018-12-20 13:35:57 +01:00
manuel.montes ac4d420173 Added hint to url address input
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08:46 +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
vgilc 33603a79d8 Merge branch '2176-SNMP-Wizard-Nombres-de-modulos-con-entities2' into 'develop'
Fixed bug in SNMP Wizard

See merge request artica/pandorafms!1929
2018-11-30 13:37:07 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
samucarc 8bd99e6c82 Removed Web Analysis and Log4x from data server module 2018-11-16 13:28:16 +01:00
alejandro-campos c5a0065cba decoded entities when retrieving module name in case SNMP module name is updated 2018-11-13 11:50:46 +01:00
manuel.montes 5420da9f23 fixed error message 2018-11-13 09:36:20 +01:00
manuel.montes 45b757b5db Fixed bug in SNMP Wizard 2018-11-05 14:17:43 +01:00
daniel f2b1c99013 fixed minor error cluster name by alias 2018-11-02 09:56:31 +01:00
alejandro-campos 74016c928f fixed bug: failing load of post process and unit fields in plugin component in module creation 2018-10-30 10:20:31 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
2018-10-29 09:17:54 +01:00
vgilc 3c4f6d3b23 Merge branch '2580-VERSION-OPEN-Línea-divisoria' into 'develop'
Fixed bug in module manager

See merge request artica/pandorafms!1729
2018-10-25 13:00:59 +02:00
vgilc af2e49966b Merge branch '2734-6444-Nombre-de-interfaces-en-SNMP-Interface-Wizard2' into 'develop'
Added horizontal scroll in the interfaces select

See merge request artica/pandorafms!1738
2018-10-25 11:58:33 +02:00
vgilc cab90a4fd3 Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop'
Added module name and agent name in actions enable and disable module - #2783

See merge request artica/pandorafms!1783
2018-10-25 11:44:42 +02:00
manuel.montes aa0c4b41e7 Fixed bug in the data collection of network component when creating its corresponding module 2018-10-17 13:31:14 +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
daniel fd13e33259 fixed minor error input max-length in plugin network component 2018-10-09 10:51:03 +02:00
Fermin 198eb1bbc3 [Tags performance] Fixed parent module select 2018-10-05 10:12:40 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
vgilc 21c9a7ee4a Merge branch '2127-Paginacion-en-busqueda-de-modulos' into 'develop'
added hidden input to policy modules filters form

See merge request artica/pandorafms!1597
2018-10-04 14:16:22 +02:00
fermin831 3d1e2e4c79 Removed unused code 2018-10-03 11:14:11 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
vgilc 17b183a6eb Merge branch '1807-Entities-en-el-nombre-de-modulo' into 'develop'
fixed minor bug: entities in module name

See merge request artica/pandorafms!1592
2018-10-01 15:16:03 +02:00
vgilc 796e7ee06f Merge branch '6338_Visualizacion_erronea_de_advertencia' into 'develop'
Fixed visual error in module agent

See merge request artica/pandorafms!1705
2018-09-28 10:23:54 +02:00
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop'
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
2018-09-28 10:04:12 +02:00
vgilc ddd799c926 Merge branch '2579-version-open-enterprise-borrado-de-modulo' into 'develop'
added redirection after module deletion on agent modules view

See merge request artica/pandorafms!1663
2018-09-28 10:01:57 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +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 9cf578e1f6 Update configuration files when disabled is modified on agents editing 2018-09-24 16:54:53 +02:00
tatiana.llorente@artica.es e0e098a7a6 Added module name and agent name in actions enable and disable module - #2783 2018-09-19 16:51:31 +02:00
tatiana.llorente@artica.es d652a9c942 Created function that adds class checkselected and added inputs to select all in several tables - #2429 2018-09-13 16:07:40 +02:00
manuel.montes a807763c1f Added horizontal scroll in the interfaces select 2018-09-07 13:56:35 +02:00
manuel.montes a0470114a5 Fixed bug in module manager 2018-09-04 13:00:43 +02:00
manuel.montes e59f123d19 Fixed bug in agent-manager 2018-08-28 10:23:25 +02:00
vgilc 266dba4600 Merge branch '2654-No-se-puede-editar-agente-y-no-aparece-QR2' into 'develop'
Fixed bug in agent manager

See merge request artica/pandorafms!1711
2018-08-27 09:15:11 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop'
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
2018-08-27 09:10:00 +02:00
manuel.montes 5d495226d3 Fixed bug in agent manager 2018-08-23 08:28:02 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
samucarc 708349bcba Fixed visual error in module agent 2018-08-20 16:57:12 +02:00
fermin831 b597c936e8 [Secondary groups] Avoid duplicates in manage agents 2018-08-20 12:02:34 +02:00
fermin831 168d081268 [Secondary groups] Added to manage agents view 2018-08-20 11:38:01 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
fermin831 df46772733 [Secondary groups] Fixed modules edition problems 2018-08-16 14:55:48 +02:00
fermin831 304a3b40c2 Fixed overwrite primery group if user has no permissions for this group on update agent 2018-08-16 12:48:44 +02:00
fermin831 54803de45d Added missing enterprise_hook in get cps 2018-08-13 16:43:01 +02:00
alejandro-campos 8e55522e3f added alert message on module deletion at agent modules view 2018-08-03 15:18:03 +02:00
alejandro-campos ae47e7c03a added redirection after module deletion on agent modules view 2018-08-03 14:40:51 +02:00
daniel f317f3e736 fixed errors in graph min and max warning and critical for edition module 2018-07-17 11:26:25 +02:00
fermin831 001861b746 Hide policy edition on centralized management on node 2018-07-17 08:51:39 +02:00
daniel 9e8126542a fixed minor error 2018-07-16 18:15:04 +02:00
daniel 713fbd5368 fixed visual errors and console 2018-07-16 17:01:50 +02:00
fermin831 d0b6c9775f Addapted modules edition to metaconsole 2018-07-13 11:56:37 +02:00
alejandro-campos 30b720c291 added hidden input to policy modules filters form 2018-07-05 12:41:05 +02:00
alejandro-campos b372bcabac fixed minor bug: entities in module name 2018-07-03 13:47:34 +02:00
alejandro-campos 0cf3aa2e78 changed width of changing snmp module name alert popup 2018-07-03 12:50:28 +02:00
alejandro-campos c400b261ff changed size of changing snmp module name alert popup 2018-06-29 14:57:40 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop'
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
2018-06-27 18:10:41 +02:00
daniel 85897315cd cascade protection services 2018-06-27 15:03:46 +02:00
daniel 84f1cf95eb Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
2018-06-26 13:44:16 +02:00
daniel 76cd718262 add cps for agent, module, policies and bulk opertaion 2018-06-26 13:23:12 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
slerena 2284d6d3fa Merge branch 'ent-2320-pete-grupos-secundarios' into 'develop'
Fixed secondary groups configuration in agent creation

See merge request artica/pandorafms!1545
2018-06-25 19:01:58 +02:00
slerena e2f9e25dd9 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop'
Fixed bug in cluster view

See merge request artica/pandorafms!1571
2018-06-25 18:54:26 +02:00
slerena dddde8fba1 Merge branch '2194-IDs-de-SO-en-Manage-agents' into 'develop'
Fixed select in modificar_agente.php

See merge request artica/pandorafms!1520
2018-06-25 18:52:38 +02:00
manuel.montes 6f25c229e3 Fixed bug in cluster view 2018-06-25 12:35:39 +02:00
fermin831 fec5299179 Fixed secondary groups configuration in agent creation 2018-06-18 13:46:13 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
manuel.montes 17b2b01e7a Fixed select in modificar_agente.php 2018-06-08 14:09:59 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop'
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
2018-06-05 10:26:40 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop'
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
2018-06-04 10:18:44 +02:00
fermin831 a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
enriquecd deb1cebeca Show warning modal window when change snmp or satellite module name - #2251 2018-05-11 16:13:56 +02:00
fermin831 d663553e8d [Rebranding] Open godmode/agentes 2018-05-10 13:08:34 +02:00
vgilc 6eea48dccf Merge branch 'ent-2057-modulos-prediction-se-crean-en-otro-agente' into 'develop'
Fixed module prediction agent creation

See merge request artica/pandorafms!1435
2018-05-09 10:26:16 +02:00
enriquecd d92dc1a2b0 Change API and flags in cluster manager - #2007 2018-04-27 11:06:29 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
vgilc 5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop'
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
2018-04-20 10:31:57 +02:00
fermin831 fdc70572ff Fixed module prediction agent creation 2018-04-18 15:00:56 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios
Conflicts:
	pandora_console/include/class/Tree.class.php
2018-04-10 09:29:14 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
vgilc d5cd5963d7 Merge branch '2081-Enlace-de-ayuda-mal-en-edicion-de-agente' into 'develop'
Help icon in module creator - #2081

See merge request artica/pandorafms!1388
2018-03-22 10:10:49 +01:00
enriquecd f5e8d4f90f Help icon in module creator - #2081 2018-03-21 19:18:24 +01:00