diff --git a/config/install_agent.tpl b/config/install_agent.tpl index 7077864e..e130b6c0 100644 --- a/config/install_agent.tpl +++ b/config/install_agent.tpl @@ -3,7 +3,7 @@ set -eo pipefail function print_usage() { - echo "Usage: curl -sSL http://$[[CLOUD_ENDPOINT]]/instance/_get_install_script?token | sudo bash -s -- [-u url_for_download_program] [-v version_for_program ] [-t target_install_dir] [-o overwite_flag] [-s url_console_lan_adress]" + echo "Usage: curl -ksSL http://$[[CLOUD_ENDPOINT]]/instance/_get_install_script?token | sudo bash -s -- [-u url_for_download_program] [-v version_for_program ] [-t target_install_dir] [-o overwite_flag] [-s url_console_lan_adress]" echo "Options:" echo " -u, --url Install Agent download URL, format is schema://domain:port/stable/agent-platform-version.ext, can be manually specified" echo " -v, --version Install Agent version, default is to get latest version online, can be manually specified" diff --git a/modules/agent/api/elasticsearch.go b/modules/agent/api/elasticsearch.go index 20e49996..a2146931 100644 --- a/modules/agent/api/elasticsearch.go +++ b/modules/agent/api/elasticsearch.go @@ -186,7 +186,7 @@ func GetElasticsearchNodesViaAgent(ctx context.Context, endpoint string) (*elast } obj := elastic.DiscoveryResult{} - _, err := server.ProxyAgentRequest(endpoint, req, &obj) + _, err := server.ProxyAgentRequest("elasticsearch",endpoint, req, &obj) if err != nil { return nil, err } @@ -218,7 +218,7 @@ func GetElasticLogFiles(ctx context.Context, instance *model.Instance, logsPath } resBody := map[string]interface{}{} - _, err := server.ProxyAgentRequest(instance.GetEndpoint(), req, &resBody) + _, err := server.ProxyAgentRequest("elasticsearch",instance.GetEndpoint(), req, &resBody) if err != nil { return nil, err } @@ -237,7 +237,7 @@ func GetElasticLogFileContent(ctx context.Context, instance *model.Instance, bod Body: util.MustToJSONBytes(body), } resBody := map[string]interface{}{} - _, err := server.ProxyAgentRequest(instance.GetEndpoint(), req, &resBody) + _, err := server.ProxyAgentRequest("elasticsearch",instance.GetEndpoint(), req, &resBody) if err != nil { return nil, err } @@ -651,7 +651,7 @@ func (h *APIHandler) getESNodeInfoViaProxyWithConfig(cfg *elastic.ElasticsearchC } obj := elastic.LocalNodeInfo{} - res, err := server.ProxyAgentRequest(endpoint, req, &obj) + res, err := server.ProxyAgentRequest("elasticsearch",endpoint, req, &obj) if err != nil { if global.Env().IsDebug { log.Error(err) diff --git a/modules/agent/common/config.go b/modules/agent/common/config.go index 3cb7d7f1..bc605f8f 100644 --- a/modules/agent/common/config.go +++ b/modules/agent/common/config.go @@ -17,7 +17,6 @@ func GetAgentConfig() *model.AgentConfig { Enabled: true, Setup: &model.SetupConfig{ DownloadURL: "https://release.infinilabs.com/agent/stable", - Version: "0.7.0-364", }, } _, err := env.ParseConfig("agent", agentCfg ) diff --git a/modules/agent/model/config.go b/modules/agent/model/config.go index d20526b3..b5283d54 100644 --- a/modules/agent/model/config.go +++ b/modules/agent/model/config.go @@ -11,7 +11,6 @@ type AgentConfig struct { type SetupConfig struct { DownloadURL string `config:"download_url"` - Version string `config:"version"` CACertFile string `config:"ca_cert"` CAKeyFile string `config:"ca_key"` ConsoleEndpoint string `config:"console_endpoint"`