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

27284 Commits

Author SHA1 Message Date
artica 63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
Daniel Rodriguez 4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
José González e0ec645613 Fixed issue with last hash symbol 2021-05-19 15:22:24 +02:00
José González 45b5ab4589 Added separator control 2021-05-19 12:40:06 +02:00
artica f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
José González 91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
Daniel Rodriguez 2f6a7143f3 Merge branch 'ent-7549-error-de-carga-link-publico-consolas-visuales' into 'develop' 
Common requirements using base url

See merge request artica/pandorafms!4137
 2021-05-18 14:33:07 +00:00
José González 5342ae077c id_agent default value 2021-05-18 15:27:45 +02:00
José González 46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
Rafael Ameijeiras 171275200a Merge branch 'ent-7551-add-expect-dependencie-cloudinstaller' into 'develop' 
adding expect to be used with ssh modules

See merge request artica/pandorafms!4138
 2021-05-18 10:08:49 +00:00
rafael.ameijeiras b0fbe192a0 adding expect to be used with ssh modules 2021-05-18 11:43:43 +02:00
fbsanchez 9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
José González 5cdc0b8a14 Code review 2021-05-18 10:52:39 +02:00
José González be6269fc89 Code review 2021-05-18 10:25:45 +02:00
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
Daniel Rodriguez 7244100737 Merge branch 'ent-6978-umbrales-inversos-fallan' into 'develop' 
Ent 6978 umbrales inversos fallan

See merge request artica/pandorafms!3949
 2021-05-17 13:00:59 +00:00
Daniel Maya fd372d53d1 Ent 6978 umbrales inversos fallan 2021-05-17 13:00:59 +00:00
alejandro.campos@artica.es 663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
Daniel Rodriguez 9d6d84ab6b Merge branch 'ent-5321-9399-error-agente-ssl-proxy-mode' into 'develop' 
Ent 5321 9399 error agente ssl proxy mode

See merge request artica/pandorafms!4124
 2021-05-17 11:20:44 +00:00
Daniel Rodriguez a6f41ede3d Merge branch 'ent-7521-Dynamic-Threshold-max-desactivado-por-error' into 'develop' 
Fixed issue with undesired deactivate dynamic threshold max field

Closes pandora_enterprise#7521

See merge request artica/pandorafms!4130
 2021-05-17 08:07:11 +00:00
Daniel Rodriguez 8b704cb2c1 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas-2' into 'develop' 
new bell orange

See merge request artica/pandorafms!4131
 2021-05-17 08:06:37 +00:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
marcos 9cde309222 new bell orange 2021-05-14 11:58:08 +02:00
Daniel Rodriguez 203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop' 
remove vamos a ver

See merge request artica/pandorafms!4126
 2021-05-14 09:39:07 +00:00
Daniel Rodriguez 823eb96d47 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas' into 'develop' 
changed bell orange

See merge request artica/pandorafms!4127
 2021-05-14 09:38:47 +00:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
José González 998fb4b0dc Fixed issue with undesired deactivate dynamic threshold max field 2021-05-14 11:22:32 +02:00
alejandro.campos@artica.es 2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es 86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
José González 0633ac24b9 Fixed issues with https calls 2021-05-13 16:43:18 +02:00
alejandro.campos@artica.es 1a194e1644 minor change 2021-05-13 14:10:42 +02:00
alejandro.campos@artica.es b52f971262 minor change 2021-05-13 14:06:54 +02:00
alejandro.campos@artica.es 172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop' 
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
 2021-05-13 11:14:44 +00:00
marcos 40cfe62e96 changed bell orange 2021-05-13 13:14:16 +02:00
marcos d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Daniel Rodriguez 16c40c3ed4 Merge branch '7027-log-rotate-para-el-log-de-snmpd-de-las-traps' into 'develop' 
Add a comment regarding snmp_logfile.

See merge request artica/pandorafms!4122
 2021-05-12 15:56:45 +00:00
Ramon Novoa 7d7c4db8f4 Revert "Use -C to invoke tentacle_server when using SSL proxy mode (see also e8e59f3e3e)." 
This reverts commit f005b00eb6.

-C is not a valid option for tentacle_server.
 2021-05-12 15:21:44 +02:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
José González 3758c80019 Fixed delete_files entries. 2021-05-12 13:07:45 +00:00
Daniel Rodriguez 6aa1188d35 Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop' 
Added missing fields to alert snmp actions

See merge request artica/pandorafms!3927
 2021-05-12 12:54:37 +00:00
Luis 7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00