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

5942 Commits

Author SHA1 Message Date
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
Daniel Rodriguez 6fff287b70 Merge branch 'ent-7314-comillas-comandos-remotos' into 'develop' 
Added tip for notice to users for use single quotation

Closes pandora_enterprise#7314

See merge request artica/pandorafms!4376
 2021-09-08 13:14:54 +00:00
José González 740a82253a Fixed quot string 2021-09-08 12:20:38 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop' 
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
 2021-09-08 10:14:22 +00:00
Jose Gonzalez e8eb77058b Fix 2021-09-06 15:19:23 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
marcos 9c425f60e8 less module selector width 2021-09-02 16:56:01 +02:00
fbsanchez 6756c16c35 Added correlation server to server list 2021-09-02 12:21:31 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop' 
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
 2021-09-01 13:18:10 +00:00
Jose Gonzalez 73cd0fd17e Changed content of advice 2021-09-01 10:29:25 +02:00
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop' 
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
 2021-08-31 10:05:31 +00:00
Daniel Rodriguez fae4b284e4 Merge branch 'ent-7945-500-al-crear-informe' into 'develop' 
Ent 7945 500 al crear informe

See merge request artica/pandorafms!4373
 2021-08-27 12:07:24 +00:00
José González 84b8973027 Added tip for notice to users for use single quotation 2021-08-27 12:49:27 +02:00
Daniel Rodriguez 16fff8b2f5 Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop' 
Change snmpwalk behaviour in module configuration

Closes pandora_enterprise#7619

See merge request artica/pandorafms!4221
 2021-08-27 10:45:42 +00:00
Daniel Maya c4e6c52fe2 #7915 fixed custom field filter 2021-08-27 11:24:23 +02:00
Daniel Rodriguez c172afe1ce Merge branch 'ent-7940-Bug-items-de-informes-en-open' into 'develop' 
Ent 7940 bug items de informes en open

See merge request artica/pandorafms!4372
 2021-08-26 10:13:13 +00:00
Daniel Maya 0a79014480 #7495 fixed report name 2 2021-08-26 12:03:14 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez 61baf63a6a Merge branch 'ent-7819-500-al-ordernar-items-de-informes' into 'develop' 
fixed error 500 when sort report items

See merge request artica/pandorafms!4314
 2021-08-25 12:52:33 +00:00
Daniel Rodriguez 3be8971360 Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop' 
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos

See merge request artica/pandorafms!4365
 2021-08-25 12:52:06 +00:00
Daniel Maya c8fb8a441f #7940 Fixed server filter in open 2021-08-25 13:43:13 +02:00
Jose Gonzalez 1bbcc47344 Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager 2021-08-24 16:17:33 +02:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop' 
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
 2021-08-24 12:28:03 +00:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
José González 6358f3fc9b Fixed issues with files upload 2021-08-23 15:35:47 +02:00
Daniel Rodriguez 3dc6db320e Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop' 
Fixed SLA report items creating empty extra item

See merge request artica/pandorafms!4253
 2021-08-23 10:50:10 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
alejandro.campos@artica.es c07a112f4b migrate histrogram report items 2021-08-19 16:23:52 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Daniel Rodriguez 44dcdb03bc Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop' 
Ent 7542 11882 buscador de acciones no funciona

See merge request artica/pandorafms!4343
 2021-08-17 07:09:26 +00:00
alejandro.campos@artica.es 21e15752cf fixed select2 search in action update 2021-08-16 11:04:52 +02:00
alejandro.campos@artica.es 54ae7e5783 modified availability report 2021-08-16 09:43:11 +02:00
fbsanchez 93636aef96 Avoid warning phpcs 2021-08-12 12:00:53 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez 03306454e0 Merge branch 'ent-7883-aplicacion-de-parches-offline-en-la-open' into 'develop' 
Allowed UMC offline for opensource installations, fixed issue while accessing settings

See merge request artica/pandorafms!4349
 2021-08-11 12:20:32 +00:00
fbsanchez 3662d8b8a0 Added offline entry to menu in community ed 2021-08-11 14:12:49 +02:00
fbsanchez c69c326bc5 Warning to be careful with offline patches 2021-08-11 11:34:29 +02:00
fbsanchez 97afb02ba6 Allowed UMC offline for opensource installations, fixed issue while accessing settings 2021-08-11 11:28:33 +02:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico 
Conflicts:
	pandora_console/godmode/um_client/index.php
 2021-08-11 09:56:02 +02:00
Daniel Rodriguez f8e9bd38ec Merge branch 'ent-7633-selector-de-grupos-en-el-graph-builder-de-las-custom-graphs-ocupa-todo-el-ancho-de-la-pantalla' into 'develop' 
colspan 1 to group selector custom graph

See merge request artica/pandorafms!4223
 2021-08-11 07:10:50 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
Daniel Rodriguez b3336cdc4f Merge branch 'ent-7563-bug-carga-dinamica-icono-grupos-creacion-agente' into 'develop' 
Fixed group icon on agent creation

See merge request artica/pandorafms!4145
 2021-08-10 07:00:56 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
Daniel Maya a5f9e74b50 #7881 Fixed snmp alert 2021-08-05 15:53:44 +02:00
Daniel Rodriguez e623fa1822 Merge branch 'ent-7854-warning-por-memoria-php-umc-cuando-vale-1' into 'develop' 
Minor fix in memory detection UMC

See merge request artica/pandorafms!4327
 2021-08-05 11:51:39 +00:00
alejandro.campos@artica.es 5acd64bbf7 fixed text inputs in add action modals 2021-08-05 13:05:53 +02:00
Daniel Rodriguez 39d4466658 Merge branch 'ent-fix-alert-action-creation' into 'develop' 
Fixed alert action creation problem.

See merge request artica/pandorafms!4313
 2021-08-05 07:56:22 +00:00
Daniel Rodriguez e2a1a42006 Merge branch 'ent-7592-componentes-remotos-de-red-campo-tcp-send' into 'develop' 
Unset field tcp send when snmp remote component selected

See merge request artica/pandorafms!4160
 2021-08-04 12:03:52 +00:00
Daniel Rodriguez 801f8fc3c4 Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop' 
Fixed alert command hide on update

See merge request artica/pandorafms!4164
 2021-08-03 06:47:41 +00:00
Daniel Rodriguez 2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop' 
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
 2021-08-02 07:18:02 +00:00
fbsanchez b88b019528 errata fix0 2021-07-29 13:15:01 +02:00
fbsanchez 41f2842e41 Proxy fix and some traceability for DBH upgrade 2021-07-29 13:11:45 +02:00
fbsanchez cea9d2ae3d Fix searchpath for MR while updating 2021-07-28 19:16:27 +02:00
fbsanchez 9206dc491e avoid notice but accept any other alert from PHP 2021-07-27 11:24:23 +02:00
fbsanchez 3c78bfc89e Changed LOAD por SOURCE in UMC - MR loader 2021-07-27 10:48:12 +02:00
fbsanchez 60de51cfdb Minor fix in memory detection UMC 2021-07-27 10:21:52 +02:00
fbsanchez dc7d30cbf8 Stupid sexy error_get_last 2021-07-22 11:41:04 +02:00
fbsanchez d3270904bd Avoid notice 2021-07-22 11:33:57 +02:00
fbsanchez f83fddb4ff Always ignopre undefined indexes notices 2021-07-22 11:29:01 +02:00
fbsanchez 52059661a4 Ignore undefined indexes E_NOTICE 2021-07-22 10:59:19 +02:00
fbsanchez f71ae73c84 Load procedures (or complex queries) in UMC 2021-07-21 17:31:03 +02:00
marcos e02dd1b61f fixed error 500 when sort report items 2021-07-21 11:43:11 +02:00
Junichi Satoh 4115bd0cba Fixed an issue where alert actions belonging to the "All" group could be created by restricted users. 2021-07-21 15:34:46 +09:00
José González 96fccb01b9 Created token for hande file creation 2021-07-16 16:54:43 +02:00
fbsanchez d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00
vgilc b7729447f6 Merge branch 'ent-fix-keep-counters' into 'develop' 
Fixed 'Keep counters' cannot be cleared in module configuration.

See merge request artica/pandorafms!4292
 2021-07-13 08:37:09 +00:00
Junichi Satoh 512cfb69c5 Fixed 'Keep counters' cannot be cleared in module configuration. 2021-07-13 11:55:49 +09:00
Junichi Satoh e7079dd4c4 Fixed all alert actions are shown after alert action creation/edition even if user has access rights only for specific groups. 2021-07-13 09:53:23 +09:00
marcos 201e9c7216 fixed visual error 2021-07-12 11:10:41 +02:00
marcos ff60a4ec62 fixed visual error 2021-07-12 10:58:51 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
marcos 7a4224cef6 add update manager black background update manager 2021-07-06 12:49:20 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-05 09:55:14 +02:00
José González 498a353a29 Improve code for get secondary groups 2021-07-02 12:20:53 +02:00
Calvo 5bd49a1e49 Fixed SLA report items creating empty extra item 2021-06-30 12:04:01 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
fbsanchez 3bd0464c86 removed unwanted traces 2021-06-29 14:35:22 +02:00
fbsanchez f403e3a43b Avoid trial users from using UMC 2021-06-29 14:34:09 +02:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
fbsanchez 4e1110a052 MQ up to down connections (MC => NODES) 2021-06-28 21:21:31 +02:00
fbsanchez 017e12c751 Use metaconsole_access_node to allow or deny access to node for a user created and synchronized from MC 2021-06-25 15:41:34 +02:00
fbsanchez 4d2f9fb4c9 missing messages 2021-06-25 12:54:14 +02:00
fbsanchez 7e178ed18c Fix add multiple tags at once into a module definition 2021-06-24 19:58:08 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 294741b472 Merge branch 'ent-6990-copiar-informes' into 'develop' 
Ent 6990 copiar informes

See merge request artica/pandorafms!4129
 2021-06-21 14:07:03 +00:00
Luis 51844da01b Ent 6990 copiar informes 2021-06-21 14:07:03 +00:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
Daniel Rodriguez ab3a7e9d2d Merge branch 'ent-7629-Error-500-en-borrado-selectivo-de-items-de-informes' into 'develop' 
Ent 7629 error 500 en borrado selectivo de items de informes

See merge request artica/pandorafms!4175
 2021-06-21 14:03:39 +00:00
Daniel Rodriguez 227055446e Merge branch 'ent-7630-bug-visual-enedicion-de-items-de-informes' into 'develop' 
fixed error updating item reporting

See merge request artica/pandorafms!4168
 2021-06-21 14:02:54 +00:00
marcos 951924dd93 colspan 1 to group selector custom graph 2021-06-21 11:40:48 +02:00
José González 0c5b8766d0 Change snmpwalk behaviour in module configuration 2021-06-18 14:05:59 +02:00