Merge branch 'master' into canvas-fix-fullscreen-header

elasticmachine · web-flow · commit 60a63e761e71 · 2020-05-20T13:17:21.000-07:00
diff --git a/package.json b/package.json
@@ -298,7 +298,6 @@
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
     "@elastic/makelogs": "^5.0.1",
-    "@elastic/static-fs": "1.0.2",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/eslint-import-resolver-kibana": "2.0.0",
diff --git a/scripts/kibana.js b/scripts/kibana.js
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-require('../src/setup_node_env');
 require('../src/apm')(process.env.ELASTIC_APM_PROXY_SERVICE_NAME || 'kibana-proxy');
+require('../src/setup_node_env');
 require('../src/cli/cli');
diff --git a/src/cli/index.js b/src/cli/index.js
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-require('../setup_node_env');
 require('../apm')();
+require('../setup_node_env');
 require('./cli');
diff --git a/src/dev/build/build_distributables.js b/src/dev/build/build_distributables.js
@@ -40,7 +40,6 @@ import {
   CreatePackageJsonTask,
   CreateReadmeTask,
   CreateRpmPackageTask,
-  CreateStaticFsWithNodeModulesTask,
   DownloadNodeBuildsTask,
   ExtractNodeBuildsTask,
   InstallDependenciesTask,
@@ -127,7 +126,6 @@ export async function buildDistributables(options) {
   await run(CleanTypescriptTask);
   await run(CleanExtraFilesFromModulesTask);
   await run(CleanEmptyFoldersTask);
-  await run(CreateStaticFsWithNodeModulesTask);
 
   /**
    * copy generic build outputs into platform-specific build
diff --git a/src/dev/build/tasks/create_static_fs_with_node_modules_task.js b/src/dev/build/tasks/create_static_fs_with_node_modules_task.js
diff --git a/src/dev/build/tasks/index.js b/src/dev/build/tasks/index.js
@@ -25,7 +25,6 @@ export * from './create_archives_task';
 export * from './create_empty_dirs_and_files_task';
 export * from './create_package_json_task';
 export * from './create_readme_task';
-export * from './create_static_fs_with_node_modules_task';
 export * from './install_dependencies_task';
 export * from './license_file_task';
 export * from './nodejs';
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/datatypes/text_datatype.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/datatypes/text_datatype.test.tsx
@@ -24,7 +24,8 @@ export const defaultTextParameters = {
   store: false,
 };
 
-describe('Mappings editor: text datatype', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/66669
+describe.skip('Mappings editor: text datatype', () => {
   let testBed: MappingsEditorTestBed;
 
   /**
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx
@@ -33,7 +33,7 @@ export const MonitorDurationComponent = ({
 }: DurationChartProps) => {
   return (
     <EuiPanel paddingSize="m">
-      <EuiFlexGroup>
+      <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
         <EuiFlexItem>
           <EuiTitle size="xs">
             <h4>
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_header.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_header.tsx
@@ -16,9 +16,25 @@ const TitleStyle = styled(EuiTitle)`
   margin-left: auto;
 `;
 
+const FlexGroupContainer = styled(EuiFlexGroup)`
+  && {
+    @media only screen and (max-width: 768px) {
+      > :first-child {
+        flex-basis: 40% !important;
+      }
+      > :nth-child(2) {
+        order: 3;
+      }
+      > :nth-child(3) {
+        flex-basis: 60% !important;
+      }
+    }
+  }
+`;
+
 export const MonitorListHeader: React.FC = () => {
   return (
-    <EuiFlexGroup alignItems="center">
+    <FlexGroupContainer alignItems="center">
       <EuiFlexItem grow={false}>
         <EuiTitle size="xs">
           <h5>
@@ -44,6 +60,6 @@ export const MonitorListHeader: React.FC = () => {
           </h5>
         </TitleStyle>
       </EuiFlexItem>
-    </EuiFlexGroup>
+    </FlexGroupContainer>
   );
 };
diff --git a/x-pack/test/api_integration/apis/kibana/stats/stats.js b/x-pack/test/api_integration/apis/kibana/stats/stats.js
@@ -9,49 +9,45 @@ import expect from '@kbn/expect';
 export default function({ getService }) {
   const supertestNoAuth = getService('supertestWithoutAuth');
   const supertest = getService('supertest');
+  const config = getService('config');
 
   describe('/api/stats', () => {
     describe('operational stats and usage stats', () => {
+      // lazy check for uuid for test runs against preexisting services
+      function isUUID(uuid) {
+        return typeof uuid === 'string' && uuid.length === 36;
+      }
+
       describe('no auth', () => {
-        it('should return 200 and stats for no extended', async () => {
+        // depends on kibana.yml setting status.allowAnonymous
+        // skip this test when running against a remote host, as we can't
+        // validate the status of this setting
+        const host = config.get('servers.kibana.hostname');
+        const ifLocalhost = host.includes('localhost') ? it : it.skip;
+        ifLocalhost('should return 200 and stats for no extended', async () => {
           const { body } = await supertestNoAuth.get('/api/stats').expect(200);
-          expect(body.kibana.uuid).to.eql('5b2de169-2785-441b-ae8c-186a1936b17d');
-          expect(body.process.uptime_ms).to.be.greaterThan(0);
-          expect(body.os.uptime_ms).to.be.greaterThan(0);
-          expect(body.usage).to.be(undefined);
+          expect(isUUID(body.kibana.uuid)).to.be.ok();
         });
 
-        // FLAKY: https://github.com/elastic/kibana/issues/29254
-        it.skip('should return 401 for extended', async () => {
-          await supertestNoAuth.get('/api/stats?extended').expect(401); // unauthorized
+        it('should return 401 for extended', async () => {
+          await supertestNoAuth.get('/api/stats?extended').expect(401);
         });
       });
 
       describe('with auth', () => {
         it('should return 200 and stats for no extended', async () => {
           const { body } = await supertest.get('/api/stats').expect(200);
-          expect(body.kibana.uuid).to.eql('5b2de169-2785-441b-ae8c-186a1936b17d');
-          expect(body.process.uptime_ms).to.be.greaterThan(0);
-          expect(body.os.uptime_ms).to.be.greaterThan(0);
+          expect(isUUID(body.kibana.uuid)).to.be.ok();
         });
 
         it('should return 200 for extended', async () => {
           const { body } = await supertest.get('/api/stats?extended').expect(200);
-          expect(body.kibana.uuid).to.eql('5b2de169-2785-441b-ae8c-186a1936b17d');
-          expect(body.process.uptime_ms).to.be.greaterThan(0);
-          expect(body.os.uptime_ms).to.be.greaterThan(0);
-          expect(body.usage.kibana.index).to.be('.kibana');
-          expect(body.usage.kibana.dashboard.total).to.be(0);
+          expect(isUUID(body.kibana.uuid)).to.be.ok();
         });
 
         it('should return 200 for extended and legacy', async () => {
           const { body } = await supertest.get('/api/stats?extended&legacy').expect(200);
-          expect(body.kibana.uuid).to.eql('5b2de169-2785-441b-ae8c-186a1936b17d');
-          expect(body.process.uptime_ms).to.be.greaterThan(0);
-          expect(body.os.uptime_ms).to.be.greaterThan(0);
-          expect(body.usage.index).to.be('.kibana');
-          expect(body.usage.dashboard.total).to.be(0);
-          expect(body.usage.xpack.reporting.available).to.be(true);
+          expect(isUUID(body.kibana.uuid)).to.be.ok();
         });
       });
     });
diff --git a/yarn.lock b/yarn.lock
@@ -1427,11 +1427,6 @@
     "@types/node-jose" "1.1.0"
     node-jose "1.1.0"
 
-"@elastic/static-fs@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@elastic/static-fs/-/static-fs-1.0.2.tgz#c1e5fea6a1b35abcd005cecf7880156ed0f273ae"
-  integrity sha512-0cZc5D9Wg6pJsc8Sa2ns1eOuxtXEidE7GBb2B0KZdJq9nZzUCxMyplURqT0Nr3i5XpoHb6ZEmxWsji86j1KjDw==
-
 "@elastic/ui-ace@0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@elastic/ui-ace/-/ui-ace-0.2.3.tgz#5281aed47a79b7216c55542b0675e435692f20cd"
