From 0575954b2eecdae4796cf4fc3301d936bf3acec0 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 28 Apr 2021 10:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0pangu=5Fpxy.log=5Fcache?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aktau_install_config/group_vars/adc_global.yml | 9 ++++++++- Aktubinsk_install_config/group_vars/adc_global.yml | 8 +++++++- Almaty_install_config/group_vars/adc_global.yml | 8 +++++++- Atyrau_install_config/group_vars/adc_global.yml | 8 +++++++- Karaganda_install_config/group_vars/adc_global.yml | 8 +++++++- Kokshetau_install_config/group_vars/adc_global.yml | 6 ++++++ Kostanay_install_config/group_vars/adc_global.yml | 6 ++++++ Kyzylorda_install_config/group_vars/adc_global.yml | 8 +++++++- NurSultan_install_config/group_vars/adc_global.yml | 6 ++++++ Pavlodar_install_config/group_vars/adc_global.yml | 6 ++++++ Petropavl_install_config/group_vars/adc_global.yml | 6 ++++++ Semey_install_config/group_vars/adc_global.yml | 6 ++++++ Shymkent_install_config/group_vars/adc_global.yml | 6 ++++++ Taldykurgan_install_config/group_vars/adc_global.yml | 8 +++++++- Taraz_install_config/group_vars/adc_global.yml | 6 ++++++ Uralsk_install_config/group_vars/adc_global.yml | 8 +++++++- UstKamenogorsk_install_config/group_vars/adc_global.yml | 6 ++++++ Zhezkazgan_install_config/group_vars/adc_global.yml | 6 ++++++ roles/tfe/templates/pangu_pxy.conf.j2 | 4 ++-- 19 files changed, 119 insertions(+), 10 deletions(-) diff --git a/Aktau_install_config/group_vars/adc_global.yml b/Aktau_install_config/group_vars/adc_global.yml index 84358ac..53a4be4 100644 --- a/Aktau_install_config/group_vars/adc_global.yml +++ b/Aktau_install_config/group_vars/adc_global.yml @@ -43,6 +43,13 @@ log_minio: address: "10.1.62.253" port: 9090 + +pangu_pxy: + log_cache: + address: "10.1.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +58,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/Aktubinsk_install_config/group_vars/adc_global.yml b/Aktubinsk_install_config/group_vars/adc_global.yml index b76061e..e226584 100644 --- a/Aktubinsk_install_config/group_vars/adc_global.yml +++ b/Aktubinsk_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.2.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.2.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/Almaty_install_config/group_vars/adc_global.yml b/Almaty_install_config/group_vars/adc_global.yml index 4faaf40..11b5a8c 100644 --- a/Almaty_install_config/group_vars/adc_global.yml +++ b/Almaty_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.3.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.3.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/Atyrau_install_config/group_vars/adc_global.yml b/Atyrau_install_config/group_vars/adc_global.yml index 37c7f55..ad68452 100644 --- a/Atyrau_install_config/group_vars/adc_global.yml +++ b/Atyrau_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.5.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.5.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/Karaganda_install_config/group_vars/adc_global.yml b/Karaganda_install_config/group_vars/adc_global.yml index 73952ac..39afa99 100644 --- a/Karaganda_install_config/group_vars/adc_global.yml +++ b/Karaganda_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.6.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.6.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/Kokshetau_install_config/group_vars/adc_global.yml b/Kokshetau_install_config/group_vars/adc_global.yml index 0883495..b86a4a8 100644 --- a/Kokshetau_install_config/group_vars/adc_global.yml +++ b/Kokshetau_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.7.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.7.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Kostanay_install_config/group_vars/adc_global.yml b/Kostanay_install_config/group_vars/adc_global.yml index df61755..e9a6262 100644 --- a/Kostanay_install_config/group_vars/adc_global.yml +++ b/Kostanay_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.8.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.8.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Kyzylorda_install_config/group_vars/adc_global.yml b/Kyzylorda_install_config/group_vars/adc_global.yml index 326f506..912bb01 100644 --- a/Kyzylorda_install_config/group_vars/adc_global.yml +++ b/Kyzylorda_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.9.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.9.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/NurSultan_install_config/group_vars/adc_global.yml b/NurSultan_install_config/group_vars/adc_global.yml index 2de720d..7a5d4d4 100644 --- a/NurSultan_install_config/group_vars/adc_global.yml +++ b/NurSultan_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.4.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.4.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Pavlodar_install_config/group_vars/adc_global.yml b/Pavlodar_install_config/group_vars/adc_global.yml index 170e3a1..71c7a6b 100644 --- a/Pavlodar_install_config/group_vars/adc_global.yml +++ b/Pavlodar_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.19.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.19.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Petropavl_install_config/group_vars/adc_global.yml b/Petropavl_install_config/group_vars/adc_global.yml index eab3c4a..5436f38 100644 --- a/Petropavl_install_config/group_vars/adc_global.yml +++ b/Petropavl_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.11.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.11.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Semey_install_config/group_vars/adc_global.yml b/Semey_install_config/group_vars/adc_global.yml index e9d9fee..3a267af 100644 --- a/Semey_install_config/group_vars/adc_global.yml +++ b/Semey_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.12.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.12.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Shymkent_install_config/group_vars/adc_global.yml b/Shymkent_install_config/group_vars/adc_global.yml index 31ef7f5..5c41d13 100644 --- a/Shymkent_install_config/group_vars/adc_global.yml +++ b/Shymkent_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.13.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.13.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Taldykurgan_install_config/group_vars/adc_global.yml b/Taldykurgan_install_config/group_vars/adc_global.yml index 6d66515..ec71a33 100644 --- a/Taldykurgan_install_config/group_vars/adc_global.yml +++ b/Taldykurgan_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.14.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.14.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/Taraz_install_config/group_vars/adc_global.yml b/Taraz_install_config/group_vars/adc_global.yml index 75d1bd9..9bc4303 100644 --- a/Taraz_install_config/group_vars/adc_global.yml +++ b/Taraz_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.15.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.15.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Uralsk_install_config/group_vars/adc_global.yml b/Uralsk_install_config/group_vars/adc_global.yml index c3f2d08..61fcd11 100644 --- a/Uralsk_install_config/group_vars/adc_global.yml +++ b/Uralsk_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.16.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.16.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL @@ -51,7 +57,7 @@ fw_mail_log_level: 10 fw_http_log_level: 10 fw_dns_log_level: 10 fw_quic_log_level: 10 -app_control_log_level: 10 +app_control_log_level: 10 capture_packet_log_level: 10 tsg_log_level: 10 tsg_master_log_level: 10 diff --git a/UstKamenogorsk_install_config/group_vars/adc_global.yml b/UstKamenogorsk_install_config/group_vars/adc_global.yml index 45f4dd4..5506965 100644 --- a/UstKamenogorsk_install_config/group_vars/adc_global.yml +++ b/UstKamenogorsk_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.17.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.17.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/Zhezkazgan_install_config/group_vars/adc_global.yml b/Zhezkazgan_install_config/group_vars/adc_global.yml index 5985962..df14d75 100644 --- a/Zhezkazgan_install_config/group_vars/adc_global.yml +++ b/Zhezkazgan_install_config/group_vars/adc_global.yml @@ -43,6 +43,12 @@ log_minio: address: "10.18.62.253" port: 9090 +pangu_pxy: + log_cache: + address: "10.18.61.253" + port: 9098 + + ######################################### #Log Level Config #日志等级 10:DEBUG 20:INFO 30:FATAL diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2 index ed23571..d7c372a 100644 --- a/roles/tfe/templates/pangu_pxy.conf.j2 +++ b/roles/tfe/templates/pangu_pxy.conf.j2 @@ -7,8 +7,8 @@ en_sendlog=1 entrance_id=0 #Addresses of hos, Bucket name in hos. Format is defined by WiredLB. -cache_ip_list= {{ log_minio.address }} -cache_listen_port= {{ log_minio.port }} +cache_ip_list= {{ pangu_pxy.log_cache.address }} +cache_listen_port= {{ pangu_pxy.log_cache.port }} cache_bucket_name=hos/proxy_hos_bucket cache_token=c21f969b5f03d33d43e04f8f136e7682