diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
index 24f47d70b46cb..bb51ca2c8b0b0 100644
--- a/src/core_plugins/kibana/public/discover/controllers/discover.js
+++ b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -285,7 +285,7 @@ function discoverController(
   // searchSource which applies time range
   const timeRangeSearchSource = savedSearch.searchSource.create();
   timeRangeSearchSource.setField('filter', () => {
-    return timefilter.createFilter($scope.indexPattern);
+    return isDefaultTypeIndexPattern($scope.indexPattern) && timefilter.createFilter($scope.indexPattern);
   });
 
   $scope.searchSource.setParent(timeRangeSearchSource);
@@ -391,7 +391,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,
   };
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js
index f1d52ec44d8d7..fabe183099583 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js
@@ -27,7 +27,7 @@ import uiRoutes from 'ui/routes';
 import { uiModules } from 'ui/modules';
 import template from './edit_index_pattern.html';
 import { FieldWildcardProvider } from 'ui/field_wildcard';
-import { IndexPatternListFactory } from 'ui/management';
+import { IndexPatternListFactory } from 'ui/management/index_pattern_list';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { SourceFiltersTable } from './source_filters_table';
@@ -201,7 +201,7 @@ uiModules.get('apps/management')
     });
 
     $scope.$watch('indexPattern.fields', function () {
-      $scope.editSections = $scope.editSectionsProvider($scope.indexPattern);
+      $scope.editSections = $scope.editSectionsProvider($scope.indexPattern, indexPatternListProvider);
       $scope.refreshFilters();
       $scope.fields = $scope.indexPattern.getNonScriptedFields();
       updateIndexedFieldsTable($scope, $state);
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js
index 20a8e49c7eee2..c7f53096bfa6e 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js
@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
 
 export function IndicesEditSectionsProvider() {
 
-  return function (indexPattern) {
+  return function (indexPattern, indexPatternListProvider) {
     const fieldCount = _.countBy(indexPattern.fields, function (field) {
       return (field.scripted) ? 'scripted' : 'indexed';
     });
@@ -33,22 +33,28 @@ export function IndicesEditSectionsProvider() {
       sourceFilters: indexPattern.sourceFilters ? indexPattern.sourceFilters.length : 0,
     });
 
-    return [
-      {
-        title: i18n.translate('kbn.management.editIndexPattern.tabs.fieldsHeader', { defaultMessage: 'Fields' }),
-        index: 'indexedFields',
-        count: fieldCount.indexed
-      },
-      {
+    const editSections = [];
+
+    editSections.push({
+      title: i18n.translate('kbn.management.editIndexPattern.tabs.fieldsHeader', { defaultMessage: 'Fields' }),
+      index: 'indexedFields',
+      count: fieldCount.indexed
+    });
+
+    if(indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) {
+      editSections.push({
         title: i18n.translate('kbn.management.editIndexPattern.tabs.scriptedHeader', { defaultMessage: 'Scripted fields' }),
         index: 'scriptedFields',
         count: fieldCount.scripted
-      },
-      {
-        title: i18n.translate('kbn.management.editIndexPattern.tabs.sourceHeader', { defaultMessage: 'Source filters' }),
-        index: 'sourceFilters',
-        count: fieldCount.sourceFilters
-      }
-    ];
+      });
+    }
+
+    editSections.push({
+      title: i18n.translate('kbn.management.editIndexPattern.tabs.sourceHeader', { defaultMessage: 'Source filters' }),
+      index: 'sourceFilters',
+      count: fieldCount.sourceFilters
+    });
+
+    return editSections;
   };
 }
diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.js b/src/core_plugins/kibana/public/management/sections/indices/index.js
index c8793c7842f17..cc16fa4b24931 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/index.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/index.js
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { management, IndexPatternListFactory } from 'ui/management';
+import { management } from 'ui/management';
+import { IndexPatternListFactory } from 'ui/management/index_pattern_list';
 import { IndexPatternCreationFactory } from 'ui/management/index_pattern_creation';
 import './create_index_pattern_wizard';
 import './edit_index_pattern';
@@ -126,7 +127,7 @@ uiModules.get('apps/management')
               return 1;
             }
             return 0;
-          });
+          }) || [];
 
           updateIndexPatternList($scope, indexPatternCreationOptions, $scope.defaultIndex, $scope.indexPatternList);
         };
diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js
index a50927dd8c3d7..30c4c6fddead0 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js
@@ -23,16 +23,18 @@ import PropTypes from 'prop-types';
 import {
   EuiButtonEmpty,
   EuiBadge,
+  EuiCallOut,
 } from '@elastic/eui';
 
 export class List extends Component {
   static propTypes = {
     indexPatterns: PropTypes.array,
+    defaultIndex: PropTypes.string,
   }
 
-  render() {
+  renderList() {
     const { indexPatterns } = this.props;
-    return (
+    return indexPatterns && indexPatterns.length ? (
       <div>
         {
           indexPatterns.map(pattern => {
@@ -51,6 +53,29 @@ export class List extends Component {
           })
         }
       </div>
+    ) : null;
+  }
+
+  renderNoDefaultMessage() {
+    const { defaultIndex } = this.props;
+    return !defaultIndex ? (
+      <div className="indexPatternList__headerWrapper">
+        <EuiCallOut
+          color="warning"
+          size="s"
+          iconType="alert"
+          title="No default index pattern. You must select or create one to continue."
+        />
+      </div>
+    ) : null;
+  }
+
+  render() {
+    return (
+      <div>
+        {this.renderNoDefaultMessage()}
+        {this.renderList()}
+      </div>
     );
   }
 }
diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js
index 831b357512516..5c91a359cce9c 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js
@@ -17,29 +17,20 @@
  * under the License.
  */
 
-import React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
+import React, { Fragment } from 'react';
 
 import { Header } from './components/header';
 import { List } from './components/list';
 
-export class IndexPatternList extends Component {
-  static propTypes = {
-    indexPatternCreationOptions: PropTypes.array.isRequired,
-    defaultIndex: PropTypes.string,
-    indexPatterns: PropTypes.array.isRequired,
-  }
-
-  render() {
-    const { indexPatterns, indexPatternCreationOptions } = this.props;
-
-    return(
-      <Fragment>
-        <div className="indexPatternList__headerWrapper">
-          <Header indexPatternCreationOptions={indexPatternCreationOptions} />
-        </div>
-        <List indexPatterns={indexPatterns} />
-      </Fragment>
-    );
-  }
-}
+export const IndexPatternList = ({
+  indexPatternCreationOptions,
+  defaultIndex,
+  indexPatterns
+}) => (
+  <Fragment>
+    <div className="indexPatternList__headerWrapper">
+      <Header indexPatternCreationOptions={indexPatternCreationOptions} />
+    </div>
+    <List indexPatterns={indexPatterns} defaultIndex={defaultIndex} />
+  </Fragment>
+);
diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js
index 4bdf474602d90..5772218ce53be 100644
--- a/src/ui/public/agg_types/buckets/histogram.js
+++ b/src/ui/public/agg_types/buckets/histogram.js
@@ -19,6 +19,7 @@
 
 import _ from 'lodash';
 
+import { toastNotifications } from 'ui/notify';
 import '../../validate_date_interval';
 import chrome from '../../chrome';
 import { BucketAggType } from './_bucket_agg_type';
@@ -95,6 +96,12 @@ export const histogramBucketAgg = new BucketAggType({
               min: _.get(resp, 'aggregations.minAgg.value'),
               max: _.get(resp, 'aggregations.maxAgg.value')
             });
+          })
+          .catch(() => {
+            toastNotifications.addWarning(`
+              Unable to retrieve max and min values to auto-scale histogram buckets. 
+              This may lead to poor visualization performance.
+            `);
           });
       },
       write: function (aggConfig, output) {
diff --git a/src/ui/public/agg_types/controls/order_and_size.html b/src/ui/public/agg_types/controls/order_and_size.html
index 6a5626b3e140e..0daee545ea149 100644
--- a/src/ui/public/agg_types/controls/order_and_size.html
+++ b/src/ui/public/agg_types/controls/order_and_size.html
@@ -1,6 +1,6 @@
 <div>
   <div class="visEditorAgg__formRow--flex">
-    <div ng-if="agg.type.params.byName.order" class="form-group">
+    <div ng-if="agg.type.params.byName.order && aggParam.options" class="form-group">
       <label for="visEditorOrderByOrder{{agg.id}}">Order</label>
       <select
         id="visEditorOrderByOrder{{agg.id}}"
diff --git a/src/ui/public/management/index.js b/src/ui/public/management/index.js
index 89b429dac047f..62d44ef0794cb 100644
--- a/src/ui/public/management/index.js
+++ b/src/ui/public/management/index.js
@@ -24,4 +24,3 @@ export {
 export { registerSettingsComponent } from '../../../core_plugins/kibana/public/management/sections/settings/components/component_registry';
 export { Field } from '../../../core_plugins/kibana/public/management/sections/settings/components/field/field';
 export { management } from './sections_register';
-export { IndexPatternListRegistry, IndexPatternListFactory } from './index_pattern_list';
diff --git a/src/ui/public/utils/parse_es_interval/index.js b/src/ui/public/management/index_pattern_list/index.js
similarity index 75%
rename from src/ui/public/utils/parse_es_interval/index.js
rename to src/ui/public/management/index_pattern_list/index.js
index 38ce09487a1d8..a77a3f1f61f2c 100644
--- a/src/ui/public/utils/parse_es_interval/index.js
+++ b/src/ui/public/management/index_pattern_list/index.js
@@ -17,6 +17,7 @@
  * under the License.
  */
 
-export { parseEsInterval } from './parse_es_interval';
-export { ParseEsIntervalInvalidCalendarIntervalError } from './parse_es_interval_invalid_calendar_interval_error';
-export { ParseEsIntervalInvalidFormatError } from './parse_es_interval_invalid_format_error';
+import './register';
+export { IndexPatternListFactory } from './index_pattern_list';
+export { IndexPatternListConfig } from './index_pattern_list_config';
+export { IndexPatternListConfigRegistry } from './index_pattern_list_config_registry';
diff --git a/src/ui/public/management/index_pattern_list.js b/src/ui/public/management/index_pattern_list/index_pattern_list.js
similarity index 77%
rename from src/ui/public/management/index_pattern_list.js
rename to src/ui/public/management/index_pattern_list/index_pattern_list.js
index e45f650492ebf..8be2720fb8e3d 100644
--- a/src/ui/public/management/index_pattern_list.js
+++ b/src/ui/public/management/index_pattern_list/index_pattern_list.js
@@ -17,17 +17,11 @@
  * under the License.
  */
 
-import { uiRegistry } from 'ui/registry/_registry';
-
-export const IndexPatternListRegistry = uiRegistry({
-  name: 'indexPatternList',
-  index: ['name'],
-  order: ['order'],
-});
+import { IndexPatternListConfigRegistry } from './index_pattern_list_config_registry';
 
 class IndexPatternList {
   constructor(registry) {
-    this._plugins = registry.inOrder.map(Plugin => new Plugin);
+    this._plugins = registry.inOrder.map(Plugin => new Plugin());
   }
 
   getIndexPatternTags = (indexPattern) => {
@@ -41,11 +35,17 @@ class IndexPatternList {
       return plugin.getFieldInfo ? info.concat(plugin.getFieldInfo(indexPattern, field)) : info;
     }, []);
   }
+
+  areScriptedFieldsEnabled = (indexPattern) => {
+    return this._plugins.every((plugin) => {
+      return plugin.areScriptedFieldsEnabled ? plugin.areScriptedFieldsEnabled(indexPattern) : true;
+    });
+  }
 }
 
 export const IndexPatternListFactory = (Private) => {
   return function () {
-    const indexPatternListRegistry = Private(IndexPatternListRegistry);
+    const indexPatternListRegistry = Private(IndexPatternListConfigRegistry);
     const indexPatternListProvider = new IndexPatternList(indexPatternListRegistry);
     return indexPatternListProvider;
   };
diff --git a/src/ui/public/management/index_pattern_list/index_pattern_list_config.js b/src/ui/public/management/index_pattern_list/index_pattern_list_config.js
new file mode 100644
index 0000000000000..dc6ff3af5fb6b
--- /dev/null
+++ b/src/ui/public/management/index_pattern_list/index_pattern_list_config.js
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export class IndexPatternListConfig {
+  static key = 'default';
+
+  getIndexPatternTags = () => {
+    return [];
+  }
+
+  getFieldInfo = () => {
+    return [];
+  }
+
+  areScriptedFieldsEnabled = () => {
+    return true;
+  }
+}
diff --git a/src/ui/public/management/index_pattern_list/index_pattern_list_config_registry.js b/src/ui/public/management/index_pattern_list/index_pattern_list_config_registry.js
new file mode 100644
index 0000000000000..9b1bfca284ee6
--- /dev/null
+++ b/src/ui/public/management/index_pattern_list/index_pattern_list_config_registry.js
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { uiRegistry } from 'ui/registry/_registry';
+
+export const IndexPatternListConfigRegistry = uiRegistry({
+  name: 'indexPatternList',
+  index: ['name'],
+  order: ['order'],
+});
diff --git a/src/ui/public/management/index_pattern_list/register.js b/src/ui/public/management/index_pattern_list/register.js
new file mode 100644
index 0000000000000..6488ddd399b7b
--- /dev/null
+++ b/src/ui/public/management/index_pattern_list/register.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IndexPatternListConfig } from './index_pattern_list_config';
+import { IndexPatternListConfigRegistry } from './index_pattern_list_config_registry';
+
+IndexPatternListConfigRegistry.register(() => IndexPatternListConfig);
diff --git a/src/ui/public/utils/parse_es_interval/index.ts b/src/ui/public/utils/parse_es_interval/index.ts
new file mode 100644
index 0000000000000..ff0f59607f78f
--- /dev/null
+++ b/src/ui/public/utils/parse_es_interval/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { parseEsInterval } from './parse_es_interval';
+export {
+  ParseEsIntervalInvalidCalendarIntervalError,
+} from './parse_es_interval_invalid_calendar_interval_error';
+export { ParseEsIntervalInvalidFormatError } from './parse_es_interval_invalid_format_error';
diff --git a/src/ui/public/vis/editors/default/agg.html b/src/ui/public/vis/editors/default/agg.html
index 4cf8174c7a7ba..baba3554a9c3b 100644
--- a/src/ui/public/vis/editors/default/agg.html
+++ b/src/ui/public/vis/editors/default/agg.html
@@ -24,7 +24,7 @@
   </span>
 
   <!-- error -->
-  <span ng-if="!editorOpen && aggForm.$invalid && aggForm.softErrorCount()" class="visEditorAggHeader__description visEditorAggHeader__description--danger" title="{{aggForm.describeErrors()}}">
+  <span ng-if="!editorOpen && aggForm.$invalid" class="visEditorAggHeader__description visEditorAggHeader__description--danger" title="{{aggForm.describeErrors()}}">
     {{ aggForm.describeErrors() }}
   </span>
 
diff --git a/src/ui/public/vis/editors/default/agg_params.js b/src/ui/public/vis/editors/default/agg_params.js
index 0f67e687dc9d0..de252c2f2dd82 100644
--- a/src/ui/public/vis/editors/default/agg_params.js
+++ b/src/ui/public/vis/editors/default/agg_params.js
@@ -47,11 +47,6 @@ uiModules
         $scope.aggTypeOptions = aggTypeFilters
           .filter(aggTypes.byType[$scope.groupName], $scope.indexPattern, $scope.agg);
 
-        // If current agg type is not part of allowed agg types, set to first element of allowed agg types
-        if(!$scope.aggTypeOptions.includes($scope.agg.type)) {
-          $scope.agg.type = $scope.aggTypeOptions[0];
-        }
-
         $scope.advancedToggled = false;
 
         // We set up this watch prior to adding the controls below, because when the controls are added,
diff --git a/x-pack/plugins/rollup/index.js b/x-pack/plugins/rollup/index.js
index 8501e34c502e2..a0c10643b6c87 100644
--- a/x-pack/plugins/rollup/index.js
+++ b/x-pack/plugins/rollup/index.js
@@ -33,6 +33,15 @@ export function rollup(kibana) {
       search: [
         'plugins/rollup/search',
       ],
+      migrations: {
+        'index-pattern': {
+          '6.5.0': (doc) => {
+            doc.attributes.type = doc.attributes.type || undefined;
+            doc.attributes.typeMeta = doc.attributes.typeMeta || undefined;
+            return doc;
+          }
+        },
+      }
     },
     init: function (server) {
       registerLicenseChecker(server);
diff --git a/x-pack/plugins/rollup/public/index_pattern_list/register.js b/x-pack/plugins/rollup/public/index_pattern_list/register.js
index b62c6cf027ae5..b616cad421216 100644
--- a/x-pack/plugins/rollup/public/index_pattern_list/register.js
+++ b/x-pack/plugins/rollup/public/index_pattern_list/register.js
@@ -3,43 +3,8 @@
 * or more contributor license agreements. Licensed under the Elastic License;
 * you may not use this file except in compliance with the Elastic License.
 */
-import { IndexPatternListRegistry } from 'ui/management';
 
-IndexPatternListRegistry.register(() => {
-  return class RollupIndexPatternList {
-    static key = 'rollup';
+import { IndexPatternListConfigRegistry } from 'ui/management/index_pattern_list';
+import { RollupIndexPatternListConfig } from './rollup_index_pattern_list_config';
 
-    getIndexPatternTags = (indexPattern) => {
-      const tags = [];
-      if(indexPattern.type === 'rollup' || (indexPattern.get && indexPattern.get('type') === 'rollup')) {
-        tags.push({
-          key: 'rollup',
-          name: 'Rollup',
-        });
-      }
-      return tags;
-    }
-
-    getFieldInfo = (indexPattern, field) => {
-      const allAggs = indexPattern.typeMeta && indexPattern.typeMeta.aggs;
-      const fieldAggs = allAggs && Object.keys(allAggs).filter(agg => allAggs[agg][field] && Array.isArray(allAggs[agg][field]));
-
-      if(!fieldAggs || !fieldAggs.length) {
-        return [];
-      }
-
-      return ['Rollup aggregations:'].concat(fieldAggs.map(aggName => {
-        const agg = allAggs[aggName][field];
-        switch(aggName) {
-          case 'date_histogram':
-            return `${aggName} (interval: ${agg.interval}, ${agg.delay ? `delay: ${agg.delay},` : ''} ${agg.time_zone})`;
-            break;
-          case 'histogram':
-            return `${aggName} (interval: ${agg.interval})`;
-          default:
-            return aggName;
-        }
-      }));
-    }
-  };
-});
+IndexPatternListConfigRegistry.register(() => RollupIndexPatternListConfig);
diff --git a/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js b/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js
new file mode 100644
index 0000000000000..da5fc2da38898
--- /dev/null
+++ b/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js
@@ -0,0 +1,51 @@
+/*
+* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+* or more contributor license agreements. Licensed under the Elastic License;
+* you may not use this file except in compliance with the Elastic License.
+*/
+import { IndexPatternListConfig } from 'ui/management/index_pattern_list';
+
+function isRollup(indexPattern) {
+  return indexPattern.type === 'rollup' || (indexPattern.get && indexPattern.get('type') === 'rollup');
+}
+
+export class RollupIndexPatternListConfig extends IndexPatternListConfig {
+  static key = 'rollup';
+
+  getIndexPatternTags = (indexPattern) => {
+    return isRollup(indexPattern) ? [{
+      key: 'rollup',
+      name: 'Rollup',
+    }] : [];
+  }
+
+  getFieldInfo = (indexPattern, field) => {
+    if(!isRollup(indexPattern)) {
+      return [];
+    }
+
+    const allAggs = indexPattern.typeMeta && indexPattern.typeMeta.aggs;
+    const fieldAggs = allAggs && Object.keys(allAggs).filter(agg => allAggs[agg][field]);
+
+    if(!fieldAggs || !fieldAggs.length) {
+      return [];
+    }
+
+    return ['Rollup aggregations:'].concat(fieldAggs.map(aggName => {
+      const agg = allAggs[aggName][field];
+      switch(aggName) {
+        case 'date_histogram':
+          return `${aggName} (interval: ${agg.interval}, ${agg.delay ? `delay: ${agg.delay},` : ''} ${agg.time_zone})`;
+          break;
+        case 'histogram':
+          return `${aggName} (interval: ${agg.interval})`;
+        default:
+          return aggName;
+      }
+    }));
+  }
+
+  areScriptedFieldsEnabled = (indexPattern) => {
+    return !isRollup(indexPattern);
+  }
+}
diff --git a/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js b/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js
index 446431c813e31..62d5b3d09cb03 100644
--- a/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js
+++ b/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js
@@ -11,8 +11,9 @@ import { aggTypeFieldFilters } from 'ui/agg_types/param_types/filter';
  * and limit available fields for a given aggType based on that.
  */
 aggTypeFieldFilters.addFilter(
-  (field, fieldParamType, indexPattern, aggConfig) => {
-    if(indexPattern.type !== 'rollup') {
+  (field, fieldParamType, aggConfig) => {
+    const indexPattern = aggConfig.getIndexPattern();
+    if(!indexPattern || indexPattern.type !== 'rollup') {
       return true;
     }
     const aggName = aggConfig.type.name;
diff --git a/x-pack/plugins/rollup/public/visualize/agg_type_filter.js b/x-pack/plugins/rollup/public/visualize/agg_type_filter.js
index 87c052ca09542..a3e13250152bc 100644
--- a/x-pack/plugins/rollup/public/visualize/agg_type_filter.js
+++ b/x-pack/plugins/rollup/public/visualize/agg_type_filter.js
@@ -17,6 +17,9 @@ aggTypeFilters.addFilter(
     }
     const aggName = aggType.name;
     const aggs = indexPattern.typeMeta.aggs;
-    return Object.keys(aggs).includes(aggName);
+
+    // Return doc_count (which is collected by default for rollup date histogram, histogram, and terms)
+    // and the rest of the defined metrics from capabilities.
+    return aggName === 'count' || Object.keys(aggs).includes(aggName);
   }
 );
diff --git a/x-pack/plugins/rollup/public/visualize/editor_config.js b/x-pack/plugins/rollup/public/visualize/editor_config.js
new file mode 100644
index 0000000000000..af30fc1c9b697
--- /dev/null
+++ b/x-pack/plugins/rollup/public/visualize/editor_config.js
@@ -0,0 +1,79 @@
+/*
+* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+* or more contributor license agreements. Licensed under the Elastic License;
+* you may not use this file except in compliance with the Elastic License.
+*/
+
+import { editorConfigProviders } from 'ui/vis/editors/config/editor_config_providers';
+
+// Limit agg params based on rollup capabilities
+editorConfigProviders.register((aggType, indexPattern, aggConfig) => {
+  if(indexPattern.type !== 'rollup') {
+    return {};
+  }
+
+  const aggTypeName = aggConfig.type && aggConfig.type.name;
+
+  // Exclude certain param options for terms:
+  // otherBucket, missingBucket, orderBy, orderAgg
+  if(aggTypeName === 'terms') {
+    return {
+      otherBucket: {
+        hidden: true
+      },
+      missingBucket: {
+        hidden: true
+      },
+      orderBy: {
+        fixedValue: '_key',
+        hidden: true
+      },
+      orderAgg: {
+        hidden: true,
+      }
+    };
+  }
+
+  const rollupAggs = indexPattern.typeMeta && indexPattern.typeMeta.aggs;
+  const field = aggConfig.params && aggConfig.params.field && aggConfig.params.field.name;
+  const fieldAgg = rollupAggs && field && rollupAggs[aggTypeName] && rollupAggs[aggTypeName][field];
+
+  if(!rollupAggs || !field || !fieldAgg) {
+    return {};
+  }
+
+  // Set interval and base interval for histograms based on rollup capabilities
+  if(aggTypeName === 'histogram') {
+    const interval = fieldAgg.interval;
+    return interval ? {
+      intervalBase: {
+        fixedValue: interval
+      },
+      interval: {
+        base: interval,
+        help: `Must be a multiple of rollup configuration interval: ${interval}`
+      }
+    } : {};
+  }
+
+  // Set date histogram time zone based on rollup capabilities
+  if (aggTypeName === 'date_histogram') {
+    const timezone = fieldAgg.time_zone || 'UTC';
+    const interval = fieldAgg.interval;
+    return {
+      time_zone: {
+        fixedValue: timezone,
+      },
+      interval: {
+        fixedValue: 'custom',
+      },
+      customInterval: {
+        default: interval,
+        timeBase: interval,
+        help: `Must be a multiple of rollup configuration interval: ${interval}`
+      }
+    };
+  }
+
+  return {};
+});
diff --git a/x-pack/plugins/rollup/public/visualize/index.js b/x-pack/plugins/rollup/public/visualize/index.js
index 5961110b5fc07..a6c486fc3d891 100644
--- a/x-pack/plugins/rollup/public/visualize/index.js
+++ b/x-pack/plugins/rollup/public/visualize/index.js
@@ -6,3 +6,4 @@
 
 import './agg_type_filter';
 import './agg_type_field_filter';
+import './editor_config';