From 5df75ae1e93087ec7a03b8dffa76dc2df6df7aba Mon Sep 17 00:00:00 2001 From: Wangjunqi123 Date: Tue, 4 Jun 2024 14:21:10 +0800 Subject: [PATCH] kibanaclient: create 8.13.0 kibanaclient --- elk/elasticClient/client.go | 1 + elk/elasticsearch/elasticsearch.go | 1 - elk/kibanaClient/{ => 8_13_0}/client.go | 2 +- elk/kibanaClient/{ => 8_13_0}/clientFleetAPI+.go | 2 +- elk/kibanaClient/{ => 8_13_0}/gjsonProcess.go | 2 +- elk/kibanaClient/{ => 8_13_0}/meta/packagePolicy.go | 0 elk/kibanaClient/{ => 8_13_0}/meta/packageinfo.go | 0 elk/main.go | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 elk/elasticClient/client.go delete mode 100644 elk/elasticsearch/elasticsearch.go rename elk/kibanaClient/{ => 8_13_0}/client.go (97%) rename elk/kibanaClient/{ => 8_13_0}/clientFleetAPI+.go (96%) rename elk/kibanaClient/{ => 8_13_0}/gjsonProcess.go (97%) rename elk/kibanaClient/{ => 8_13_0}/meta/packagePolicy.go (100%) rename elk/kibanaClient/{ => 8_13_0}/meta/packageinfo.go (100%) diff --git a/elk/elasticClient/client.go b/elk/elasticClient/client.go new file mode 100644 index 00000000..742d3e7d --- /dev/null +++ b/elk/elasticClient/client.go @@ -0,0 +1 @@ +package elasticClient \ No newline at end of file diff --git a/elk/elasticsearch/elasticsearch.go b/elk/elasticsearch/elasticsearch.go deleted file mode 100644 index 53be44f6..00000000 --- a/elk/elasticsearch/elasticsearch.go +++ /dev/null @@ -1 +0,0 @@ -package elasticsearch \ No newline at end of file diff --git a/elk/kibanaClient/client.go b/elk/kibanaClient/8_13_0/client.go similarity index 97% rename from elk/kibanaClient/client.go rename to elk/kibanaClient/8_13_0/client.go index 459dafb4..4b9f4a62 100644 --- a/elk/kibanaClient/client.go +++ b/elk/kibanaClient/8_13_0/client.go @@ -8,7 +8,7 @@ import ( "gitee.com/openeuler/PilotGo-plugin-elk/conf" "gitee.com/openeuler/PilotGo-plugin-elk/errormanager" "gitee.com/openeuler/PilotGo-plugin-elk/global" - "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/meta" + "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/8_13_0/meta" "gitee.com/openeuler/PilotGo-plugin-elk/pluginclient" "github.com/elastic/elastic-agent-libs/kibana" ) diff --git a/elk/kibanaClient/clientFleetAPI+.go b/elk/kibanaClient/8_13_0/clientFleetAPI+.go similarity index 96% rename from elk/kibanaClient/clientFleetAPI+.go rename to elk/kibanaClient/8_13_0/clientFleetAPI+.go index 48006739..053a33ad 100644 --- a/elk/kibanaClient/clientFleetAPI+.go +++ b/elk/kibanaClient/8_13_0/clientFleetAPI+.go @@ -8,7 +8,7 @@ import ( "io" "net/http" - "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/meta" + "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/8_13_0/meta" "gitee.com/openeuler/PilotGo-plugin-elk/global" "github.com/elastic/elastic-agent-libs/kibana" ) diff --git a/elk/kibanaClient/gjsonProcess.go b/elk/kibanaClient/8_13_0/gjsonProcess.go similarity index 97% rename from elk/kibanaClient/gjsonProcess.go rename to elk/kibanaClient/8_13_0/gjsonProcess.go index 7c396eb3..6c58862e 100644 --- a/elk/kibanaClient/gjsonProcess.go +++ b/elk/kibanaClient/8_13_0/gjsonProcess.go @@ -1,7 +1,7 @@ package kibanaClient import ( - "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/meta" + "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/8_13_0/meta" "github.com/tidwall/gjson" ) diff --git a/elk/kibanaClient/meta/packagePolicy.go b/elk/kibanaClient/8_13_0/meta/packagePolicy.go similarity index 100% rename from elk/kibanaClient/meta/packagePolicy.go rename to elk/kibanaClient/8_13_0/meta/packagePolicy.go diff --git a/elk/kibanaClient/meta/packageinfo.go b/elk/kibanaClient/8_13_0/meta/packageinfo.go similarity index 100% rename from elk/kibanaClient/meta/packageinfo.go rename to elk/kibanaClient/8_13_0/meta/packageinfo.go diff --git a/elk/main.go b/elk/main.go index 341a0cd2..41cdabfd 100644 --- a/elk/main.go +++ b/elk/main.go @@ -5,7 +5,7 @@ import ( "gitee.com/openeuler/PilotGo-plugin-elk/db" "gitee.com/openeuler/PilotGo-plugin-elk/errormanager" "gitee.com/openeuler/PilotGo-plugin-elk/handler" - "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient" + kibanaclient "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/8_13_0" "gitee.com/openeuler/PilotGo-plugin-elk/logger" "gitee.com/openeuler/PilotGo-plugin-elk/pluginclient" "gitee.com/openeuler/PilotGo-plugin-elk/signal" @@ -46,7 +46,7 @@ func main() { /* init kibana client */ - kibanaClient.InitKibanaClient() + kibanaclient.InitKibanaClient() /* 终止进程信号监听 -- Gitee