Skip to content

Revert "[SIEM] apollo@3 (#51926)" and "[SIEM][CASE] Init Configure Case Page (#58121)"#58806

Merged
spalger merged 3 commits intoelastic:masterfrom
spalger:revert/51926
Feb 28, 2020
Merged

Revert "[SIEM] apollo@3 (#51926)" and "[SIEM][CASE] Init Configure Case Page (#58121)"#58806
spalger merged 3 commits intoelastic:masterfrom
spalger:revert/51926

Conversation

@spalger
Copy link
Copy Markdown
Contributor

@spalger spalger commented Feb 28, 2020 •
edited by tylersmalley
Loading

This reverts #51926

Closes #58793

This PR caused a number of issues in local development, introduced old versions of packages we work hard to keep updated, and triggers a bunch of new warnings in npm.

@spalger spalger added Team:Operations Kibana-Operations Team Team:Security Platform Security: Auth, Users, Roles, Spaces, Audit Logging, etc t// Team:SIEM v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.7.0 labels Feb 28, 2020
@spalger spalger requested a review from a team as a code owner February 28, 2020 00:52
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 28, 2020

Pinging @elastic/kibana-security (Team:Security)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 28, 2020

Pinging @elastic/siem (Team:SIEM)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 28, 2020

Pinging @elastic/kibana-operations (Team:Operations)

@tylersmalley
Copy link
Copy Markdown
Member

tylersmalley commented Feb 28, 2020 •
edited
Loading

Considering the number of issues stemming from that commit and no real certainty to when they will be resolved. I think the best course of action is to revert is for now to restore the state of master and another PR can be opened to update apollo.

@spalger
Copy link
Copy Markdown
Contributor Author

spalger commented Feb 28, 2020

@elasticmachine merge upstream

3 similar comments
@spalger
Copy link
Copy Markdown
Contributor Author

spalger commented Feb 28, 2020

@elasticmachine merge upstream

@spalger
Copy link
Copy Markdown
Contributor Author

spalger commented Feb 28, 2020

@elasticmachine merge upstream

@patrykkopycinski
Copy link
Copy Markdown
Contributor

patrykkopycinski commented Feb 28, 2020

@elasticmachine merge upstream

@sulemanof
Copy link
Copy Markdown
Contributor

sulemanof commented Feb 28, 2020

CI, please, go green 🙏 ! ©️ Windows users.

@spalger
Copy link
Copy Markdown
Contributor Author

spalger commented Feb 28, 2020

@elasticmachine merge upstream

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 28, 2020

merge conflict between base and head

@spalger spalger changed the title Revert "[SIEM] apollo@3 (#51926)" Revert "[SIEM] apollo@3 (#51926)" and "[SIEM][CASE] Init Configure Case Page (#58121)" Feb 28, 2020
@spalger
Copy link
Copy Markdown
Contributor Author

spalger commented Feb 28, 2020 •
edited
Loading

Okay, there is a problem in the X-Pack jest tests caused by an outdated snapshot that should trigger a failure. I'll push up a fix for that once CI is done and if that's the only failure I'm merging this as this PR has become urgent to fix windows dev and unblock the rest of the SIEM team. I've verified all other checks from the xpack-intake job locally and they look good (It's just node legacy/plugins/siem/scripts/check_circular_deps).

@spalger spalger merged commit a3e68a1 into elastic:master Feb 28, 2020
@cnasikas cnasikas mentioned this pull request Feb 28, 2020
Merged
2 tasks
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Feb 28, 2020

💚 Build Succeeded

History

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

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Feb 29, 2020

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 58806 or prevent reminders by adding the backport:skip label.

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Feb 29, 2020
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Mar 1, 2020

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 58806 or prevent reminders by adding the backport:skip label.

jloleysens added a commit to jloleysens/kibana that referenced this pull request Mar 2, 2020
@jloleysens
Merge branch 'master' of github.com:elastic/kibana into ua/batch-rein…
17f39e7 
…dex-server-side

* 'master' of github.com:elastic/kibana: (34 commits)
  [Upgrade Assistant] Remove "boom" from reindex service (elastic#58715)
  [data] Clean up QueryStringInput unit tests (elastic#58704)
  [SIEM] Detection Fix typo in Adobe Hijack Persistence rule (elastic#58804)
  Restores [SIEM][CASE] Init Configure Case Page (elastic#58121) (elastic#58924)
  Skips additional failing Ingest Manager integration tests
  Skips failing Ingest Manager integration tests
  Move dev tools styles to NP (elastic#58855)
  change to have kibana --ssl cli option use more recent certs (elastic#57933)
  disable failing suite (elastic#58942)
  Don't start pollEsNodesVersion unless someone subscribes (elastic#56923)
  Do not write UUID file during optimize process (elastic#58899)
  [Endpoint] Task/add nav bar (elastic#58604)
  [Metric Alerts] Add backend support for multiple expressions per alert  (elastic#58672)
  [Metrics Alerts] Fix alerting on a rate aggregation (elastic#58789)
  disable flaky suite (elastic#55953)
  Revert "[SIEM] apollo@3 (elastic#51926)" and "[SIEM][CASE] Init Confi… (elastic#58806)
  [resubmit] Prep agg types for new platform (elastic#58893)
  [Lens] Allow number formatting within Lens (elastic#56253)
  [Autocomplete] Use settings from config rather than UI settings (elastic#58784)
  Improve action and trigger types (elastic#58657)
  ...

# Conflicts:
#	x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
@spalger spalger added backport:skip This PR does not require backporting and removed v7.7.0 labels Mar 2, 2020
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 2, 2020
@spalger spalger deleted the revert/51926 branch August 18, 2020 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tylersmalley tylersmalley tylersmalley approved these changes

Assignees

No one assigned

Labels

backport:skip This PR does not require backporting release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team Team:Security Platform Security: Auth, Users, Roles, Spaces, Audit Logging, etc t// Team:SIEM v8.0.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Kibana on Windows 'New platform optimizer error Error: optimizer unexpectedly completed when in watch mode'

6 participants

@spalger @elasticmachine @tylersmalley @patrykkopycinski @sulemanof @kibanamachine