Merge branch '7.x' into backport/7.x/pr-95991

elastic · Apr 5, 2021 · 4a4dfc9 · 4a4dfc9
2 parents 1738678 + 317e1e4
commit 4a4dfc9
Show file tree

Hide file tree

Showing 94 changed files with 6,172 additions and 61 deletions.
diff --git a/tsconfig.json b/tsconfig.json
@@ -83,6 +83,7 @@
     "x-pack/plugins/uptime/server/lib/requests/helper.ts",
     "x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx",
     "x-pack/plugins/uptime/public/lib/helper/enzyme_helpers.tsx",
+    "x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx",
     "x-pack/plugins/apm/server/utils/test_helpers.tsx",
     "x-pack/plugins/apm/public/utils/testHelpers.tsx",
 

diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
@@ -3,7 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "observability"],
-  "optionalPlugins": ["licensing", "home", "usageCollection"],
+  "optionalPlugins": ["licensing", "home", "usageCollection","lens"],
   "requiredPlugins": ["data"],
   "ui": true,
   "server": true,

diff --git a/x-pack/plugins/observability/public/assets/kibana_dashboard_dark.svg b/x-pack/plugins/observability/public/assets/kibana_dashboard_dark.svg
diff --git a/x-pack/plugins/observability/public/assets/kibana_dashboard_light.svg b/x-pack/plugins/observability/public/assets/kibana_dashboard_light.svg
diff --git a/x-pack/plugins/observability/public/components/app/header/index.tsx b/x-pack/plugins/observability/public/components/app/header/index.tsx
@@ -59,13 +59,13 @@ export function Header({ color, datePicker = null, restrictWidth }: Props) {
       </HeaderMenuPortal>
       <Wrapper restrictWidth={restrictWidth}>
         <EuiSpacer size="l" />
-        <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
           <EuiFlexItem>
             <EuiFlexGroup>
               <EuiFlexItem grow={false}>
                 <EuiIcon type="logoObservability" size="xxl" data-test-subj="observability-logo" />
               </EuiFlexItem>
-              <EuiFlexItem>
+              <EuiFlexItem grow={false} style={{ alignSelf: 'center' }}>
                 <EuiTitle>
                   <h1>
                     {i18n.translate('xpack.observability.home.title', {