Commit Graph

7899 Commits

Author SHA1 Message Date
Ramon Novoa ddebb9ca7c Merge remote-tracking branch 'origin/develop' into ent-10849-cambiar-modo-del-servidor-un-solo-proceso-muchos-hilos-varios-procesos-algunos-hilos 2024-01-23 10:44:51 +01:00
Rafael Ameijeiras 36de621fed Merge branch 'ent-12454-lineas-de-inicio-y-fin-de-mantenimiento-se-introducen-tarde' into 'develop'
Ent-12454-lineas-de-inicio-y-fin-de-mantenimiento-se-introducen-tarde

Closes pandora_enterprise#12454

See merge request artica/pandorafms!6805
2024-01-23 07:20:01 +00:00
artica d4c5d2f316 Auto-updated build strings. 2024-01-23 01:00:29 +01:00
Diego Muñoz-Reja 9bdcfb4b4d Merge branch 'ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api' into 'develop'
Ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api

Closes pandora_enterprise#12519

See merge request artica/pandorafms!6769
2024-01-22 15:49:32 +00:00
Ramon Novoa 6d1c2b38fa Add support for forking servers. 2024-01-22 10:28:07 +01:00
artica 895684238e Auto-updated build strings. 2024-01-22 01:00:15 +01:00
artica 91e072e384 Auto-updated build strings. 2024-01-21 01:00:15 +01:00
artica f67c9185f8 Auto-updated build strings. 2024-01-20 01:00:29 +01:00
Rafael Ameijeiras 11e8b9942f Merge branch 'ent-12514-error-el-ejecutar-comandos-en-la-cli' into 'develop'
Ent-12514-error-el-ejecutar-comandos-en-la-cli

Closes pandora_enterprise#12514

See merge request artica/pandorafms!6760
2024-01-19 08:18:06 +00:00
artica 2400c110b1 Auto-updated build strings. 2024-01-19 01:01:35 +01:00
Daniel Rodriguez b7777f1b83 Merge branch 'ent-12434-cambiar-netscan-para-que-lance-el-nmap-durante-la-recon' into 'develop'
Ent-12434-cambiar-netscan-para-que-lance-el-nmap-durante-la-recon

Closes pandora_enterprise#12434

