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

[EPM]: Assign data source to policy in UI #53597

Merged
merged 19 commits into from
Dec 23, 2019
Merged

[EPM]: Assign data source to policy in UI #53597

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f5107eb
WIP. Add datasource to policy
Dec 19, 2019
27a827d
WIP. Fix proxy bug. Let ES generate source ids. Refactor along the way.
Dec 19, 2019
12e98a3
Datasource.id isn't optional. It's just missing before we send to Ingest
Dec 20, 2019
0b15c18
Delete EPM's mapping of datasources saved object. Ingest handles that.
Dec 20, 2019
12de8c5
Keep datasource object-related work in constructDatasource
Dec 20, 2019
f0df303
Whitespace / comment changes
Dec 20, 2019
0cc5d85
Move asset installation into own function. Keep entry point high-level.
Dec 20, 2019
e749c9d
Extract function arguments into an interface
Dec 20, 2019
48b9519
More descriptive (less ambiguous) names for these two functions
Dec 20, 2019
0b7a6de
Use enum values from Ingest instead of plain strings
Dec 20, 2019
4008ed2
Limit the 'type' key of references to known asset types.
Dec 20, 2019
ae5152f
Update variable names to clarify that we're merging arrays of references
Dec 20, 2019
a9dab31
Merge branch 'feature-ingest' into assign-data-source-to-policy-epm-ui
Dec 20, 2019
db8d6c6
Use [].flat instead .reduce + .concat to avoid error on empty arrays.
Dec 20, 2019
7f272dc
Pass PackageInfo value directly to component vs pulling off n properties
Dec 20, 2019
a502cb0
Name handlers/options based on the data, not the UI element
Dec 20, 2019
503dfec
Populate policy combo box based on values from Ingest policy API
Dec 20, 2019
5dba6cc
Mark Dataset.vars as optional.
Dec 23, 2019
bae5244
Add TODOs
Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Whitespace / comment changes
  • Loading branch information
John Schulz committed Dec 20, 2019
commit f0df303e0af97786f29474fd88239ab18a936a58
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/epm/server/datasources/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ export async function handleRequestInstallDatasource(
datasets,
datasourceName,
callCluster,
policyIds,
// long-term, I don't want to pass `request` through
// but this was the fastest/least invasive change way to make the change
request,
policyIds,
});

return result;
Expand Down
7 changes: 4 additions & 3 deletions x-pack/legacy/plugins/epm/server/ingest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import { ReturnTypeCreate, ReturnTypeUpdate } from '../../ingest/common/types/st
import { Datasource } from '../../ingest/server/libs/types';
import { Request } from './types';

// Temporary while we're iterating.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Like the comment says, this is just a place to store Ingest-related behavior, like we do with Registry, Packages, etc. I expect these to be replaced by calls to functions from Ingest but this keeps them together while we're figuring thing out.

// Not an abstraction for Ingest. Just a file which handles Ingest-related behavior
// We'll delete it or clean it up eventually

export async function addDatasourcesToPolicy({
request,
datasources,
Expand Down Expand Up @@ -54,9 +58,6 @@ export async function createDatasource({
}
}

// Temporary while we're iterating.
// If we end up keeping the "make another HTTP request" method,
// we'll clean this up via proxy or something else
async function ingestAPI({
path,
method,
Expand Down