Merge branch 'release-branch.v7' of github.com:olivere/elastic into r…

…elease-branch.v7
olivere · Mar 19, 2022 · 53dffb0 · 53dffb0
2 parents 67e024d + 97254fa
commit 53dffb0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/indices_get_index_template.go b/indices_get_index_template.go
@@ -231,16 +231,20 @@ type IndicesGetIndexTemplateData struct {
 }
 
 type IndicesDataStream struct {
-	Name               string                 `json:"name,omitempty"`
-	TimestampField     string                 `json:"timestamp_field,omitempty"`
-	Indices            []string               `json:"indices,omitempty"`
-	Generation         int64                  `json:"generation,omitempty"`
-	Status             string                 `json:"status,omitempty"`
-	IndexTemplate      string                 `json:"template,omitempty"`
-	IlmPolicy          string                 `json:"ilm_policy,omitempty"`
-	Meta               map[string]interface{} `json:"_meta,omitempty"`
-	Hidden             bool                   `json:"hidden,omitempty"`
-	System             bool                   `json:"system,omitempty"`
-	AllowCustomRouting bool                   `json:"allow_custom_routing,omitempty"`
-	Replicated         bool                   `json:"replicated,omitempty"`
+	Name               string                           `json:"name,omitempty"`
+	TimestampField     *IndicesDataStreamTimestampField `json:"timestamp_field,omitempty"`
+	Indices            []string                         `json:"indices,omitempty"`
+	Generation         int64                            `json:"generation,omitempty"`
+	Status             string                           `json:"status,omitempty"`
+	IndexTemplate      string                           `json:"template,omitempty"`
+	IlmPolicy          string                           `json:"ilm_policy,omitempty"`
+	Meta               map[string]interface{}           `json:"_meta,omitempty"`
+	Hidden             bool                             `json:"hidden,omitempty"`
+	System             bool                             `json:"system,omitempty"`
+	AllowCustomRouting bool                             `json:"allow_custom_routing,omitempty"`
+	Replicated         bool                             `json:"replicated,omitempty"`
+}
+
+type IndicesDataStreamTimestampField struct {
+	Name string `json:"name,omitempty"`
 }
diff --git a/recipes/search_with_point_in_time/search.go b/recipes/search_with_point_in_time/search.go
@@ -79,7 +79,7 @@ func main() {
 		).
 		Size(*size).
 		PointInTime(
-			elastic.NewPointInTime(pit.Id, "2m"),
+			elastic.NewPointInTimeWithKeepAlive(pit.Id, "2m"),
 		).
 		Do(context.Background())
 	if err != nil {