b0b50654db
Revert "Specify -C option to Launch tentacle_server when using SSL proxy mode."
...
This reverts commit ed53b3c67b
2021-05-12 13:32:10 +02:00
a08a69fa91
#7522 fixed duplicate ip_target
2021-05-12 12:39:56 +02:00
5021f66808
Merge branch 'ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando' into 'develop'
...
Unify the format of product version messages.
See merge request artica/pandorafms!4121
2021-05-12 09:11:38 +00:00
3cfb07a36f
Merge remote-tracking branch 'origin/develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando
2021-05-12 10:18:30 +02:00
83822395f6
Merge branch 'develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando
2021-05-12 10:01:52 +02:00
4e871ed296
Merge branch 'ent-6983-typo-en-traduccion' into 'develop'
...
fixed wrong string
See merge request artica/pandorafms!4099
2021-05-12 07:55:09 +00:00
90573feb1b
Issue with Perl5 paths
2021-05-12 09:35:35 +02:00
dc15f736b5
Merge branch 'ent-6858-Goliat-opensource' of brutus.artica.es:artica/pandorafms into ent-6858-Goliat-opensource
2021-05-12 09:19:07 +02:00
9e9ea4d00a
Merge with last develop
2021-05-12 09:17:32 +02:00
671c1ca0a3
Auto-updated build strings.
2021-05-12 01:00:48 +02:00
47c73518bd
Add a comment regarding snmp_logfile.
...
There's an entry for pandora_snmptrap.log in
/etc/logrotate.d/pandora_server which should be updated if snmp_logfile
is changed in pandora_server.conf. Ref. pandora_enterprise#7027.
2021-05-11 17:40:15 +02:00
8a3d977e82
Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop'
...
Ent 5401 búsqueda de módulo por id al llegar desde link de consola
See merge request artica/pandorafms!4026
2021-05-11 15:38:01 +00:00
315e7dc996
Merge branch 'ent-6143-desinstalacion-de-agente-en-ruta-personalizada' into 'develop'
...
Issue with custom agent installation
See merge request artica/pandorafms!4115
2021-05-11 13:51:19 +00:00
dcbeaa1b3e
Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop'
...
Fixed visual bug on event modal event responses
See merge request artica/pandorafms!4022
2021-05-11 13:49:40 +00:00
b9398604f6
Fixed visual bug on event modal event responses
2021-05-11 13:49:40 +00:00
858adb2628
Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop'
...
Fixed errors diagnostic
See merge request artica/pandorafms!4047
2021-05-11 13:48:55 +00:00
e5a06ba29a
Merge branch 'ent-7087-Mensaje-duplicado-en-los-test-mails' into 'develop'
...
Ent 7087 mensaje duplicado en los test mails
See merge request artica/pandorafms!3973
2021-05-11 13:48:09 +00:00
9c234eef85
Ent 7087 mensaje duplicado en los test mails
2021-05-11 13:48:09 +00:00
5aa5e9eab4
Merge branch 'develop' into 'ent-6858-Goliat-opensource'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
2021-05-11 13:11:51 +00:00
128f67b058
Merge branch 'ent-7139-clickjacking' into 'develop'
...
Avoiding clickjacking
Closes pandora_enterprise#7139
See merge request artica/pandorafms!4013
2021-05-11 09:45:08 +00:00
fc4d3b7d23
Merge branch 'ent-7302-bug-en-macro-moduledata-x' into 'develop'
...
Fixed encoding ampersand on mail alerts
See merge request artica/pandorafms!4035
2021-05-11 09:44:15 +00:00
fb539be410
Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop'
...
fixed bug in file attachment
See merge request artica/pandorafms!4102
2021-05-11 07:40:54 +00:00
89dcde6ca7
Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop'
...
minor changes
See merge request artica/pandorafms!4107
2021-05-11 07:40:24 +00:00
f77d774a32
Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop'
...
fixed visual error black theme
See merge request artica/pandorafms!4100
2021-05-11 07:39:58 +00:00
ac0ef3c61c
Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop'
...
minor change in integria ims setup
See merge request artica/pandorafms!4104
2021-05-11 07:39:16 +00:00
de58f0533b
Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop'
...
Ent 6618 giss nombres de servicios aleatorios
See merge request artica/pandorafms!4039
2021-05-11 07:37:49 +00:00
197e156869
Merge branch 'ent-5264-Report-vacio-mails-console-tasks' into 'develop'
...
Added function for use templates in emails
Closes pandora_enterprise#5264
See merge request artica/pandorafms!4027
2021-05-11 07:35:01 +00:00
6bdd983755
Auto-updated build strings.
2021-05-11 01:00:46 +02:00
6939ec4d44
Unify the format of product version messages.
2021-05-10 17:58:17 +02:00
847b567f5c
Merge branch 'ent-7516-warnings-en-ejecuccion-de-vmware-plugin-pl' into 'develop'
...
avoid warnings in old perl versions
See merge request artica/pandorafms!4114
2021-05-10 11:06:45 +00:00
fd7eb10f3e
Merge branch 'ent-7340-Mensaje-ajax-php-permanente-en-el-log-de-consola' into 'develop'
...
remove log input
See merge request artica/pandorafms!4103
2021-05-10 09:52:08 +00:00
e492214e0b
Merge branch 'ent-5680-llamada-api-set-update-agent-field' into 'develop'
...
Ent 5680 llamada api set update agent field
See merge request artica/pandorafms!4118
2021-05-10 09:49:43 +00:00
61dc2e833b
Ent 5680 llamada api set update agent field
2021-05-10 09:49:43 +00:00
b6169575a9
Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop'
...
Ent 7155 bug edicion tickets integria
See merge request artica/pandorafms!3991
2021-05-10 09:17:14 +00:00
a94c70551d
Ent 7155 bug edicion tickets integria
2021-05-10 09:17:14 +00:00
826e9edddb
Merge branch 'ent-7481-black-theme-segunda-solapa-de-vista-de-un-agente-no-tiene-tabla' into 'develop'
...
fixed visual error black theme event modal
See merge request artica/pandorafms!4098
2021-05-10 09:16:19 +00:00
8f324b942b
fixed visual error black theme event modal
2021-05-10 09:16:19 +00:00
a0197dab87
Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop'
...
Ent 7453 busqueda alertas en vista de agente no funciona
See merge request artica/pandorafms!4084
2021-05-10 09:15:40 +00:00
4c768bc6cd
Merge branch 'ent-7439-metaconsola-dashboard-fallo-link-publico' into 'develop'
...
Reference to base public_dashboard url
See merge request artica/pandorafms!4081
2021-05-10 09:14:58 +00:00
12ccb680d6
Merge branch 'ent-7099-11462-Crear-grupo-de-agentes-con-contraseña-mediante-la-API' into 'develop'
...
Added new field in api call
See merge request artica/pandorafms!4040
2021-05-10 09:14:25 +00:00
d1e0f070f1
Merge branch 'ent-7296-botones-descolocados-gestion-eventos-metaconsola' into 'develop'
...
Event responses buttons visual bug
See merge request artica/pandorafms!4111
2021-05-10 09:11:29 +00:00
5a339ac76e
Merge branch 'ent-7284-Warning-creación-agente' into 'develop'
...
Ent 7284 warning creación agente
See merge request artica/pandorafms!4017
2021-05-10 09:10:43 +00:00
cdf0e1a4f4
Ent 7284 warning creación agente
2021-05-10 09:10:43 +00:00
3d8f0b58d6
Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop'
...
Fix bugs with SLA item reports
Closes pandora_enterprise#7258
See merge request artica/pandorafms!4000
2021-05-10 09:09:36 +00:00
514a91c853
Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop'
...
Ent 6541 quitar id usuario url seccion usuario
Closes pandora_enterprise#6541
See merge request artica/pandorafms!3990
2021-05-10 09:08:59 +00:00
d878fdfdb8
Merge branch 'ent-7184-duplicate-web-server-module' into 'develop'
...
Ent 7184 duplicate web server module
Closes pandora_enterprise#7184
See merge request artica/pandorafms!3978
2021-05-10 09:08:09 +00:00
6faefa4afa
Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
...
Unified downtime name as scheduled downtime
See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
f25256a74d
Unified downtime name as scheduled downtime
2021-05-10 09:06:43 +00:00
c6068a8544
Merge branch 'ent-7113-warning-ejecucion-erronea-pandora_server' into 'develop'
...
Fixed issue with execution without correct params
Closes pandora_enterprise#7113
See merge request artica/pandorafms!3989
2021-05-10 08:53:21 +00:00
b609bbfdd9
Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop'
...
Fixed metaconsole ACL on module graphs view
See merge request artica/pandorafms!3987
2021-05-10 08:15:50 +00:00
Ramon Novoa
Daniel Maya
Daniel Rodriguez
José González
artica
Luis
José González
Ramon Novoa
Marcos Alconada