From 8dd23dfda98226076cc34499c8363c2c46b96b86 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 28 Jul 2021 10:36:59 +0800 Subject: [PATCH] =?UTF-8?q?feature:TSG-7213=E5=A2=9E=E5=8A=A0feature?= =?UTF-8?q?=E9=80=89=E9=A1=B9=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=94=9F=E6=88=90minidump=E6=88=96=E4=BC=A0=E7=BB=9F=E7=9A=84c?= =?UTF-8?q?oredump=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certstore/templates/cert_store.ini.j2.j2 | 27 ++++++++++++++++--- ansible/roles/sapp/templates/sapp.toml.j2.j2 | 21 +++++++++++++-- ansible/roles/tfe/templates/tfe.conf.j2.j2 | 20 +++++++++++++- .../provision.yml.sample.7400MCN0P01R01 | 6 +++-- .../provision.yml.sample.7400MCN123P01R01 | 6 +++-- .../provision.yml.sample.9000NPBP01R01 | 6 +++-- 6 files changed, 73 insertions(+), 13 deletions(-) diff --git a/ansible/roles/certstore/templates/cert_store.ini.j2.j2 b/ansible/roles/certstore/templates/cert_store.ini.j2.j2 index 5f1589df..f7d5b864 100644 --- a/ansible/roles/certstore/templates/cert_store.ini.j2.j2 +++ b/ansible/roles/certstore/templates/cert_store.ini.j2.j2 @@ -4,12 +4,31 @@ DEBUG_SWITCH = 1 RUN_LOG_PATH = "conf/zlog.conf" [breakpad] -disable_coredump=0 -enable_breakpad=1 -breakpad_minidump_dir=/tmp/certstore/crashreport -enable_breakpad_upload=1 {% raw %}breakpad_upload_url= {{ sentry_url }} {% endraw %} +{% raw %}{% if coredump.format == 'none' %} + disable_coredump=1 + enable_breakpad=0 + enable_breakpad_upload=0 +{% endif %} +{% if coredump.format == 'core' %} + disable_coredump=0 + enable_breakpad=0 + enable_breakpad_upload=0 +{% endif %} +{% if coredump.format == 'minidump' %} + disable_coredump=1 + enable_breakpad=1 +{% if coredump.collect == 'sentry' %} + enable_breakpad_upload=1 + breakpad_upload_url={{ coredump.sentry_url }} +{% endif %} +{% if coredump.collect == 'local' %} + enable_breakpad_upload=0 +{% endif %} +{% endif %} +{% endraw %} + breakpad_minidump_dir="/tmp/crashreport" [CONFIG] #Number of running threads thread-nu = 4 diff --git a/ansible/roles/sapp/templates/sapp.toml.j2.j2 b/ansible/roles/sapp/templates/sapp.toml.j2.j2 index 8ccdae10..e511824a 100644 --- a/ansible/roles/sapp/templates/sapp.toml.j2.j2 +++ b/ansible/roles/sapp/templates/sapp.toml.j2.j2 @@ -192,12 +192,29 @@ dictator_enable=1 [breakpad] +{% raw %}{% if coredump.format == 'none' %} + disable_coredump=1 + enable_breakpad=0 + enable_breakpad_upload=0 +{% endif %} +{% if coredump.format == 'core' %} + disable_coredump=0 + enable_breakpad=0 + enable_breakpad_upload=0 +{% endif %} +{% if coredump.format == 'minidump' %} disable_coredump=1 enable_breakpad=1 - breakpad_minidump_dir="/tmp/crashreport" +{% if coredump.collect == 'sentry' %} enable_breakpad_upload=1 -{% raw %} breakpad_upload_url="{{ sentry_url }}" + breakpad_upload_url={{ coredump.sentry_url }} +{% endif %} +{% if coredump.collect == 'local' %} + enable_breakpad_upload=0 +{% endif %} +{% endif %} {% endraw %} + breakpad_minidump_dir="/tmp/crashreport" ### note: ### These configurations format is complex and difficult to describe with toml grammar, diff --git a/ansible/roles/tfe/templates/tfe.conf.j2.j2 b/ansible/roles/tfe/templates/tfe.conf.j2.j2 index 14a32062..208b3142 100644 --- a/ansible/roles/tfe/templates/tfe.conf.j2.j2 +++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2 @@ -5,10 +5,28 @@ enable_kni_v2=0 enable_kni_v3=1 # Only when (disable_coredump == 1 || (enable_breakpad == 1 && enable_breakpad_upload == 1)) is satisfied, the core will not be generated locally + +{% raw %}{% if coredump.format == 'none' %} +disable_coredump=1 +enable_breakpad=0 +enable_breakpad_upload=0 +{% endif %} +{% if coredump.format == 'core' %} disable_coredump=0 +enable_breakpad=0 +enable_breakpad_upload=0 +{% endif %} +{% if coredump.format == 'minidump' %} +disable_coredump=1 enable_breakpad=1 +{% if coredump.collect == 'sentry' %} enable_breakpad_upload=1 -{% raw %}breakpad_upload_url={{ sentry_url }} +breakpad_upload_url={{ coredump.sentry_url }} +{% endif %} +{% if coredump.collect == 'local' %} +enable_breakpad_upload=0 +{% endif %} +{% endif %} {% 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/config_sample/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 index c059bf44..2f9fc229 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 @@ -8,8 +8,10 @@ cm: db_static: 0 db_dynamic: 1 -sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 - +coredump: + format: minidump/core/none + collect: local/sentry + sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 data_center: name: City instance diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01 index 0f233620..caece746 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01 @@ -8,8 +8,10 @@ cm: db_static: 0 db_dynamic: 1 -sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 - +coredump: + enable: 1/0 + collect: local/sentry + sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 data_center: name: City instance diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 index 28d72ad6..9ce13a7c 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 @@ -8,8 +8,10 @@ cm: db_static: 0 db_dynamic: 1 -sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 - +coredump: + enable: 1/0 + collect: local/sentry + sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 data_center: name: City instance