Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

chore: bring back system integration scenarios#2233

Merged
mdelapenya merged 18 commits intoelastic:mainfrom
mdelapenya:bring-system-integration-back
Mar 29, 2022
Merged

chore: bring back system integration scenarios#2233
mdelapenya merged 18 commits intoelastic:mainfrom
mdelapenya:bring-system-integration-back

Conversation

@mdelapenya
Copy link
Copy Markdown
Contributor

What does this PR do?

It brings back the system_integration scenarios, which were skipped in the past with the move to the VM support.

Why is it important?

We want to double check why the data_streams are not showing the inputs.streams elements when updating a policy, which was detected while trying to restore the stand-alone mode scenarios.

We noticed that both scenarios (standalone and system integration) share the steps to update the policy, and wanted to double check that the issue that we see with standalone is not present in the system integration. Why?

  1. after updating the package integration with system/metrics, we consider the metrics.json file is outdated
  2. standalone mode uses docker containers, which is still reproducible locally. System metrics uses the underlying VM, so not possible to be tested locally

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 run the Unit tests (make unit-test), and they are passing locally
  • I have run the End-2-End tests for the suite I'm working on, and they are passing locally
  • I have noticed new Go dependencies (run make notice in the proper directory)

@mdelapenya mdelapenya added Team:Automation Label for the Observability productivity team backport-v7.17.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify labels Mar 14, 2022
@mdelapenya mdelapenya self-assigned this Mar 14, 2022
@mdelapenya mdelapenya requested review from a team, IgorGuz2000 and adam-stokes March 14, 2022 17:53
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Mar 14, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-03-28T15:25:41.947+0000

  • Duration: 72 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 315
Skipped 0
Total 315

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@mdelapenya
Copy link
Copy Markdown
Contributor Author

This task is stuck until we know how the metrics.json file is generated. We have contacted @IgorGuz2000 as the original author of the tests and he is researching on how it was created. Waiting for that.

@mdelapenya mdelapenya marked this pull request as ready for review March 28, 2022 12:57
@mdelapenya
Copy link
Copy Markdown
Contributor Author

@IgorGuz2000 this is ready and working! Thanks for your help!!

