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

Feature query regex #94

Merged
merged 6 commits into from
Aug 25, 2021
Merged

Feature query regex #94

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
708d357
added regex to get index
mengweieric Aug 24, 2021
b98b80a
file renaming to unify naming converntions
mengweieric Aug 24, 2021
426b118
file renaming
mengweieric Aug 24, 2021
8833a6e
a minor refactoring
mengweieric Aug 24, 2021
c33c600
regex changes
mengweieric Aug 25, 2021
576958a
minor fix for regex
mengweieric Aug 25, 2021
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
0 public/common/constants/explorer.ts → common/constants/explorer.ts
View file
Open in desktop
File renamed without changes.
0 common/index.ts → common/constants/shared.ts
View file
Open in desktop
File renamed without changes.
0 public/common/types/explorer.ts → common/types/explorer.ts
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions common/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*/

export { getIndexPatternFromRawQuery } from './query_utils';
18 changes: 18 additions & 0 deletions common/utils/query_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*/

export const getIndexPatternFromRawQuery = (query: string) : string => {
const indexMatches = query.match('\=(.*)');
Copy link
Member

Choose a reason for hiding this comment

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

maybe use /regex/ instead of 'regex', also the \ and () doesn't seem to make a difference?

does this work with the example i gave before? I was thinking something like .match(/source\s*=\s*([^|\s]+)/)[1] instead of js string manipulation

Copy link
Collaborator Author

@mengweieric mengweieric Aug 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Sure, we can use /regex/. Yes, the \ and () can be removed in this case.

This works with the example you gave before and also other corner cases I can think of. But I agree it's better to use regex entirely in this case.

Copy link
Member

Choose a reason for hiding this comment

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

Got it, then looks good. up to you on which implementation you want to use.

just a note i did not test the regex i wrote. if you use something similar maybe also add the /i flag to ignore case, and i think index can be used instead of source so maybe (source|index)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Exactly, I'm adding index and /i to it, thanks

if (indexMatches) {
return indexMatches[0]?.slice(1)?.split('|')[0]?.trim();
}
return '';
};
4 changes: 2 additions & 2 deletions public/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import { Home as TraceAnalyticsHome } from './trace_analytics/home';
import { Home as CustomPanelsHome } from './custom_panels/home';
import { CustomPanelView } from './custom_panels/custom_panel_view';
import { Home as EventExplorerHome } from './explorer/home';
import { LogExplorer } from './explorer/logExplorer';
import { observabilityTitle } from '../../common';
import { LogExplorer } from './explorer/log_explorer';
import { observabilityTitle } from '../../common/constants/shared';

interface ObservabilityAppDeps {
CoreStart: CoreStart;
Expand Down
0 public/components/explorer/dataGrid.scss → public/components/explorer/data_grid.scss
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion public/components/explorer/dataGrid.tsx → public/components/explorer/data_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* GitHub history for details.
*/

import './dataGrid.scss';
import './data_grid.scss';

import React, { useMemo } from 'react';
import _ from 'lodash';
Expand Down
51 changes: 25 additions & 26 deletions public/components/explorer/explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ import {
} from '@elastic/eui';
import classNames from 'classnames';
import { Search } from '../common/seach/search';
import { CountDistribution } from './visualizations/countDistribution';
import { DataGrid } from './dataGrid';
import { CountDistribution } from './visualizations/count_distribution';
import { DataGrid } from './data_grid';
import { Sidebar } from './sidebar';
import { NoResults } from './noResults';
import { NoResults } from './no_results';
import { HitsCounter } from './hits_counter/hits_counter';
import { TimechartHeader } from './timechart_header';
import { ExplorerVisualizations } from './visualizations';
import {
IField,
IQueryTab
} from '../../common/types/explorer';
} from '../../../common/types/explorer';
import {
TAB_CHART_TITLE,
TAB_EVENT_TITLE,
Expand All @@ -44,19 +44,20 @@ import {
RAW_QUERY,
SELECTED_FIELDS,
UNSELECTED_FIELDS
} from '../../common/constants/explorer';
} from '../../../common/constants/explorer';
import { getIndexPatternFromRawQuery } from '../../../common/utils';
import {
useFetchEvents,
useFetchVisualizations
} from './hooks';
import {
changeQuery,
selectQueries
} from './slices/querySlice';
import { selectQueryResult } from './slices/queryResultSlice';
import { selectFields, updateFields } from './slices/fieldSlice';
import { selectCountDistribution } from './slices/countDistributionSlice';
import { selectExplorerVisualization } from './slices/visualizationSlice';
} from './slices/query_slice';
import { selectQueryResult } from './slices/query_result_slice';
import { selectFields, updateFields } from './slices/field_slice';
import { selectCountDistribution } from './slices/count_distribution_slice';
import { selectExplorerVisualization } from './slices/visualization_slice';

