Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@michalpristas
michalpristas committed Jun 17, 2021
1 parent 255e83c commit b9ee11a
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/pkg/agent/application/info/agent_id.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const maxRetriesloadAgentInfo = 5

type persistentAgentInfo struct {
ID string `json:"id" yaml:"id" config:"id"`
CustomHeaders map[string]string `json:"custom_headers" yaml:"custom_headers" config:"custom_headers"`
Headers map[string]string `json:"headers" yaml:"headers" config:"headers"`
LogLevel string `json:"logging.level,omitempty" yaml:"logging.level,omitempty" config:"logging.level,omitempty"`
MonitoringHTTP *monitoringConfig.MonitoringHTTPConfig `json:"monitoring.http,omitempty" yaml:"monitoring.http,omitempty" config:"monitoring.http,omitempty"`
}
Expand Down
18 changes: 9 additions & 9 deletions x-pack/elastic-agent/pkg/agent/application/info/agent_info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

// AgentInfo is a collection of information about agent.
type AgentInfo struct {
agentID string
logLevel string
customHeaders map[string]string
agentID string
logLevel string
headers map[string]string
}

// NewAgentInfoWithLog creates a new agent information.
Expand All @@ -29,9 +29,9 @@ func NewAgentInfoWithLog(level string, createAgentID bool) (*AgentInfo, error) {
}

return &AgentInfo{
agentID: agentInfo.ID,
logLevel: agentInfo.LogLevel,
customHeaders: agentInfo.CustomHeaders,
agentID: agentInfo.ID,
logLevel: agentInfo.LogLevel,
headers: agentInfo.Headers,
}, nil
}

Expand Down Expand Up @@ -87,7 +87,7 @@ func (*AgentInfo) Snapshot() bool {
return release.Snapshot()
}

// CustomHeaders returns custom headers used to communicate with elasticsearch.
func (i *AgentInfo) CustomHeaders() map[string]string {
return i.customHeaders
// Headers returns custom headers used to communicate with elasticsearch.
func (i *AgentInfo) Headers() map[string]string {
return i.headers
}
6 changes: 3 additions & 3 deletions x-pack/elastic-agent/pkg/agent/cmd/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func runContainerCmd(streams *cli.IOStreams, cmd *cobra.Command, cfg setupConfig
}

if cfg.Kibana.Fleet.Setup {
client, err = kibanaClient(cfg.Kibana, cfg.FleetServer.CustomKibanaHeaders)
client, err = kibanaClient(cfg.Kibana, cfg.Kibana.Headers)
if err != nil {
return err
}
Expand All @@ -286,7 +286,7 @@ func runContainerCmd(streams *cli.IOStreams, cmd *cobra.Command, cfg setupConfig
token := cfg.Fleet.EnrollmentToken
if token == "" && !cfg.FleetServer.Enable {
if client == nil {
client, err = kibanaClient(cfg.Kibana, cfg.FleetServer.CustomKibanaHeaders)
client, err = kibanaClient(cfg.Kibana, cfg.Kibana.Headers)
if err != nil {
return err
}
Expand Down Expand Up @@ -364,7 +364,7 @@ func buildEnrollArgs(cfg setupConfig, token string, policyID string) ([]string,
args = append(args, "--fleet-server-cert-key", cfg.FleetServer.CertKey)
}

for k, v := range cfg.FleetServer.CustomHeaders {
for k, v := range cfg.FleetServer.Headers {
args = append(args, "--header", k+"="+v)
}

Expand Down
8 changes: 4 additions & 4 deletions x-pack/elastic-agent/pkg/agent/cmd/enroll.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func buildEnrollmentFlags(cmd *cobra.Command, url string, token string) []string
fPort, _ := cmd.Flags().GetUint16("fleet-server-port")
fCert, _ := cmd.Flags().GetString("fleet-server-cert")
fCertKey, _ := cmd.Flags().GetString("fleet-server-cert-key")
fCustomHeaders, _ := cmd.Flags().GetStringSlice("header")
fHeaders, _ := cmd.Flags().GetStringSlice("header")
fInsecure, _ := cmd.Flags().GetBool("fleet-server-insecure-http")
ca, _ := cmd.Flags().GetString("certificate-authorities")
sha256, _ := cmd.Flags().GetString("ca-sha256")
Expand Down Expand Up @@ -132,7 +132,7 @@ func buildEnrollmentFlags(cmd *cobra.Command, url string, token string) []string
args = append(args, fCertKey)
}

for k, v := range mapFromEnvList(fCustomHeaders) {
for k, v := range mapFromEnvList(fHeaders) {
args = append(args, "--header")
args = append(args, k+"="+v)
}
Expand Down Expand Up @@ -220,7 +220,7 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, args []string) error {
enrollmentToken, _ := cmd.Flags().GetString("enrollment-token")
fServer, _ := cmd.Flags().GetString("fleet-server-es")
fElasticSearchCA, _ := cmd.Flags().GetString("fleet-server-es-ca")
fCustomHeaders, _ := cmd.Flags().GetStringSlice("header")
fHeaders, _ := cmd.Flags().GetStringSlice("header")
fServiceToken, _ := cmd.Flags().GetString("fleet-server-service-token")
fPolicy, _ := cmd.Flags().GetString("fleet-server-policy")
fHost, _ := cmd.Flags().GetString("fleet-server-host")
Expand Down Expand Up @@ -256,7 +256,7 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, args []string) error {
CertKey: fCertKey,
Insecure: fInsecure,
SpawnAgent: !fromInstall,
CustomHeaders: mapFromEnvList(fCustomHeaders),
Headers: mapFromEnvList(fHeaders),
},
}

Expand Down
10 changes: 5 additions & 5 deletions x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type enrollCmdFleetServerOption struct {
CertKey string
Insecure bool
SpawnAgent bool
CustomHeaders map[string]string
Headers map[string]string
}

// enrollCmdOption define all the supported enrollment option.
Expand Down Expand Up @@ -235,7 +235,7 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) (string, error) {
c.options.FleetServer.PolicyID,
c.options.FleetServer.Host, c.options.FleetServer.Port,
c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA,
c.options.FleetServer.CustomHeaders)
c.options.FleetServer.Headers)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -415,7 +415,7 @@ func (c *enrollCmd) enroll(ctx context.Context, persistentConfig map[string]inte
return err
}

agentConfig, err := c.createAgentConfig(resp.Item.ID, persistentConfig, c.options.FleetServer.CustomHeaders)
agentConfig, err := c.createAgentConfig(resp.Item.ID, persistentConfig, c.options.FleetServer.Headers)
if err != nil {
return err
}
Expand All @@ -426,7 +426,7 @@ func (c *enrollCmd) enroll(ctx context.Context, persistentConfig map[string]inte
c.options.FleetServer.PolicyID,
c.options.FleetServer.Host, c.options.FleetServer.Port,
c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA,
c.options.FleetServer.CustomHeaders)
c.options.FleetServer.Headers)
if err != nil {
return err
}
Expand Down Expand Up @@ -797,7 +797,7 @@ func (c *enrollCmd) createAgentConfig(agentID string, pc map[string]interface{},
}

if len(headers) > 0 {
agentConfig["custom_headers"] = headers
agentConfig["headers"] = headers
}

if c.options.Staging != "" {
Expand Down
34 changes: 17 additions & 17 deletions x-pack/elastic-agent/pkg/agent/cmd/setup_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@ type fleetConfig struct {
}

type fleetServerConfig struct {
Cert string `config:"cert"`
CertKey string `config:"cert_key"`
Elasticsearch elasticsearchConfig `config:"elasticsearch"`
Enable bool `config:"enable"`
Host string `config:"host"`
InsecureHTTP bool `config:"insecure_http"`
PolicyID string `config:"policy_id"`
Port string `config:"port"`
CustomHeaders map[string]string `config:"headers"`
CustomKibanaHeaders map[string]string `config:"kibana_headers"`
Cert string `config:"cert"`
CertKey string `config:"cert_key"`
Elasticsearch elasticsearchConfig `config:"elasticsearch"`
Enable bool `config:"enable"`
Host string `config:"host"`
InsecureHTTP bool `config:"insecure_http"`
PolicyID string `config:"policy_id"`
Port string `config:"port"`
Headers map[string]string `config:"headers"`
}

type elasticsearchConfig struct {
Expand All @@ -50,6 +49,7 @@ type kibanaConfig struct {
Fleet kibanaFleetConfig `config:"fleet"`
RetrySleepDuration time.Duration `config:"retry_sleep_duration"`
RetryMaxCount int `config:"retry_max_count"`
Headers map[string]string `config:"headers"`
}

type kibanaFleetConfig struct {
Expand Down Expand Up @@ -92,13 +92,12 @@ func defaultAccessConfig() (setupConfig, error) {
ServiceToken: envWithDefault("", "FLEET_SERVER_SERVICE_TOKEN"),
CA: envWithDefault("", "FLEET_SERVER_ELASTICSEARCH_CA", "ELASTICSEARCH_CA"),
},
Enable: envBool("FLEET_SERVER_ENABLE"),
Host: envWithDefault("", "FLEET_SERVER_HOST"),
InsecureHTTP: envBool("FLEET_SERVER_INSECURE_HTTP"),
PolicyID: envWithDefault("", "FLEET_SERVER_POLICY_ID", "FLEET_SERVER_POLICY"),
Port: envWithDefault("", "FLEET_SERVER_PORT"),
CustomHeaders: envMap("FLEET_CUSTOM_HEADER"),
CustomKibanaHeaders: envMap("FLEET_CUSTOM_KIBANA_HEADER"),
Enable: envBool("FLEET_SERVER_ENABLE"),
Host: envWithDefault("", "FLEET_SERVER_HOST"),
InsecureHTTP: envBool("FLEET_SERVER_INSECURE_HTTP"),
PolicyID: envWithDefault("", "FLEET_SERVER_POLICY_ID", "FLEET_SERVER_POLICY"),
Port: envWithDefault("", "FLEET_SERVER_PORT"),
Headers: envMap("FLEET_HEADER"),
},
Kibana: kibanaConfig{
Fleet: kibanaFleetConfig{
Expand All @@ -113,6 +112,7 @@ func defaultAccessConfig() (setupConfig, error) {
},
RetrySleepDuration: retrySleepDuration,
RetryMaxCount: retryMaxCount,
Headers: envMap("FLEET_KIBANA_HEADER"),
},
}
return cfg, nil
Expand Down
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/pkg/agent/program/program_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ func (*fakeAgentInfo) Snapshot() bool {
return false
}

func (*fakeAgentInfo) CustomHeaders() map[string]string {
func (*fakeAgentInfo) Headers() map[string]string {
return map[string]string{
"h1": "test-header",
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/pkg/agent/program/supported.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b9ee11a

Please sign in to comment.