Skip to content

Commit

Permalink
Merge branch 'main' of github.com:elastic/kibana into issue-163120-ad…
Browse files Browse the repository at this point in the history
…d-support-for-group-by-to-burn-rate-rule
  • Loading branch information
simianhacker committed Aug 10, 2023
2 parents 217bc5c + ea57cae commit a80174a
Show file tree
Hide file tree
Showing 100 changed files with 2,867 additions and 369 deletions.
4 changes: 4 additions & 0 deletions WORKSPACE.bazel
Expand Up @@ -57,7 +57,11 @@ yarn_install(
quiet = False,
frozen_lockfile = False,
environment = {
"GECKODRIVER_CDNURL": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache",
"CHROMEDRIVER_CDNURL": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache",
"CHROMEDRIVER_CDNBINARIESURL": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache",
"SASS_BINARY_SITE": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass",
"RE2_DOWNLOAD_MIRROR": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2",
"CYPRESS_DOWNLOAD_MIRROR": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/cypress",
}
)
2 changes: 1 addition & 1 deletion src/dev/ci_setup/setup_env.sh
Expand Up @@ -128,10 +128,10 @@ export PATH="$PATH:$yarnGlobalDir"

# use a proxy to fetch chromedriver/geckodriver asset
export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export CHROMEDRIVER_LEGACY_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export CHROMEDRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export CHROMEDRIVER_CDNBINARIESURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export RE2_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export SASS_BINARY_SITE="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass"
export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/cypress"

export CHECKS_REPORTER_ACTIVE=false
Expand Down
Expand Up @@ -11,17 +11,17 @@ import {
EuiFlexGroup,
EuiFlexItem,
EuiIcon,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageSection,
EuiSpacer,
EuiText,
EuiTitle,
IconType,
} from '@elastic/eui';

