Merge remote-tracking branch 'upstream/main' into filters-url-state

elastic · Oct 11, 2024 · cbcc72c · cbcc72c
2 parents 9ef1ccc + 930f861
commit cbcc72c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/...gins/security_solution/public/entity_analytics/pages/entity_analytics_management_page.tsx b/...gins/security_solution/public/entity_analytics/pages/entity_analytics_management_page.tsx
@@ -20,16 +20,16 @@ export const EntityAnalyticsManagementPage = () => {
  return (
  <>
  <RiskEnginePrivilegesCallOut privileges={privileges} />
- <EuiFlexGroup gutterSize="s" alignItems="baseline">
- <EuiFlexItem grow={false}>
- <EuiPageHeader
- data-test-subj="entityAnalyticsManagementPageTitle"
- pageTitle={ENTITY_ANALYTICS_RISK_SCORE}
- />
- </EuiFlexItem>
- <EuiFlexItem grow={false} />
- <EuiBetaBadge label={BETA} size="s" />
- </EuiFlexGroup>
+ <EuiPageHeader
+ pageTitle={
+ <EuiFlexGroup>
+ <EuiFlexItem data-test-subj="entityAnalyticsManagementPageTitle" grow={false}>
+  {ENTITY_ANALYTICS_RISK_SCORE}
+  </EuiFlexItem>
+  <EuiBetaBadge label={BETA} size="s" />
+  </EuiFlexGroup>
+ }
+ />
  <EuiSpacer size="l" />
  <EuiFlexGroup gutterSize="xl">
  <EuiFlexItem grow={2}>

diff --git a/x-pack/test_serverless/functional/test_suites/search/custom_role_access.ts b/x-pack/test_serverless/functional/test_suites/search/custom_role_access.ts
@@ -18,7 +18,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  const testSubjects = getService('testSubjects');
  let roleAuthc: RoleCredentials;
 
- describe('With custom role', function () {
+ // Failing: See https://github.com/elastic/kibana/issues/195976
+ describe.skip('With custom role', function () {
  // skipping on MKI while we are working on a solution
  this.tags(['skipMKI']);
  before(async () => {