Skip to content

Commit 5ed700f

Browse files
author
Mattia Moretti
authored
Version 6.0.2 (#300)
* initial release * uplot fix * version 6.0.2 * versione
1 parent 8011124 commit 5ed700f

File tree

8 files changed

+90
-47
lines changed

8 files changed

+90
-47
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="v6.0.2"></a>
2+
# [Security Maintenance release (v6.0.2)](https://github.com/oracle/oci-grafana-metrics/releases/tag/v6.0.2) - 14 Oct 2024
3+
4+
This release includes:
5+
6+
- security patches
7+
- Added new regions
8+
9+
[Changes][v6.0.2]
10+
111
<a name="v6.0.1"></a>
212
# [Security Maintenance release (v6.0.1)](https://github.com/oracle/oci-grafana-metrics/releases/tag/v6.0.1) - 03 Oct 2024
313

@@ -451,7 +461,9 @@ Adds more documentation
451461

452462
[Changes][v1.0.1]
453463

454-
464+
[v6.0.2]: https://github.com/oracle/oci-grafana-metrics/compare/v6.0.1...v6.0.2
465+
[v6.0.1]: https://github.com/oracle/oci-grafana-metrics/compare/v6.0.0...v6.0.1
466+
[v6.0.0]: https://github.com/oracle/oci-grafana-metrics/compare/v5.5.1...v6.0.0
455467
[v5.5.1]: https://github.com/oracle/oci-grafana-metrics/compare/v5.5.0...v5.5.1
456468
[v5.5.0]: https://github.com/oracle/oci-grafana-metrics/compare/v5.5.0-beta-unsigned...v5.5.0
457469
[v5.5.0-beta-unsigned]: https://github.com/oracle/oci-grafana-metrics/compare/v5.2.0...v5.5.0-beta-unsigned

‎generate_region_list.py‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import requests
2+
import re
3+
4+
# Function to fetch and process regions
5+
def fetch_and_process_regions(custom_regions=None):
6+
# Step 1: Fetch the raw content of the file from the URL
7+
url = "https://raw.githubusercontent.com/oracle/oci-typescript-sdk/refs/heads/master/lib/common/lib/region.ts"
8+
response = requests.get(url)
9+
file_content = response.text
10+
11+
# Step 2: Find all lines that contain 'Region.register'
12+
matches = re.findall(r'Region\.register\("([^"]+)"', file_content)
13+
14+
# Step 3: Sort the matches and remove duplicates
15+
unique_sorted_matches = sorted(set(matches))
16+
17+
# Step 4: Add custom regions (if provided)
18+
if custom_regions:
19+
unique_sorted_matches.extend(custom_regions)
20+
unique_sorted_matches = sorted(set(unique_sorted_matches)) # Remove duplicates after adding custom regions
21+
22+
# Step 5: Format the result to mimic the output of the original command
23+
regions = ', '.join([f"'{match}'" for match in unique_sorted_matches])
24+
regions = f"export const regions = [{regions}]"
25+
26+
# Step 6: Write the result to the file 'regionlist.ts'
27+
with open('./src/regionlist.ts', 'w') as file:
28+
file.write(regions)
29+
30+
print("Result successfully written to './src/regionlist.ts'")
31+
32+
# Example usage with custom regions
33+
custom_regions = ['ap-silverdale-1', 'ap-hobsonville-1'] # Define custom regions here
34+
fetch_and_process_regions(custom_regions)

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "oci-metrics-datasource",
33
"private": true,
4-
"version": "6.0.1",
4+
"version": "6.0.2",
55
"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
66
"scripts": {
77
"build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
@@ -71,15 +71,15 @@
7171
"@apache-arrow/es5-cjs": "^4.0.1",
7272
"@babel/preset-env": "v7.24.1",
7373
"@emotion/css": "11.10.6",
74-
"@grafana/data": "^10.4.0",
75-
"@grafana/runtime": "^10.4.0",
76-
"@grafana/ui": "^10.4.0",
74+
"@grafana/data": "^10.4.10",
75+
"@grafana/runtime": "^10.4.10",
76+
"@grafana/ui": "^10.4.10",
7777
"eslint": "^9.6.0",
7878
"js-yaml": "^3.13.1",
7979
"lodash": "^4.17.21",
8080
"react": "18.2.0",
8181
"react-dom": "18.2.0",
82-
"@grafana/schema": "^10.4.0",
82+
"@grafana/schema": "^10.4.10",
8383
"tslib": "2.5.3"
8484
},
8585
"resolutions": {

‎src/ConfigEditor.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ import {
1515
import { OCIDataSourceOptions } from './types';
1616
import {
1717
AuthProviders,
18-
regions,
1918
TenancyChoices,
2019
AuthProviderOptions,
2120
TenancyChoiceOptions,
2221
} from './config.options';
22+
import {
23+
regions,
24+
} from './regionlist';
2325

2426
interface Props extends DataSourcePluginOptionsEditorProps<OCIDataSourceOptions> {}
2527

‎src/config.options.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ export enum AuthProviders {
1010
OCI_INSTANCE = 'OCI Instance',
1111
}
1212

13-
export const regions = ['af-johannesburg-1', 'ap-chiyoda-1', 'ap-chuncheon-1', 'ap-dcc-canberra-1', 'ap-hyderabad-1', 'ap-hobsonville-1', 'ap-ibaraki-1', 'ap-melbourne-1',
14-
'ap-mumbai-1', 'ap-osaka-1', 'ap-seoul-1', 'ap-silverdale-1', 'ap-singapore-1', 'ap-sydney-1', 'ap-tokyo-1', 'ca-montreal-1', 'ca-toronto-1',
15-
'eu-amsterdam-1', 'eu-frankfurt-1', 'eu-frankfurt-2', 'eu-jovanovac-1', 'eu-madrid-1', 'eu-madrid-2', 'eu-marseille-1', 'eu-milan-1', 'eu-paris-1', 'eu-stockholm-1', 'eu-zurich-1',
16-
'il-jerusalem-1', 'me-abudhabi-1', 'me-dubai-1', 'me-jeddah-1', 'me-dcc-muscat-1', 'mx-monterrey-1', 'mx-queretaro-1', 'sa-bogota-1','sa-santiago-1', 'sa-saopaulo-1', 'sa-valparaiso-1', 'sa-vinhedo-1',
17-
'uk-cardiff-1', 'uk-gov-cardiff-1', 'uk-gov-london-1', 'uk-london-1', 'us-ashburn-1', 'us-chicago-1', 'us-gov-ashburn-1',
18-
'us-gov-chicago-1', 'us-gov-phoenix-1', 'us-langley-1', 'us-luke-1', 'us-phoenix-1', 'us-sanjose-1'];
1913

2014
export const namespaces = ['oci_computeagent', 'oci_blockstore', 'oci_lbaas', 'oci_telemetry'];
2115
export const environments = ['local', 'OCI Instance'];

‎src/plugin.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
{ "name": "UPL", "url": "https://oss.oracle.com/licenses/upl" }
2525
],
26-
"version": "6.0.1",
27-
"updated": "2024-10-03",
26+
"version": "6.0.2",
27+
"updated": "2024-10-13",
2828
"screenshots":[
2929
{
3030
"name":"OCI Metrics Dashboard",

‎src/regionlist.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const regions = ['af-johannesburg-1', 'ap-chiyoda-1', 'ap-chuncheon-1', 'ap-dcc-canberra-1', 'ap-dcc-gazipur-1', 'ap-hobsonville-1', 'ap-hyderabad-1', 'ap-ibaraki-1', 'ap-melbourne-1', 'ap-mumbai-1', 'ap-osaka-1', 'ap-seoul-1', 'ap-silverdale-1', 'ap-singapore-1', 'ap-singapore-2', 'ap-sydney-1', 'ap-tokyo-1', 'ca-montreal-1', 'ca-toronto-1', 'eu-amsterdam-1', 'eu-crissier-1', 'eu-dcc-dublin-1', 'eu-dcc-dublin-2', 'eu-dcc-milan-1', 'eu-dcc-milan-2', 'eu-dcc-rating-1', 'eu-dcc-rating-2', 'eu-dcc-zurich-1', 'eu-frankfurt-1', 'eu-frankfurt-2', 'eu-jovanovac-1', 'eu-madrid-1', 'eu-madrid-2', 'eu-marseille-1', 'eu-milan-1', 'eu-paris-1', 'eu-stockholm-1', 'eu-zurich-1', 'il-jerusalem-1', 'me-abudhabi-1', 'me-abudhabi-2', 'me-abudhabi-3', 'me-abudhabi-4', 'me-dcc-doha-1', 'me-dcc-muscat-1', 'me-dubai-1', 'me-jeddah-1', 'me-riyadh-1', 'mx-monterrey-1', 'mx-queretaro-1', 'sa-bogota-1', 'sa-santiago-1', 'sa-saopaulo-1', 'sa-valparaiso-1', 'sa-vinhedo-1', 'uk-cardiff-1', 'uk-gov-cardiff-1', 'uk-gov-london-1', 'uk-london-1', 'us-ashburn-1', 'us-chicago-1', 'us-gov-ashburn-1', 'us-gov-chicago-1', 'us-gov-phoenix-1', 'us-langley-1', 'us-luke-1', 'us-phoenix-1', 'us-saltlake-2', 'us-sanjose-1', 'us-somerset-1', 'us-thames-1']

‎yarn.lock‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,13 +1332,13 @@
13321332
dependencies:
13331333
tslib "^2.4.0"
13341334

1335-
"@grafana/data@10.4.5", "@grafana/data@^10.4.0":
1336-
version "10.4.5"
1337-
resolved "https://registry.yarnpkg.com/@grafana/data/-/data-10.4.5.tgz#86a4d46a27097343ab97d6cf9c5ea8b918f07479"
1338-
integrity sha512-SYyaPTKIO3p4MoS0PvZ+bIW7Q8EHYbu/czQENyk0/rFmodfBzcJA0AVuafFBY0T4oCQENFHfmhM9q7209B3oOw==
1335+
"@grafana/data@10.4.10", "@grafana/data@^10.4.10":
1336+
version "10.4.10"
1337+
resolved "https://registry.yarnpkg.com/@grafana/data/-/data-10.4.10.tgz#5c323efa44e788a6f6dadab4471c62e06d47a0a5"
1338+
integrity sha512-s8IU8qtuxLht1l4FuxOHMXx16BTKfzr1G7w92etRYfi+DTEcXfP1g2rBcihoOcPpXZ/2uVWvZJmH0FeWFsvdLw==
13391339
dependencies:
13401340
"@braintree/sanitize-url" "7.0.0"
1341-
"@grafana/schema" "10.4.5"
1341+
"@grafana/schema" "10.4.10"
13421342
"@types/d3-interpolate" "^3.0.0"
13431343
"@types/string-hash" "1.1.3"
13441344
d3-interpolate "3.0.1"
@@ -1363,10 +1363,10 @@
13631363
uplot "1.6.30"
13641364
xss "^1.0.14"
13651365

1366-
"@grafana/e2e-selectors@10.4.5":
1367-
version "10.4.5"
1368-
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-10.4.5.tgz#e6ac31c97c03567e8eb723f91e70e38646a0dd23"
1369-
integrity sha512-BsFll+sCs8riIVDHzqZswDFmDdt5Mt0yqcDqc3FuQqyv5Lm0PLtoWCzVkadk3AJ74sxlXvC0pb/mtb5e+KaZTA==
1366+
"@grafana/e2e-selectors@10.4.10":
1367+
version "10.4.10"
1368+
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-10.4.10.tgz#ca5b9522a4206432a50c4e0a5f900a34956d8288"
1369+
integrity sha512-ZDFPc1x6NpdpynwCNvba+HfybWYPbgdi5WqpjXPEPyGsLg7/LyaPokuQtLBY/StYoQ4AsSD522IADjKJlMutWQ==
13701370
dependencies:
13711371
"@grafana/tsconfig" "^1.2.0-rc1"
13721372
tslib "2.6.2"
@@ -1403,27 +1403,27 @@
14031403
ua-parser-js "^1.0.32"
14041404
web-vitals "^4.0.1"
14051405

1406-
"@grafana/runtime@^10.4.0":
1407-
version "10.4.5"
1408-
resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-10.4.5.tgz#704f3ab08624d1da7de003798c61a2a1aa4da641"
1409-
integrity sha512-C+AAVz6T7g4TRmNHK/G0vmkJQ/i33tHNnsNg1wS6gzeSv6Jqu/xmDrws/wIe8oDBS5Asf68fXfyrrSnPs1KpyQ==
1406+
"@grafana/runtime@^10.4.10":
1407+
version "10.4.10"
1408+
resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-10.4.10.tgz#31f087f8ff447e2dbe32f6c163bd80246ac5b7d1"
1409+
integrity sha512-97OqYMk/epuQBfAi3RUNDfjJkUPDP8ls0gs/CbDVx7+yQVHnENjYKCq9rkkdsoEpK5STcpcPZwBo2G6umFyw8Q==
14101410
dependencies:
1411-
"@grafana/data" "10.4.5"
1412-
"@grafana/e2e-selectors" "10.4.5"
1411+
"@grafana/data" "10.4.10"
1412+
"@grafana/e2e-selectors" "10.4.10"
14131413
"@grafana/faro-web-sdk" "^1.3.6"
1414-
"@grafana/schema" "10.4.5"
1415-
"@grafana/ui" "10.4.5"
1414+
"@grafana/schema" "10.4.10"
1415+
"@grafana/ui" "10.4.10"
14161416
history "4.10.1"
14171417
lodash "4.17.21"
14181418
rxjs "7.8.1"
14191419
systemjs "6.14.3"
14201420
systemjs-cjs-extra "0.2.0"
14211421
tslib "2.6.2"
14221422

1423-
"@grafana/schema@10.4.5", "@grafana/schema@^10.4.0":
1424-
version "10.4.5"
1425-
resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-10.4.5.tgz#e496cc5e247f58f4eb6e908b0ba156f96a9f886a"
1426-
integrity sha512-Qi8GuMk5X8J+cIe18JZpU1QpagEeu+BdES97FmHXmBIR69i+sGebjzwH9NN++cjZZvq+x8tvXUxOpLL84VnYsg==
1423+
"@grafana/schema@10.4.10", "@grafana/schema@^10.4.10":
1424+
version "10.4.10"
1425+
resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-10.4.10.tgz#058c9385910a2d93f4a5b1bd9fc40e26d57506b6"
1426+
integrity sha512-CHL/YqLiUzvGXbQzbzY5URX2SUpioXscZ62+SUz38W/pRB4jErfvUNXL8YQGtTxnISjsS4I3ZGvWt8DWwZQgzg==
14271427
dependencies:
14281428
tslib "2.6.2"
14291429

@@ -1432,18 +1432,18 @@
14321432
resolved "https://registry.yarnpkg.com/@grafana/tsconfig/-/tsconfig-1.2.0-rc1.tgz#10973c978ec95b0ea637511254b5f478bce04de7"
14331433
integrity sha512-+SgQeBQ1pT6D/E3/dEdADqTrlgdIGuexUZ8EU+8KxQFKUeFeU7/3z/ayI2q/wpJ/Kr6WxBBNlrST6aOKia19Ag==
14341434

1435-
"@grafana/ui@10.4.5", "@grafana/ui@^10.4.0":
1436-
version "10.4.5"
1437-
resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-10.4.5.tgz#3780cdef9774dfb7b09cf051d61329c08be635dd"
1438-
integrity sha512-BO9GTjm8AeXk+rgOYSaQ4XvRJ3otPRtHbQhIJ9D96ZFpYPbbLHno5DBOPazKcp3ukiW7SA72ymgDRbpcdND18Q==
1435+
"@grafana/ui@10.4.10", "@grafana/ui@^10.4.10":
1436+
version "10.4.10"
1437+
resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-10.4.10.tgz#5884ae4cb4f077b9e2c8d7f0468dcbc4a8f83b9d"
1438+
integrity sha512-2bdT7pyOZF2n+YCdI0M0UTjERh9attimGWdx4UuLfjAQ4ZPerhAA9YUuSZewyPx7VmZL2M6g+/LB8fGZMNMOKQ==
14391439
dependencies:
14401440
"@emotion/css" "11.11.2"
14411441
"@emotion/react" "11.11.3"
14421442
"@floating-ui/react" "0.26.9"
1443-
"@grafana/data" "10.4.5"
1444-
"@grafana/e2e-selectors" "10.4.5"
1443+
"@grafana/data" "10.4.10"
1444+
"@grafana/e2e-selectors" "10.4.10"
14451445
"@grafana/faro-web-sdk" "^1.3.6"
1446-
"@grafana/schema" "10.4.5"
1446+
"@grafana/schema" "10.4.10"
14471447
"@leeoniya/ufuzzy" "1.0.14"
14481448
"@monaco-editor/react" "4.6.0"
14491449
"@popperjs/core" "2.11.8"
@@ -9173,10 +9173,10 @@ update-browserslist-db@^1.1.0:
91739173
escalade "^3.1.2"
91749174
picocolors "^1.0.1"
91759175

9176-
uplot@1.6.30:
9177-
version "1.6.30"
9178-
resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.30.tgz#1622a96b7cb2e50622c74330823c321847cbc147"
9179-
integrity sha512-48oVVRALM/128ttW19F2a2xobc2WfGdJ0VJFX00099CfqbCTuML7L2OrTKxNzeFP34eo1+yJbqFSoFAp2u28/Q==
9176+
uplot@1.6.31:
9177+
version "1.6.31"
9178+
resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.31.tgz#092a4b586590e9794b679e1df885a15584b03698"
9179+
integrity sha512-sQZqSwVCbJGnFB4IQjQYopzj5CoTZJ4Br1fG/xdONimqgHmsacvCjNesdGDypNKFbrhLGIeshYhy89FxPF+H+w==
91809180

91819181
uri-js@^4.2.2, uri-js@^4.4.1:
91829182
version "4.4.1"

0 commit comments

Comments
 (0)