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.

Sign up for GitHub

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

Jump to bottom

[Ingest Manager] Version checks agent vs kibana #76238

Merged
merged 6 commits into from
Sep 1, 2020
Merged

[Ingest Manager] Version checks agent vs kibana #76238

merged 6 commits into from
Sep 1, 2020

Conversation

jfsiii
Copy link
Contributor

@jfsiii jfsiii commented Aug 28, 2020

Summary

closes #75176

Updated validateAgentVersion & added tests based on #75176 (comment)

Also changed validateAgentVersions signature

- function validateAgentVersion(metadata?: { local: any; userProvided: any }) {
+ function validateAgentVersion(
+   agentVersion: string,
+   kibanaVersion = appContextService.getKibanaVersion()
+ ) {

Which means we use it like

  const agentVersion = metadata?.local?.elastic?.agent?.version;
  validateAgentVersion(agentVersion);

or like in the tests

validateAgentVersion('7.8.0-SNAPSHOT', '7.8.0');

Checklist

@jfsiii jfsiii added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team labels Aug 28, 2020
@jfsiii jfsiii requested review from nchaulet, EricDavisX and a team August 28, 2020 21:11
@elasticmachine
Copy link
Contributor

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

@jfsiii jfsiii mentioned this pull request Aug 28, 2020
Closed
@jfsiii jfsiii self-assigned this Aug 29, 2020
@jfsiii
Copy link
Contributor Author

jfsiii commented Aug 30, 2020

@elasticmachine merge upstream

1 similar comment
@jfsiii
Copy link
Contributor Author

jfsiii commented Aug 31, 2020

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@jfsiii jfsiii requested a review from a user August 31, 2020 15:09
@jfsiii jfsiii added v7.9.2 and removed v7.9.1 labels Sep 1, 2020
@jfsiii
Copy link
Contributor Author

jfsiii commented Sep 1, 2020

Changed to 7.9.2 after a Slack conversation with @ph and @jen-huang

jfsiii
jfsiii commented Sep 1, 2020
View reviewed changes
x-pack/plugins/ingest_manager/server/services/agents/enroll.test.ts
validateAgentVersion('7.8.0', '7.8.0-SNAPSHOT');
});

it('very close versions, e.g. patch/prerelease - all combos should work', () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

cc: @EricDavisX wdyt of these tests? They are basically validate(agent_version, kibana_version)

Any other combinations you'd like added to the tests?

@jfsiii jfsiii merged commit 030d5e1 into elastic:master Sep 1, 2020
gmmorris added a commit to gmmorris/kibana that referenced this pull request Sep 2, 2020
@gmmorris
Merge branch 'master' into actions/webhook-remove-header
c9deb85 
* master: (223 commits)
  skip flaky suite (elastic#75724)
  [Reporting] Add functional test for Reports in non-default spaces (elastic#76053)
  [Enterprise Search] Fix various icons in dark mode (elastic#76430)
  skip flaky suite (elastic#76245)
  Add `auto` interval to histogram AggConfig (elastic#76001)
  [Resolver] generator uses setup_node_env (elastic#76422)
  [Ingest Manager] Support both zip & tar archives from Registry (elastic#76197)
  [Ingest Manager] Improve agent vs kibana version checks (elastic#76238)
  Manually building `KueryNode` for Fleet's routes (elastic#75693)
  remove dupe tinymath section (elastic#76093)
  Create APM issue template (elastic#76362)
  Delete unused file. (elastic#76386)
  [SECURITY_SOLUTION][ENDPOINT] Trusted Apps Create API (elastic#76178)
  [Detections Engine] Add Alert actions to the Timeline (elastic#73228)
  [Dashboard First] Library Notification (elastic#76122)
  [Maps] Add mvt support for ES doc sources  (elastic#75698)
  Add setHeaderActionMenu API to AppMountParameters (elastic#75422)
  [ML] Remove "Are you sure" from data frame analytics jobs (elastic#76214)
  [yarn] remove typings-tester, use @ts-expect-error (elastic#76341)
  [Reporting/CSV] Do not fail the job if scroll ID can not be cleared (elastic#76014)
  ...
jfsiii pushed a commit to jfsiii/kibana that referenced this pull request Sep 2, 2020
@elasticmachine
[Ingest Manager] Improve agent vs kibana version checks (elastic#76238)
c7d6f19 
* Add logic spec'd in issue comments. Tests pass.

* Change fn to accept 1 (opt 2) string vs object

* Add tests based on issue comments

* Change expected error message in test

* Capitalize Kibana in error message

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@jfsiii jfsiii mentioned this pull request Sep 2, 2020
Merged
jfsiii pushed a commit to jfsiii/kibana that referenced this pull request Sep 2, 2020
@elasticmachine
[Ingest Manager] Improve agent vs kibana version checks (elastic#76238)
b845020 
* Add logic spec'd in issue comments. Tests pass.

* Change fn to accept 1 (opt 2) string vs object

* Add tests based on issue comments

* Change expected error message in test

* Capitalize Kibana in error message

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@jfsiii jfsiii mentioned this pull request Sep 2, 2020
Merged
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Sep 3, 2020
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

jfsiii pushed a commit that referenced this pull request Sep 3, 2020
@elasticmachine
[Ingest Manager] Improve agent vs kibana version checks (#76238) (#76490
5beb515 
)

* Add logic spec'd in issue comments. Tests pass.

* Change fn to accept 1 (opt 2) string vs object

* Add tests based on issue comments

* Change expected error message in test

* Capitalize Kibana in error message

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Sep 3, 2020
jfsiii pushed a commit that referenced this pull request Sep 3, 2020
@elasticmachine
[Ingest Manager] Improve agent vs kibana version checks (#76238) (#76488
e2af848 
)

* Add logic spec'd in issue comments. Tests pass.

* Change fn to accept 1 (opt 2) string vs object

* Add tests based on issue comments

* Change expected error message in test

* Capitalize Kibana in error message

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@neptunian neptunian mentioned this pull request Sep 14, 2020
Closed
@ghost
Copy link

ghost commented Sep 18, 2020

Hi @jfsiii

We have validated this ticket on 7.9.2-SNAPSHOT cloud environment and found it Fixed.

We have executed 06 tests under Version agent checks vs kibana TestRun.

Please let us know if anything is missing from our end.

@ph ph mentioned this pull request Oct 16, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nchaulet nchaulet nchaulet approved these changes

@EricDavisX EricDavisX Awaiting requested review from EricDavisX

Assignees

@jfsiii jfsiii

Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.9.2 v7.10.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Ingest Manager] Fix /Enhance Enrollment version checks for Agent v Kibana
4 participants
@jfsiii @elasticmachine @kibanamachine @nchaulet