From fbe35e2c26fc340e5bbd3bc0476a02efb127dee8 Mon Sep 17 00:00:00 2001
From: "jingshun.tq" <35712518+Teingi@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:06:33 +0800
Subject: [PATCH] Fix some minor bugs in version 3.0.0 (#655)

* Rename Dockerfile to DockerFile

* Focused efforts on addressing bugs identified in the 3.0.0 iteration

* 3.0.0 fix bug

* fix

* fix

* fix
---
 .gitignore                                | 5 ++++-
 .secignore                                | 4 +---
 plugins/gather/tasks/observer/memory.yaml | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 990bea80..b3e64ac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,7 @@ dependencies/python2/site-packages
 dependencies/python2/libs
 dependencies/python3/site-packages
 dependencies/python3/libs
-gather_pack_*
+obdiag_gather_pack_*
+obdiag_analyze_pack_*
+obdiag_rca*
+
diff --git a/.secignore b/.secignore
index 36b1f7fb..8534a354 100644
--- a/.secignore
+++ b/.secignore
@@ -24,8 +24,6 @@ BFlow Secret Scan Ignore List              #
   https://github.com/oceanbase/obdiag/issues/*
 **/README.md
   http://xxx.xxx.xxx.xxx:xxxx
-**/init.sh
-  https://mirrors.aliyun.com/oceanbase/OceanBase.repo
 **/dependencies/bin/obstack_x86_64_7
   http://llvm.org/):
 **/resources/web/bootstrap.min.js
@@ -34,7 +32,7 @@ BFlow Secret Scan Ignore List              #
   https://github.com/twbs/bootstrap/blob/main/LICENSE)
   https://popper.js.org/)
   https://popper.js.org/)
-**/common/constant.py
+**/src/common/constant.py
   openwebapi-pre.oceanbase.com*
   openwebapi.oceanbase.com*
   openwebapi-pre.oceanbase.com*
diff --git a/plugins/gather/tasks/observer/memory.yaml b/plugins/gather/tasks/observer/memory.yaml
index c871f6e5..1f18193c 100644
--- a/plugins/gather/tasks/observer/memory.yaml
+++ b/plugins/gather/tasks/observer/memory.yaml
@@ -100,7 +100,7 @@ task:
         sql: "SELECT CASE WHEN tenant_name IS NULL THEN TENANT_ID ELSE tenant_name END tenant_name, host,ctx_name, mod_name, hold, used, count FROM ( SELECT tenant_name,tenant_id,HOST,ctx_name,mod_name,hold,used,COUNT, ROW_NUMBER () OVER ( PARTITION BY tenant_name, HOST ORDER BY hold desc) rnum FROM   (SELECT  b.tenant_name, a.tenant_id, concat(a.svr_ip, ':', a.svr_port) HOST,  a.ctx_name, a.mod_name,  round(a.hold / 1024 / 1024 / 1024) hold, round(a.used / 1024 / 1024 / 1024) used, a.COUNT FROM  oceanbase.__all_virtual_memory_info a  LEFT JOIN oceanbase.__all_tenant b ON a.TENANT_ID = b.TENANT_ID  WHERE a.hold > 1024 * 1024 * 1024 ));"
         global: true
       - type: ssh # 可看到租户的规格、线程、队列及请求统计等信息，且这条日志每个租户每 30s 打印一次
-        ssh: "grep 'dump tenant info.tenant=' #{observer_data_dir}/log/observer.log | sed 's/,/,/g'"
+        ssh: "cat #{observer_data_dir}/log/observer.log | grep 'dump tenant info.tenant=' | sed 's/,/,/g'"
         global: false
       - type: log
         grep: ""