if name == "linux/metrics" {
file = "/linux_metrics.json"
metrics = "linux"
packageDS, err = fts.kibanaClient.GetIntegrationFromAgentPolicy(fts.currentContext, metrics, fts.Policy)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

For safety, linux metrics keeps the old behaviour and reading the metrics inputs from the "linux_metrics" golden file. @IgorGuz2000 I think it could follow the same approach, although I do not see any scenario using the "linux/metrics" scenario.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yes there is only one scenario there to verify the metrics exist

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

But with current project layout, I cannot see it anymore. Do you have any clue on where it is?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@IgorGuz2000 I'm going to merge this one, we can revisit the "linux_metrics" in follow ups. Thanks!

@mdelapenya mdelapenya merged commit ac1503d into elastic:main Mar 29, 2022
@mdelapenya
Copy link
Copy Markdown
Contributor Author

@Mergifyio refresh

@mdelapenya
Copy link
Copy Markdown
Contributor Author

@Mergifyio backport 7.17

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 29, 2022

refresh

✅ Pull request refreshed

mergify bot pushed a commit that referenced this pull request Mar 29, 2022
* chore: bring back system integration scenarios

* chore: simplify system integration scenarios to use Examples

* fix: retrieve system metrics from Kibana, not from the file

* fix: use example in scenario name

* fix: get package policy right

* chore: eval error the soonest

* chore: handle not supported package policy

* chore: use new method for retrieving the package policy by name

* revert: log inputs from the package policy first

* fix: committed by mistake

* chore: retrieve package policy by ID

* fix: read response properly

* chore: simplify wati strategy

* chore: remove unused file

* chore: enable syslog integration too

* chore: abstract scenario

(cherry picked from commit ac1503d)
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 29, 2022

backport 7.17

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Mar 29, 2022
* chore: bring back system integration scenarios

* chore: simplify system integration scenarios to use Examples

* fix: retrieve system metrics from Kibana, not from the file

* fix: use example in scenario name

* fix: get package policy right

* chore: eval error the soonest

* chore: handle not supported package policy

* chore: use new method for retrieving the package policy by name

* revert: log inputs from the package policy first

* fix: committed by mistake

* chore: retrieve package policy by ID

* fix: read response properly

* chore: simplify wati strategy

* chore: remove unused file

* chore: enable syslog integration too

* chore: abstract scenario

(cherry picked from commit ac1503d)
mergify bot pushed a commit that referenced this pull request Mar 29, 2022
* chore: bring back system integration scenarios

* chore: simplify system integration scenarios to use Examples

* fix: retrieve system metrics from Kibana, not from the file

* fix: use example in scenario name

* fix: get package policy right

* chore: eval error the soonest

* chore: handle not supported package policy

* chore: use new method for retrieving the package policy by name

* revert: log inputs from the package policy first

* fix: committed by mistake

* chore: retrieve package policy by ID

* fix: read response properly

* chore: simplify wati strategy

* chore: remove unused file

* chore: enable syslog integration too

* chore: abstract scenario

(cherry picked from commit ac1503d)
mdelapenya added a commit that referenced this pull request Mar 29, 2022
* chore: bring back system integration scenarios

* chore: simplify system integration scenarios to use Examples

* fix: retrieve system metrics from Kibana, not from the file

* fix: use example in scenario name

* fix: get package policy right

* chore: eval error the soonest

* chore: handle not supported package policy

* chore: use new method for retrieving the package policy by name

* revert: log inputs from the package policy first

* fix: committed by mistake

* chore: retrieve package policy by ID

* fix: read response properly

* chore: simplify wati strategy

* chore: remove unused file

* chore: enable syslog integration too

* chore: abstract scenario

(cherry picked from commit ac1503d)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Mar 29, 2022
* chore: bring back system integration scenarios

* chore: simplify system integration scenarios to use Examples

* fix: retrieve system metrics from Kibana, not from the file

* fix: use example in scenario name

* fix: get package policy right

* chore: eval error the soonest

* chore: handle not supported package policy

* chore: use new method for retrieving the package policy by name

* revert: log inputs from the package policy first

* fix: committed by mistake

* chore: retrieve package policy by ID

* fix: read response properly

* chore: simplify wati strategy

* chore: remove unused file

* chore: enable syslog integration too

* chore: abstract scenario

(cherry picked from commit ac1503d)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Mar 29, 2022
* chore: bring back system integration scenarios

* chore: simplify system integration scenarios to use Examples

* fix: retrieve system metrics from Kibana, not from the file

* fix: use example in scenario name

* fix: get package policy right

* chore: eval error the soonest

* chore: handle not supported package policy

* chore: use new method for retrieving the package policy by name

* revert: log inputs from the package policy first

* fix: committed by mistake

* chore: retrieve package policy by ID

* fix: read response properly

* chore: simplify wati strategy

* chore: remove unused file

* chore: enable syslog integration too

* chore: abstract scenario

(cherry picked from commit ac1503d)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request Mar 30, 2022
* main: (72 commits)
  fix: always quote variables in shell scripts (elastic#2284)
  chore: bring back system integration scenarios (elastic#2233)
  chore: do not notify build green for fleet nightly builds (elastic#2277)
  chore: include suite, platform and tags in test reports name (elastic#2273)
  bump stack version 8.2.0-dcff22d7 (elastic#2270)
  bump stack version 8.2.0-4509f321 (elastic#2265)
  chore: bump Godog to v0.12.4 (elastic#2245)
  bump stack version 8.2.0-5cc993c1 (elastic#2254)
  bump stack version 8.2.0-82b803a1 (elastic#2250)
  fix: never process elasticsearch CI artifacts (elastic#2246)
  bump stack version 8.2.0-ff67d7b8 (elastic#2242)
  ci: periodic builds for the last two minor versions (elastic#2241)
  bump stack version 8.2.0-9bac538c (elastic#2240)
  fix: add end-of-file line in templates (elastic#2237)
  chore: add Christos to SSH users
  bump stack version 8.2.0-fee3b8d2 (elastic#2234)
  Separate ES workload from Agent spec and make it req for the scenarios (elastic#2203)
  bump stack version 8.2.0-d02c907a (elastic#2228)
  bump stack version 8.2.0-63265ec9 (elastic#2225)
  fix: wrong link (elastic#2220)
  ...
@mdelapenya mdelapenya deleted the bring-system-integration-back branch April 11, 2022 15:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport-v7.17.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify Team:Automation Label for the Observability productivity team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants