Allow fields with ip_range datatype (#26444)

adriansr · web-flow · commit ec52595d8f07 · 2021-06-24T15:15:47.000+02:00
This updates libbeat to support fields with ip_range type. See https://www.elastic.co/guide/en/elasticsearch/reference/master/range.html
diff --git a/libbeat/kibana/fields_transformer.go b/libbeat/kibana/fields_transformer.go
@@ -293,6 +293,7 @@ var (
 		"geo_point":    "geo_point",
 		"date":         "date",
 		"ip":           "ip",
+		"ip_range":     "ip_range",
 		"boolean":      "boolean",
 	}
 )
diff --git a/libbeat/kibana/fields_transformer_test.go b/libbeat/kibana/fields_transformer_test.go
@@ -205,6 +205,8 @@ func TestTransformTypes(t *testing.T) {
 		{commonField: mapping.Field{Type: "string"}, expected: nil},
 		{commonField: mapping.Field{Type: "date"}, expected: "date"},
 		{commonField: mapping.Field{Type: "geo_point"}, expected: "geo_point"},
+		{commonField: mapping.Field{Type: "ip"}, expected: "ip"},
+		{commonField: mapping.Field{Type: "ip_range"}, expected: "ip_range"},
 		{commonField: mapping.Field{Type: "invalid"}, expected: nil},
 	}
 	for idx, test := range tests {
diff --git a/libbeat/mapping/field.go b/libbeat/mapping/field.go
@@ -153,7 +153,7 @@ func (f *Field) validateType() error {
 		allowedFormatters = []string{"geo_point"}
 	case "date_range":
 		allowedFormatters = []string{"date_range"}
-	case "boolean", "binary", "ip", "alias", "array":
+	case "boolean", "binary", "ip", "alias", "array", "ip_range":
 		// No formatters, metric types, or units allowed.
 	case "object":
 		if f.DynamicTemplate && (len(f.ObjectTypeParams) > 0 || f.ObjectType != "") {
diff --git a/libbeat/mapping/field_test.go b/libbeat/mapping/field_test.go
@@ -364,6 +364,11 @@ func TestFieldValidate(t *testing.T) {
 			},
 			err: true,
 		},
+		"allow ip_range": {
+			cfg:   common.MapStr{"type": "ip_range"},
+			err:   false,
+			field: Field{Type: "ip_range"},
+		},
 	}
 
 	for name, test := range tests {

Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,7 @@ var (`
`293`	`293`	`"geo_point": "geo_point",`
`294`	`294`	`"date": "date",`
`295`	`295`	`"ip": "ip",`
	`296`	`+ "ip_range": "ip_range",`
`296`	`297`	`"boolean": "boolean",`
`297`	`298`	`}`
`298`	`299`	`)`
Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,8 @@ func TestTransformTypes(t *testing.T) {`
`205`	`205`	`{commonField: mapping.Field{Type: "string"}, expected: nil},`
`206`	`206`	`{commonField: mapping.Field{Type: "date"}, expected: "date"},`
`207`	`207`	`{commonField: mapping.Field{Type: "geo_point"}, expected: "geo_point"},`
	`208`	`+ {commonField: mapping.Field{Type: "ip"}, expected: "ip"},`
	`209`	`+ {commonField: mapping.Field{Type: "ip_range"}, expected: "ip_range"},`
`208`	`210`	`{commonField: mapping.Field{Type: "invalid"}, expected: nil},`
`209`	`211`	`}`
`210`	`212`	`for idx, test := range tests {`