From 29555f5f360133ac0d2ef7789cf3fa592bf38e45 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 22 Jun 2021 14:56:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E5=B0=86breakpad=5Fupload=5Furl?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E4=B8=BAsentry=5Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/certstore/templates/cert_store.ini.j2.j2 | 2 +- ansible/roles/sapp/templates/sapp.toml.j2.j2 | 2 +- ansible/roles/tfe/templates/tfe.conf.j2.j2 | 2 +- .../files/tsg-os-provision/provision.yml.sample | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ansible/roles/certstore/templates/cert_store.ini.j2.j2 b/ansible/roles/certstore/templates/cert_store.ini.j2.j2 index e9c93550..8ebdc965 100644 --- a/ansible/roles/certstore/templates/cert_store.ini.j2.j2 +++ b/ansible/roles/certstore/templates/cert_store.ini.j2.j2 @@ -9,7 +9,7 @@ enable_breakpad=1 breakpad_minidump_dir=/tmp/certstore/crashreport enable_breakpad_upload=1 {% raw %} -breakpad_upload_url= {{ breakpad_upload_url }} +breakpad_upload_url= {{ sentry_url }} {% endraw %} [CONFIG] #Number of running threads diff --git a/ansible/roles/sapp/templates/sapp.toml.j2.j2 b/ansible/roles/sapp/templates/sapp.toml.j2.j2 index adf6f63c..3d375426 100644 --- a/ansible/roles/sapp/templates/sapp.toml.j2.j2 +++ b/ansible/roles/sapp/templates/sapp.toml.j2.j2 @@ -197,7 +197,7 @@ dictator_enable=1 breakpad_minidump_dir="/tmp/crashreport" enable_breakpad_upload=1 {% raw %} - breakpad_upload_url="{{ breakpad_upload_url }}" + breakpad_upload_url="{{ sentry_url }}" {% endraw %} ### note: diff --git a/ansible/roles/tfe/templates/tfe.conf.j2.j2 b/ansible/roles/tfe/templates/tfe.conf.j2.j2 index 508e6e77..28676683 100644 --- a/ansible/roles/tfe/templates/tfe.conf.j2.j2 +++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2 @@ -9,7 +9,7 @@ disable_coredump=0 enable_breakpad=1 enable_breakpad_upload=1 {% raw %} -breakpad_upload_url={{ breakpad_upload_url }} +breakpad_upload_url={{ sentry_url }} {% endraw %} # must be /run/tfe/crashreport，due to tmpfile limit breakpad_minidump_dir=/run/tfe/crashreport diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample index b8fe442c..acc6c0c0 100644 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample @@ -10,7 +10,8 @@ CM: index_dynamic: 1 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 +sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 + data_center: Kyzylorda tsg_master_entrance_id: 9