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

Fix for the OS field and scenarios#1349

Merged
IgorGuz2000 merged 11 commits intoelastic:masterfrom
IgorGuz2000:Igor_test_system
Jul 27, 2021
Merged

Fix for the OS field and scenarios#1349
IgorGuz2000 merged 11 commits intoelastic:masterfrom
IgorGuz2000:Igor_test_system

Conversation

@IgorGuz2000
Copy link
Copy Markdown
Contributor

@IgorGuz2000 IgorGuz2000 commented Jul 21, 2021

What does this PR do?

added OS field to the steps and one scenario

Why is it important?

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)

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 21, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-27T19:50:35.639+0000

  • Duration: 37 min 1 sec

  • Commit: aabc2ed

Test stats 🧪

Test Results
Failed 0
Passed 231
Skipped 0
Total 231

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 231
Skipped 0
Total 231

Comment thread e2e/_suites/fleet/features/system_integration.feature
@IgorGuz2000
Copy link
Copy Markdown
Contributor Author

This is the ticket for this problem
#1324

Comment thread e2e/_suites/fleet/fleet.go Outdated
@IgorGuz2000 IgorGuz2000 requested a review from adam-stokes July 27, 2021 20:30
@IgorGuz2000 IgorGuz2000 merged commit 986ac90 into elastic:master Jul 27, 2021
mergify Bot pushed a commit that referenced this pull request Jul 27, 2021
* Fixed some minor errors and add one scenario

* fixes by Adam comments

* fix comments

* fix by Adam comments

(cherry picked from commit 986ac90)
mergify Bot pushed a commit that referenced this pull request Jul 27, 2021
* Fixed some minor errors and add one scenario

* fixes by Adam comments

* fix comments

* fix by Adam comments

(cherry picked from commit 986ac90)
mergify Bot pushed a commit that referenced this pull request Jul 27, 2021
* Fixed some minor errors and add one scenario

* fixes by Adam comments

* fix comments

* fix by Adam comments

(cherry picked from commit 986ac90)
Comment on lines +1336 to +1340
log.WithFields(log.Fields{
"last_activity_ms": item.Path("last_activity_ms").Data().(float64),
"startTime": startTime,
"os": os,
}).Info("The " + name + " with value system." + set + " in the metrics")
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.

For upcoming PRs, the preferred logging style should be something like this:

log.WithFields(log.Fields{
	"last_activity_ms": item.Path("last_activity_ms").Data().(float64),
	"startTime":        startTime,
	"os":        os,
	"integration":   name,
	"metricset":       set,
}).Info("Last activity greater than start time")

And maybe using Debug level.

@mdelapenya
Copy link
Copy Markdown
Contributor

Great work with the PR @IgorGuz2000! Let's not forget to open a bug in the dev team repo (See my comment here #1324 (comment)) so that they can work on the fix for Centos

mdelapenya added a commit that referenced this pull request Jul 28, 2021
* Fix for the OS field and scenarios (#1349)

* Fixed some minor errors and add one scenario

* fixes by Adam comments

* fix comments

* fix by Adam comments

(cherry picked from commit 986ac90)

* fix: remove whitespaces

Co-authored-by: IgorG <56408662+IgorGuz2000@users.noreply.github.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Jul 28, 2021
* Fix for the OS field and scenarios (#1349)

* Fixed some minor errors and add one scenario

* fixes by Adam comments

* fix comments

* fix by Adam comments

(cherry picked from commit 986ac90)

* fix: remove whitespaces

Co-authored-by: IgorG <56408662+IgorGuz2000@users.noreply.github.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Jul 28, 2021
* Fix for the OS field and scenarios (#1349)

* Fixed some minor errors and add one scenario

* fixes by Adam comments

* fix comments

* fix by Adam comments

(cherry picked from commit 986ac90)

* fix: remove whitespaces

Co-authored-by: IgorG <56408662+IgorGuz2000@users.noreply.github.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request Jul 28, 2021
* master:
  fix(ci): wait for downstream jobs on scheduled jobs (elastic#1393)
  Fix for the OS field and scenarios (elastic#1349)
  Add test case for add_kubernetes_metadata with autodiscover (elastic#1385)
  chore(ci): propagate downstream build result to upstream (elastic#1377)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants