[Rollups] Rollup support in Kibana, phase 1

src/core_plugins/kibana/mappings.json

@@ -21,6 +21,12 @@
       },
       "title": {
         "type": "text"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "typeMeta": {
+        "type": "keyword"
       }
     }
   },

src/core_plugins/kibana/public/discover/controllers/discover.js

@@ -278,11 +278,19 @@ function discoverController(
     .setField('highlightAll', true)
     .setField('version', true);
 
+  // Even when searching rollups, we want to use the default strategy so that we get back a
+  // document-like response.
+  $scope.searchSource.setPreferredSearchStrategyId('default');
+
   // searchSource which applies time range
   const timeRangeSearchSource = savedSearch.searchSource.create();
-  timeRangeSearchSource.setField('filter', () => {
-    return timefilter.createFilter($scope.indexPattern);
-  });
+  if(isDefaultTypeIndexPattern($scope.indexPattern)) {
+    timeRangeSearchSource.setField('filter', () => {
+      return timefilter.createFilter($scope.indexPattern);
+    });
+  } else {
+    delete $scope.indexPattern.timeFieldName;
+  }
 
   $scope.searchSource.setParent(timeRangeSearchSource);
 
@@ -393,7 +401,7 @@ function discoverController(
   $scope.opts = {
     // number of records to fetch, then paginate through
     sampleSize: config.get('discover:sampleSize'),
-    timefield: $scope.indexPattern.timeFieldName,
+    timefield: isDefaultTypeIndexPattern($scope.indexPattern) && $scope.indexPattern.timeFieldName,
     savedSearch: savedSearch,
     indexPatternList: $route.current.locals.ip.list,
   };

src/core_plugins/kibana/public/kibana.js

@@ -37,6 +37,7 @@ import 'uiExports/fieldFormatEditors';
 import 'uiExports/navbarExtensions';
 import 'uiExports/contextMenuActions';
 import 'uiExports/managementSections';
+import 'uiExports/indexManagement';
 import 'uiExports/devTools';
 import 'uiExports/docViews';
 import 'uiExports/embeddableFactories';

src/core_plugins/kibana/public/management/index.scss

@@ -9,6 +9,7 @@
 
 @import 'hacks';
 
-// Core 
+// Core
 @import 'management_app';
-@import 'sections/settings/advanced_settings';
+@import 'sections/settings/advanced_settings';
+@import 'sections/indices/index';

src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/__snapshots__/create_index_pattern_wizard.test.js.snap

@@ -3,8 +3,10 @@
 exports[`CreateIndexPatternWizard defaults to the loading state 1`] = `
 <div>
   <Header
+    indexPatternName="name"
     isIncludingSystemIndices={false}
     onChangeIncludingSystemIndices={[Function]}
+    showSystemIndices={false}
   />
   <LoadingState />
 </div>
@@ -13,8 +15,10 @@ exports[`CreateIndexPatternWizard defaults to the loading state 1`] = `
 exports[`CreateIndexPatternWizard renders index pattern step when there are indices 1`] = `
 <div>
   <Header
+    indexPatternName="name"
     isIncludingSystemIndices={false}
     onChangeIncludingSystemIndices={[Function]}
+    showSystemIndices={false}
   />
   <StepIndexPattern
     allIndices={
@@ -26,6 +30,16 @@ exports[`CreateIndexPatternWizard renders index pattern step when there are indi
     }
     esService={Object {}}
     goToNextStep={[Function]}
+    indexPatternCreationType={
+      Object {
+        "checkIndicesForErrors": [Function],
+        "getIndexPatternMappings": [Function],
+        "getIndexPatternName": [Function],
+        "getIndexPatternType": [Function],
+        "getShowSystemIndices": [Function],
+        "renderPrompt": [Function],
+      }
+    }
     initialQuery=""
     isIncludingSystemIndices={false}
     savedObjectsClient={Object {}}
@@ -36,8 +50,10 @@ exports[`CreateIndexPatternWizard renders index pattern step when there are indi
 exports[`CreateIndexPatternWizard renders the empty state when there are no indices 1`] = `
 <div>
   <Header
+    indexPatternName="name"
     isIncludingSystemIndices={false}
     onChangeIncludingSystemIndices={[Function]}
+    showSystemIndices={false}
   />
   <EmptyState
     onRefresh={[Function]}
@@ -48,13 +64,25 @@ exports[`CreateIndexPatternWizard renders the empty state when there are no indi
 exports[`CreateIndexPatternWizard renders time field step when step is set to 2 1`] = `
 <div>
   <Header
+    indexPatternName="name"
     isIncludingSystemIndices={false}
     onChangeIncludingSystemIndices={[Function]}
+    showSystemIndices={false}
   />
   <StepTimeField
     createIndexPattern={[Function]}
     goToPreviousStep={[Function]}
     indexPattern=""
+    indexPatternCreationType={
+      Object {
+        "checkIndicesForErrors": [Function],
+        "getIndexPatternMappings": [Function],
+        "getIndexPatternName": [Function],
+        "getIndexPatternType": [Function],
+        "getShowSystemIndices": [Function],
+        "renderPrompt": [Function],
+      }
+    }
     indexPatternsService={Object {}}
   />
 </div>
@@ -63,8 +91,10 @@ exports[`CreateIndexPatternWizard renders time field step when step is set to 2
 exports[`CreateIndexPatternWizard shows system indices even if there are no other indices if the include system indices is toggled 1`] = `
 <div>
   <Header
+    indexPatternName="name"
     isIncludingSystemIndices={true}
     onChangeIncludingSystemIndices={[Function]}
+    showSystemIndices={false}
   />
   <StepIndexPattern
     allIndices={
@@ -76,6 +106,16 @@ exports[`CreateIndexPatternWizard shows system indices even if there are no othe
     }
     esService={Object {}}
     goToNextStep={[Function]}
+    indexPatternCreationType={
+      Object {
+        "checkIndicesForErrors": [Function],
+        "getIndexPatternMappings": [Function],
+        "getIndexPatternName": [Function],
+        "getIndexPatternType": [Function],
+        "getShowSystemIndices": [Function],
+        "renderPrompt": [Function],
+      }
+    }
     initialQuery=""
     isIncludingSystemIndices={true}
     savedObjectsClient={Object {}}

src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/create_index_pattern_wizard.test.js

@@ -21,7 +21,14 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { CreateIndexPatternWizard } from '../create_index_pattern_wizard';
-
+const mockIndexPatternCreationType = {
+  getIndexPatternType: () => 'default',
+  getIndexPatternName: () => 'name',
+  checkIndicesForErrors: () => false,
+  getShowSystemIndices: () => false,
+  renderPrompt: () => {},
+  getIndexPatternMappings: () => { return {}; }
+};
 jest.mock('../components/step_index_pattern', () => ({ StepIndexPattern: 'StepIndexPattern' }));
 jest.mock('../components/step_time_field', () => ({ StepTimeField: 'StepTimeField' }));
 jest.mock('../components/header', () => ({ Header: 'Header' }));
@@ -44,6 +51,7 @@ const services = {
   config: {},
   changeUrl: () => {},
   scopeApply: () => {},
+  indexPatternCreationType: mockIndexPatternCreationType,
 };
 
 describe('CreateIndexPatternWizard', () => {
@@ -154,6 +162,7 @@ describe('CreateIndexPatternWizard', () => {
             cache: { clear }
           },
           changeUrl,
+          indexPatternCreationType: mockIndexPatternCreationType
         }}
       />
     );

src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/render.test.js

@@ -52,6 +52,7 @@ describe('CreateIndexPatternWizardRender', () => {
         savedObjectsClient: {},
         config: {},
         changeUrl: () => {},
+        indexPatternCreationType: {},
       }
     );
 

src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap

@@ -10,9 +10,13 @@ exports[`Header should render normally 1`] = `
   >
     <h1>
       <FormattedMessage
-        defaultMessage="Create index pattern"
+        defaultMessage="Create {indexPatternName}"
         id="kbn.management.createIndexPatternHeader"
-        values={Object {}}
+        values={
+          Object {
+            "indexPatternName": undefined,
+          }
+        }
       />
     </h1>
   </EuiTitle>
@@ -46,23 +50,6 @@ exports[`Header should render normally 1`] = `
         </p>
       </EuiText>
     </EuiFlexItem>
-    <EuiFlexItem
-      component="div"
-      grow={false}
-    >
-      <EuiSwitch
-        checked={true}
-        id="checkboxShowSystemIndices"
-        label={
-          <FormattedMessage
-            defaultMessage="Include system indices"
-            id="kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel"
-            values={Object {}}
-          />
-        }
-        onChange={[Function]}
-      />
-    </EuiFlexItem>
   </EuiFlexGroup>
   <EuiSpacer
     size="m"
@@ -80,9 +67,13 @@ exports[`Header should render without including system indices 1`] = `
   >
     <h1>
       <FormattedMessage
-        defaultMessage="Create index pattern"
+        defaultMessage="Create {indexPatternName}"
         id="kbn.management.createIndexPatternHeader"
-        values={Object {}}
+        values={
+          Object {
+            "indexPatternName": undefined,
+          }
+        }
       />
     </h1>
   </EuiTitle>
@@ -116,23 +107,6 @@ exports[`Header should render without including system indices 1`] = `
         </p>
       </EuiText>
     </EuiFlexItem>
-    <EuiFlexItem
-      component="div"
-      grow={false}
-    >
-      <EuiSwitch
-        checked={false}
-        id="checkboxShowSystemIndices"
-        label={
-          <FormattedMessage
-            defaultMessage="Include system indices"
-            id="kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel"
-            values={Object {}}
-          />
-        }
-        onChange={[Function]}
-      />
-    </EuiFlexItem>
   </EuiFlexGroup>
   <EuiSpacer
     size="m"

src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React from 'react';
+import React, { Fragment } from 'react';
 
 import {
   EuiSpacer,
@@ -32,6 +32,9 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 
 export const Header = ({
+  prompt,
+  indexPatternName,
+  showSystemIndices,
   isIncludingSystemIndices,
   onChangeIncludingSystemIndices,
 }) => (
@@ -41,7 +44,10 @@ export const Header = ({
       <h1>
         <FormattedMessage
           id="kbn.management.createIndexPatternHeader"
-          defaultMessage="Create index pattern"
+          defaultMessage="Create {indexPatternName}"
+          values={{
+            indexPatternName
+          }}
         />
       </h1>
     </EuiTitle>
@@ -58,18 +64,30 @@ export const Header = ({
           </p>
         </EuiText>
       </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiSwitch
-          label={<FormattedMessage
-            id="kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel"
-            defaultMessage="Include system indices"
-          />}
-          id="checkboxShowSystemIndices"
-          checked={isIncludingSystemIndices}
-          onChange={onChangeIncludingSystemIndices}
-        />
-      </EuiFlexItem>
+      {
+        showSystemIndices ? (
+          <EuiFlexItem grow={false}>
+            <EuiSwitch
+              label={<FormattedMessage
+                id="kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel"
+                defaultMessage="Include system indices"
+              />}
+              id="checkboxShowSystemIndices"
+              checked={isIncludingSystemIndices}
+              onChange={onChangeIncludingSystemIndices}
+            />
+          </EuiFlexItem>
+        ) : null
+      }
     </EuiFlexGroup>
+    {
+      prompt ? (
+        <Fragment>
+          <EuiSpacer size="s" />
+          {prompt}
+        </Fragment>
+      ) : null
+    }
     <EuiSpacer size="m"/>
   </div>
 );