diff --git a/elk/kibanaClient/8_13_0/client.go b/elk/kibanaClient/8_13_0/client.go index 4b9f4a627843a02c27b6c3eda503628a2e2e2b4e..4b3c2ca38313933dafdfd7135cbc93725fa0aa93 100644 --- a/elk/kibanaClient/8_13_0/client.go +++ b/elk/kibanaClient/8_13_0/client.go @@ -13,9 +13,9 @@ import ( "github.com/elastic/elastic-agent-libs/kibana" ) -var Global_kibana *KibanaClient +var Global_kibana *KibanaClient_v8 -type KibanaClient struct { +type KibanaClient_v8 struct { Client *kibana.Client Ctx context.Context } @@ -35,13 +35,13 @@ func InitKibanaClient() { return } - Global_kibana = &KibanaClient{ + Global_kibana = &KibanaClient_v8{ Client: ki_client, Ctx: context.Background(), } } -func (client *KibanaClient) pkgInfo2PkgPolicyInputs(pinfo *meta.PackageInfo_p) map[string]meta.PackagePolicyInput_p { +func (client *KibanaClient_v8) pkgInfo2PkgPolicyInputs(pinfo *meta.PackageInfo_p) map[string]meta.PackagePolicyInput_p { inputs := map[string]meta.PackagePolicyInput_p{} for _, policy_template_input := range pinfo.PolicyTemplates[0].Inputs { pkg_policy_input := meta.PackagePolicyInput_p{ @@ -82,7 +82,7 @@ input(value).streams[0](key) => data_streams[0].dataset input(key) == data_streams[0].streams[0].input */ -func (client *KibanaClient) ComposePackagePolicy(policyid, pkgname, pkgversion string) (*meta.PackagePolicyRequest_p, error) { +func (client *KibanaClient_v8) ComposePackagePolicy(policyid, pkgname, pkgversion string) (*meta.PackagePolicyRequest_p, error) { pkginfo, err := client.GetPackageInfo(client.Ctx, pkgname, pkgversion) if err != nil { return nil, err diff --git a/elk/kibanaClient/8_13_0/clientFleetAPI+.go b/elk/kibanaClient/8_13_0/clientFleetAPI+.go index 053a33ad7939bf135a2093b0a1edd9cbe5b61f57..6af65a7202026725cdfe50c7ce7cb6f9e04ac4a7 100644 --- a/elk/kibanaClient/8_13_0/clientFleetAPI+.go +++ b/elk/kibanaClient/8_13_0/clientFleetAPI+.go @@ -13,7 +13,7 @@ import ( "github.com/elastic/elastic-agent-libs/kibana" ) -func (client *KibanaClient) GetPackageInfo(ctx context.Context, pkgname, pkgversion string) (*meta.PackageInfo_p, error) { +func (client *KibanaClient_v8) GetPackageInfo(ctx context.Context, pkgname, pkgversion string) (*meta.PackageInfo_p, error) { apiURL := fmt.Sprintf(meta.FleetPackageInfoAPI, pkgname, pkgversion) resp, err := client.Client.Connection.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil) if err != nil { @@ -29,7 +29,7 @@ func (client *KibanaClient) GetPackageInfo(ctx context.Context, pkgname, pkgvers return pinfo, nil } -func (client *KibanaClient) InstallFleetPackage(ctx context.Context, reqbody *meta.PackagePolicyRequest_p) (*kibana.PackagePolicyResponse, error) { +func (client *KibanaClient_v8) InstallFleetPackage(ctx context.Context, reqbody *meta.PackagePolicyRequest_p) (*kibana.PackagePolicyResponse, error) { reqBytes, err := json.Marshal(reqbody) if err != nil { return nil, fmt.Errorf("marshalling request json: %w", err) diff --git a/elk/main.go b/elk/main.go index 41cdabfda3fd87f709b1a666b0bb2b4cacb13904..926abc0aea690ec10c2eff91b463ab541fdb5c03 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" - kibanaclient "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/8_13_0" + kibanaclient "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/7_17_16" "gitee.com/openeuler/PilotGo-plugin-elk/logger" "gitee.com/openeuler/PilotGo-plugin-elk/pluginclient" "gitee.com/openeuler/PilotGo-plugin-elk/signal"