See merge request artica/pandorafms!6806
2024-01-18 08:13:45 +00:00
Calvo cb1f1b1ff2 Merge remote-tracking branch 'origin/develop' into ent-10847-modo-standby-en-vista-ha 2024-01-18 08:13:49 +01:00
artica 49f15c354c Auto-updated build strings. 2024-01-18 01:01:27 +01:00
Calvo 50e6a44002 Merge remote-tracking branch 'origin/develop' into ent-10847-modo-standby-en-vista-ha 2024-01-17 16:36:08 +01:00
Calvo d3ca5862b4 #12222 Fix timezone offset when modules has timezone data 2024-01-17 11:01:25 +01:00
artica f33865542c Auto-updated build strings. 2024-01-17 01:01:47 +01:00
Daniel Cebrian c8a73f59f5 #12569 added audit in discovery and task console 2024-01-16 11:53:11 +01:00
artica a16fa51922 Auto-updated build strings. 2024-01-16 01:01:13 +01:00
artica 616af6450b Auto-updated build strings. 2024-01-15 01:00:21 +01:00
artica 2e45362944 Auto-updated build strings. 2024-01-14 01:01:50 +01:00
artica e2b837186c Auto-updated build strings. 2024-01-13 01:00:46 +01:00
artica 3a509b9415 Auto-updated build strings. 2024-01-12 01:02:06 +01:00
felix.suarez 5cf9d70c6f Add config token for mail_subject_encoding 2024-01-11 09:58:06 -06:00
artica 62d7adec39 Auto-updated build strings. 2024-01-11 01:00:34 +01:00
artica 353c7e1fa1 Auto-updated build strings. 2024-01-10 01:00:40 +01:00
artica 6930631c66 Auto-updated build strings. 2024-01-09 01:00:36 +01:00
felix.suarez 600797d531 Previous installation verification 2024-01-08 14:50:11 -06:00
artica d9b400d4ee Auto-updated build strings. 2024-01-08 01:00:21 +01:00
artica 6db5e5b728 Auto-updated build strings. 2024-01-07 01:00:19 +01:00
artica bb94bf2c6c Auto-updated build strings. 2024-01-06 01:00:33 +01:00
artica 8395597605 Auto-updated build strings. 2024-01-05 01:00:33 +01:00
artica 200298a0f6 Auto-updated build strings. 2024-01-04 01:00:56 +01:00
artica 4786a9260c Auto-updated build strings. 2024-01-03 01:00:26 +01:00
Daniel Cebrian 110d7f4842 #12323 added netflow interval select 2024-01-02 12:57:02 +01:00
artica 0efa911300 Auto-updated build strings. 2024-01-02 01:00:19 +01:00
artica bf905c1ab7 Auto-updated build strings. 2024-01-01 01:00:19 +01:00
artica dfe134b39c Auto-updated build strings. 2023-12-31 01:00:20 +01:00
artica 72dcbf95c4 Auto-updated build strings. 2023-12-30 01:00:24 +01:00
artica 58c9cc5b93 Auto-updated build strings. 2023-12-29 01:00:24 +01:00
artica 12e95f9920 Auto-updated build strings. 2023-12-28 01:00:27 +01:00
artica 415682611a Auto-updated build strings. 2023-12-27 01:00:27 +01:00
felix.suarez 251bf60d5e Add warning time to CLI create 2023-12-26 15:47:42 -06:00
artica bc7ae01e13 Auto-updated build strings. 2023-12-26 01:00:19 +01:00
artica 2efc95587f Auto-updated build strings. 2023-12-25 01:00:19 +01:00
artica 7e91d94faa Auto-updated build strings. 2023-12-24 01:00:17 +01:00
artica 3a5fe1acb0 Auto-updated build strings. 2023-12-23 01:00:25 +01:00
felix.suarez 6dea725452 Execute command during scanning and not during the creation of Agent 2023-12-21 21:29:19 -06:00
artica 2d06d5f94d Auto-updated build strings. 2023-12-22 01:00:27 +01:00
felix.suarez f36d36a34f Modify the place where maintenance lines are added 2023-12-21 11:20:57 -06:00
artica 82bc2c3f98 Updated version and build strings. 2023-12-21 17:13:20 +01:00
artica ffec658ee8 Auto-updated build strings. 2023-12-21 01:00:28 +01:00
artica e947ac4f00 Auto-updated build strings. 2023-12-20 01:00:27 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
artica 43fbc6eca4 Auto-updated build strings. 2023-12-19 01:00:37 +01:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
artica 0336f87b24 Auto-updated build strings. 2023-12-18 01:00:22 +01:00
felix.suarez d348f1bf1d Remove conf db change 2023-12-17 00:01:47 -06:00
felix.suarez 3d71d27d6b Change autodisabled query 2023-12-16 23:59:21 -06:00
artica 2d379f6700 Auto-updated build strings. 2023-12-17 01:00:20 +01:00
artica 9037819ceb Auto-updated build strings. 2023-12-16 01:00:26 +01:00
artica d81805d2c2 Auto-updated build strings. 2023-12-15 01:00:29 +01:00
felix.suarez d6c47ca069 Disable PrintError on DB 2023-12-14 16:21:22 -06:00
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
Rafael Ameijeiras abe950e7d7 Merge branch 'ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event' into 'develop'
Ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event

Closes pandora_enterprise#11731

