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

1235 Commits

Author SHA1 Message Date
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
fermin831 26da63610a [Secondary Groups] Change secondary groups from selected to non selected in agent edit view 2018-03-21 18:32:14 +01:00
fermin831 efe420edfb [Secondary groups] Added view in agent edition 2018-03-21 16:27:01 +01:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
KIKUCHI Koichiro 022eddf43f Make change of "modules selection mode" updates module list 2018-03-01 19:56:38 +09:00
enriquecd 1a50cdf950 Change web module options for curl commandos - #1903 2018-02-16 15:35:46 +01:00
daniel 615c61bfb2 fixed error acl perm PM in view agent 2018-02-12 11:14:04 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00