From 405707484451f62a7c0482813cb17f15ddb9664d Mon Sep 17 00:00:00 2001 From: liuwenping Date: Thu, 17 Feb 2022 15:12:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0bcs=E9=87=87?= =?UTF-8?q?=E9=9B=86=E9=85=8D=E7=BD=AE=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- support-files/templates/aix/powerpc/etc/bkunifylogbeat.conf | 2 ++ .../templates/aix/powerpc/etc/bkunifylogbeat_main.conf.tpl | 2 ++ support-files/templates/linux/aarch64/etc/bkunifylogbeat.conf | 2 ++ .../templates/linux/aarch64/etc/bkunifylogbeat_main.conf.tpl | 2 ++ support-files/templates/linux/x86/etc/bkunifylogbeat.conf | 2 ++ .../templates/linux/x86/etc/bkunifylogbeat_main.conf.tpl | 2 ++ support-files/templates/linux/x86_64/etc/bkunifylogbeat.conf | 2 ++ .../templates/linux/x86_64/etc/bkunifylogbeat_main.conf.tpl | 2 ++ support-files/templates/windows/x86/etc/bkunifylogbeat.conf | 2 ++ .../templates/windows/x86/etc/bkunifylogbeat_main.conf.tpl | 2 ++ support-files/templates/windows/x86_64/etc/bkunifylogbeat.conf | 2 ++ .../templates/windows/x86_64/etc/bkunifylogbeat_main.conf.tpl | 2 ++ 12 files changed, 24 insertions(+) diff --git a/support-files/templates/aix/powerpc/etc/bkunifylogbeat.conf b/support-files/templates/aix/powerpc/etc/bkunifylogbeat.conf index a88823a..62c0347 100644 --- a/support-files/templates/aix/powerpc/etc/bkunifylogbeat.conf +++ b/support-files/templates/aix/powerpc/etc/bkunifylogbeat.conf @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: "/usr/local/gse/plugins/etc/bkunifylogbeat" file_pattern: "*.conf" + - path: "/usr/local/gse/plugins/etc/bkunifylogbeat/bcs" + file_pattern: "*.conf" \ No newline at end of file diff --git a/support-files/templates/aix/powerpc/etc/bkunifylogbeat_main.conf.tpl b/support-files/templates/aix/powerpc/etc/bkunifylogbeat_main.conf.tpl index b84d813..0bf03a8 100644 --- a/support-files/templates/aix/powerpc/etc/bkunifylogbeat_main.conf.tpl +++ b/support-files/templates/aix/powerpc/etc/bkunifylogbeat_main.conf.tpl @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: {{ plugin_path.subconfig_path }} file_pattern: "*.conf" + - path: {{ plugin_path.subconfig_path }}/bcs + file_pattern: "*.conf" diff --git a/support-files/templates/linux/aarch64/etc/bkunifylogbeat.conf b/support-files/templates/linux/aarch64/etc/bkunifylogbeat.conf index a88823a..62c0347 100644 --- a/support-files/templates/linux/aarch64/etc/bkunifylogbeat.conf +++ b/support-files/templates/linux/aarch64/etc/bkunifylogbeat.conf @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: "/usr/local/gse/plugins/etc/bkunifylogbeat" file_pattern: "*.conf" + - path: "/usr/local/gse/plugins/etc/bkunifylogbeat/bcs" + file_pattern: "*.conf" \ No newline at end of file diff --git a/support-files/templates/linux/aarch64/etc/bkunifylogbeat_main.conf.tpl b/support-files/templates/linux/aarch64/etc/bkunifylogbeat_main.conf.tpl index b84d813..0bf03a8 100644 --- a/support-files/templates/linux/aarch64/etc/bkunifylogbeat_main.conf.tpl +++ b/support-files/templates/linux/aarch64/etc/bkunifylogbeat_main.conf.tpl @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: {{ plugin_path.subconfig_path }} file_pattern: "*.conf" + - path: {{ plugin_path.subconfig_path }}/bcs + file_pattern: "*.conf" diff --git a/support-files/templates/linux/x86/etc/bkunifylogbeat.conf b/support-files/templates/linux/x86/etc/bkunifylogbeat.conf index a88823a..62c0347 100644 --- a/support-files/templates/linux/x86/etc/bkunifylogbeat.conf +++ b/support-files/templates/linux/x86/etc/bkunifylogbeat.conf @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: "/usr/local/gse/plugins/etc/bkunifylogbeat" file_pattern: "*.conf" + - path: "/usr/local/gse/plugins/etc/bkunifylogbeat/bcs" + file_pattern: "*.conf" \ No newline at end of file diff --git a/support-files/templates/linux/x86/etc/bkunifylogbeat_main.conf.tpl b/support-files/templates/linux/x86/etc/bkunifylogbeat_main.conf.tpl index b84d813..0bf03a8 100644 --- a/support-files/templates/linux/x86/etc/bkunifylogbeat_main.conf.tpl +++ b/support-files/templates/linux/x86/etc/bkunifylogbeat_main.conf.tpl @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: {{ plugin_path.subconfig_path }} file_pattern: "*.conf" + - path: {{ plugin_path.subconfig_path }}/bcs + file_pattern: "*.conf" diff --git a/support-files/templates/linux/x86_64/etc/bkunifylogbeat.conf b/support-files/templates/linux/x86_64/etc/bkunifylogbeat.conf index a88823a..62c0347 100644 --- a/support-files/templates/linux/x86_64/etc/bkunifylogbeat.conf +++ b/support-files/templates/linux/x86_64/etc/bkunifylogbeat.conf @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: "/usr/local/gse/plugins/etc/bkunifylogbeat" file_pattern: "*.conf" + - path: "/usr/local/gse/plugins/etc/bkunifylogbeat/bcs" + file_pattern: "*.conf" \ No newline at end of file diff --git a/support-files/templates/linux/x86_64/etc/bkunifylogbeat_main.conf.tpl b/support-files/templates/linux/x86_64/etc/bkunifylogbeat_main.conf.tpl index b84d813..0bf03a8 100644 --- a/support-files/templates/linux/x86_64/etc/bkunifylogbeat_main.conf.tpl +++ b/support-files/templates/linux/x86_64/etc/bkunifylogbeat_main.conf.tpl @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: {{ plugin_path.subconfig_path }} file_pattern: "*.conf" + - path: {{ plugin_path.subconfig_path }}/bcs + file_pattern: "*.conf" diff --git a/support-files/templates/windows/x86/etc/bkunifylogbeat.conf b/support-files/templates/windows/x86/etc/bkunifylogbeat.conf index 15bcf16..4ccfdb9 100644 --- a/support-files/templates/windows/x86/etc/bkunifylogbeat.conf +++ b/support-files/templates/windows/x86/etc/bkunifylogbeat.conf @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: C:\gse\plugins\etc\bkunifylogbeat file_pattern: "*.conf" + - path: C:\gse\plugins\etc\bkunifylogbeat\bcs + file_pattern: "*.conf" diff --git a/support-files/templates/windows/x86/etc/bkunifylogbeat_main.conf.tpl b/support-files/templates/windows/x86/etc/bkunifylogbeat_main.conf.tpl index b84d813..dd4f36d 100644 --- a/support-files/templates/windows/x86/etc/bkunifylogbeat_main.conf.tpl +++ b/support-files/templates/windows/x86/etc/bkunifylogbeat_main.conf.tpl @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: {{ plugin_path.subconfig_path }} file_pattern: "*.conf" + - path: {{ plugin_path.subconfig_path }}\bcs + file_pattern: "*.conf" diff --git a/support-files/templates/windows/x86_64/etc/bkunifylogbeat.conf b/support-files/templates/windows/x86_64/etc/bkunifylogbeat.conf index 15bcf16..4ccfdb9 100644 --- a/support-files/templates/windows/x86_64/etc/bkunifylogbeat.conf +++ b/support-files/templates/windows/x86_64/etc/bkunifylogbeat.conf @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: C:\gse\plugins\etc\bkunifylogbeat file_pattern: "*.conf" + - path: C:\gse\plugins\etc\bkunifylogbeat\bcs + file_pattern: "*.conf" diff --git a/support-files/templates/windows/x86_64/etc/bkunifylogbeat_main.conf.tpl b/support-files/templates/windows/x86_64/etc/bkunifylogbeat_main.conf.tpl index b84d813..dd4f36d 100644 --- a/support-files/templates/windows/x86_64/etc/bkunifylogbeat_main.conf.tpl +++ b/support-files/templates/windows/x86_64/etc/bkunifylogbeat_main.conf.tpl @@ -31,3 +31,5 @@ bkunifylogbeat.eventdataid: -1 bkunifylogbeat.multi_config: - path: {{ plugin_path.subconfig_path }} file_pattern: "*.conf" + - path: {{ plugin_path.subconfig_path }}\bcs + file_pattern: "*.conf" From e05e1bf63af46b12d5474f2afd9e68cc8a7ebb2a Mon Sep 17 00:00:00 2001 From: liuwenping Date: Mon, 21 Feb 2022 20:50:22 +0800 Subject: [PATCH 2/2] minor: update beats framework version to v7.1.14-bk --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 512a2a3..6466fe4 100644 --- a/go.mod +++ b/go.mod @@ -17,5 +17,5 @@ require ( replace ( github.com/Sirupsen/logrus v1.6.0 => github.com/sirupsen/logrus v1.6.0 - github.com/elastic/beats v7.1.1+incompatible => github.com/TencentBlueKing/beats v7.1.12-bk+incompatible + github.com/elastic/beats v7.1.1+incompatible => github.com/TencentBlueKing/beats v7.1.14-bk+incompatible ) diff --git a/go.sum b/go.sum index 260f9b5..3ca20c9 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWso github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/TencentBlueKing/beats v7.1.12-bk+incompatible h1:rG9cyibyCYcUVYQPSG395AdKXsL5kf/2gz8fDLmwtnQ= -github.com/TencentBlueKing/beats v7.1.12-bk+incompatible/go.mod h1:ZMsX71rXxEo52YtXTamkUBNY4BmgxFY1NSZL1l1dNts= +github.com/TencentBlueKing/beats v7.1.14-bk+incompatible h1:uUfbp2yncxRKUIdMAMStBnBRuUNMF+/cFmB9mWEMVcY= +github.com/TencentBlueKing/beats v7.1.14-bk+incompatible/go.mod h1:ZMsX71rXxEo52YtXTamkUBNY4BmgxFY1NSZL1l1dNts= github.com/TencentBlueKing/collector-go-sdk/v2 v2.0.0 h1:2KNdks6NP7BRSUwQeqWsdFFCxVmAJWMGu1bIdTpiIrk= github.com/TencentBlueKing/collector-go-sdk/v2 v2.0.0/go.mod h1:WedWCIQbgTlpmFUj9Ol19QPm7hlKzd/nbAFzr3ZxTz4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=