v650 (#314)

* v650

* docs preliminary

* custom region

* multi

* ready doc

* removed debug printout

Author: Mattia Moretti

CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="v6.5.0"></a>
+# [Security Maintenance release (v6.5.0)](https://github.com/oracle/oci-grafana-metrics/releases/tag/v6.5.0) - 05 Feb 2025
+
+This release includes:
+
+- Support for DRCC/Alloy Regions
+- Updated version of OCI Golang libraries to v65.81.3
+- Some bug fixes
+- Support for Custom Region
+
+[Changes][v6.5.0]
+
+
 <a name="v6.0.3"></a>
 # [Security Maintenance release (v6.0.3)](https://github.com/oracle/oci-grafana-metrics/releases/tag/v6.0.3) - 26 Nov 2024
 

docs/images/custom_region.png

@@ -153,15 +153,24 @@ You can then choose between two different modes as **Tenancy mode**:
 If you selected **single** as **Tenancy mode** then fill in the following credentials:
 
 * `Profile Name` - A user-defined name for this profile. In **single** mode this is automatically set to **DEFAULT** and cannot be modified.
+* `Dedicated Region` (optional) - Toggle this to configure dedicated Region and domain such as in DRCC/Alloy Regions (not needed for commercial or sovereign regions)
 * `Region` - An OCI region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
-* `User OCID` - OCID of the user calling the API. To get the value, see [**Getting User OCID Configuration value**](#getting-the-user-OCID).* 
+* `User OCID` - OCID of the user calling the API. To get the value, see [**Getting User OCID Configuration value**](#getting-the-user-OCID).
 * `Tenancy OCID` - OCID of your tenancy. To get the value, see [**Getting Tenancy OCID Configuration value**](#getting-the-tenancy-OCID).
 * `Fingerprint` - Fingerprint for the key pair being used. To get the value, see [**Getting Fingerprint Configuration value**](#getting-the-private-api-key-and-fingerprint).
 * `Private Key` - The contents of the private key file. To get the value, see [**Getting Private Key Configuration value**](#getting-the-private-api-key-and-fingerprint).
 
 The configured data source will look like the following:
 
-![Datasource Filled](images/datasource_conf_filled.png)
+![Datasource Filled](images/standard_region.png)
+
+In case you are setting up a Dedicated Region, you must provide these two additional information:
+* `Region` - The DRCC/Alloy region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
+* `Domain` - The first level domain of your Dedicated Region.
+
+The configured data source with dedicated Region and domain configuration will look like the following:
+
+![Datasource Filled](images/custom_region.png)
 
 Click **Save & Test** to return to the home dashboard.
 
@@ -170,6 +179,7 @@ Click **Save & Test** to return to the home dashboard.
 If you selected **multi** as **Tenancy mode** then fill in the following credentials for **each Tenancy you want to configure (up to 5 additional tenancies)**:
 
 * `Profile Name` - A user-defined name for this profile. The first Tenancy is automatically set to **DEFAULT** and cannot be modified. You need to specify a custom and unique Profile name for each of the additional tenancies.
+* `Dedicated Region` (optional) - Toggle this to configure dedicated Region and domain such as in DRCC/Alloy Regions (not needed for commercial or sovereign regions)
 * `Region` - An OCI region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
 * `User OCID` - OCID of the user calling the API. To get the value, see [**Getting User OCID Configuration value**](#getting-the-user-OCID).
 * `Tenancy OCID` - OCID of your tenancy. To get the value, see [**Getting Tenancy OCID Configuration value**](#getting-the-tenancy-OCID).
@@ -182,9 +192,17 @@ The configured data source will look like the following:
 
 ![Datasource Filled](images/multitenancy_configured.png)
 
+In case you are setting up a Dedicated Region, you must provide these two additional information:
+* `Region` - The DRCC/Alloy region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
+* `Domain` - The first level domain of your Dedicated Region.
+
+The configured data source with dedicated Region and domain configuration will look like the following:
+
+![Datasource Filled](images/custom_region.png)
+
 Click **Save & Test** to return to the home dashboard.
 
-After the initial configuration, you can modify the datasource by adding a new tenancy by clicking on the **Add another Tenancy** checkbox and filling in the additional credentials. You can also disable a configured Tenancy leaving ampty the **Profile Name** as in this screenshot:
+After the initial configuration, you can modify the datasource by adding a new tenancy by clicking on the **Add another Tenancy** checkbox and filling in the additional credentials. You can also disable a configured Tenancy leaving empty the **Profile Name** as in this screenshot:
 
 ![Tenancy Disabled](images/multi_disable.png)
 

docs/images/standard_region.png

@@ -154,15 +154,24 @@ You can then choose between two different modes as **Tenancy mode**:
 If you selected **single** as **Tenancy mode** then fill in the following credentials:
 
 * `Profile Name` - A user-defined name for this profile. In **single** mode this is automatically set to **DEFAULT** and cannot be modified.
+* `Dedicated Region` (optional) - Toggle this to configure dedicated Region and domain such as in DRCC/Alloy Regions (not needed for commercial or sovereign regions)
 * `Region` - An OCI region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
-* `User OCID` - OCID of the user calling the API. To get the value, see [**Getting User OCID Configuration value**](#getting-the-user-OCID).* 
+* `User OCID` - OCID of the user calling the API. To get the value, see [**Getting User OCID Configuration value**](#getting-the-user-OCID).
 * `Tenancy OCID` - OCID of your tenancy. To get the value, see [**Getting Tenancy OCID Configuration value**](#getting-the-tenancy-OCID).
 * `Fingerprint` - Fingerprint for the key pair being used. To get the value, see [**Getting Fingerprint Configuration value**](#getting-the-private-api-key-and-fingerprint).
 * `Private Key` - The contents of the private key file. To get the value, see [**Getting Private Key Configuration value**](#getting-the-private-api-key-and-fingerprint).
 
 The configured data source will look like the following:
 
-![Datasource Filled](images/datasource_conf_filled.png)
+![Datasource Filled](images/standard_region.png)
+
+In case you are setting up a Dedicated Region, you must provide these two additional information:
+* `Region` - The DRCC/Alloy region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
+* `Domain` - The first level domain of your Dedicated Region.
+
+The configured data source with dedicated Region and domain configuration will look like the following:
+
+![Datasource Filled](images/custom_region.png)
 
 Click **Save & Test** to return to the home dashboard.
 
@@ -171,6 +180,7 @@ Click **Save & Test** to return to the home dashboard.
 If you selected **multi** as **Tenancy mode** then fill in the following credentials for **each Tenancy you want to configure (up to 5 additional tenancies)**:
 
 * `Profile Name` - A user-defined name for this profile. The first Tenancy is automatically set to **DEFAULT** and cannot be modified. You need to specify a custom and unique Profile name for each of the additional tenancies.
+* `Dedicated Region` (optional) - Toggle this to configure dedicated Region and domain such as in DRCC/Alloy Regions (not needed for commercial or sovereign regions)
 * `Region` - An OCI region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
 * `User OCID` - OCID of the user calling the API. To get the value, see [**Getting User OCID Configuration value**](#getting-the-user-OCID).
 * `Tenancy OCID` - OCID of your tenancy. To get the value, see [**Getting Tenancy OCID Configuration value**](#getting-the-tenancy-OCID).
@@ -183,9 +193,17 @@ The configured data source will look like the following:
 
 ![Datasource Filled](images/multitenancy_configured.png)
 
+In case you are setting up a Dedicated Region, you must provide these two additional information:
+* `Region` - The DRCC/Alloy region. To get the value, see [**Getting Region Configuration value**](#getting-the-region).
+* `Domain` - The first level domain of your Dedicated Region.
+
+The configured data source with dedicated Region and domain configuration will look like the following:
+
+![Datasource Filled](images/custom_region.png)
+
 Click **Save & Test** to return to the home dashboard.
 
-After the initial configuration, you can modify the datasource by adding a new tenancy by clicking on the **Add another Tenancy** checkbox and filling in the additional credentials. You can also disable a configured Tenancy leaving ampty the **Profile Name** as in this screenshot:
+After the initial configuration, you can modify the datasource by adding a new tenancy by clicking on the **Add another Tenancy** checkbox and filling in the additional credentials. You can also disable a configured Tenancy leaving empty the **Profile Name** as in this screenshot:
 
 ![Tenancy Disabled](images/multi_disable.png)
 

docs/linux.md

@@ -1,7 +1,7 @@
 {
   "name": "oci-metrics-datasource",
   "private": true,
-  "version": "6.0.3",
+  "version": "6.5.0",
   "description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

docs/macos.md

@@ -371,8 +371,6 @@ func (o *OCIDatasource) getConfigProvider(environment string, tenancymode string
 				host_custom_identity := common.StringToRegion(q.customregion[key]).EndpointForTemplate("identity", "https://identity."+q.customregion[key]+"."+q.customdomain[key])
 				monitoringClient.Host = host_custom_telemetry
 				identityClient.Host = host_custom_identity
-				backend.Logger.Debug("getConfigProvider", "monitoringClient.Host", monitoringClient.Host)
-				backend.Logger.Debug("getConfigProvider", "identityClient.Host", identityClient.Host)
 			}
 
 			tenancyocid, err := configProvider.TenancyOCID()

package.json

@@ -23,8 +23,8 @@
       },
       { "name": "UPL", "url": "https://oss.oracle.com/licenses/upl" }
     ],
-    "version": "6.0.3",
-    "updated": "2024-10-13",
+    "version": "6.5.0",
+    "updated": "2025-02-05",
     "screenshots":[
       {
         "name":"OCI Metrics Dashboard",