Skip to content

Commit

Permalink
[8.15] [Automatic Import] Resolve http_endpoint config not loading co…
Browse files Browse the repository at this point in the history
…rrectly (#191964) (#192502)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[Automatic Import] Resolve http_endpoint config not loading correctly
(#191964)](#191964)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Marius
Iversen","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-03T12:38:57Z","message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:fix","backport:prev-minor","v8.16.0"],"title":"[Automatic
Import] Resolve http_endpoint config not loading
correctly","number":191964,"url":"https://github.com/elastic/kibana/pull/191964","mergeCommit":{"message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/191964","number":191964,"mergeCommit":{"message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324"}}]}]
BACKPORT-->

Co-authored-by: Marius Iversen <[email protected]>
  • Loading branch information
kibanamachine and P1llus authored Sep 10, 2024
1 parent d6cacce commit f1cb738
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ components:
- filestream
- gcp-pubsub
- gcs
- http-endpoint
- http_endpoint
- journald
- kafka
- tcp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const InputType = z.enum([
'filestream',
'gcp-pubsub',
'gcs',
'http-endpoint',
'http_endpoint',
'journald',
'kafka',
'tcp',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const InputTypeOptions: Array<EuiComboBoxOptionOption<InputType>> = [
{ value: 'filestream', label: 'File Stream' },
{ value: 'gcp-pubsub', label: 'GCP Pub/Sub' },
{ value: 'gcs', label: 'Google Cloud Storage' },
{ value: 'http-endpoint', label: 'HTTP Endpoint' },
{ value: 'http_endpoint', label: 'HTTP Endpoint' },
{ value: 'journald', label: 'Journald' },
{ value: 'kafka', label: 'Kafka' },
{ value: 'tcp', label: 'TCP' },
Expand Down

0 comments on commit f1cb738

Please sign in to comment.