Skip to content

Commit 16aee59

Browse files
committed
more count/distinct
1 parent ee46291 commit 16aee59

File tree

6 files changed

+277
-307
lines changed

6 files changed

+277
-307
lines changed

x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/k8s-downsampled.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@timestamp:date,cluster:keyword,pod:keyword,client.ip:ip,network.bytes_in:long,network.total_bytes_in:counter_long,network.cost:double,network.total_cost:counter_double,network.eth0.up:boolean,network.eth0.tx:aggregate_metric_double,network.eth0.rx:aggregate_metric_double,network.eth0.last_up:date_nanos,network.eth0.firmware_version:version,network.eth0.currently_connected_clients:integer,events_received:long,event_log:text,city:geo_point,city_boundary:geo_shape,shape:cartesian_shape,location:cartesian_point
1+
@timestamp:date,cluster:keyword,pod:keyword,client.ip:ip,network.bytes_in:long,network.total_bytes_in:counter_long,network.cost:double,network.total_cost:counter_double,network.eth0.up:boolean,network.eth0.tx:aggregate_metric_double,network.eth0.rx:aggregate_metric_double,network.eth0.last_up:date_nanos,network.eth0.firmware_version:version,network.eth0.currently_connected_clients:integer,events_received:long,event_log:text,event_city:geo_point,event_city_boundary:geo_shape,event_shape:cartesian_shape,event_location:cartesian_point
22
2024-05-09T23:30:00.000Z,staging,one,10.10.20.34,699,821,9.375,9.875,true,{"min":263.0\,"max":740.0\,"sum":5390.0\,"value_count":10},{"min":397.0\,"max":1079.0\,"sum":6348.0\,"value_count":6},2024-04-13T05:15:29.735829818Z,7.8.4,862,10,Lorem ipsum dolor sit amet consectetur adipiscing elit nulla ut in nullam tristique viverra penatibus ac integer,POINT(-0.2 5.55),"POLYGON((-0.2841 5.572\,-0.272 5.5406\,-0.282 5.5172\,-0.1227 5.5661\,-0.0549 5.6077\,-0.1142 5.6466\,-0.1407 5.636\,-0.1515 5.6599\,-0.1904 5.6674\,-0.2671 5.6069\,-0.2841 5.572))","POLYGON((2 2\, 3 2\, 3 3\, 2 3\, 2 2))",POINT(5426503.078078238 3677395.4640035294)
33
2024-05-09T23:30:00.000Z,staging,two,10.10.20.34,473,838,1.25,8.125,true,{"min":442.0\,"max":1011.0\,"sum":3850.0\,"value_count":7},{"min":226.0\,"max":226.0\,"sum":226.0\,"value_count":1},2024-05-03T15:37:33.324440296Z,6.2.3,369,6,interdum ridiculus tellus risus iaculis faucibus. Eu cursus ante et nullam litora nulla habitasse nisl dignissim quisque molestie pretium,POINT(-124.0857 40.9488),"POLYGON((-124.482 40.4403\,-124.4281 40.3618\,-124.4213 40.2371\,-124.2312 40.0934\,-124.1538 40.0635\,-124.1349 40.0025\,-123.5445 40.002\,-123.5435 40.7376\,-123.5661 40.789\,-123.5537 40.7962\,-123.5636 40.842\,-123.5876 40.8586\,-123.5801 40.8676\,-123.6103 40.8785\,-123.5973 40.8844\,-123.6238 40.9293\,-123.5874 40.928\,-123.5594 40.9503\,-123.4815 40.9148\,-123.4058 41.0134\,-123.4235 41.0582\,-123.4638 41.0761\,-123.464 41.0951\,-123.4396 41.0924\,-123.4325 41.1628\,-123.4081 41.1801\,-123.4541 41.2363\,-123.4431 41.273\,-123.4615 41.2826\,-123.4596 41.3101\,-123.4786 41.3296\,-123.4743 41.3663\,-123.4993 41.3824\,-123.7704 41.3808\,-123.7708 41.4641\,-124.1366 41.4645\,-124.14 41.3818\,-124.2065 41.3847\,-124.2424 41.3433\,-124.22 41.303\,-124.1607 41.2893\,-124.1955 41.1846\,-124.2376 41.166\,-124.2525 41.1341\,-124.2271 41.0466\,-124.1827 41.0013\,-124.1976 40.9505\,-124.2326 40.8693\,-124.4034 40.6132\,-124.482 40.4403))","POLYGON((0 2\, 1 2\, 1 3\, 0 3\, 0 2))",POINT(4783520.559160681 1661010.0197476079)
44
2024-05-09T23:30:00.000Z,staging,three,10.10.20.30,113,930,9.25,6.5,false,{"min":341.0\,"max":592.0\,"sum":1956.0\,"value_count":5},{"min":289.0\,"max":869.0\,"sum":2604.0\,"value_count":6},2024-03-25T09:57:51.755620402Z,13.10.4,949,,integer,POINT(35.3213 37.0),"POLYGON((34.7393 36.574\,35.4026 36.263\,35.965 36.671\,36.0962 37.155\,35.8806 37.1757\,35.9203 37.4744\,36.2673 37.7557\,36.3747 38.3784\,35.7699 38.1024\,35.5128 37.7183\,34.8796 37.682\,34.7788 37.3309\,34.9746 37.2677\,35.1471 36.7991\,34.7393 36.574))","MULTIPOLYGON(((0 0\, 1 0\, 1 1\, 0 1\, 0 0)\, (0.4 0.4\, 0.6 0.4\, 0.6 0.6\, 0.4 0.6\, 0.4 0.4))\, ((2 0\, 3 0\, 3 1\, 2 1\, 2 0)\, (2.4 0.4\, 2.6 0.4\, 2.6 0.6\, 2.4 0.6\, 2.4 0.4))\, ((2 2\, 3 2\, 3 3\, 2 3\, 2 2)\, (2.4 2.4\, 2.6 2.4\, 2.6 2.6\, 2.4 2.6\, 2.4 2.4))\, ((0 2\, 1 2\, 1 3\, 0 3\, 0 2)\, (0.4 2.4\, 0.6 2.4\, 0.6 2.6\, 0.4 2.6\, 0.4 2.4)))",POINT(8439051.727244465 2599127.5424638605)

