From cf38f74bdeb7feff34617368f04688a8c60ed806 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 23 Feb 2022 13:51:17 +0800 Subject: [PATCH] 22.02 update --- TSG发布版本更新记录/TSG-21.11/nginx/nginx.conf | 5 +++-- TSG发布版本更新记录/TSG-22.02/clickhouse/update-02-ck.sql | 3 +-- TSG发布版本更新记录/TSG-22.02/hos/create_bucket.txt | 2 ++ TSG发布版本更新记录/TSG-22.02/job/update-02-job.sql | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 TSG发布版本更新记录/TSG-22.02/hos/create_bucket.txt create mode 100644 TSG发布版本更新记录/TSG-22.02/job/update-02-job.sql diff --git a/TSG发布版本更新记录/TSG-21.11/nginx/nginx.conf b/TSG发布版本更新记录/TSG-21.11/nginx/nginx.conf index 745fc37..fbfe5ba 100644 --- a/TSG发布版本更新记录/TSG-21.11/nginx/nginx.conf +++ b/TSG发布版本更新记录/TSG-21.11/nginx/nginx.conf @@ -1,4 +1,4 @@ -worker_processes auto; +worker_processes auto; events { worker_connections 4096; @@ -18,7 +18,8 @@ http { access_log off; # 关闭access日志 upstream hos { - server {{ machine_host }}:8186; + server {{ hos_ip1 }}:8186; + server {{ hos_ip2 }}:8186; keepalive 1000; keepalive_timeout 65; keepalive_requests 100000; diff --git a/TSG发布版本更新记录/TSG-22.02/clickhouse/update-02-ck.sql b/TSG发布版本更新记录/TSG-22.02/clickhouse/update-02-ck.sql index 27bfa65..eea9780 100644 --- a/TSG发布版本更新记录/TSG-22.02/clickhouse/update-02-ck.sql +++ b/TSG发布版本更新记录/TSG-22.02/clickhouse/update-02-ck.sql @@ -71,8 +71,7 @@ CREATE TABLE IF NOT EXISTS tsg_galaxy_v3.assessment_event_local ON CLUSTER ck_c ) ENGINE = MergeTree PARTITION BY toYYYYMMDD(toDate(common_recv_time)) -ORDER BY (common_log_id, - common_recv_time) +ORDER BY (common_log_id, common_recv_time); CREATE TABLE IF NOT EXISTS tsg_galaxy_v3.assessment_event ON CLUSTER ck_cluster ( diff --git a/TSG发布版本更新记录/TSG-22.02/hos/create_bucket.txt b/TSG发布版本更新记录/TSG-22.02/hos/create_bucket.txt new file mode 100644 index 0000000..8af11df --- /dev/null +++ b/TSG发布版本更新记录/TSG-22.02/hos/create_bucket.txt @@ -0,0 +1,2 @@ +新增桶 +assessment_hos_bucket \ No newline at end of file diff --git a/TSG发布版本更新记录/TSG-22.02/job/update-02-job.sql b/TSG发布版本更新记录/TSG-22.02/job/update-02-job.sql new file mode 100644 index 0000000..093d383 --- /dev/null +++ b/TSG发布版本更新记录/TSG-22.02/job/update-02-job.sql @@ -0,0 +1,2 @@ +INSERT INTO `xxl_job_info` VALUES ('101', '3', '0 0 0 1/7 * ?', 'Web-Sketch-Assessment-File', '2022-01-27 17:40:42', '2022-02-23 02:16:56', 'galaxy', '', 'FAILOVER', 'httpToStoreJobHandler', ' [{\r\n \"url\": \"http://192.168.44.12:9999/?option=long-term&resultId=1&query=SELECT http_domain AS name, arrayStringConcat(groupUniqArray(common_l7_protocol),\',\') AS protocol, count(*) AS sessions FROM tsg_galaxy_v3.session_record WHERE common_recv_time >= toStartOfDay(now()- INTERVAL 7 DAY) AND common_recv_time < toStartOfDay(now()) AND notEmpty(http_domain) GROUP BY name ORDER BY sessions DESC LIMIT 500000;\",\r\n \"method\": \"get\",\r\n \"requestBody\": {},\r\n \"resultKey\": \"data\",\r\n \"store\": \"all\"\r\n}, {\r\n \"url\": \"http://192.168.44.12:9999/?option=long-term&resultId=1&query=SELECT http_domain AS name, arrayStringConcat(groupUniqArray(common_l7_protocol),\',\') AS protocol, count(*) AS sessions FROM tsg_galaxy_v3.session_record WHERE common_recv_time >= toStartOfDay(now()- INTERVAL 7 DAY) AND common_recv_time < toStartOfDay(now()) AND notEmpty(http_domain) AND empty(common_service_category) AND http_domain NOT IN (select http_domain FROM tsg_galaxy_v3.session_record WHERE common_recv_time >= toStartOfDay(now()- INTERVAL 7 DAY) AND common_recv_time < toStartOfDay(now()) AND notEmpty(http_domain) AND notEmpty(common_service_category)) GROUP BY name ORDER BY sessions DESC LIMIT 500000;\",\r\n \"method\": \"get\",\r\n \"requestBody\": {},\r\n \"resultKey\": \"data\",\r\n \"store\": \"uncategorized\"\r\n}]', 'COVER_EARLY', '0', '0', 'BEAN', '', 'GLUE代码初始化', '2022-01-27 17:40:42', '', '1', '1645488000000', '1646092800000'); +INSERT INTO `xxl_job_info` VALUES ('103', '3', '0 0 0/4 * * ?', 'IP-Locate-Library', '2022-02-08 15:14:04', '2022-02-10 15:26:28', 'tian', '', 'FIRST', 'IPLocateLibraryJobHandler', 'docker run -it -d --rm -v /home/galaxy/volumes/mmdb:/mmdb -v /home/galaxy/volumes/mmdb/mmdb-perl-user-defined.pl:/mmdb-perl-user-defined.pl -v /home/galaxy/volumes/mmdb/mmdb-perl-built-in.pl:/mmdb-perl-built-in.pl --name my-running-script 192.168.40.153:9080/tsg/perl:v3 sh -c \'cd /mmdb &&perl /mmdb-perl-user-defined.pl && perl /mmdb-perl-built-in.pl\'', 'SERIAL_EXECUTION', '200000', '0', 'BEAN', '', 'GLUE代码初始化', '2022-02-08 15:14:04', '', '1', '1644566511000', '1644566512000');