-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ESQL: Mark counter fields as unsupported (#99054)
This marks TSDB's `counter` fields as unsupported by ESQL. We'll support them eventually, but in the short term we were just treating them like their underlying numeric type and that's not great. They have a conceptually different meaning that we'd like to respect one day. So, for now, we'll mark them unsupported.
- Loading branch information
Showing
13 changed files
with
236 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| pr: 99054 | ||
| summary: "ESQL: Mark counter fields as unsupported" | ||
| area: ES|QL | ||
| type: enhancement | ||
| issues: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
.../server/single-node/src/yamlRestTest/resources/rest-api-spec/test/45_non_tsdb_counter.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| setup: | ||
| - do: | ||
| indices.create: | ||
| index: test | ||
| body: | ||
| settings: | ||
| index: | ||
| mode: standard | ||
| mappings: | ||
| properties: | ||
| "@timestamp": | ||
| type: date | ||
| metricset: | ||
| type: keyword | ||
| time_series_dimension: true | ||
| k8s: | ||
| properties: | ||
| pod: | ||
| properties: | ||
| uid: | ||
| type: keyword | ||
| time_series_dimension: true | ||
| name: | ||
| type: keyword | ||
| ip: | ||
| type: ip | ||
| network: | ||
| properties: | ||
| tx: | ||
| type: long | ||
| time_series_metric: counter | ||
| rx: | ||
| type: long | ||
| time_series_metric: counter | ||
| - do: | ||
| bulk: | ||
| refresh: true | ||
| index: test | ||
| body: | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:50:04.467Z", "metricset": "pod", "k8s": {"pod": {"name": "cat", "uid":"947e4ced-1786-4e53-9e0c-5c447e959507", "ip": "10.10.55.1", "network": {"tx": 2001818691, "rx": 802133794}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:50:24.467Z", "metricset": "pod", "k8s": {"pod": {"name": "cat", "uid":"947e4ced-1786-4e53-9e0c-5c447e959507", "ip": "10.10.55.1", "network": {"tx": 2005177954, "rx": 801479970}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:50:44.467Z", "metricset": "pod", "k8s": {"pod": {"name": "cat", "uid":"947e4ced-1786-4e53-9e0c-5c447e959507", "ip": "10.10.55.1", "network": {"tx": 2006223737, "rx": 802337279}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:51:04.467Z", "metricset": "pod", "k8s": {"pod": {"name": "cat", "uid":"947e4ced-1786-4e53-9e0c-5c447e959507", "ip": "10.10.55.2", "network": {"tx": 2012916202, "rx": 803685721}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:50:03.142Z", "metricset": "pod", "k8s": {"pod": {"name": "dog", "uid":"df3145b3-0563-4d3b-a0f7-897eb2876ea9", "ip": "10.10.55.3", "network": {"tx": 1434521831, "rx": 530575198}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:50:23.142Z", "metricset": "pod", "k8s": {"pod": {"name": "dog", "uid":"df3145b3-0563-4d3b-a0f7-897eb2876ea9", "ip": "10.10.55.3", "network": {"tx": 1434577921, "rx": 530600088}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@timestamp": "2021-04-28T18:50:53.142Z", "metricset": "pod", "k8s": {"pod": {"name": "dog", "uid":"df3145b3-0563-4d3b-a0f7-897eb2876ea9", "ip": "10.10.55.3", "network": {"tx": 1434587694, "rx": 530604797}}}}' | ||
| - '{"index": {}}' | ||
| - '{"@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": 1434595272, "rx": 530605511}}}}' | ||
|
|
||
| --- | ||
| load everything: | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test' | ||
|
|
||
| - match: {columns.0.name: "@timestamp"} | ||
| - match: {columns.0.type: "date"} | ||
| - match: {columns.1.name: "k8s.pod.ip"} | ||
| - match: {columns.1.type: "ip"} | ||
| - match: {columns.2.name: "k8s.pod.name"} | ||
| - match: {columns.2.type: "keyword"} | ||
| - match: {columns.3.name: "k8s.pod.network.rx"} | ||
| - match: {columns.3.type: "long"} | ||
| - match: {columns.4.name: "k8s.pod.network.tx"} | ||
| - match: {columns.4.type: "long"} | ||
| - match: {columns.5.name: "k8s.pod.uid"} | ||
| - match: {columns.5.type: "keyword"} | ||
| - match: {columns.6.name: "metricset"} | ||
| - match: {columns.6.type: "keyword"} | ||
| - length: {values: 8} | ||
|
|
||
| --- | ||
| load a document: | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where @timestamp == "2021-04-28T18:50:23.142Z"' | ||
|
|
||
| - length: {values: 1} | ||
| - length: {values.0: 7} | ||
| - match: {values.0.0: "2021-04-28T18:50:23.142Z"} | ||
| - match: {values.0.1: "10.10.55.3"} | ||
| - match: {values.0.2: "dog"} | ||
| - match: {values.0.3: 530600088} | ||
| - match: {values.0.4: 1434577921} | ||
| - match: {values.0.5: "df3145b3-0563-4d3b-a0f7-897eb2876ea9"} | ||
| - match: {values.0.6: "pod"} | ||
|
|
||
| --- | ||
| filter on counter: | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where k8s.pod.network.tx == 1434577921' | ||
|
|
||
| - length: {values: 1} | ||
| - length: {values.0: 7} | ||
| - match: {values.0.0: "2021-04-28T18:50:23.142Z"} | ||
| - match: {values.0.1: "10.10.55.3"} | ||
| - match: {values.0.2: "dog"} | ||
| - match: {values.0.3: 530600088} | ||
| - match: {values.0.4: 1434577921} | ||
| - match: {values.0.5: "df3145b3-0563-4d3b-a0f7-897eb2876ea9"} | ||
| - match: {values.0.6: "pod"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...lugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeRegistryTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
| package org.elasticsearch.xpack.esql.type; | ||
|
|
||
| import org.elasticsearch.action.fieldcaps.FieldCapabilities; | ||
| import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse; | ||
| import org.elasticsearch.index.mapper.TimeSeriesParams; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.xpack.ql.index.IndexResolution; | ||
| import org.elasticsearch.xpack.ql.index.IndexResolver; | ||
| import org.elasticsearch.xpack.ql.type.DataType; | ||
| import org.elasticsearch.xpack.ql.type.DataTypes; | ||
| import org.elasticsearch.xpack.ql.type.EsField; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class EsqlDataTypeRegistryTests extends ESTestCase { | ||
| public void testCounter() { | ||
| resolve("long", TimeSeriesParams.MetricType.COUNTER, DataTypes.UNSUPPORTED); | ||
| } | ||
|
|
||
| public void testGauge() { | ||
| resolve("long", TimeSeriesParams.MetricType.GAUGE, DataTypes.LONG); | ||
| } | ||
|
|
||
| public void testLong() { | ||
| resolve("long", null, DataTypes.LONG); | ||
| } | ||
|
|
||
| private void resolve(String esTypeName, TimeSeriesParams.MetricType metricType, DataType expected) { | ||
| String[] indices = new String[] { "idx-" + randomAlphaOfLength(5) }; | ||
| FieldCapabilities fieldCap = new FieldCapabilities( | ||
| randomAlphaOfLength(3), | ||
| esTypeName, | ||
| false, | ||
| true, | ||
| true, | ||
| false, | ||
| metricType, | ||
| indices, | ||
| null, | ||
| null, | ||
| null, | ||
| null, | ||
| Map.of() | ||
| ); | ||
| FieldCapabilitiesResponse caps = new FieldCapabilitiesResponse(indices, Map.of(fieldCap.getName(), Map.of(esTypeName, fieldCap))); | ||
| IndexResolution resolution = IndexResolver.mergedMappings(EsqlDataTypeRegistry.INSTANCE, "idx-*", caps); | ||
|
|
||
| EsField f = resolution.get().mapping().get(fieldCap.getName()); | ||
| assertThat(f.getDataType(), equalTo(expected)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.