Skip to content
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

[Ingest] Support root level yaml variables in agent stream template #66120

Merged
merged 1 commit into from
May 13, 2020

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented May 11, 2020

Description

Needed for elastic/package-registry#449
support agent template like

dataset: {{dataset}}
{{custom}}

Our agent stream template can contains yaml values for example this currently work
template

key:patterns: {{key:patterns}}

with yaml variable like this

key:patterns: `
- foo: "bar"
`

We currently do not support root level yaml variables like this
template

{{custom}}

with yaml variable like this

custom: `
foo: "bar"
`

This PR is fixing this

@nchaulet nchaulet changed the title [Ingest] Poc custom vars in templates [Ingest] Support root level yaml variables in agent stream template May 12, 2020
@nchaulet nchaulet self-assigned this May 12, 2020
@nchaulet nchaulet added Team:Fleet Team label for Observability Data Collection Fleet team v7.8.0 v7.9.0 v8.0.0 labels May 12, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Team:Ingest Management)

@nchaulet nchaulet marked this pull request as ready for review May 12, 2020 14:07
@nchaulet nchaulet requested review from a team and ruflin May 12, 2020 14:07
@nchaulet nchaulet added the release_note:skip Skip the PR/issue when compiling release notes label May 12, 2020
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

  • 💚 Build #47108 succeeded acecf552ef0eae81ea03f1cea6138dcbf08d00a6

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested it locally and works as expected!

@nchaulet nchaulet merged commit 41fbd0f into elastic:master May 13, 2020
@nchaulet nchaulet deleted the poc-custom-var branch May 13, 2020 13:10
v1v added a commit to v1v/kibana that referenced this pull request May 13, 2020
* upstream/master: (223 commits)
  [Ingest] Support root level yaml variables in agent stream template (elastic#66120)
  [Snapshot Restore] Fix error when deleting snapshots behind reverse proxy (elastic#66147)
  [Lens] fix empty state for pie (elastic#66206)
  [APM] Improve e2e tests (elastic#66373)
  [ML] Data Frame Analytics: Fix steps to be named phases. (elastic#65855)
  [Discover] Encode context link filter part (elastic#63831)
  [APM] Scope APM alert creation to environment (elastic#65681)
  Move Kibana Usage collectors outside the telemetry plugin (elastic#65663)
  [ML] Data Frame Analytics: Fix confusion matrix data grid width. (elastic#65818)
  Switch to core application service (elastic#63443)
  Removes use of prefer_v2_templates (elastic#66316)
  [Maps] handle case where fit to bounds does not match any documents (elastic#66307)
  log error instead of throw (elastic#66254)
  [plugin-helpers] remove outdated postinstall task (elastic#66324)
  Spaces - migrate default space and enter space view to KP (elastic#66098)
  [APM] Change plugin id for `apm_oss` to `apmOss` (elastic#66164)
  [Maps] convert map_selectors to TS (elastic#65905)
  [uptime/usage-collector] add missing await (elastic#66079)
  [Ingest] Add additional attributes to the Datasources Saved Object (elastic#66127)
  [Endpoint]EMT-339: add new policy response schema (elastic#66264)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.8.0 v7.9.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants