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

5825 Commits

Author SHA1 Message Date
artica ab0fda5a5d Auto-updated build strings. 2023-08-03 01:00:42 +02:00
artica d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
artica dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
artica 3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
artica c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00
artica 0682574cc8 Auto-updated build strings. 2023-07-29 01:00:52 +02:00
artica 5692f69ed4 Auto-updated build strings. 2023-07-28 01:00:46 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
Daniel Rodriguez 0c6877e7d2 Merge branch 'ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery' into 'develop' 
Ent 9771 discovery 2 0 sistema de extensiones disco para el discovery

See merge request artica/pandorafms!5603
 2023-07-27 07:24:09 +00:00
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
artica 244c717355 Auto-updated build strings. 2023-07-26 01:00:54 +02:00
Rafael Ameijeiras bb74aa13bd Merge branch 'ent-11672-cambiar-referencias-a-artica-st-por-pandora-fms' into 'develop' 
Ent 11672 cambiar referencias a artica st por pandora fms

Closes pandora_enterprise#11672

See merge request artica/pandorafms!6198
 2023-07-25 07:50:53 +00:00
artica 1de2fe9898 Auto-updated build strings. 2023-07-25 01:02:35 +02:00
artica c57fb14bc2 Auto-updated build strings. 2023-07-24 01:00:48 +02:00
artica 3e6f88e812 Auto-updated build strings. 2023-07-23 01:00:51 +02:00
artica 13552e74f1 Auto-updated build strings. 2023-07-22 01:00:52 +02:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00
artica 1f722998e6 Auto-updated build strings. 2023-07-20 01:01:06 +02:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
artica e645f65e8e Auto-updated build strings. 2023-07-19 01:00:45 +02:00
Daniel Rodriguez 3482ef7d8e Merge branch 'ent-11448-comportamiento-extrano-tras-cambios-del-ticket-https-brutus-artica-es-8081-artica' into 'develop' 
Ent-11448-comportamiento-extrano-tras-cambios-del-ticket-https-brutus-artica-es-8081-artica

See merge request artica/pandorafms!6124
 2023-07-18 10:41:22 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
artica 20e05f677e Auto-updated build strings. 2023-07-18 01:01:01 +02:00
Diego Muñoz-Reja f69ef73232 Merge branch 'ent-11251-macros-_moduletags_-y-_policy_-no-muestran-datos' into 'develop' 
Ent-11251 macros _moduletags_ y _policy_ no muestran datos

See merge request artica/pandorafms!6011
 2023-07-17 08:54:31 +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
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
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
artica 0a6301a3a8 Auto-updated build strings. 2023-07-14 01:00:57 +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
Félix Suárez 356a3cc9c3 Modify aditional user/pass on core. 2023-07-12 08:31:52 -06: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
alejandro c4444e9f9c fix warning plugintools 2023-07-12 10:15:13 +02:00
artica 6e180ca5ad Auto-updated build strings. 2023-07-12 01:00:54 +02:00
Félix Suárez d17d3bd3eb Use server UID to authorize instead of user/pass. 2023-07-11 14:38:14 -06:00
artica 93ec27179c Auto-updated build strings. 2023-07-11 01:01:00 +02:00
alejandro 7991c6fd54 change regexp snmp value to accept negative numbers 2023-07-10 16:44:51 +02:00
daniel 7a84419f3f Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-10 08:52:46 +02:00
artica f89a8bd80e Auto-updated build strings. 2023-07-10 01:00:55 +02:00
artica 9e120f0acf Auto-updated build strings. 2023-07-09 01:00:45 +02:00
artica 089b856641 Auto-updated build strings. 2023-07-08 01:00:45 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
artica 4f4079144d Auto-updated build strings. 2023-07-07 01:01:46 +02:00