interface Props {
title: string;
subtitle: string;
iconType?: IconType;
subtitle: string;
title: string;
}
export const AnalyticsSection: React.FC<Props> = ({ title, subtitle, iconType, children }) => (
<section>
Expand Down Expand Up @@ -49,6 +49,6 @@ export const AnalyticsSection: React.FC<Props> = ({ title, subtitle, iconType, c
</EuiText>
</header>
<EuiSpacer size="m" />
<EuiPageContentBody>{children}</EuiPageContentBody>
<EuiPageSection paddingSize="none">{children}</EuiPageSection>
</section>
);
Expand Up @@ -16,8 +16,7 @@ import {
EuiButtonIcon,
EuiSpacer,
EuiButton,
EuiPageContentHeader_Deprecated as EuiPageContentHeader,
EuiPageContentHeaderSection_Deprecated as EuiPageContentHeaderSection,
EuiPageHeader,
EuiSkeletonText,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
Expand Down Expand Up @@ -85,31 +84,27 @@ export const Credentials: React.FC = () => {
</EuiCopy>
</EuiPanel>
<EuiSpacer size="xxl" />
<EuiPageContentHeader responsive={false}>
<EuiPageContentHeaderSection>
<EuiTitle size="m">
<h2>
{i18n.translate('xpack.enterpriseSearch.appSearch.credentials.apiKeys', {
defaultMessage: 'API keys',
})}
</h2>
</EuiTitle>
</EuiPageContentHeaderSection>
<EuiPageContentHeaderSection>
{!dataLoading && (
<EuiButton
color="primary"
data-test-subj="CreateAPIKeyButton"
fill
onClick={() => showCredentialsForm()}
>
{i18n.translate('xpack.enterpriseSearch.appSearch.credentials.createKey', {
defaultMessage: 'Create key',
})}
</EuiButton>
)}
</EuiPageContentHeaderSection>
</EuiPageContentHeader>
<EuiPageHeader responsive={false}>
<EuiTitle size="m">
<h2>
{i18n.translate('xpack.enterpriseSearch.appSearch.credentials.apiKeys', {
defaultMessage: 'API keys',
})}
</h2>
</EuiTitle>
{!dataLoading && (
<EuiButton
color="primary"
data-test-subj="CreateAPIKeyButton"
fill
onClick={() => showCredentialsForm()}
>
{i18n.translate('xpack.enterpriseSearch.appSearch.credentials.createKey', {
defaultMessage: 'Create key',
})}
</EuiButton>
)}
</EuiPageHeader>
<EuiSpacer size="m" />
<EuiPanel hasBorder>
<EuiSkeletonText lines={3} isLoading={!!dataLoading}>
Expand Down
Expand Up @@ -13,13 +13,13 @@ import {
EuiSpacer,
EuiPageHeader,
EuiTitle,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageContent_Deprecated as EuiPageContent,
EuiPageSection,
EuiDragDropContext,
EuiDroppable,
EuiDraggable,
EuiButtonIconProps,
EuiEmptyPrompt,
EuiPageBody,
} from '@elastic/eui';

import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
Expand Down Expand Up @@ -167,8 +167,8 @@ export const Library: React.FC = () => {
<>
<SetPageChrome trail={['Library']} />
<EuiPageHeader pageTitle="Library" />
<EuiPageContent hasBorder>
<EuiPageContentBody>
<EuiPageBody panelled hasBorder>
<EuiPageSection>
<EuiTitle size="m">
<h2>Result</h2>
</EuiTitle>
Expand Down Expand Up @@ -540,8 +540,8 @@ export const Library: React.FC = () => {

<EuiSpacer />
<EuiSpacer />
</EuiPageContentBody>
</EuiPageContent>
</EuiPageSection>
</EuiPageBody>
</>
);
};
Expand Up @@ -9,13 +9,7 @@

import React from 'react';

import {
EuiPageContent_Deprecated as EuiPageContent,
EuiSteps,
EuiText,
EuiLink,
EuiCallOut,
} from '@elastic/eui';
import { EuiPageSection, EuiSteps, EuiText, EuiLink, EuiCallOut } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';

Expand All @@ -27,7 +21,7 @@ interface Props {
}

export const CloudSetupInstructions: React.FC<Props> = ({ productName, cloudDeploymentLink }) => (
<EuiPageContent>
<EuiPageSection>
<EuiSteps
headingElement="h2"
steps={[
Expand Down Expand Up @@ -176,5 +170,5 @@ export const CloudSetupInstructions: React.FC<Props> = ({ productName, cloudDepl
},
]}
/>
</EuiPageContent>
</EuiPageSection>
);
Expand Up @@ -8,7 +8,7 @@
import React from 'react';

import {
EuiPageContent_Deprecated as EuiPageContent,
EuiPageSection,
EuiText,
EuiSteps,
EuiCode,
Expand All @@ -27,7 +27,7 @@ interface Props {
}

export const SetupInstructions: React.FC<Props> = ({ productName }) => (
<EuiPageContent>
<EuiPageSection>
<EuiSteps
headingElement="h2"
steps={[
Expand Down Expand Up @@ -126,5 +126,5 @@ export const SetupInstructions: React.FC<Props> = ({ productName }) => (
},
]}
/>
</EuiPageContent>
</EuiPageSection>
);
Expand Up @@ -11,7 +11,7 @@ import { useValues } from 'kea';

import {
EuiPage,
EuiPageSideBar_Deprecated as EuiPageSideBar,
EuiPageSidebar,
EuiPageBody,
EuiSpacer,
EuiFlexGroup,
Expand All @@ -35,8 +35,8 @@ import './setup_guide.scss';

interface Props {
children: React.ReactNode;
productName: string;
productEuiIcon: 'logoAppSearch' | 'logoWorkplaceSearch' | 'logoEnterpriseSearch';
productName: string;
}

export const SetupGuideLayout: React.FC<Props> = ({ children, productName, productEuiIcon }) => {
Expand All @@ -46,7 +46,7 @@ export const SetupGuideLayout: React.FC<Props> = ({ children, productName, produ

return (
<EuiPage className="setupGuide" data-test-subj="setupGuide">
<EuiPageSideBar className="setupGuide__sidebar">
<EuiPageSidebar className="setupGuide__sidebar">
<EuiText color="subdued" size="s">
<strong>{SETUP_GUIDE_TITLE}</strong>
</EuiText>
Expand All @@ -64,7 +64,7 @@ export const SetupGuideLayout: React.FC<Props> = ({ children, productName, produ
</EuiFlexGroup>

{children}
</EuiPageSideBar>
</EuiPageSidebar>

<EuiPageBody className="setupGuide__body">
{isCloudEnabled ? (
Expand Down
Expand Up @@ -18,6 +18,7 @@
}

&__body {
padding-top:0;
position: relative;
width: 100%;
height: 100%;
Expand Down
Expand Up @@ -11,12 +11,12 @@ import { useRouteMatch } from 'react-router-dom';
import { useValues } from 'kea';

import {
EuiPage,
EuiPageSideBar_Deprecated as EuiPageSideBar,
EuiPageSidebar,
EuiPageBody,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageSection,
EuiCallOut,
EuiSpacer,
EuiPageTemplate,
} from '@elastic/eui';

import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '..';
Expand Down Expand Up @@ -47,13 +47,22 @@ export const PersonalDashboardLayout: React.FC<LayoutProps> = ({
<>
{pageChrome && <SetWorkplaceSearchChrome trail={pageChrome} />}
<AccountHeader />
<EuiPage className="personalDashboardLayout" paddingSize="none">
<EuiPageSideBar role="navigation" className="personalDashboardLayout__sideBar" sticky>
<EuiPageTemplate className="personalDashboardLayout" paddingSize="none">
<EuiPageSidebar
role="navigation"
className="personalDashboardLayout__sideBar"
sticky
minWidth="480px"
>
{useRouteMatch(PRIVATE_SOURCES_PATH) && <PrivateSourcesSidebar />}
{useRouteMatch(PERSONAL_SETTINGS_PATH) && <AccountSettingsSidebar />}
</EuiPageSideBar>
</EuiPageSidebar>
<EuiPageBody component="main" panelled role="main">
<EuiPageContentBody className="personalDashboardLayout__body" restrictWidth>
<EuiPageSection
className="personalDashboardLayout__body"
paddingSize="none"
restrictWidth
>
{readOnlyMode && (
<>
<EuiCallOut
Expand All @@ -65,10 +74,11 @@ export const PersonalDashboardLayout: React.FC<LayoutProps> = ({
</>
)}
<FlashMessages />

{isLoading ? <Loading /> : children}
</EuiPageContentBody>
</EuiPageSection>
</EuiPageBody>
</EuiPage>
</EuiPageTemplate>
</>
);
};
Expand Up @@ -9,7 +9,7 @@ import type { DataViewField, DataView } from '@kbn/data-views-plugin/common';
import { UseAssetDetailsStateProps } from '../../../hooks/use_asset_details_state';

export const assetDetailsState: UseAssetDetailsStateProps['state'] = {
node: {
asset: {
name: 'host1',
id: 'host1-macOS',
ip: '192.168.0.1',
Expand All @@ -29,7 +29,7 @@ export const assetDetailsState: UseAssetDetailsStateProps['state'] = {
showActionsColumn: true,
},
},
nodeType: 'host',
assetType: 'host',
dateRange: {
from: '2023-04-09T11:07:49Z',
to: '2023-04-09T11:23:49Z',
Expand Down
Expand Up @@ -22,42 +22,36 @@ const tabs: Tab[] = [
name: i18n.translate('xpack.infra.nodeDetails.tabs.overview.title', {
defaultMessage: 'Overview',
}),
'data-test-subj': 'hostsView-flyout-tabs-overview',
},
{
id: FlyoutTabIds.LOGS,
name: i18n.translate('xpack.infra.nodeDetails.tabs.logs', {
defaultMessage: 'Logs',
}),
'data-test-subj': 'hostsView-flyout-tabs-logs',
},
{
id: FlyoutTabIds.METADATA,
name: i18n.translate('xpack.infra.metrics.nodeDetails.tabs.metadata', {
defaultMessage: 'Metadata',
}),
'data-test-subj': 'hostsView-flyout-tabs-metadata',
},
{
id: FlyoutTabIds.PROCESSES,
name: i18n.translate('xpack.infra.metrics.nodeDetails.tabs.processes', {
defaultMessage: 'Processes',
}),
'data-test-subj': 'hostsView-flyout-tabs-processes',
},
{
id: FlyoutTabIds.ANOMALIES,
name: i18n.translate('xpack.infra.nodeDetails.tabs.anomalies', {
defaultMessage: 'Anomalies',
}),
'data-test-subj': 'hostsView-flyout-tabs-anomalies',
},
{
id: FlyoutTabIds.LINK_TO_APM,
name: i18n.translate('xpack.infra.infra.nodeDetails.apmTabLabel', {
defaultMessage: 'APM',
}),
'data-test-subj': 'hostsView-flyout-apm-link',
},
];

Expand Down Expand Up @@ -96,7 +90,7 @@ const FlyoutTemplate: Story<AssetDetailsProps> = (args) => {
Open flyout
</EuiButton>
<div hidden={!isOpen}>
{isOpen && <AssetDetails {...args} renderMode={{ showInFlyout: true, closeFlyout }} />}
{isOpen && <AssetDetails {...args} renderMode={{ mode: 'flyout', closeFlyout }} />}
</div>
</div>
);
Expand All @@ -107,7 +101,7 @@ export const Page = PageTemplate.bind({});
export const Flyout = FlyoutTemplate.bind({});
Flyout.args = {
renderMode: {
showInFlyout: true,
mode: 'flyout',
closeFlyout: () => {},
},
};
Expand Down

0 comments on commit a80174a

Please sign in to comment.