x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/k8s.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@timestamp:date,cluster:keyword,pod:keyword,client.ip:ip,network.bytes_in:long,network.total_bytes_in:counter_long,network.cost:double,network.total_cost:counter_double,network.eth0.up:boolean,network.eth0.tx:integer,network.eth0.rx:integer,network.eth0.last_up:date_nanos,network.eth0.firmware_version:version,network.eth0.currently_connected_clients:integer,events_received:long,event_log:text,city:geo_point,city_boundary:geo_shape,shape:cartesian_shape,location:cartesian_point
1+
@timestamp:date,cluster:keyword,pod:keyword,client.ip:ip,network.bytes_in:long,network.total_bytes_in:counter_long,network.cost:double,network.total_cost:counter_double,network.eth0.up:boolean,network.eth0.tx:integer,network.eth0.rx:integer,network.eth0.last_up:date_nanos,network.eth0.firmware_version:version,network.eth0.currently_connected_clients:integer,events_received:long,event_log:text,event_city:geo_point,event_city_boundary:geo_shape,event_shape:cartesian_shape,event_location:cartesian_point
22
2024-05-10T00:00:29.000Z,staging,two,10.10.20.34,699,953,9.375,11.25,true,81,42,2024-04-13T05:15:29.735829818Z,7.8.4,862,9,Lorem ipsum dolor sit amet consectetur adipiscing elit nulla ut in nullam tristique viverra penatibus ac integer,POINT(-4.0333 5.3167),"POLYGON((-4.2941 5.307\,-4.2519 5.2994\,-4.2167 5.2209\,-3.978 5.2553\,-3.8548 5.2269\,-3.844 5.2541\,-3.8196 5.2507\,-3.8086 5.2893\,-3.7879 5.2728\,-3.7307 5.2737\,-3.7177 5.2945\,-3.7847 5.3634\,-3.8274 5.3747\,-3.8135 5.4275\,-3.8261 5.4324\,-3.8304 5.4854\,-3.8462 5.5089\,-3.8684 5.504\,-3.8966 5.5546\,-3.9219 5.5653\,-3.9356 5.6363\,-3.9853 5.6053\,-4.2579 5.6058\,-4.2439 5.49\,-4.2597 5.4862\,-4.2725 5.4497\,-4.2941 5.307))","MULTIPOLYGON(((0 0\, 1 0\, 1 1\, 0 1\, 0 0))\, ((2 0\, 3 0\, 3 1\, 2 1\, 2 0))\, ((2 2\, 3 2\, 3 3\, 2 3\, 2 2))\, ((0 2\, 1 2\, 1 3\, 0 3\, 0 2)))",POINT(8455502.60394535 3613330.7325705294)
33
2024-05-10T00:00:33.000Z,staging,three,10.10.20.34,473,1111,1.25,9.125,true,48,77,2024-05-03T15:37:33.324440296Z,6.2.3,369,9,interdum ridiculus tellus risus iaculis faucibus. Eu cursus ante et nullam litora nulla habitasse nisl dignissim quisque molestie pretium\, a,POINT(7.4833 9.0667),"POLYGON((7.0972 8.9458\,7.3315 8.8215\,7.4793 8.8065\,7.4852 8.7724\,7.5231 8.7478\,7.482 8.6784\,7.4297 8.6384\,7.4776 8.6313\,7.5917 8.8349\,7.5887 9.1291\,7.6033 9.1614\,7.2498 9.1557\,7.1911 9.0483\,7.0972 8.9458))","POLYGON((0 0\, 1 0\, 1 1\, 0 1\, 0 0))",POINT(8452829.548091331 1993750.242252398)
44
2024-05-10T00:00:51.000Z,prod,three,10.10.20.30,113,278,9.25,17.375,false,58,96,2024-03-25T09:57:51.755620402Z,13.10.4,949,5,integer\, non imperdiet massa luctus condimentum lacus eu vitae libero nam euismod nostra eleifend enim. Cubilia,POINT(-99.8825 16.8636),"POLYGON((-100.0022 16.914\,-99.6089 16.6834\,-99.4736 16.972\,-99.7223 17.2337\,-100.0022 16.914))","POLYGON((2 0\, 3 0\, 3 1\, 2 1\, 2 0))",POINT(9498179.37479558 2670487.5434313933)

x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-downsampled-mappings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
"events_received": {
3232
"type": "long"
3333
},
34-
"city": {
34+
"event_city": {
3535
"type": "geo_point"
3636
},
37-
"city_boundary": {
37+
"event_city_boundary": {
3838
"type": "geo_shape"
3939
},
40-
"shape": {
40+
"event_shape": {
4141
"type": "shape"
4242
},
43-
"location": {
43+
"event_location": {
4444
"type": "point"
4545
},
4646
"network": {

x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-mappings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"events_received": {
2828
"type": "long"
2929
},
30-
"city": {
30+
"event_city": {
3131
"type": "geo_point"
3232
},
33-
"city_boundary": {
33+
"event_city_boundary": {
3434
"type": "geo_shape"
3535
},
36-
"shape": {
36+
"event_shape": {
3737
"type": "shape"
3838
},
39-
"location": {
39+
"event_location": {
4040
"type": "point"
4141
},
4242
"network": {

0 commit comments

Comments
 (0)