Skip to content

Commit 30aa568

Browse files
GuarisGuaris
authored
Merge branch 'main' into release/insomnia-12
2 parents 900d30f + 2fe0db0 commit 30aa568

File tree

187 files changed

+5167
-1247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+5167
-1247
lines changed

‎.github/workflows/automated-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: bundle install --jobs 4 --retry 3
4848

4949
# Configure Node to build assets
50-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
50+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
5151
with:
5252
node-version: "22"
5353
- name: Cache node modules

‎.github/workflows/check-links-scheduled.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: bundle install --jobs 4 --retry 3
4242

4343
# Configure Node to build assets
44-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
44+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
4545
with:
4646
node-version: "22"
4747
- name: Cache node modules

‎.github/workflows/gateway-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: bundle install --jobs 4 --retry 3
5252

5353
# Configure Node to build assets
54-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
54+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
5555
with:
5656
node-version: "22"
5757
- name: Cache node modules

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ node_modules
2929

3030
tools/changelog-generator/tmp/*
3131
tools/automated-tests/.automated-tests
32+
33+
.idea/*

‎Gemfile.lock‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (8.0.3)
4+
activesupport (8.1.0)
55
base64
6-
benchmark (>= 0.3)
76
bigdecimal
87
concurrent-ruby (~> 1.0, >= 1.3.1)
98
connection_pool (>= 2.2.5)
109
drb
1110
i18n (>= 1.6, < 2)
11+
json
1212
logger (>= 1.4.2)
1313
minitest (>= 5.1)
1414
securerandom (>= 0.3)
@@ -17,14 +17,13 @@ GEM
1717
addressable (2.8.6)
1818
public_suffix (>= 2.0.2, < 6.0)
1919
ast (2.4.3)
20-
base64 (0.2.0)
21-
benchmark (0.4.1)
22-
bigdecimal (3.1.9)
20+
base64 (0.3.0)
21+
bigdecimal (3.3.1)
2322
byebug (12.0.0)
2423
coderay (1.1.3)
2524
colorator (1.1.0)
2625
concurrent-ruby (1.3.5)
27-
connection_pool (2.4.1)
26+
connection_pool (2.5.4)
2827
csv (3.3.5)
2928
drb (2.2.3)
3029
dry-cli (1.0.0)
@@ -70,7 +69,7 @@ GEM
7069
vite_ruby (~> 3.2)
7170
jekyll-watch (2.2.1)
7271
listen (~> 3.0)
73-
json (2.15.0)
72+
json (2.15.2)
7473
kramdown (2.4.0)
7574
rexml
7675
kramdown-parser-gfm (1.1.0)
@@ -83,24 +82,24 @@ GEM
8382
listen (3.9.0)
8483
rb-fsevent (~> 0.10, >= 0.10.3)
8584
rb-inotify (~> 0.9, >= 0.9.10)
86-
logger (1.6.6)
85+
logger (1.7.0)
8786
mercenary (0.4.0)
8887
method_source (1.1.0)
8988
mini_portile2 (2.8.9)
90-
minitest (5.25.5)
89+
minitest (5.26.0)
9190
nio4r (2.7.4)
9291
nodo (1.8.1)
9392
logger
9493
nokogiri (1.18.10)
9594
mini_portile2 (~> 2.8.2)
9695
racc (~> 1.4)
9796
parallel (1.27.0)
98-
parser (3.3.9.0)
97+
parser (3.3.10.0)
9998
ast (~> 2.4.1)
10099
racc
101100
pathutil (0.16.2)
102101
forwardable-extended (~> 2.6)
103-
prism (1.5.1)
102+
prism (1.5.2)
104103
pry (0.15.2)
105104
coderay (~> 1.1)
106105
method_source (~> 1.0)
@@ -122,7 +121,7 @@ GEM
122121
regexp_parser (2.11.3)
123122
rexml (3.4.2)
124123
rouge (4.6.1)
125-
rubocop (1.81.1)
124+
rubocop (1.81.6)
126125
json (~> 2.3)
127126
language_server-protocol (~> 3.17.0.2)
128127
lint_roller (~> 1.1.0)
@@ -141,14 +140,14 @@ GEM
141140
sass-embedded (1.75.0)
142141
google-protobuf (>= 3.25, < 5.0)
143142
rake (>= 13.0.0)
144-
securerandom (0.3.2)
143+
securerandom (0.4.1)
145144
terminal-table (3.0.2)
146145
unicode-display_width (>= 1.1.1, < 3)
147146
thor (1.4.0)
148147
tzinfo (2.0.6)
149148
concurrent-ruby (~> 1.0)
150149
unicode-display_width (2.6.0)
151-
uri (1.0.3)
150+
uri (1.0.4)
152151
vite_ruby (3.5.0)
153152
dry-cli (>= 0.7, < 2)
154153
rack-proxy (~> 0.6, >= 0.6.1)

‎api-specs/konnect/analytics-dashboards/openapi.yaml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ paths:
7272
$ref: '#/components/examples/VerticalBarDashboardExample'
7373
'Single Tile, Donut (LLM datasource)':
7474
$ref: '#/components/examples/DonutDashboardExample'
75+
'Single Tile, Choropleth Map':
76+
$ref: '#/components/examples/ChoroplethMapDashboardExample'
7577
'Single Tile, Single Value':
7678
$ref: '#/components/examples/SingleValueDashboardExample'
7779
Multiple tiles and preset filters:
@@ -146,6 +148,8 @@ paths:
146148
$ref: '#/components/examples/VerticalBarDashboardExample'
147149
'Single Tile, Donut (LLM datasource)':
148150
$ref: '#/components/examples/DonutDashboardExample'
151+
'Single Tile, Choropleth Map':
152+
$ref: '#/components/examples/ChoroplethMapDashboardExample'
149153
'Single Tile, Single Value':
150154
$ref: '#/components/examples/SingleValueDashboardExample'
151155
Multiple tiles and preset filters:
@@ -256,6 +260,7 @@ components:
256260
- consumer
257261
- control_plane
258262
- control_plane_group
263+
- country_code
259264
- data_plane_node
260265
- data_plane_node_version
261266
- gateway_service
@@ -1075,6 +1080,42 @@ components:
10751080
- operator
10761081
- field
10771082
title: Filter by control_plane_group
1083+
MetricsCountryCodeFilterByField:
1084+
oneOf:
1085+
- title: Multiselect filters
1086+
type: object
1087+
properties:
1088+
operator:
1089+
$ref: '#/components/schemas/RequestsFilterType'
1090+
value:
1091+
description: |
1092+
The values to include in the results.
1093+
type: array
1094+
items:
1095+
type: string
1096+
field:
1097+
description: The field to filter.
1098+
type: string
1099+
enum:
1100+
- country_code
1101+
required:
1102+
- operator
1103+
- value
1104+
- field
1105+
- title: Empty filters
1106+
type: object
1107+
properties:
1108+
operator:
1109+
$ref: '#/components/schemas/RequestsFilterTypeEmpty'
1110+
field:
1111+
description: The field to filter.
1112+
type: string
1113+
enum:
1114+
- country_code
1115+
required:
1116+
- operator
1117+
- field
1118+
title: Filter by country_code
10781119
MetricsDataPlaneNodeFilterByField:
10791120
oneOf:
10801121
- title: Multiselect filters
@@ -1491,6 +1532,7 @@ components:
14911532
consumer: '#/components/schemas/MetricsConsumerFilterByField'
14921533
control_plane: '#/components/schemas/MetricsControlPlaneFilterByField'
14931534
control_plane_group: '#/components/schemas/MetricsControlPlaneGroupFilterByField'
1535+
country_code: '#/components/schemas/MetricsCountryCodeFilterByField'
14941536
data_plane_node: '#/components/schemas/MetricsDataPlaneNodeFilterByField'
14951537
data_plane_node_version: '#/components/schemas/MetricsDataPlaneNodeVersionFilterByField'
14961538
gateway_service: '#/components/schemas/MetricsGatewayServiceFilterByField'
@@ -1510,6 +1552,7 @@ components:
15101552
- $ref: '#/components/schemas/MetricsConsumerFilterByField'
15111553
- $ref: '#/components/schemas/MetricsControlPlaneFilterByField'
15121554
- $ref: '#/components/schemas/MetricsControlPlaneGroupFilterByField'
1555+
- $ref: '#/components/schemas/MetricsCountryCodeFilterByField'
15131556
- $ref: '#/components/schemas/MetricsDataPlaneNodeFilterByField'
15141557
- $ref: '#/components/schemas/MetricsDataPlaneNodeVersionFilterByField'
15151558
- $ref: '#/components/schemas/MetricsGatewayServiceFilterByField'
@@ -2020,6 +2063,25 @@ components:
20202063
required:
20212064
- type
20222065
title: Single value chart
2066+
ChoroplethMapChart:
2067+
description: |
2068+
A chart that displays data on a world map. Each region on the map is colored based on the metric value.
2069+
This chart works only with the `api_usage` datasource and requires a single metric and a single dimension of `country_code`.
2070+
No additional dimensions are supported.
2071+
type: object
2072+
properties:
2073+
chart_title:
2074+
description: 'The title of the chart, which is displayed in the tile''s header.'
2075+
type: string
2076+
nullable: false
2077+
type:
2078+
type: string
2079+
enum:
2080+
- choropleth_map
2081+
additionalProperties: false
2082+
required:
2083+
- type
2084+
title: Choropleth map chart
20232085
Chart:
20242086
description: The type of chart to render.
20252087
discriminator:
@@ -2031,11 +2093,13 @@ components:
20312093
horizontal_bar: '#/components/schemas/BarChart'
20322094
vertical_bar: '#/components/schemas/BarChart'
20332095
single_value: '#/components/schemas/SingleValueChart'
2096+
choropleth_map: '#/components/schemas/ChoroplethMapChart'
20342097
oneOf:
20352098
- $ref: '#/components/schemas/DonutChart'
20362099
- $ref: '#/components/schemas/TimeseriesChart'
20372100
- $ref: '#/components/schemas/BarChart'
20382101
- $ref: '#/components/schemas/SingleValueChart'
2102+
- $ref: '#/components/schemas/ChoroplethMapChart'
20392103
AllFilterItems:
20402104
discriminator:
20412105
propertyName: field
@@ -2051,6 +2115,7 @@ components:
20512115
consumer: '#/components/schemas/MetricsConsumerFilterByField'
20522116
control_plane: '#/components/schemas/MetricsControlPlaneFilterByField'
20532117
control_plane_group: '#/components/schemas/MetricsControlPlaneGroupFilterByField'
2118+
country_code: '#/components/schemas/MetricsCountryCodeFilterByField'
20542119
data_plane_node: '#/components/schemas/MetricsDataPlaneNodeFilterByField'
20552120
data_plane_node_version: '#/components/schemas/MetricsDataPlaneNodeVersionFilterByField'
20562121
gateway_service: '#/components/schemas/MetricsGatewayServiceFilterByField'
@@ -2077,6 +2142,7 @@ components:
20772142
- $ref: '#/components/schemas/MetricsConsumerFilterByField'
20782143
- $ref: '#/components/schemas/MetricsControlPlaneFilterByField'
20792144
- $ref: '#/components/schemas/MetricsControlPlaneGroupFilterByField'
2145+
- $ref: '#/components/schemas/MetricsCountryCodeFilterByField'
20802146
- $ref: '#/components/schemas/MetricsDataPlaneNodeFilterByField'
20812147
- $ref: '#/components/schemas/MetricsDataPlaneNodeVersionFilterByField'
20822148
- $ref: '#/components/schemas/MetricsGatewayServiceFilterByField'
@@ -2343,6 +2409,34 @@ components:
23432409
field: gateway_service
23442410
value:
23452411
- '00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000'
2412+
ChoroplethMapDashboardExample:
2413+
value:
2414+
name: 'Single Tile, Choropleth Map'
2415+
definition:
2416+
tiles:
2417+
- type: chart
2418+
layout:
2419+
size:
2420+
cols: 3
2421+
rows: 2
2422+
position:
2423+
col: 0
2424+
row: 0
2425+
definition:
2426+
chart:
2427+
type: choropleth_map
2428+
chart_title: Latency by country for a sample route
2429+
query:
2430+
metrics:
2431+
- response_latency_p99
2432+
datasource: api_usage
2433+
dimensions:
2434+
- country_code
2435+
filters:
2436+
- operator: in
2437+
field: route
2438+
value:
2439+
- '00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000'
23462440
SingleValueDashboardExample:
23472441
value:
23482442
name: 'Single Tile, Single Value'

‎api-specs/konnect/analytics-requests/v2/openapi.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ components:
8282
- $ref: '#/components/schemas/ConsumerFilterByField'
8383
- $ref: '#/components/schemas/ControlPlaneFilterByField'
8484
- $ref: '#/components/schemas/ControlPlaneGroupFilterByField'
85+
- $ref: '#/components/schemas/CountryCodeFilterByField'
8586
- $ref: '#/components/schemas/DataPlaneNodeFilterByField'
8687
- $ref: '#/components/schemas/DataPlaneNodeVersionFilterByField'
8788
- $ref: '#/components/schemas/GatewayServiceFilterByField'
@@ -327,6 +328,10 @@ components:
327328
description: Control Plane Group ID associated with the request.
328329
type: string
329330
nullable: true
331+
country_code:
332+
description: Country code associated with the request.
333+
type: string
334+
nullable: true
330335
data_plane_node:
331336
description: 'Data Plane Node ID associated with the request. In the format `control_plane_id:data_plane_node_id` if the node belongs to a control plane or `control_plane_group_id:data_plane_node_id` if the node belongs to a control plane group.'
332337
type: string
@@ -780,6 +785,22 @@ components:
780785
- $ref: '#/components/schemas/FilterSingleValueUUID'
781786
- $ref: '#/components/schemas/FilterEmpty'
782787
title: Filter by control_plane_group
788+
CountryCodeFilterByField:
789+
allOf:
790+
- type: object
791+
properties:
792+
field:
793+
description: The field to filter.
794+
type: string
795+
enum:
796+
- country_code
797+
required:
798+
- field
799+
- oneOf:
800+
- $ref: '#/components/schemas/FilterMultiValueString'
801+
- $ref: '#/components/schemas/FilterSingleValueString'
802+
- $ref: '#/components/schemas/FilterEmpty'
803+
title: Filter by country_code
783804
DataPlaneNodeFilterByField:
784805
allOf:
785806
- type: object
@@ -1786,6 +1807,7 @@ components:
17861807
consumer: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:d69557ff-277c-4579-a821-4f8d158ae070'
17871808
control_plane: d5ac5d88-efed-4e10-9dfe-0b0a6646c219
17881809
control_plane_group: cafe2d4f-95ec-458c-8c88-62417018678d
1810+
country_code: CN
17891811
data_plane_node: 'cafe2d4f-95ec-458c-8c88-62417018678d:122a0f86-029c-4292-82fd-f3b38e1cfa60'
17901812
data_plane_node_version: 3.8.0.1
17911813
gateway_service: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:523468b1-2e74-4b58-b30e-6f904e99e4d0'
@@ -1841,6 +1863,7 @@ components:
18411863
consumer: null
18421864
control_plane: d5ac5d88-efed-4e10-9dfe-0b0a6646c219
18431865
control_plane_group: null
1866+
country_code: US
18441867
data_plane_node: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:a3e0692c-2351-4c8e-acbe-e7a5185147de'
18451868
data_plane_node_version: 3.8.0.1
18461869
gateway_service: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:523468b1-2e74-4b58-b30e-6f904e99e4d0'

‎api-specs/konnect/api-builder/v3/openapi.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openapi: 3.0.3
22
info:
33
title: Konnect API Builder
4-
version: 3.0.24
4+
version: 3.0.25
55
description: The management API for building APIs for Konnect Dev Portals.
66
contact:
77
name: Kong
@@ -2025,6 +2025,7 @@ components:
20252025
- is_supported_network_availability_zone_list
20262026
- is_supported_network_cidr_block
20272027
- is_supported_provider_region
2028+
- type
20282029
nullable: true
20292030
readOnly: true
20302031
InvalidParameterStandard:

‎api-specs/konnect/api-products/v2/openapi.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,6 +1603,7 @@ components:
16031603
- is_supported_network_availability_zone_list
16041604
- is_supported_network_cidr_block
16051605
- is_supported_provider_region
1606+
- type
16061607
nullable: true
16071608
readOnly: true
16081609
InvalidParameterStandard:

‎api-specs/konnect/application-auth-strategies/v2/openapi.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,7 @@ components:
15541554
- is_supported_network_availability_zone_list
15551555
- is_supported_network_cidr_block
15561556
- is_supported_provider_region
1557+
- type
15571558
nullable: true
15581559
readOnly: true
15591560
InvalidParameterStandard:

0 commit comments

Comments
 (0)