diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobConfig.java
index a799cbe9447..3818ebcf447 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobConfig.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobConfig.java
@@ -13,6 +13,7 @@ import org.elasticsearch.common.io.stream.NamedWriteable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -173,7 +174,7 @@ public class RollupJobConfig implements NamedWriteable, ToXContentObject {
         builder.endObject();
         return builder;
     }
-    
+
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(id);
@@ -336,6 +337,17 @@ public class RollupJobConfig implements NamedWriteable, ToXContentObject {
             if (indexPattern == null || indexPattern.isEmpty()) {
                 throw new IllegalArgumentException("An index pattern is mandatory.");
             }
+            if (Regex.isMatchAllPattern(indexPattern)) {
+                throw new IllegalArgumentException("Index pattern must not match all indices (as it would match it's own rollup index");
+            }
+            if (Regex.isSimpleMatchPattern(indexPattern)) {
+                if (Regex.simpleMatch(indexPattern, rollupIndex)) {
+                    throw new IllegalArgumentException("Index pattern would match rollup index name which is not allowed.");
+                }
+            }
+            if (indexPattern.equals(rollupIndex)) {
+                throw new IllegalArgumentException("Rollup index may not be the same as the index pattern.");
+            }
             if (rollupIndex == null || rollupIndex.isEmpty()) {
                 throw new IllegalArgumentException("A rollup index name is mandatory.");
             }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/rollup/ConfigTestHelpers.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/rollup/ConfigTestHelpers.java
index 7522f474e77..3d82ac118f5 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/rollup/ConfigTestHelpers.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/rollup/ConfigTestHelpers.java
@@ -27,8 +27,9 @@ public class ConfigTestHelpers {
         builder.setId(jobId);
         builder.setCron(getCronString());
         builder.setTimeout(new TimeValue(ESTestCase.randomIntBetween(1,100)));
-        builder.setIndexPattern(ESTestCase.randomAlphaOfLengthBetween(1,10));
-        builder.setRollupIndex(ESTestCase.randomAlphaOfLengthBetween(1,10));
+        String indexPattern = ESTestCase.randomAlphaOfLengthBetween(1,10);
+        builder.setIndexPattern(indexPattern);
+        builder.setRollupIndex("rollup_" + indexPattern); // to ensure the index pattern != rollup index
         builder.setGroupConfig(ConfigTestHelpers.getGroupConfig().build());
         builder.setPageSize(ESTestCase.randomIntBetween(1,10));
         if (ESTestCase.randomBoolean()) {
diff --git a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java
index 24dcb323e3d..819a8dfa3fe 100644
--- a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java
+++ b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java
@@ -95,8 +95,8 @@ public class TransportPutRollupJobAction extends TransportMasterNodeAction<PutRo
         XPackPlugin.checkReadyForXPackCustomMetadata(clusterState);
 
         FieldCapabilitiesRequest fieldCapsRequest = new FieldCapabilitiesRequest()
-                .indices(request.getConfig().getIndexPattern())
-                .fields(request.getConfig().getAllFields().toArray(new String[0]));
+            .indices(request.getConfig().getIndexPattern())
+            .fields(request.getConfig().getAllFields().toArray(new String[0]));
 
         client.fieldCaps(fieldCapsRequest, new ActionListener<FieldCapabilitiesResponse>() {
             @Override
diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java
index f22a6c87a3f..e465c7883cf 100644
--- a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java
+++ b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java
@@ -122,6 +122,37 @@ public class ConfigTests extends ESTestCase {
         assertThat(e.getMessage(), equalTo("An index pattern is mandatory."));
     }
 
+    public void testMatchAllIndexPattern() {
+        RollupJobConfig.Builder job = ConfigTestHelpers.getRollupJob("foo");
+        job.setIndexPattern("*");
+        Exception e = expectThrows(IllegalArgumentException.class, job::build);
+        assertThat(e.getMessage(), equalTo("Index pattern must not match all indices (as it would match it's own rollup index"));
+    }
+
+    public void testMatchOwnRollupPatternPrefix() {
+        RollupJobConfig.Builder job = ConfigTestHelpers.getRollupJob("foo");
+        job.setIndexPattern("foo-*");
+        job.setRollupIndex("foo-rollup");
+        Exception e = expectThrows(IllegalArgumentException.class, job::build);
+        assertThat(e.getMessage(), equalTo("Index pattern would match rollup index name which is not allowed."));
+    }
+
+    public void testMatchOwnRollupPatternSuffix() {
+        RollupJobConfig.Builder job = ConfigTestHelpers.getRollupJob("foo");
+        job.setIndexPattern("*-rollup");
+        job.setRollupIndex("foo-rollup");
+        Exception e = expectThrows(IllegalArgumentException.class, job::build);
+        assertThat(e.getMessage(), equalTo("Index pattern would match rollup index name which is not allowed."));
+    }
+
+    public void testIndexPatternIdenticalToRollup() {
+        RollupJobConfig.Builder job = ConfigTestHelpers.getRollupJob("foo");
+        job.setIndexPattern("foo");
+        job.setRollupIndex("foo");
+        Exception e = expectThrows(IllegalArgumentException.class, job::build);
+        assertThat(e.getMessage(), equalTo("Rollup index may not be the same as the index pattern."));
+    }
+
     public void testEmptyRollupIndex() {
         RollupJobConfig.Builder job = ConfigTestHelpers.getRollupJob("foo");
         job.setRollupIndex("");
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/put_job.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/put_job.yml
index 568a6261cda..717be0d6b25 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/put_job.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/put_job.yml
@@ -188,4 +188,3 @@ setup:
             ]
           }
 
-