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

[ML] Adding ML node warning to overview and analytics pages #50766

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
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import React, { Fragment, FC } from 'react';

import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { mlNodesAvailable, permissionToViewMlNodeCount } from '../../../../ml_nodes_check';
import { getCloudDeploymentId, isCloud } from '../../../../services/ml_server_info';
import { mlNodesAvailable, permissionToViewMlNodeCount } from '../../ml_nodes_check';
import { getCloudDeploymentId, isCloud } from '../../services/ml_server_info';

export const NodeAvailableWarning: FC = () => {
if (mlNodesAvailable() === true || permissionToViewMlNodeCount() === false) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/


export { UpgradeWarning } from './upgrade_warning';
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,24 @@
* you may not use this file except in compliance with the Elastic License.
*/

import React, { FC } from 'react';

import React from 'react';

import {
EuiCallOut,
EuiSpacer,
} from '@elastic/eui';
import { EuiCallOut, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { isUpgradeInProgress } from '../../services/upgrade_service';

export function UpgradeWarning() {
export const UpgradeWarning: FC = () => {
if (isUpgradeInProgress() === true) {
return (
<React.Fragment>
<EuiCallOut
title={(<FormattedMessage
id="xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningTitle"
defaultMessage="Index migration in progress"
/>)}
title={
<FormattedMessage
id="xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningTitle"
defaultMessage="Index migration in progress"
/>
}
color="warning"
iconType="alert"
>
Expand All @@ -45,4 +43,4 @@ export function UpgradeWarning() {
}

return null;
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import { DeepPartial } from '../../../../../../common/types/common';
import { checkPermission } from '../../../../../privilege/check_privilege';
import { mlNodesAvailable } from '../../../../../ml_nodes_check/check_ml_nodes';

import { DataFrameAnalyticsId, DataFrameAnalyticsConfig } from '../../../../common';

Expand Down Expand Up @@ -102,6 +103,7 @@ export const getInitialState = (): State => ({
},
jobConfig: {},
disabled:
!mlNodesAvailable() ||
!checkPermission('canCreateDataFrameAnalytics') ||
!checkPermission('canStartStopDataFrameAnalytics'),
indexNames: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { NavigationMenu } from '../../../components/navigation_menu';
import { DataFrameAnalyticsList } from './components/analytics_list';
import { useRefreshInterval } from './components/analytics_list/use_refresh_interval';
import { useCreateAnalyticsForm } from './hooks/use_create_analytics_form';
import { NodeAvailableWarning } from '../../../components/node_available_warning';
import { UpgradeWarning } from '../../../components/upgrade';

export const Page: FC = () => {
const [blockRefresh, setBlockRefresh] = useState(false);
Expand Down Expand Up @@ -62,6 +64,10 @@ export const Page: FC = () => {
</EuiTitle>
</EuiPageHeaderSection>
</EuiPageHeader>

<NodeAvailableWarning />
<UpgradeWarning />

<DataFrameAnalyticsList
blockRefresh={blockRefresh}
createAnalyticsForm={createAnalyticsForm}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import uiRoutes from 'ui/routes';
// @ts-ignore
import { checkFullLicense } from '../../../license/check_license';
import { checkGetJobsPrivilege } from '../../../privilege/check_privilege';
import { loadMlServerInfo } from '../../../services/ml_server_info';
import { getMlNodeCount } from '../../../ml_nodes_check/check_ml_nodes';
import {
loadCurrentIndexPattern,
loadCurrentSavedSearch,
Expand All @@ -26,5 +28,7 @@ uiRoutes.when('/data_frame_analytics/?', {
privileges: checkGetJobsPrivilege,
indexPattern: loadCurrentIndexPattern,
savedSearch: loadCurrentSavedSearch,
mlNodeCount: getMlNodeCount,
loadMlServerInfo,
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { CreateWatchFlyout } from '../create_watch_flyout';
import { MultiJobActions } from '../multi_job_actions';
import { NewJobButton } from '../new_job_button';
import { JobStatsBar } from '../jobs_stats_bar';
import { NodeAvailableWarning } from '../node_available_warning';
import { NodeAvailableWarning } from '../../../../components/node_available_warning';
import { UpgradeWarning } from '../../../../components/upgrade';
import { RefreshJobsListButton } from '../refresh_jobs_list_button';
import { isEqual } from 'lodash';
Expand Down
6 changes: 6 additions & 0 deletions x-pack/legacy/plugins/ml/public/overview/overview_page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,23 @@ import { mlNodesAvailable } from '../ml_nodes_check/check_ml_nodes';
import { NavigationMenu } from '../components/navigation_menu';
import { OverviewSideBar } from './components/sidebar';
import { OverviewContent } from './components/content';
import { NodeAvailableWarning } from '../components/node_available_warning';
import { UpgradeWarning } from '../components/upgrade';

export const OverviewPage: FC = () => {
const disableCreateAnomalyDetectionJob = !checkPermission('canCreateJob') || !mlNodesAvailable();
const disableCreateAnalyticsButton =
!mlNodesAvailable() ||
!checkPermission('canCreateDataFrameAnalytics') ||
!checkPermission('canStartStopDataFrameAnalytics');
return (
<Fragment>
<NavigationMenu tabId="overview" />
<EuiPage data-test-subj="mlPageOverview">
<EuiPageBody>
<NodeAvailableWarning />
<UpgradeWarning />

<EuiFlexGroup>
<OverviewSideBar createAnomalyDetectionJobDisabled={disableCreateAnomalyDetectionJob} />
<OverviewContent
Expand Down
2 changes: 2 additions & 0 deletions x-pack/legacy/plugins/ml/public/overview/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
// @ts-ignore no declaration module
import { checkFullLicense } from '../license/check_license';
import { checkGetJobsPrivilege } from '../privilege/check_privilege';
import { loadMlServerInfo } from '../services/ml_server_info';
import { getOverviewBreadcrumbs } from './breadcrumbs';
import './directive';

Expand All @@ -21,5 +22,6 @@ uiRoutes.when('/overview/?', {
CheckLicense: checkFullLicense,
privileges: checkGetJobsPrivilege,
mlNodeCount: getMlNodeCount,
loadMlServerInfo,
},
});