fix: some more _tsid values and yaml test skip version

salvatore-campagna · Sep 7, 2023 · 6bb3695 · 6bb3695
1 parent 0db1f0d
commit 6bb3695
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 130 deletions.
diff --git a/...s/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml b/...s/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml
@@ -54,8 +54,8 @@ setup:
 ---
 "Basic test":
   - skip:
-      version: " - 8.6.99"
-      reason: Time series result serialization changed in 8.6.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       search:
@@ -76,7 +76,7 @@ setup:
   - match: { hits.total.value: 1 }
   - length: { aggregations: 1 }
 
-  - match: { aggregations.ts.buckets.0.key: { _tsid: HItuiNXRFKqL3KHB3Q7OZQ } }
+  - match: { aggregations.ts.buckets.0.key: { _tsid: "RGqc4j2v9houOhyLbojV0RSqi9yhwd0OzmU" } }
   - match: { aggregations.ts.buckets.0.doc_count: 1 }
 
 ---
@@ -107,8 +107,8 @@ setup:
 ---
 "Size test":
   - skip:
-      version: " - 8.6.99"
-      reason: Size added in 8.7.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       search:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/25_id_generation.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/25_id_generation.yml
@@ -211,8 +211,8 @@ create operation on top of old document fails:
 ---
 create operation on top of old document fails over bulk:
   - skip:
-      version: " - 8.1.99"
-      reason: id generation changed in 8.2
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       bulk:
@@ -221,13 +221,13 @@ create operation on top of old document fails over bulk:
         body:
           - '{"create": {}}'
           - '{"@timestamp": "2021-04-28T18:51:03.142Z", "metricset": "pod", "k8s": {"pod": {"name": "dog", "uid":"df3145b3-0563-4d3b-a0f7-897eb2876ea9", "ip": "10.10.55.3", "network": {"tx": 111434595272, "rx": 430605511}}}}'
-  - match: { items.0.create.error.reason: "[cn4exTOUtxytuLkQAAABeRnR_mY][{k8s.pod.uid=df3145b3-0563-4d3b-a0f7-897eb2876ea9, metricset=pod}@2021-04-28T18:51:03.142Z]: version conflict, document already exists (current version [1])" }
+  - match: { items.0.create.error.reason: "[cn4exTOUtxytuLkQAAABeRnR_mY][{_tsid=q2RfQj05ihHDOlaZAWQ9--qoyDozlLccrbi5EMFdqCeotpKt}@2021-04-28T18:51:03.142Z]: version conflict, document already exists (current version [1])" }
 
 ---
 ids query:
   - skip:
-      version: " - 8.1.99"
-      reason: ids generation changed in 8.2
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       search:
@@ -240,9 +240,9 @@ ids query:
               values: ["cn4exTOUtxytuLkQAAABeRnR_mY", "cZZNs4NdV58ePSPIAAABeRnSA5M"]
           sort: ["@timestamp"]
   - match: {hits.total.value: 2}
-  - match: {hits.hits.0._id: "cn4exTOUtxytuLkQAAABeRnR_mY"}
+  - match: {hits.hits.0._id: "cn4exWs7v3M2l8W_AAABeRnR_mY"}
   - match: {hits.hits.0.fields.k8s\.pod\.network\.tx: [1434595272]}
-  - match: {hits.hits.1._id: "cZZNs4NdV58ePSPIAAABeRnSA5M"}
+  - match: {hits.hits.1._id: "cZZNs-e5_7Eqw0RIAAABeRnSA5M"}
   - match: {hits.hits.1.fields.k8s\.pod\.network\.tx: [2012916202]}
 
 ---

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml
@@ -170,8 +170,8 @@ fetch a tag:
 ---
 "fetch the tsid":
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       search:
@@ -184,7 +184,7 @@ fetch a tag:
               query: '+@timestamp:"2021-04-28T18:51:04.467Z" +k8s.pod.name:cat'
 
   - match: {hits.total.value: 1}
-  - match: {hits.hits.0.fields._tsid: [{k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507, metricset: pod}]}
+  - match: {hits.hits.0.fields._tsid: [{_tsid: "q2RfQj112oDhOlaZAWQ9--qoyDqDXVefHj0jyCjcoxXulD39"}]}
 
 ---
 aggregate a dimension:
@@ -265,8 +265,8 @@ aggregate a tag:
 ---
 "aggregate the tsid":
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       search:
@@ -308,8 +308,8 @@ aggregate a tag:
 ---
 sort by tsid:
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       search:
@@ -318,7 +318,7 @@ sort by tsid:
           sort:   [ "_tsid", "@timestamp" ]
 
   - match: {hits.total.value: 8}
-  - match: {hits.hits.0.sort: [{ "k8s.pod.uid" : "947e4ced-1786-4e53-9e0c-5c447e959507", "metricset" : "pod"}, 1619635804467]}
-  - match: {hits.hits.1.sort: [{ "k8s.pod.uid" : "947e4ced-1786-4e53-9e0c-5c447e959507", "metricset" : "pod"}, 1619635824467]}
-  - match: {hits.hits.4.sort: [{ "k8s.pod.uid" : "df3145b3-0563-4d3b-a0f7-897eb2876ea9", "metricset" : "pod"}, 1619635803142]}
-  - match: {hits.hits.7.sort: [{ "k8s.pod.uid" : "df3145b3-0563-4d3b-a0f7-897eb2876ea9", "metricset" : "pod"}, 1619635863142]}
+  - match: {hits.hits.0.sort: [{ _tsid : "q2RfQj05ihHDOlaZAWQ9--qoyDozlLccrbi5EMFdqCeotpKt"}, 1619635803142]}
+  - match: {hits.hits.1.sort: [{ _tsid : "q2RfQj05ihHDOlaZAWQ9--qoyDozlLccrbi5EMFdqCeotpKt"}, 1619635823142]}
+  - match: {hits.hits.4.sort: [{ _tsid : "q2RfQj112oDhOlaZAWQ9--qoyDqDXVefHj0jyCjcoxXulD39"}, 1619635804467]}
+  - match: {hits.hits.7.sort: [{ _tsid : "q2RfQj112oDhOlaZAWQ9--qoyDqDXVefHj0jyCjcoxXulD39"}, 1619635864467]}
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml
@@ -1,8 +1,8 @@
 ---
 add dimensions with put_mapping:
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       indices.create:
@@ -48,14 +48,14 @@ add dimensions with put_mapping:
             - field: "@timestamp"
 
   - match: {hits.total.value: 1}
-  - match: {hits.hits.0.fields._tsid: [ { _tsid: U6txPvtQs7IIPDHGBuj5hg } ] }
+  - match: {hits.hits.0.fields._tsid: [ { _tsid: "VpkBZD0GlT_5OlOrcT77ULOyCDwxxgbo-YY" } ] }
   - match: {hits.hits.0.fields.@timestamp: ["2021-04-28T18:35:24.467Z"]}
 
 ---
 add dimensions to no dims with dynamic_template over index:
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       indices.create:
@@ -102,8 +102,8 @@ add dimensions to no dims with dynamic_template over index:
 ---
 add dimensions to no dims with dynamic_template over bulk:
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       indices.create:
@@ -144,14 +144,14 @@ add dimensions to no dims with dynamic_template over bulk:
             - field: _tsid
             - field: "@timestamp"
   - match: {hits.total.value: 1}
-  - match: {hits.hits.0.fields._tsid: [ { metricset: cat } ] }
+  - match: {hits.hits.0.fields._tsid: [ { _tsid: "VpkBZD0GlT_5OlOrcT77ULOyCDwxxgbo-YY" } ] }
   - match: {hits.hits.0.fields.@timestamp: ["2021-04-28T18:35:24.467Z"]}
 
 ---
 add dimensions to some dims with dynamic_template over index:
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       indices.create:
@@ -202,8 +202,8 @@ add dimensions to some dims with dynamic_template over index:
 ---
 add dimensions to some dims with dynamic_template over bulk:
   - skip:
-      version: " - 8.1.99"
-      reason: tsdb indexing changed in 8.2.0
+      version: " - 8.10.99"
+      reason: _tsid hasing introduced in 8.11
 
   - do:
       indices.create:
@@ -247,5 +247,5 @@ add dimensions to some dims with dynamic_template over bulk:
             - field: _tsid
             - field: "@timestamp"
   - match: {hits.total.value: 1}
-  - match: {hits.hits.0.fields._tsid: [ { metricset: cat, other_dim: cat } ] }
+  - match: {hits.hits.0.fields._tsid: [ { _tsid: "VpkBZD0GlT_5OportLw9BpU_-Tpg0xF7LEdq7PSCPmOfbe2l" } ] }
   - match: {hits.hits.0.fields.@timestamp: ["2021-04-28T18:35:24.467Z"]}