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

[Backport 2.x] Hide query assist UI if PPL agent is not created #1400

Merged
merged 1 commit into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions common/constants/query_assist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

const QUERY_ASSIST_API_PREFIX = '/api/observability/query_assist';
export const QUERY_ASSIST_API = {
CONFIGURED: `${QUERY_ASSIST_API_PREFIX}/configured`,
GENERATE_PPL: `${QUERY_ASSIST_API_PREFIX}/generate_ppl`,
SUMMARIZE: `${QUERY_ASSIST_API_PREFIX}/summarize`,
};
Expand Down
22 changes: 20 additions & 2 deletions public/components/event_analytics/explorer/explorer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
TAB_EVENT_TITLE,
TIME_INTERVAL_OPTIONS,
} from '../../../../common/constants/explorer';
import { QUERY_ASSIST_API } from '../../../../common/constants/query_assist';
import {
LIVE_END_TIME,
LIVE_OPTIONS,
Expand Down Expand Up @@ -101,8 +102,8 @@
import { getVizContainerProps } from '../../visualizations/charts/helpers';
import { TabContext, useFetchEvents, useFetchPatterns, useFetchVisualizations } from '../hooks';
import {
selectCountDistribution,
render as updateCountDistribution,
selectCountDistribution,
} from '../redux/slices/count_distribution_slice';
import { selectFields, updateFields } from '../redux/slices/field_slice';
import { selectQueryResult } from '../redux/slices/query_result_slice';
Expand All @@ -112,8 +113,8 @@
import {
change as changeVisualizationConfig,
change as changeVizConfig,
selectVisualizationConfig,
change as updateVizConfig,
selectVisualizationConfig,
} from '../redux/slices/viualization_config_slice';
import { getDefaultVisConfig } from '../utils';
import { formatError, getContentTabTitle, getDateRange } from '../utils/utils';
Expand Down Expand Up @@ -199,7 +200,7 @@
return explorerSearchMeta.datasources?.[0]?.type
? dataSourcePluggables[explorerSearchMeta?.datasources[0]?.type]
: dataSourcePluggables.DEFAULT_INDEX_PATTERNS;
}, [explorerSearchMeta.datasources]);

Check warning on line 203 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useMemo has a missing dependency: 'dataSourcePluggables'. Either include it or remove the dependency array
const { ui } =
currentPluggable?.getComponentSetForVariation(
'languages',
Expand All @@ -217,6 +218,7 @@
const [subType, setSubType] = useState('visualization');
const [_metricMeasure, setMetricMeasure] = useState('');
const [_metricChecked, setMetricChecked] = useState(false);
const [_refresh, setRefresh] = useState({});
const queryRef = useRef();
const appBasedRef = useRef('');
appBasedRef.current = appBaseQuery;
Expand Down Expand Up @@ -272,8 +274,24 @@
};
}, []);

useEffect(() => {
// query assist UI should only be enabled when the feature is enabled and configured.
if (coreRefs.queryAssistEnabled) {
http
.get<{ configured: boolean; error?: string }>(QUERY_ASSIST_API.CONFIGURED)
.catch(() => {
console.warn('Failed to check if query assist is configured');
return { configured: false };
})
.then((response) => {
coreRefs.queryAssistEnabled = response.configured;
setRefresh({});
});
}
}, []);

Check warning on line 291 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useEffect has a missing dependency: 'http'. Either include it or remove the dependency array

const getErrorHandler = (title: string) => {
return (error: any) => {

Check warning on line 294 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

Unexpected any. Specify a different type
if (coreRefs.summarizeEnabled) return;
const formattedError = formatError(error.name, error.message, error.body.message);
notifications.toasts.addError(formattedError, {
Expand Down Expand Up @@ -388,7 +406,7 @@
callbackInApp(() => prepareAvailability());
}
}
}, [appBasedRef.current]);

Check warning on line 409 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useEffect has missing dependencies: 'callback', 'callbackInApp', and 'prepareAvailability'. Either include them or remove the dependency array. Mutable values like 'appBasedRef.current' aren't valid dependencies because mutating them doesn't re-render the component