See merge request artica/pandorafms!6293
2023-12-14 15:11:27 +00:00
Jonathan 53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00
artica dffdbff8b1 Auto-updated build strings. 2023-12-14 01:00:28 +01:00
felix.suarez f5b4cf2359 CLI allow create events with event_custom_id 2023-12-13 10:45:48 -06:00
Jonathan 5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +01:00
Diego Muñoz-Reja 89ec81e151 Merge branch 'ent-11971-16145-proteccion-en-cascada-de-modulos-no-funciona-cuando-hay-ff' into 'develop'
ent-11971-[#16145] Protección en cascada de módulos no funciona cuando hay FF

See merge request artica/pandorafms!6645
2023-12-13 08:40:35 +00:00
felix.suarez e3fc6c13f5 Change api_call to manage_api_call 2023-12-12 22:29:47 -06:00
artica 14f8deebca Auto-updated build strings. 2023-12-13 01:00:28 +01:00
Daniel Cebrian 12f2bce2f2 Merge branch 'ent-12022-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown' into ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola 2023-12-12 16:33:34 +01:00
Ramon Novoa e85604775b Add support for ignore_unknown.
If tagente_modulo.ignore_unknown is set to 1, a module will never become
unknown.
2023-12-12 16:28:24 +01:00
artica ffdf0d81b9 Auto-updated build strings. 2023-12-12 01:00:30 +01:00
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +01:00
artica 5351af2f7a Auto-updated build strings. 2023-12-11 01:00:22 +01:00
artica 16f75809f1 Auto-updated build strings. 2023-12-10 01:00:20 +01:00
artica ef339a1bbe Auto-updated build strings. 2023-12-09 01:00:21 +01:00
artica d83a64da9c Auto-updated build strings. 2023-12-08 01:00:28 +01:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
artica 62901b6a70 Auto-updated build strings. 2023-12-07 01:00:21 +01:00
artica 0481af6b50 Auto-updated build strings. 2023-12-06 01:00:26 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
Diego Muñoz-Reja b2bcae6571 Merge branch 'ent-11966-no-se-envian-imagenes-correctamente-utilizando-la-macro-_moduledata_x_' into 'develop'
Fix _moduledata_x when data is a b64 image

See merge request artica/pandorafms!6585
2023-12-05 11:18:54 +00:00
artica cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
Daniel Rodriguez 868598b1b2 Merge branch 'ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db' into 'develop'
delete agents pandora_db pandora_enterprise#12293

See merge request artica/pandorafms!6656
2023-12-04 13:39:10 +00:00
Daniel Rodriguez 9922c29579 Merge branch 'ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db' into 'develop'
Ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db

See merge request artica/pandorafms!6726
2023-12-04 11:53:16 +00:00
Rafael Ameijeiras 3f2d9e0cb1 Merge branch 'ent-12507-hay-macros-de-eventos-que-no-funcionan-en-el-eventserver' into 'develop'
Added function to pretty print json

See merge request artica/pandorafms!6704
2023-12-04 08:20:22 +00:00
artica 3eac0f9661 Auto-updated build strings. 2023-12-04 01:00:21 +01:00
Enrique Martin 988841084c Fixed log modules generation 2023-12-04 00:00:41 +01:00
Enrique Martin 7892eb5c0c Added log modules 2023-12-03 23:52:55 +01:00
artica a2ea6f33f3 Auto-updated build strings. 2023-12-03 01:00:20 +01:00
artica 69229987f8 Auto-updated build strings. 2023-12-02 01:00:24 +01:00
daniel b31f24aca4 remove conf agents pandora_enterprise#12293 2023-12-01 11:05:01 +01:00
daniel 95fb500fb5 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-12-01 10:33:21 +01:00
artica 3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
felix.suarez 07d6a4cdf6 Avoid add last_compact_offset when is zero 2023-11-30 09:19:50 -06:00
Jonathan c41b360a6e #8365 merge conflict 2023-11-30 12:04:28 +01:00
daniel 0d58aaf44d fix errors pandora_enterprise#12293 2023-11-30 10:25:16 +01:00
Rafael Ameijeiras 57a9e6b3bf Merge branch 'ent-12188-script-mode-de-plugins-de-inventario-no-esta-funcionando' into 'develop'
add code lost inventory server pandora_enterprise#12188

See merge request artica/pandorafms!6667
2023-11-30 09:23:33 +00:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +01:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
artica 9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
daniel dcb04a64ee fix delete conf agents pandora_enterprise#12293 2023-11-29 14:30:45 +01:00
daniel 1bacc36bc0 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-11-29 11:56:51 +01:00
daniel d2b6b098a3 fix inventory pandora_enterprise#12188 2023-11-29 11:38:19 +01:00
artica 8378d7ef91 Auto-updated build strings. 2023-11-29 01:00:30 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
Jonathan def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
artica 8bb4758439 Auto-updated build strings. 2023-11-28 01:00:28 +01:00
Calvo a497ae4369 Added function to pretty print json 2023-11-27 15:13:34 +01:00
miguel angel rasteu a4cd6d7fe1 #12138 Resolve conflict 2023-11-27 11:43:24 +01:00
Rafael Ameijeiras 13e7d2845b Merge branch 'ent-9929-ff-keep-counters-reinicia-el-contador-al-pasar-a-normal' into 'develop'
Ent-9929-ff-keep-counters-reinicia-el-contador-al-pasar-a-normal

See merge request artica/pandorafms!6573
2023-11-27 08:08:24 +00:00
miguel angel rasteu 262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
artica 60cfc49e3e Auto-updated build strings. 2023-11-27 01:00:19 +01:00
artica cdd00fcc68 Auto-updated build strings. 2023-11-26 01:00:18 +01:00
artica 18b337a8df Auto-updated build strings. 2023-11-25 01:00:21 +01:00
Enrique Martin 26e4b46b1f Removed agent_alias from agent_data 2023-11-24 12:26:59 +01:00
Enrique Martin cdc77b5f70 Added demo agents plugin 2023-11-24 10:24:46 +01:00
artica 558279e61b Auto-updated build strings. 2023-11-24 01:00:22 +01:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
artica 2576303566 Auto-updated build strings. 2023-11-23 01:00:31 +01:00
artica 445514586a Auto-updated build strings. 2023-11-22 01:00:18 +01:00
felix.suarez 5514b0735e Remove reset when reach normal but status not change 2023-11-21 09:22:12 -06:00
artica 7d8eb2a4e7 Auto-updated build strings. 2023-11-21 01:00:23 +01:00
artica 838ba785da Auto-updated build strings. 2023-11-20 01:00:19 +01:00
artica 4293669702 Auto-updated build strings. 2023-11-19 01:00:18 +01:00
artica 1649585929 Auto-updated build strings. 2023-11-18 01:00:23 +01:00
artica f386274dc0 Auto-updated build strings. 2023-11-17 01:00:20 +01:00
artica e80b590214 Auto-updated build strings. 2023-11-16 01:00:22 +01:00
daniel b45c967919 add code lost inventory server pandora_enterprise#12188 2023-11-15 08:30:24 +01:00
artica c7a746ea41 Auto-updated build strings. 2023-11-15 01:00:24 +01:00
artica 92bd8019a3 Auto-updated build strings. 2023-11-14 01:00:11 +01:00
daniel d49c5e4954 delete agents pandora_db pandora_enterprise#12293 2023-11-13 15:12:55 +01:00
Daniel Rodriguez 7fdca7aa12 Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into 'develop'
Add support for inventory vulnerability scans.

See merge request artica/pandorafms!6487
2023-11-13 08:24:48 +00:00
artica 257a45d178 Auto-updated build strings. 2023-11-13 01:00:17 +01:00
artica 4835231286 Auto-updated build strings. 2023-11-12 01:00:17 +01:00
artica 61759da3e0 Auto-updated build strings. 2023-11-11 01:00:21 +01:00
Ramon Novoa 8ec1432414 Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner 2023-11-10 09:53:17 +01:00
artica 2ba09b4b48 Auto-updated build strings. 2023-11-10 01:00:18 +01:00
felix.suarez f773230ebf Modify pandora_cps_enabled function 2023-11-09 16:18:06 -05:00
artica ea0a0969b8 Auto-updated build strings. 2023-11-09 01:01:09 +01:00
Rafael Ameijeiras 9b7bc0192f Merge branch 'ent-12403-posibilidad-de-cambiar-nombre-al-agente-de-automonitorizacion' into 'develop'
Added server conf option for self monitoring agent name

See merge request artica/pandorafms!6631
2023-11-08 12:08:09 +00:00
artica 2d3f30974f Auto-updated build strings. 2023-11-08 01:00:25 +01:00
artica e516db1ef1 Auto-updated build strings. 2023-11-07 01:00:29 +01:00
Daniel Rodriguez e498c36e7c Merge branch 'ent-12310-no-funciona-log_agent-en-alertas-de-log' into 'develop'
Make LWP use IO::Socket::SSL instead of Net::SSL.

See merge request artica/pandorafms!6616
2023-11-06 15:54:43 +00:00
Calvo a0e1274ee6 Added server conf option for self monitoring agent name 2023-11-06 13:30:49 +01:00
artica 96d8fe33f3 Auto-updated build strings. 2023-11-06 01:00:19 +01:00