diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 8d169cee2758..65bf346c8c53 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -87,6 +87,8 @@ https://github.com/elastic/beats/compare/v7.0.0-beta1...master[Check the HEAD di
 
 *Affecting all Beats*
 
+- Add ip fields to default_field in Elasticsearch template. {pull}11035[11035]
+
 *Auditbeat*
 
 - Move System module to beta. {pull}10800[10800]
diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go
index b4f6a04c0e81..4e25bcec03f2 100644
--- a/libbeat/template/processor.go
+++ b/libbeat/template/processor.go
@@ -100,6 +100,11 @@ func (p *Processor) Process(fields common.Fields, path string, output common.Map
 			mapping = p.other(&field)
 		}
 
+		switch field.Type {
+		case "", "keyword", "text", "ip":
+			addToDefaultFields(&field)
+		}
+
 		if len(mapping) > 0 {
 			output.Put(common.GenerateKey(field.Name), mapping)
 		}
@@ -107,6 +112,17 @@ func (p *Processor) Process(fields common.Fields, path string, output common.Map
 	return nil
 }
 
+func addToDefaultFields(f *common.Field) {
+	fullName := f.Name
+	if f.Path != "" {
+		fullName = f.Path + "." + f.Name
+	}
+
+	if f.Index == nil || (f.Index != nil && *f.Index) {
+		defaultFields = append(defaultFields, fullName)
+	}
+}
+
 func (p *Processor) other(f *common.Field) common.MapStr {
 	property := getDefaultProperties(f)
 	if f.Type != "" {
@@ -173,15 +189,6 @@ func (p *Processor) ip(f *common.Field) common.MapStr {
 func (p *Processor) keyword(f *common.Field) common.MapStr {
 	property := getDefaultProperties(f)
 
-	fullName := f.Name
-	if f.Path != "" {
-		fullName = f.Path + "." + f.Name
-	}
-
-	if f.Index == nil || (f.Index != nil && *f.Index) {
-		defaultFields = append(defaultFields, fullName)
-	}
-
 	property["type"] = "keyword"
 
 	switch f.IgnoreAbove {
@@ -209,15 +216,6 @@ func (p *Processor) keyword(f *common.Field) common.MapStr {
 func (p *Processor) text(f *common.Field) common.MapStr {
 	properties := getDefaultProperties(f)
 
-	fullName := f.Name
-	if f.Path != "" {
-		fullName = f.Path + "." + f.Name
-	}
-
-	if f.Index == nil || (f.Index != nil && *f.Index) {
-		defaultFields = append(defaultFields, fullName)
-	}
-
 	properties["type"] = "text"
 
 	if p.EsVersion.IsMajor(2) {