useEffect(() => {
if (
Expand All @@ -397,14 +415,14 @@
) {
setSelectedContentTab(TAB_CHART_ID);
}
}, []);

Check warning on line 418 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useEffect has a missing dependency: 'routerContext'. Either include it or remove the dependency array

useEffect(() => {
if (savedObjectId && !isObjectIdUpdatedFromSave.current) {
updateTabData(savedObjectId);
isObjectIdUpdatedFromSave.current = false;
}
}, [savedObjectId]);

Check warning on line 425 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useEffect has a missing dependency: 'updateTabData'. Either include it or remove the dependency array

const handleTimePickerChange = async (timeRange: string[]) => {
if (appLogEvents) {
Expand Down Expand Up @@ -478,7 +496,7 @@
return hits;
}
return 0;
}, [countDistribution?.data]);

Check warning on line 499 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useMemo has missing dependencies: 'isLiveTailOn' and 'liveHits'. Either include them or remove the dependency array

const mainContent = useMemo(() => {
return (
Expand Down Expand Up @@ -609,7 +627,7 @@
)}
</div>
);
}, [

Check warning on line 630 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useMemo has missing dependencies: 'appLogEvents', 'dispatch', 'endTime', 'getCountVisualizations', 'getErrorHandler', 'getPatterns', 'handleTimeRangePickerRefresh', 'http', 'isDefaultDataSourceType', 'liveTimestamp', 'pplService', 'requestParams', 'startTime', 'tabId', 'timeIntervalOptions', and 'totalHits'. Either include them or remove the dependency array. Mutable values like 'isLiveTailOnRef.current' aren't valid dependencies because mutating them doesn't re-render the component
isPanelTextFieldInvalid,
explorerData,
explorerFields,
Expand Down Expand Up @@ -640,7 +658,7 @@
appData: { fromApp: appLogEvents },
explorer: { explorerData, explorerFields, query, http, pplService },
});
}, [curVisId, explorerVisualizations, explorerFields, query, userVizConfigs]);

Check warning on line 661 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useMemo has missing dependencies: 'appLogEvents', 'explorerData', 'http', 'pplService', and 'visualizationSettings'. Either include them or remove the dependency array

const callbackForConfig = (childFunc: () => void) => {
if (childFunc && triggerAvailability) {
Expand Down Expand Up @@ -670,7 +688,7 @@
}
/>
);
}, [

Check warning on line 691 in public/components/event_analytics/explorer/explorer.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook useMemo has missing dependencies: 'appLogEvents', 'callbackForConfig', 'handleOverrideTimestamp', 'isDefaultDataSourceType', and 'queryManager'. Either include them or remove the dependency array
query,
curVisId,
explorerFields,
Expand Down
26 changes: 25 additions & 1 deletion server/routes/query_assist/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import { isResponseError } from '../../../../../src/core/server/opensearch/client/errors';
import { QUERY_ASSIST_API } from '../../../common/constants/query_assist';
import { generateFieldContext } from '../../common/helpers/query_assist/generate_field_context';
import { requestWithRetryAgentSearch } from './utils/agents';
import { requestWithRetryAgentSearch, searchAgentIdByName } from './utils/agents';

export function registerQueryAssistRoutes(router: IRouter, config: ObservabilityConfig) {
const { ppl_agent_name: pplAgentName } = config.query_assist;
Expand All @@ -22,6 +22,30 @@ export function registerQueryAssistRoutes(router: IRouter, config: Observability
error_summary_agent_name: errorSummaryAgentName,
} = config.summarize;

/**
* Returns whether the PPL agent is configured.
*/
router.get(
{
path: QUERY_ASSIST_API.CONFIGURED,
validate: {},
},
async (
context,
request,
response
): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
const client = context.core.opensearch.client.asCurrentUser;
try {
// if the call does not throw any error, then the agent is properly configured
await searchAgentIdByName(client, pplAgentName!);
return response.ok({ body: { configured: true } });
} catch (error) {
return response.ok({ body: { configured: false, error: error.message } });
}
}
);

router.post(
{
path: QUERY_ASSIST_API.GENERATE_PPL,
Expand Down
Loading