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

1261 Commits

Author SHA1 Message Date
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