Commit Graph

7767 Commits

Author SHA1 Message Date
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
artica f0d0ad540f Auto-updated build strings. 2023-11-05 01:00:18 +01:00
artica cc954ab471 Auto-updated build strings. 2023-11-04 01:00:23 +01:00
artica d05ffaac56 Auto-updated build strings. 2023-11-03 01:00:22 +01:00
Enrique Martin e6f505da54 Removed encryption functions from Tools.pm exporting 2023-11-02 12:53:38 +01:00
Enrique Martin 9e4ba18f49 Changed pandoraPlugintools encryption funcion and removed encryption functions from Tools.pm 2023-11-02 12:52:31 +01:00
Ramon Novoa 4060b27b72 Make LWP use IO::Socket::SSL instead of Net::SSL. 2023-11-02 12:51:27 +01:00
artica 5265ecbe9c Updated version and build strings. 2023-11-02 11:54:37 +01:00
Enrique Martin dc64816763 Exported encrypt and decrypt functions in Tools.pm 2023-11-02 11:26:20 +01:00
Enrique Martin 1a021c9689 Added Rijndael encryption for python pandoraPlugintools and PandoraFMS::Tools 2023-11-02 11:24:50 +01:00
Ramon Novoa 4b62b14f63 Pass the 'All' group as '' to Discovery apps.
The name of the 'All' group is localized. Pass '' instead of 'All' to
Discovery apps so they can easily handle it.
2023-11-02 10:03:40 +01:00
artica 20ac3cca46 Auto-updated build strings. 2023-11-02 01:00:20 +01:00
felix.suarez 3031e7ddbd Add export Encrypt AES to tools 2023-11-01 10:13:44 -06:00
artica 07a0a41ad9 Auto-updated build strings. 2023-11-01 01:00:29 +01:00
Ramon Novoa f700007cc0 Add monitoring capabilities to vulnerability scans. 2023-10-31 11:23:35 +01:00
artica b5098ab0e5 Auto-updated build strings. 2023-10-31 01:00:26 +01:00
Jonathan 63c74e2aa9 #8365 recovery after vscode revert error 2023-10-30 08:55:21 +01:00
artica 9cc5937c96 Auto-updated build strings. 2023-10-30 01:00:18 +01:00
artica d43b7d14fa Auto-updated build strings. 2023-10-29 01:00:20 +02:00
artica 2f07f59a7b Auto-updated build strings. 2023-10-28 01:00:20 +02:00
Calvo ecdb2cfd15 Merge remote-tracking branch 'origin/develop' into ent-12307-automonitorizacion-mysql-reads 2023-10-27 11:06:40 +02:00
artica c97d62ff0e Auto-updated build strings. 2023-10-27 01:00:24 +02:00
Ramon Novoa eade0aedbe Patch the Discovery Server to support vulnerability scans. 2023-10-26 18:51:01 +02:00
Ramon Novoa 1fbba70eb1 Add configuration options for vulnerability scans. 2023-10-26 18:50:27 +02:00
Calvo 936508174f Fix merge errors 2023-10-26 16:24:49 +02:00