Skip to content

Cherry-pick #23886 to 7.11: [Elastic Agent] Fix issues with dynamic inputs and conditions#24005

Merged
blakerouse merged 1 commit intoelastic:7.11from
blakerouse:backport_23886_7.11
Feb 11, 2021
Merged

Cherry-pick #23886 to 7.11: [Elastic Agent] Fix issues with dynamic inputs and conditions#24005
blakerouse merged 1 commit intoelastic:7.11from
blakerouse:backport_23886_7.11

Conversation

@blakerouse
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse commented Feb 11, 2021 •
edited by zube bot
Loading

Cherry-pick of PR #23886 to 7.11 branch. Original message:

What does this PR do?

Fixes 2 issues that where affecting the usage of dynamic inputs and conditions.

  • Loading of the configuration was not excluding the inputs from the go-ucfg variable expansion. Inside of inputs on variable expansion is done by the dynamic inputs code.
  • EQL string methods where too strict on type checks, this lowers that to try to convert any type to a string before doing the comparison. This is important in cases where a variable results to an un-expected type, like *eql.null.

Why is it important?

Usage of dynamic inputs work as expected.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@blakerouse
[Elastic Agent] Fix issues with dynamic inputs and conditions (elasti…
cacceef 
…c#23886)

* Fix loading of configurations to not parse variables in inputs. Fix issue with EQL string methods.

* Run fmt.

* Add changelog entry.

* Cleanup the config loading more.

* Fix NewConfigFrom to handle maps.

(cherry picked from commit de7906b)
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 11, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 11, 2021

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 11, 2021
@blakerouse blakerouse self-assigned this Feb 11, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 11, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24005 opened

  • Start Time: 2021-02-11T14:52:50.184+0000

  • Duration: 30 min 26 sec

  • Commit: cacceef

Test stats 🧪

Test Results
Failed 0
Passed 5654
Skipped 24
Total 5678

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 5654
Skipped 24
Total 5678

@blakerouse blakerouse merged commit 05adac7 into elastic:7.11 Feb 11, 2021
@blakerouse blakerouse deleted the backport_23886_7.11 branch February 11, 2021 17:04
@EricDavisX EricDavisX mentioned this pull request Mar 8, 2021
Closed
@thbkrkr thbkrkr mentioned this pull request Mar 30, 2021
Closed
thbkrkr added a commit to thbkrkr/cloud-on-k8s that referenced this pull request Mar 30, 2021
@thbkrkr
Adjust Elastic agent Kubernetes recipe
6218e83 
Use ${env.VAR} syntax for environment variables in the configuration
because loading configuration excludes `inputs` from the go-ucfg
variable expansion since elastic/beats#24005.
This was referenced Mar 30, 2021
Merged
Closed
@zube zube bot removed the [zube]: Done label May 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@blakerouse blakerouse

Labels

backport Team:Elastic-Agent Label for the Agent team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@blakerouse @elasticmachine @ChrsMark