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

[Backport 2.x] Adding remote indices and multi index functionality (#854) #863

Merged
merged 1 commit into from
Sep 5, 2024
Merged

[Backport 2.x] Adding remote indices and multi index functionality (#854) #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions public/components/FeatureAnywhereContextMenu/CreateAnomalyDetector/AddAnomalyDetector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,23 @@ function AddAnomalyDetector({
>();

const indexPatternId = embeddable.vis.data.aggs.indexPattern.id;
const [dataSourceId, setDataSourceId] = useState<string | undefined>(undefined);
const [dataSourceId, setDataSourceId] = useState<string | undefined>(
undefined
);

async function getDataSourceId() {
try {
const indexPattern = await getSavedObjectsClient().get('index-pattern', indexPatternId);
const indexPattern = await getSavedObjectsClient().get(
'index-pattern',
indexPatternId
);
const refs = indexPattern.references as References[];
const foundDataSourceId = refs.find(ref => ref.type === 'data-source')?.id;
setDataSourceId(foundDataSourceId);
const foundDataSourceId = refs.find(
(ref) => ref.type === 'data-source'
)?.id;
setDataSourceId(foundDataSourceId);
} catch (error) {
console.error("Error fetching index pattern:", error);
console.error('Error fetching index pattern:', error);
}
}

Expand All @@ -152,8 +159,12 @@ function AddAnomalyDetector({
async function fetchData() {
await getDataSourceId();

const getIndicesDispatchCall = dispatch(getIndices(queryText, dataSourceId));
const getMappingDispatchCall = dispatch(getMappings(embeddable.vis.data.aggs.indexPattern.title, dataSourceId));
const getIndicesDispatchCall = dispatch(
getIndices(queryText, dataSourceId)
);
const getMappingDispatchCall = dispatch(
getMappings([embeddable.vis.data.aggs.indexPattern.title], dataSourceId)
);
await Promise.all([getIndicesDispatchCall, getMappingDispatchCall]);
}

Expand All @@ -167,7 +178,7 @@ function AddAnomalyDetector({
}
fetchData();
createEmbeddable();
}, [dataSourceId]);
}, [dataSourceId]);

const [isShowVis, setIsShowVis] = useState(false);
const [accordionsOpen, setAccordionsOpen] = useState({ modelFeatures: true });
Expand Down Expand Up @@ -335,7 +346,7 @@ function AddAnomalyDetector({
name: OVERLAY_ANOMALIES,
args: {
detectorId: detectorId,
dataSourceId: dataSourceId
dataSourceId: dataSourceId,
},
} as VisLayerExpressionFn;

Expand Down
10 changes: 0 additions & 10 deletions public/pages/ConfigureModel/components/Features/Features.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@ export function Features(props: FeaturesProps) {
{({ push, remove, form: { values } }: FieldArrayRenderProps) => {
return (
<Fragment>
{get(props.detector, 'indices.0', '').includes(':') ? (
<div>
<EuiCallOut
title="This detector is using a remote cluster index, so you need to manually input the field."
color="warning"
iconType="alert"
/>
<EuiSpacer size="m" />
</div>
) : null}
{values.featureList.map((feature: any, index: number) => (
<FeatureAccordion
onDelete={() => {
Expand Down
19 changes: 13 additions & 6 deletions public/pages/ConfigureModel/containers/ConfigureModel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ import { RouteComponentProps, useLocation } from 'react-router-dom';
import { AppState } from '../../../redux/reducers';
import { getMappings } from '../../../redux/reducers/opensearch';
import { useFetchDetectorInfo } from '../../CreateDetectorSteps/hooks/useFetchDetectorInfo';
import { BREADCRUMBS, BASE_DOCS_LINK, MDS_BREADCRUMBS } from '../../../utils/constants';
import {
BREADCRUMBS,
BASE_DOCS_LINK,
MDS_BREADCRUMBS,
} from '../../../utils/constants';
import { useHideSideNavBar } from '../../main/hooks/useHideSideNavBar';
import { updateDetector } from '../../../redux/reducers/ad';
import {
Expand Down Expand Up @@ -121,7 +125,7 @@ export function ConfigureModel(props: ConfigureModelProps) {
setIsHCDetector(true);
}
if (detector?.indices) {
dispatch(getMappings(detector.indices[0], dataSourceId));
dispatch(getMappings(detector.indices, dataSourceId));
}
}, [detector]);

Expand All @@ -133,7 +137,11 @@ export function ConfigureModel(props: ConfigureModelProps) {
MDS_BREADCRUMBS.DETECTORS(dataSourceId),
{
text: detector && detector.name ? detector.name : '',
href: constructHrefWithDataSourceId(`#/detectors/${detectorId}`, dataSourceId, false)
href: constructHrefWithDataSourceId(
`#/detectors/${detectorId}`,
dataSourceId,
false
),
},
MDS_BREADCRUMBS.EDIT_MODEL_CONFIGURATION,
]);
Expand Down Expand Up @@ -167,12 +175,11 @@ export function ConfigureModel(props: ConfigureModelProps) {

useEffect(() => {
if (hasError) {
if(dataSourceEnabled) {
if (dataSourceEnabled) {
props.history.push(
constructHrefWithDataSourceId('/detectors', dataSourceId, false)
);
}
else {
} else {
props.history.push('/detectors');
}
}
Expand Down
6 changes: 3 additions & 3 deletions public/pages/CreateDetectorSteps/hooks/useFetchDetectorInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

import { get, isEmpty } from 'lodash';
import { useEffect } from 'react';
import { useEffect, useMemo } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { Detector } from '../../../models/interfaces';
import { AppState } from '../../../redux/reducers';
Expand Down Expand Up @@ -40,13 +40,13 @@ export const useFetchDetectorInfo = (
const isIndicesRequesting = useSelector(
(state: AppState) => state.opensearch.requesting
);
const selectedIndices = get(detector, 'indices.0', '');
const selectedIndices = useMemo(() => get(detector, 'indices', []), [detector]);
useEffect(() => {
const fetchDetector = async () => {
if (!detector) {
await dispatch(getDetector(detectorId, dataSourceId));
}
if (selectedIndices) {
if (selectedIndices && selectedIndices.length > 0) {
await dispatch(getMappings(selectedIndices, dataSourceId));
}
};
Expand Down
16 changes: 0 additions & 16 deletions public/pages/DefineDetector/components/DataFilterList/DataFilterList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
EuiSpacer,
EuiIcon,
EuiButtonEmpty,
EuiCallOut,
} from '@elastic/eui';
import { FieldArray, FieldArrayRenderProps, FormikProps } from 'formik';
import React, { useState, Fragment } from 'react';
Expand All @@ -38,9 +37,6 @@ export const DataFilterList = (props: DataFilterListProps) => {
const [isCreatingNewFilter, setIsCreatingNewFilter] =
useState<boolean>(false);

const selectedIndex = get(props, 'formikProps.values.index.0.label', '');
const isRemoteIndex = selectedIndex.includes(':');

return (
<FieldArray name="filters" validateOnChange={true}>
{({ push, remove, replace, form: { values } }: FieldArrayRenderProps) => {
Expand All @@ -66,18 +62,6 @@ export const DataFilterList = (props: DataFilterListProps) => {
>
<Fragment>
<EuiSpacer size="m" />
{isRemoteIndex ? (
<div>
<EuiCallOut
title="A remote index is selected, so you need to manually input the filter fields."
color="warning"
iconType="alert"
size="s"
style={{ marginTop: '-4px' }}
/>
<EuiSpacer size="m" />
</div>
) : null}
<EuiFlexGroup direction="row" gutterSize="xs">
<EuiFlexItem grow={false}>
{values.filters?.length === 0 ||
Expand Down
15 changes: 14 additions & 1 deletion public/pages/DefineDetector/components/DataFilterList/components/SimpleFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { getIndexFields, getOperators, isNullOperator } from '../utils/helpers';
import FilterValue from './FilterValue';
import { DetectorDefinitionFormikValues } from '../../../models/interfaces';
import { EMPTY_UI_FILTER } from '../../../utils/constants';
import _ from 'lodash';

interface SimpleFilterProps {
filter: UIFilter;
Expand All @@ -40,8 +41,20 @@ interface SimpleFilterProps {
replace(index: number, value: any): void;
}

// This sorting is needed because we utilize two different ways to get index fields,
// through get mapping call and through field_caps API for remote indices
const sortByLabel = (indexFields) => {
//sort the `options` array inside each object by the `label` field
indexFields.forEach(item => {
item.options = _.sortBy(item.options, 'label');
});
//sort the outer array by the `label` field
return _.sortBy(indexFields, 'label');
};

export const SimpleFilter = (props: SimpleFilterProps) => {
const indexFields = getIndexFields(useSelector(getAllFields));
let indexFields = getIndexFields(useSelector(getAllFields));
indexFields = sortByLabel(indexFields)
const [searchedIndexFields, setSearchedIndexFields] = useState<
({
label: DATA_TYPES;
Expand Down
Loading
Loading