Commit Graph

35090 Commits

Author SHA1 Message Date
Daniel Maya 89f55fd24e resolved conflict 2023-07-17 08:28:38 +02:00
Rafael Ameijeiras df70aa6ee6 Merge branch 'ent-11680-15857-bug-dashboard-metaconsola-widgets-servicio-con-mapa-sunburts' into 'develop'
Ent 11680 [#15857]Bug Dashboard metaconsola widgets servicio con mapa sunburts

See merge request artica/pandorafms!6190
2023-07-17 06:04:55 +00:00
Rafael Ameijeiras b7211b5f9e Merge branch 'ent-10013-filtros-procesamiento-syslog-server' into 'develop'
Ent 10013 filtros procesamiento syslog server

See merge request artica/pandorafms!6245
2023-07-17 06:03:41 +00:00
Rafael Ameijeiras 8d423fa0ad Merge branch 'ent-2892-6602-borrar-en-descripcion-de-modulo-mensaje-de-que-ha-sido-creado-a-traves-de-plantilla' into 'develop'
Ent 2892 6602 borrar en descripcion de modulo mensaje de que ha sido creado a traves de plantilla

See merge request artica/pandorafms!5791
2023-07-17 06:02:29 +00:00
Rafael Ameijeiras 3f9aea5fe4 Merge branch 'ent-7116-anadir-token-en-snmp-browser-para-poder-aplicar-ip-del-agente-a-los-modulos' into 'develop'
Ent 7116 anadir token en snmp browser para poder aplicar ip del agente a los modulos

See merge request artica/pandorafms!6061
2023-07-17 06:00:36 +00:00
Rafael Ameijeiras 9cec3e1ba5 Merge branch 'ent-5344-seleccionables-de-pdf-en-open-reports' into 'develop'
Ent 5344 seleccionables de pdf en open reports

See merge request artica/pandorafms!5792
2023-07-17 05:59:15 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
2023-07-17 05:57:29 +00:00
artica bff5210835 Auto-updated build strings. 2023-07-17 01:00:44 +02:00
artica bdf2ac1e0b Auto-updated build strings. 2023-07-16 01:00:51 +02:00
artica fd17e2179a Auto-updated build strings. 2023-07-15 01:01:00 +02:00
Jonathan 4407efecc0 #10598 remove show license and show always 2023-07-14 12:39:13 +02:00
Jonathan e6e4448ea9 #10598 license and dropsearch select2 2023-07-14 12:33:19 +02:00
Jonathan 9e81e28c62 #10598 basic_net fix 2023-07-14 12:12:20 +02:00
Jonathan ee37487b74 #10598 unknown create template and show 2023-07-14 11:44:37 +02:00
Rafael Ameijeiras bff3fcd762 Merge branch 'ent-11163-cambiar-la-forma-en-la-que-se-generan-las-graficas-para-la-macro-de-envio-por-correo' into 'develop'
Ent-11163-cambiar-la-forma-en-la-que-se-generan-las-graficas-para-la-macro-de-envio-por-correo

Closes pandora_enterprise#11163

See merge request artica/pandorafms!6234
2023-07-14 09:20:11 +00:00
Luis 9275aed3eb Update pandora_server_sec.conf.template 2023-07-14 07:39:43 +00:00
Luis 98b26382ca Fix misspell 2023-07-14 07:39:23 +00:00
Rafael Ameijeiras 92ea46b70e Merge branch 'ent-11732-las-graficas-generadas-por-api-para-el-correo-estan-rotas' into 'develop'
Ent 11732 las graficas generadas por api para el correo estan rotas

See merge request artica/pandorafms!6247
2023-07-14 07:32:26 +00:00
Rafael Ameijeiras 9499e50eea Merge branch 'ent-9686-crear-seccion-de-politicas-dentro-del-agente' into 'develop'
Ent 9686 crear seccion de politicas dentro del agente

See merge request artica/pandorafms!5830
2023-07-14 06:58:00 +00:00
artica 0a6301a3a8 Auto-updated build strings. 2023-07-14 01:00:57 +02:00
Jonathan f748a07c75 #10598 fix discovery include 2023-07-13 15:40:35 +02:00
Jonathan 8dcf516196 #11732 fix graphs for email 2023-07-13 13:45:18 +02:00
Rafael Ameijeiras be8ccde589 Merge branch 'ent-11728-erro-al-cambiar-un-modulo-de-plugin-server-modifca-el-plugin-pero-no-cambia-guarda-los-campos' into 'develop'
Ent 11728 erro al cambiar un modulo de plugin server modifca el plugin pero no cambia guarda los campos

See merge request artica/pandorafms!6243
2023-07-13 10:44:31 +00:00
Rafael Ameijeiras d9b95c08ed Merge branch 'ent-11719-selector-de-modulos-en-las-alertas-del-agente-no-muestra-los-modulos-del-agente-solo-en-nodo' into 'develop'
Ent 11719 selector de modulos en las alertas del agente no muestra los modulos del agente solo en nodo

See merge request artica/pandorafms!6237
2023-07-13 10:43:46 +00:00
Rafael Ameijeiras 9e3dcbd390 Merge branch 'ent-11331-editar-tarea-de-google-cloud-te-lleva-a-discovery' into 'develop'
Ent 11331 editar tarea de google cloud te lleva a discovery

See merge request artica/pandorafms!5957
2023-07-13 10:43:03 +00:00
Daniel Cebrian 9012b897f9 #9686 added status in centralized mode 2023-07-13 11:59:10 +02:00
Daniel Cebrian b35b4e40a1 #9686 fixed bug pagination in datatable 2023-07-13 10:46:10 +02:00
Daniel Cebrian 20c225e410 Merge branch 'develop' into ent-9686-crear-seccion-de-politicas-dentro-del-agente 2023-07-13 10:16:52 +02:00
Diego Muñoz-Reja 57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop'
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
2023-07-13 07:55:47 +00:00
Daniel Cebrian 4f26bc2d51 #9686 fixed pagination in policies manager 2023-07-13 08:56:58 +02:00
artica 79e2591939 Auto-updated build strings. 2023-07-13 01:00:52 +02:00
Calvo 6c7450cd81 Fix code style 2023-07-12 18:08:10 +02:00
Calvo 5b68fcdefe Addded blacklist and whitelist to syslogserver to server conf 2023-07-12 18:06:07 +02:00
Gorka Sanchez 9c6ff04977 Merge branch 'ent-11723-nodo-intenta-usar-login-hash-al-redirigir-desde-le-vista-de-arbol-y-te-deslogea' into 'develop'
Ent 11723 nodo intenta usar login hash al redirigir desde le vista de arbol y te deslogea

See merge request artica/pandorafms!6239
2023-07-12 14:43:41 +00:00
Gorka Sanchez fc1a0b7b64 Merge branch 'ent-11687-giss-anchura-insuficiente-en-columna-de-agentes-al-utilizar-operaciones-masivas-de-eliminar' into 'develop'
Draft: Ent 11687 giss anchura insuficiente en columna de agentes al utilizar operaciones masivas de eliminar

See merge request artica/pandorafms!6215
2023-07-12 14:43:01 +00:00
Félix Suárez 356a3cc9c3 Modify aditional user/pass on core. 2023-07-12 08:31:52 -06:00
Jonathan ab590f6493 #11716 fix size plugins preview 2023-07-12 16:24:46 +02:00
miguel angel rasteu 46f898c5a6 #11728 Fix module plugin server 2023-07-12 16:05:55 +02:00
Jonathan 4ad1aa6237 #11687 show all in agent group 2023-07-12 15:35:22 +02:00
Jonathan 5ba8b4d1ad Merge branch 'develop' into ent-11687-giss-anchura-insuficiente-en-columna-de-agentes-al-utilizar-operaciones-masivas-de-eliminar 2023-07-12 15:30:55 +02:00
miguel angel rasteu 2af618b765 #11726 Fix alert status column name agent 2023-07-12 14:11:00 +02:00
miguel angel rasteu e40c60f6c5 #11723 Fix tree view node 2023-07-12 13:54:06 +02:00
Matias Didier 676b7a9302 Merge branch 'ent-11040-valores-para-notif.security.default_password-grabados-a-fuego-con-md5' into 'develop'
Ent 11040 Valores para NOTIF.SECURITY.DEFAULT_PASSWORD grabados "a fuego" con MD5

See merge request artica/pandorafms!6086
2023-07-12 11:25:20 +00:00
miguel angel rasteu 8332dce850 #11724 Fix show hide button 2023-07-12 13:15:46 +02:00
Jonathan 0f1b8fce02 #11719 fix modules create alert 2023-07-12 12:11:50 +02:00
Jonathan d5335da885 #11687 overflow fix 2023-07-12 12:05:17 +02:00
Jonathan eada8e0652 #11687 fix errors agents and checks 2023-07-12 11:26:33 +02:00
Alejandro Sánchez 58c2037da6 Merge branch 'ent-10507-15102-plugin-dynamic_snmp-no-opera-correctamente-con-valores-negativos' into 'develop'
change regexp snmp value to accept negative numbers

See merge request artica/pandorafms!6226
2023-07-12 08:26:42 +00:00
miguel angel rasteu f6637e3827 #11031 fix audit log filter 2023-07-12 10:19:08 +02:00
alejandro c4444e9f9c fix warning plugintools 2023-07-12 10:15:13 +02:00