const TAB_EVENT_ID = _.uniqueId(TAB_EVENT_ID_TXT_PFX);
const TAB_CHART_ID = _.uniqueId(TAB_CHART_ID_TXT_PFX);
Expand All @@ -66,6 +67,8 @@ interface IExplorerProps {
tabId: string
}

const statsRegx = new RegExp(/stats/);

export const Explorer = ({
pplService,
tabId
Expand Down Expand Up @@ -113,18 +116,21 @@ export const Explorer = ({
[setFixedScrollEl]
);

const getIndexFromRawQuery = (rawQuery: string) => rawQuery.split('=')[1].split(' ')[0];

useEffect(() => {
const fetchData = () => {
if (!query) return;
if (query.includes('stats')) {
const index = getIndexFromRawQuery(query);
if (statsRegx.test(query)) {
Copy link
Member

Choose a reason for hiding this comment

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

similar here, this is the same as query.includes('stats'). maybe check if stats is followed directly (or with some spaces) after |, or some other conditions that's only true for the stats command?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yea, makes sense, I'm thinking and testing query.match(/|\s*stats/i) to match 'stats'

Copy link
Member

Choose a reason for hiding this comment

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

cool, i think the | character might need escape

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yes, the one I used includes the escape, I noticed that when I left the comment it was missing that escape. I tried to modified it to add escape but it just not reflecting it. Wired.

const index = getIndexPatternFromRawQuery(query);
if (!index) return;
getAvailableFields(`search source=${index}`);
getVisualizations();
} else {
getEvents();
getCountVisualizations('m');
getCountVisualizations('h');
}
};

useEffect(() => {
fetchData();
}, []);

const handleAddField = (field: IField) => toggleFields(field, UNSELECTED_FIELDS, SELECTED_FIELDS);
Expand Down Expand Up @@ -415,18 +421,11 @@ export const Explorer = ({

const handleContentTabClick = (selectedTab: IQueryTab) => setSelectedContentTab(selectedTab.id);

const handleQuerySearch = (tabId: string) => {
if (query.includes('stats')) {
const index = getIndexFromRawQuery(query); // index
getAvailableFields(`search source=${index}`);
getVisualizations();
return;
}
getEvents();
getCountVisualizations('m');
const handleQuerySearch = () => {
fetchData();
}

const handleQueryChange = (query, tabId) => {
const handleQueryChange = (query: string, tabId: string) => {
dispatch(changeQuery({
tabId,
query: {
Expand Down
16 changes: 6 additions & 10 deletions public/components/explorer/home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import React from 'react';
import { uniqueId } from 'lodash';
import { useDispatch, useSelector } from 'react-redux';
import { changeQuery } from './slices/querySlice';
import { initialTabId } from '../../framework/redux/store/sharedState';
import { changeQuery } from './slices/query_slice';
import { initialTabId } from '../../framework/redux/store/shared_state';
import { useHistory } from 'react-router-dom';
import { selectQueries } from './slices/querySlice';
import { selectQueries } from './slices/query_slice';
import {
EuiPage,
EuiPageBody,
Expand All @@ -30,7 +30,7 @@ import {
EuiFlexItem
} from '@elastic/eui';
import { Search } from '../common/seach/search';
import { RAW_QUERY } from '../../common/constants/explorer';
import { RAW_QUERY } from '../../../common/constants/explorer';

export const Home = (props: any) => {

Expand All @@ -40,18 +40,14 @@ export const Home = (props: any) => {

const queryHistories = [
{
query: "source=opensearch_dashboards_sample_data_flights | where timestamp > timestamp('2021-07-01 00:00:00') and timestamp < timestamp('2021-07-02 00:00:00')",
iconType: "tokenEnum"
},
{
query: "source=opensearch_dashboards_sample_data_flights",
query: "search source=opensearch_dashboards_sample_data_logs | where utc_time > timestamp('2021-07-01 00:00:00') and utc_time < timestamp('2021-07-02 00:00:00')",
iconType: "tokenEnum"
}
];

const visHistories = [
{
query: "source=opensearch_dashboards_sample_data_flights | where timestamp > timestamp('2021-07-01 00:00:00') and timestamp < timestamp('2021-07-08 00:00:00') | stats count(Origin) by span(timestamp, '2h')",
query: "search source=opensearch_dashboards_sample_data_logs | where utc_time > timestamp('2021-07-01 00:00:00') and utc_time < timestamp('2021-07-02 00:00:00') | stats count() by span(utc_time, '15m')",
iconType: "tokenHistogram"
}
];
Expand Down
4 changes: 2 additions & 2 deletions public/components/explorer/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
* GitHub history for details.
*/

export { useFetchEvents } from './useFetchEvents';
export { useFetchVisualizations } from './useFetchVisualizations';
export { useFetchEvents } from './use_fetch_events';
export { useFetchVisualizations } from './use_fetch_visualizations';
8 changes: 4 additions & 4 deletions ...mponents/explorer/hooks/useFetchEvents.ts → ...onents/explorer/hooks/use_fetch_events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import {
RAW_QUERY,
SELECTED_FIELDS,
UNSELECTED_FIELDS
} from '../../../common/constants/explorer';
import { fetchSuccess, reset as queryResultReset } from '../slices/queryResultSlice';
import { selectQueries } from '../slices/querySlice';
} from '../../../../common/constants/explorer';
import { fetchSuccess, reset as queryResultReset } from '../slices/query_result_slice';
import { selectQueries } from '../slices/query_slice';
import {
updateFields,
} from '../slices/fieldSlice';
} from '../slices/field_slice';

export const useFetchEvents = ({
pplService,
Expand Down
8 changes: 4 additions & 4 deletions .../explorer/hooks/useFetchVisualizations.ts → ...xplorer/hooks/use_fetch_visualizations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import {
} from 'react-redux';
import {
RAW_QUERY
} from '../../../common/constants/explorer';
import { render as renderCountDis } from '../slices/countDistributionSlice';
import { selectQueries } from '../slices/querySlice';
import { render as renderExplorerVis } from '../slices/visualizationSlice';
} from '../../../../common/constants/explorer';
import { render as renderCountDis } from '../slices/count_distribution_slice';
import { selectQueries } from '../slices/query_slice';
import { render as renderExplorerVis } from '../slices/visualization_slice';

export const useFetchVisualizations = ({
pplService,
Expand Down
0 public/components/explorer/LogExplorer.scss → public/components/explorer/log_explorer.scss
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions public/components/explorer/logExplorer.tsx → public/components/explorer/log_explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* GitHub history for details.
*/

import './logExplorer.scss';
import './log_explorer.scss';
import React, { useEffect, useMemo } from 'react';
import { useDispatch, useSelector, batch } from 'react-redux';
import {
Expand All @@ -24,29 +24,29 @@ import {
EuiTabbedContent
} from '@elastic/eui';
import { Explorer } from './explorer';
import { ILogExplorerProps } from '../../common/types/explorer';
import { ILogExplorerProps } from '../../../common/types/explorer';
import {
TAB_TITLE,
TAB_ID_TXT_PFX
} from '../../common/constants/explorer';
} from '../../../common/constants/explorer';
import {
selectQueryTabs,
addTab,
setSelectedQueryTab,
removeTab
} from './slices/queryTabSlice';
} from './slices/query_tab_slice';
import {
init as initFields,
remove as removefields
} from './slices/fieldSlice';
} from './slices/field_slice';
import {
init as initQuery,
remove as removeQuery
} from './slices/querySlice';
} from './slices/query_slice';
import {
init as initQueryResult,
remove as removeQueryResult,
} from './slices/queryResultSlice';
} from './slices/query_result_slice';

export const LogExplorer = ({
pplService,
Expand Down
0 public/components/explorer/noResults.tsx → public/components/explorer/no_results.tsx
View file
Open in desktop
File renamed without changes.
0 ...onents/explorer/reducers/fetchReducers.ts → ...nents/explorer/reducers/fetch_reducers.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion public/components/explorer/reducers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
* GitHub history for details.
*/

export { fetchSuccess } from './fetchReducers';
export { fetchSuccess } from './fetch_reducers';
0 ...onents/explorer/reducers/queryReducers.ts → ...nents/explorer/reducers/query_reducers.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...explorer/slices/countDistributionSlice.ts → ...plorer/slices/count_distribution_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import {
createSlice
} from '@reduxjs/toolkit';
import { initialTabId } from '../../../framework/redux/store/sharedState';
import { REDUX_EXPL_SLICE_COUNT_DISTRIBUTION } from '../../../common/constants/explorer';
import { initialTabId } from '../../../framework/redux/store/shared_state';
import { REDUX_EXPL_SLICE_COUNT_DISTRIBUTION } from '../../../../common/constants/explorer';

const initialState = {
[initialTabId]: {}
Expand Down
4 changes: 2 additions & 2 deletions .../components/explorer/slices/fieldSlice.ts → ...components/explorer/slices/field_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
import {
createSlice
} from '@reduxjs/toolkit';
import { initialTabId } from '../../../framework/redux/store/sharedState';
import { initialTabId } from '../../../framework/redux/store/shared_state';
import {
SELECTED_FIELDS,
UNSELECTED_FIELDS,
REDUX_EXPL_SLICE_FIELDS
} from '../../../common/constants/explorer';
} from '../../../../common/constants/explorer';

const initialFields = {
[SELECTED_FIELDS]: [],
Expand Down
4 changes: 2 additions & 2 deletions ...nents/explorer/slices/queryResultSlice.ts → ...nts/explorer/slices/query_result_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
createSlice
} from '@reduxjs/toolkit';
import { fetchSuccess as fetchSuccessReducer } from '../reducers'
import { initialTabId } from '../../../framework/redux/store/sharedState';
import { initialTabId } from '../../../framework/redux/store/shared_state';
import {
REDUX_EXPL_SLICE_QUERY_RESULT
} from '../../../common/constants/explorer';
} from '../../../../common/constants/explorer';

const initialState = {
[initialTabId]: {}
Expand Down
4 changes: 2 additions & 2 deletions .../components/explorer/slices/querySlice.ts → ...components/explorer/slices/query_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
import {
createSlice
} from '@reduxjs/toolkit';
import { initialTabId } from '../../../framework/redux/store/sharedState';
import { initialTabId } from '../../../framework/redux/store/shared_state';
import {
RAW_QUERY,
REDUX_EXPL_SLICE_QUERIES
} from '../../../common/constants/explorer';
} from '../../../../common/constants/explorer';

const initialState = {
[initialTabId]: {
Expand Down
4 changes: 2 additions & 2 deletions ...mponents/explorer/slices/queryTabSlice.ts → ...onents/explorer/slices/query_tab_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import {
createSlice
} from '@reduxjs/toolkit';
import { initialTabId } from '../../../framework/redux/store/sharedState';
import { initialTabId } from '../../../framework/redux/store/shared_state';
import {
SELECTED_QUERY_TAB,
QUERY_TAB_IDS,
NEW_SELECTED_QUERY_TAB,
REDUX_EXPL_SLICE_QUERY_TABS
} from '../../../common/constants/explorer';
} from '../../../../common/constants/explorer';

const initialState = {
queryTabIds: [initialTabId],
Expand Down
4 changes: 2 additions & 2 deletions ...nts/explorer/slices/visualizationSlice.ts → ...ts/explorer/slices/visualization_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import {
createSlice
} from '@reduxjs/toolkit';
import { initialTabId } from '../../../framework/redux/store/sharedState';
import { REDUX_EXPL_SLICE_VISUALIZATION } from '../../../common/constants/explorer';
import { initialTabId } from '../../../framework/redux/store/shared_state';
import { REDUX_EXPL_SLICE_VISUALIZATION } from '../../../../common/constants/explorer';

const initialState = {
[initialTabId]: {}
Expand Down
0 ...s/countDistribution/countDistribution.tsx → ...count_distribution/count_distribution.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...visualizations/countDistribution/index.ts → ...isualizations/count_distribution/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
* GitHub history for details.
*/

export * from './countDistribution';
export * from './count_distribution';
0 .../explorer/visualizations/frameLayout.scss → ...explorer/visualizations/frame_layout.scss
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/explorer/visualizations/frameLayout.tsx → .../explorer/visualizations/frame_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* GitHub history for details.
*/

import './frameLayout.scss';
import './frame_layout.scss';

import React from 'react';
import { EuiPage, EuiPageSideBar, EuiPageBody } from '@elastic/eui';
Expand Down
Loading