Allow custom port in cloud.id #7887
Merged
Conversation
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
Make it possible for the host section from the cloud.id to contain a port. If the port is not specified, 443 is used, like before. This is proposed fix for elastic#7794.
tsg
added
bug
discuss
ph
reviewed
Aug 7, 2018
libbeat/cloudid/cloudid.go
Outdated
| kibanaURL := url.URL{Scheme: "https", Host: fmt.Sprintf("%s.%s:443", words[2], words[0])} | ||
| // 4. extract port from the host | ||
| host := words[0] | ||
| port := "443" |
There was a problem hiding this comment.
nit: Use a constant for the magic number.
ph
reviewed
Aug 7, 2018
houndci-bot
reviewed
Aug 7, 2018
libbeat/cloudid/cloudid.go
Outdated
| @@ -31,6 +31,8 @@ import ( | |||
| "github.com/elastic/beats/libbeat/logp" | |||
| ) | |||
|
|
|||
| const DefaultCloudPort = "443" | |||
There was a problem hiding this comment.
exported const DefaultCloudPort should have comment or be unexported
houndci-bot
reviewed
Aug 7, 2018
libbeat/cloudid/cloudid.go
Outdated
| idx := strings.LastIndex(word, ":") | ||
| if idx >= 0 { | ||
| return word[:idx], word[idx+1:] | ||
| } else { |
There was a problem hiding this comment.
if block ends with a return statement, so drop this else and outdent its block
|
@ph I made things more flexible to also allow individual ES and KB port. |
tsg
added
v6.4.0
and removed
needs_backport
tsg
added a commit
to tsg/beats
that referenced
this pull request
Aug 8, 2018
Make it possible for the cloud.id to contain a custom port. If the port is not specified, 443 is used, like before. The custom port can be specified in multiple ways. The cloudid is formed like this: `<host>:<es-id>:<kb-id>`. The port can be specified either in es-id or kb-id, or in the host section. If specified in both, the more specific one wins (i.e. es-id over host). Examples: ``` 'us-central1.gcp.cloud.es.io:9243$ac31ebb90241773157043c34fd26fd46$a4c06230e48c8fce7be88a074a3bb3e0' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243 ``` Or: ``` 'us-central1.gcp.cloud.es.io$ac31ebb90241773157043c34fd26fd46:9243$a4c06230e48c8fce7be88a074a3bb3e0:9244' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244 ``` Closes: elastic#7794. (cherry picked from commit daaca33)
tsg
added a commit
to tsg/beats
that referenced
this pull request
Aug 8, 2018
Make it possible for the cloud.id to contain a custom port. If the port is not specified, 443 is used, like before. The custom port can be specified in multiple ways. The cloudid is formed like this: `<host>:<es-id>:<kb-id>`. The port can be specified either in es-id or kb-id, or in the host section. If specified in both, the more specific one wins (i.e. es-id over host). Examples: ``` 'us-central1.gcp.cloud.es.io:9243$ac31ebb90241773157043c34fd26fd46$a4c06230e48c8fce7be88a074a3bb3e0' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243 ``` Or: ``` 'us-central1.gcp.cloud.es.io$ac31ebb90241773157043c34fd26fd46:9243$a4c06230e48c8fce7be88a074a3bb3e0:9244' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244 ``` Closes: elastic#7794. (cherry picked from commit daaca33)
kvch
pushed a commit
that referenced
this pull request
Aug 8, 2018
Make it possible for the cloud.id to contain a custom port. If the port is not specified, 443 is used, like before. The custom port can be specified in multiple ways. The cloudid is formed like this: `<host>:<es-id>:<kb-id>`. The port can be specified either in es-id or kb-id, or in the host section. If specified in both, the more specific one wins (i.e. es-id over host). Examples: ``` 'us-central1.gcp.cloud.es.io:9243$ac31ebb90241773157043c34fd26fd46$a4c06230e48c8fce7be88a074a3bb3e0' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243 ``` Or: ``` 'us-central1.gcp.cloud.es.io$ac31ebb90241773157043c34fd26fd46:9243$a4c06230e48c8fce7be88a074a3bb3e0:9244' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244 ``` Closes: #7794. (cherry picked from commit daaca33)
kvch
pushed a commit
that referenced
this pull request
Aug 8, 2018
Make it possible for the cloud.id to contain a custom port. If the port is not specified, 443 is used, like before. The custom port can be specified in multiple ways. The cloudid is formed like this: `<host>:<es-id>:<kb-id>`. The port can be specified either in es-id or kb-id, or in the host section. If specified in both, the more specific one wins (i.e. es-id over host). Examples: ``` 'us-central1.gcp.cloud.es.io:9243$ac31ebb90241773157043c34fd26fd46$a4c06230e48c8fce7be88a074a3bb3e0' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243 ``` Or: ``` 'us-central1.gcp.cloud.es.io$ac31ebb90241773157043c34fd26fd46:9243$a4c06230e48c8fce7be88a074a3bb3e0:9244' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244 ``` Closes: #7794. (cherry picked from commit daaca33)
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
Make it possible for the cloud.id to contain a custom port. If the port is not specified, 443 is used, like before. The custom port can be specified in multiple ways. The cloudid is formed like this: `<host>:<es-id>:<kb-id>`. The port can be specified either in es-id or kb-id, or in the host section. If specified in both, the more specific one wins (i.e. es-id over host). Examples: ``` 'us-central1.gcp.cloud.es.io:9243$ac31ebb90241773157043c34fd26fd46$a4c06230e48c8fce7be88a074a3bb3e0' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243 ``` Or: ``` 'us-central1.gcp.cloud.es.io$ac31ebb90241773157043c34fd26fd46:9243$a4c06230e48c8fce7be88a074a3bb3e0:9244' ``` Results in: ``` ES: https://ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243 KB: https://a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244 ``` Closes: elastic#7794. (cherry picked from commit 8d8ac27)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Make it possible for the the cloud.id to contain a custom port. If the port is not specified, 443 is used, like before.
The custom port can be specified in multiple ways. The cloudid is formed like this:
<host>:<es-id>:<kb-id>. The port can be specified either in es-id or kb-id, or in the host section. If specified in both, the more specific one wins (i.e. es-id over host).Examples:
Results in:
Or:
Results in:
This is proposed fix for #7794.