-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable agent to send custom headers to kibana/ES #26275
Merged
michalpristas
merged 33 commits into
elastic:master
from
michalpristas:feat/custom-header
Jun 18, 2021
Merged
Changes from 10 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
becc30b
add custom headers
michalpristas 8d91386
Merge branch 'master' of github.com:elastic/beats into feat/custom-he…
michalpristas 4515d5e
headers
michalpristas de598b3
changelog
michalpristas 9ebe416
rename
michalpristas e92ef42
add kibana headers for setup
michalpristas d9c0e99
missing headers def
michalpristas b159ebd
missing headers def
michalpristas 8695fed
headers
michalpristas 449476d
rename
michalpristas 029203b
Update enroll.go
michalpristas c711673
[Oracle] Fixing default values for paths in config template (#26276)
P1llus 8859a2b
Change xml processor names in script processor to match convention (#…
andrewkroh 5f9e7a5
[filebeat] Add preserve_original_event option to o365audit input (#26…
marc-gr ef933b4
Report total and free CPU for vSphere virtual machines (#26167)
jsoriano 2b053a3
Update go version to 1.16.5 (#26186)
michel-laterman 553be20
Add support note (#26283)
54981fe
Add log.flags and object metadata to aws-s3 input events (#26267)
andrewkroh 2d44d87
Handle data returned with io.EOF in LineReader (#26260)
andrewkroh da028ac
Disable packaging-arm in elastic-agent (#26240)
kaiyan-sheng 6f6302e
First refactor of the system module - system/cpu and system/core (#25…
fearful-symmetry 01f6530
Don't include full ES index template in errors (#25743)
andrewkroh ee2777d
Change link to snapshots in README (#26317)
jsoriano 2d8b720
[Packetbeat] Add `url.extension` to Packetbeat HTTP events (#25999)
legoguy1000 e5e74e3
Osquerybeat: Align with the rest of the beats, set the ECS version (#…
aleksmaus 5c5e7d8
Updated filter expression for filtering 86 artifacts (#26313)
michalpristas 77deb96
Forward port 7.13.2 changelog to master (#26323)
andresrc e608bb6
Update go-structform to 0.0.9 (#26251)
939964b
[Filebeat] [MongoDB] Support MongoDB 4.4 json logs (#24774)
tetianakravchenko 12a2fd0
update envoyproxy ECS version (#26277)
P1llus 255e83c
update threatintel ECS version (#26274)
P1llus b9ee11a
rename
michalpristas 58f3526
conflicts
michalpristas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ import ( | |
"os" | ||
"os/signal" | ||
"strconv" | ||
"strings" | ||
"syscall" | ||
|
||
"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/application/paths" | ||
|
@@ -59,6 +60,7 @@ func addEnrollFlags(cmd *cobra.Command) { | |
cmd.Flags().Uint16P("fleet-server-port", "", 0, "Fleet Server HTTP binding port (overrides the policy)") | ||
cmd.Flags().StringP("fleet-server-cert", "", "", "Certificate to use for exposed Fleet Server HTTPS endpoint") | ||
cmd.Flags().StringP("fleet-server-cert-key", "", "", "Private key to use for exposed Fleet Server HTTPS endpoint") | ||
cmd.Flags().StringSliceP("header", "", []string{}, "App auth token used for elasticsearch") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Documentation for this flag is incorrect, seems like a copy/paste error. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. thanks for noticing |
||
cmd.Flags().BoolP("fleet-server-insecure-http", "", false, "Expose Fleet Server over HTTP (not recommended; insecure)") | ||
cmd.Flags().StringP("certificate-authorities", "a", "", "Comma separated list of root certificate for server verifications") | ||
cmd.Flags().StringP("ca-sha256", "p", "", "Comma separated list of certificate authorities hash pins used for certificate verifications") | ||
|
@@ -81,6 +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") | ||
fInsecure, _ := cmd.Flags().GetBool("fleet-server-insecure-http") | ||
ca, _ := cmd.Flags().GetString("certificate-authorities") | ||
sha256, _ := cmd.Flags().GetString("ca-sha256") | ||
|
@@ -128,6 +131,12 @@ func buildEnrollmentFlags(cmd *cobra.Command, url string, token string) []string | |
args = append(args, "--fleet-server-cert-key") | ||
args = append(args, fCertKey) | ||
} | ||
|
||
for k, v := range mapFromEnvList(fCustomHeaders) { | ||
args = append(args, "--header") | ||
args = append(args, k+"="+v) | ||
} | ||
|
||
if fInsecure { | ||
args = append(args, "--fleet-server-insecure-http") | ||
} | ||
|
@@ -211,6 +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") | ||
fServiceToken, _ := cmd.Flags().GetString("fleet-server-service-token") | ||
fPolicy, _ := cmd.Flags().GetString("fleet-server-policy") | ||
fHost, _ := cmd.Flags().GetString("fleet-server-host") | ||
|
@@ -246,6 +256,7 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, args []string) error { | |
CertKey: fCertKey, | ||
Insecure: fInsecure, | ||
SpawnAgent: !fromInstall, | ||
CustomHeaders: mapFromEnvList(fCustomHeaders), | ||
}, | ||
} | ||
|
||
|
@@ -285,3 +296,16 @@ func handleSignal(ctx context.Context) context.Context { | |
|
||
return ctx | ||
} | ||
|
||
func mapFromEnvList(envList []string) map[string]string { | ||
m := make(map[string]string) | ||
for _, kv := range envList { | ||
keyValue := strings.SplitN(kv, "=", 2) | ||
if len(keyValue) != 2 { | ||
continue | ||
} | ||
|
||
m[keyValue[0]] = keyValue[1] | ||
} | ||
return m | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why prefix with custom? Why not just "headers"?
That would match the elasticsearch configuration - https://www.elastic.co/guide/en/beats/filebeat/current/elasticsearch-output.html#_headers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
following naming from cloud
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are asking for the feature but we should align the naming with what is in beats to easy the transition to our users from beats to Elastic Agent. Unless we feel that
headers
is not a good name and now is the time to change it. I feel thatheaders
is a better name overcustom_headers
.