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

x-pack/filebeat/input/cel: add envvar support #40779

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Sep 12, 2024

Proposed commit message

See title.

Note that the example shown for allowed_environment can be demonstrated by adding the following.

diff --git a/x-pack/filebeat/input/cel/input_test.go b/x-pack/filebeat/input/cel/input_test.go
index 44ad39435b..9409c4f855 100644
--- a/x-pack/filebeat/input/cel/input_test.go
+++ b/x-pack/filebeat/input/cel/input_test.go
@@ -411,6 +411,31 @@ var inputTests = []struct {
                        {"message": "not present"},
                },
        },
+       {
+               name: "env_var_path",
+               config: map[string]interface{}{
+                       "interval": 1,
+                       "allowed_environment": []string{
+                               "PATH",
+                       },
+                       "program": `{
+                               "events": {
+                                       "message": env.?PATH.orValue("").split(":")
+                                               .map(p, try(dir(p)))
+                                               .filter(r, type(r) != type(""))
+                                               .flatten()
+                                               .collate("name")
+                               }
+                       }`,
+                       "state": nil,
+                       "resource": map[string]interface{}{
+                               "url": "",
+                       },
+               },
+               want: []map[string]interface{}{
+                       {"message": ""}, // This will fail, but will show the diff.
+               },
+       },
 
        // FS-based tests.
        {

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added enhancement Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team labels Sep 12, 2024
@efd6 efd6 self-assigned this Sep 12, 2024
@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 Sep 12, 2024
Copy link
Contributor

mergify bot commented Sep 12, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @efd6? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Sep 12, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 12, 2024
@efd6 efd6 marked this pull request as ready for review September 12, 2024 06:57
@efd6 efd6 requested a review from a team as a code owner September 12, 2024 06:57
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

Copy link
Contributor

mergify bot commented Sep 18, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b 40762-cel upstream/40762-cel
git merge upstream/main
git push upstream 40762-cel

@efd6 efd6 force-pushed the 40762-cel branch 2 times, most recently from e15ec60 to abe9459 Compare September 23, 2024 05:48
Copy link
Contributor

mergify bot commented Sep 23, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b 40762-cel upstream/40762-cel
git merge upstream/main
git push upstream 40762-cel

@efd6 efd6 force-pushed the 40762-cel branch 2 times, most recently from e0ac405 to ce78b50 Compare September 25, 2024 05:25
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM

interval: 1m
resource.url: ""
allowed_environment:
PATH
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
PATH
- PATH

@efd6 efd6 enabled auto-merge (squash) September 26, 2024 05:07
@efd6 efd6 merged commit 3c4adf6 into elastic:main Sep 26, 2024
19 of 22 checks passed
mergify bot pushed a commit that referenced this pull request Sep 26, 2024
efd6 added a commit that referenced this pull request Sep 29, 2024
(cherry picked from commit 3c4adf6)

Co-authored-by: Dan Kortschak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify enhancement Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants