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

[Ingest] Fix data source creation and double system data source #60069

Merged
merged 3 commits into from
Mar 13, 2020

Conversation

jen-huang
Copy link
Contributor

@jen-huang jen-huang commented Mar 12, 2020

Summary

This PR fixes:

  • Internal Server Error related to invalid value of updated_on field for agent config saved object when attempting to create a data source (step 3 in the UI)
  • Two system-1 packages showing in default agent config list because the datasource ID got double-assigned to the agent config

Self shipping this PR once CI is green.

@jen-huang jen-huang added Feature:EPM Fleet team's Elastic Package Manager (aka Integrations) project Feature:Fleet Fleet team's agent central management project labels Mar 12, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Feature:EPM)

@@ -82,6 +82,4 @@ async function addPackageToConfig(
config_id: config.id,
output_id: defaultOutput.id,
});
// Assign it to the given agent config
await agentConfigService.assignDatasources(soClient, datasource.config_id, [datasource.id]);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Line removed as this is done in datasourceService.create

@jfsiii
Copy link
Contributor

jfsiii commented Mar 12, 2020

Now that #59376 has merged please switch this to be against master

@jen-huang jen-huang changed the base branch from feature-ingest to master March 12, 2020 23:02
@jen-huang jen-huang force-pushed the feature/ingest/ds-fixes branch from ebe87bb to be6d794 Compare March 12, 2020 23:07
@jen-huang jen-huang added release_note:skip Skip the PR/issue when compiling release notes v7.7.0 v8.0.0 labels Mar 12, 2020
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

  • 💚 Build #32960 succeeded ebe87bb77ea5a0a5f44b98822820b34d62dd08cb

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

@jen-huang jen-huang merged commit cc535ff into elastic:master Mar 13, 2020
@jen-huang jen-huang deleted the feature/ingest/ds-fixes branch March 13, 2020 01:16
jen-huang added a commit that referenced this pull request Mar 13, 2020
…) (#60080)

* Fix Internal Server Error about mapping issue when creating a data source

* Fix double system datasource appearing in default config

* Ensure we can never double assign same datasource ID to agent config
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 13, 2020
* master:
  [Alerting] extend Alert Type with names/descriptions of action variables (elastic#59756)
  [Ingest] Fix data source creation and double system data source (elastic#60069)
  Add button to view full service map (elastic#59394)
  unskip tests for code coverage (elastic#59725)
  [Ingest] Add Fleet & EPM features (elastic#59376)
  [Logs UI] Show navigation bar while loading source configurati… (elastic#59997)
  [Endpoint] ERT-82 Alerts search bar (elastic#59702)
  Aggregate queue types being used by Beats (elastic#59850)
  skip flaky suite (elastic#59541)
  Convert Timeline to TypeScript (elastic#59966)
  Make context.core required argument to context providers (elastic#59996)
@jen-huang jen-huang added the Team:Fleet Team label for Observability Data Collection Fleet team label Mar 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature:EPM Fleet team's Elastic Package Manager (aka Integrations) project Feature:Fleet Fleet team's agent central management project release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.7.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants