adding CSP changes to grafana integration #14

dkuldeep22 · 2023-11-03T07:29:15Z

No description provided.

gangadharaswamy

LGTM

gangadharaswamy · 2023-11-07T06:43:49Z

@dkuldeep22 Please add the Datasource CLI commands for CSP OAuth and API token in the README.md.

This reverts commit 0f4df13.

Margarita-Staneva

I have one comment. I think CSP API token should be replaced with VMware Cloud services API token.

Margarita-Staneva · 2023-11-14T08:27:23Z

dist/partials/config.html

+            <a class="btn btn-secondary gf-form-btn" style="flex-grow:1" type="submit" ng-click="ctrl.resetCspApiToken()" ng-show="ctrl.cspApiTokenExists">Reset</a>
+            <input type="text" class="gf-form-input max-width-24" ng-hide="ctrl.cspApiTokenExists" ng-model="ctrl.current.jsonData.cspAPIToken"/>
+            <info-popover mode="right-absolute" ng-hide="ctrl.cspApiTokenExists">
+                Paste your CSP API token here. You can find and manage your tokens on your profile page in the Wavefront app


Please update this throughout:

Paste your VMware Cloud services API token here. You can find and manage your API tokens on your profile page in the Wavefront app.

amahajan02 · 2023-11-17T06:27:36Z

Please remove console.log statements from all files. These were added for debugging and should not be checked-in

amahajan02 · 2023-11-17T06:34:02Z

src/plugin/datasource.ts

+const CSP_API_TOKEN_URL = "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize";
+const CSP_OAUTH_TOKEN_URL = "https://console.cloud.vmware.com/csp/gateway/am/api/auth/authorize";
+
+const appSecret = ""


This is unused variable. Please remove.

amahajan02 · 2023-11-17T06:34:26Z

src/plugin/datasource.ts

@@ -15,6 +21,9 @@ export function WavefrontDatasource(instanceSettings, $q, backendSrv, templateSr
    this.backendSrv = new BackendSrvCancelledRetriesDecorator(backendSrv, $q);
    this.templateSrv = templateSrv;
    this.defaultRequestTimeoutSecs = 15;
+    const appId = instanceSettings.jsonData.cspOAuthClientId
+    const appSecret = instanceSettings.jsonData.cspOAuthClientSecret
+    const credentials = `Basic ${Buffer.from(`${appId}:${appSecret}`).toString('base64')}`;



What are we trying to do here?
Buffer does not exist and credentials is not getting used anywhere.

Use btoa for base64 encoding.
Try this: const credentials = Basic ${btoa(${appId}:${appSecret})};``

amahajan02 · 2023-11-17T06:34:53Z

src/plugin/datasource.ts

        const endSecs = dateToEpochSeconds(options.range.to);
+        console.log("********endSecs", endSecs);


Let's remove all console.log statements here.

amahajan02 · 2023-11-17T07:21:19Z

src/plugin/datasource.ts

+                    grant_type: "client_credentials",
+                }),
+                headers: {
+                    "Content-type": "application/x-www-form-urlencoded; charset=UTF-8"


We should add "Authorization" in headers.

"Authorization": credentials

amahajan02 · 2023-11-17T07:26:27Z

src/plugin/datasource.ts

@@ -15,6 +21,9 @@ export function WavefrontDatasource(instanceSettings, $q, backendSrv, templateSr
    this.backendSrv = new BackendSrvCancelledRetriesDecorator(backendSrv, $q);
    this.templateSrv = templateSrv;
    this.defaultRequestTimeoutSecs = 15;
+    const appId = instanceSettings.jsonData.cspOAuthClientId
+    const appSecret = instanceSettings.jsonData.cspOAuthClientSecret
+    const credentials = `Basic ${Buffer.from(`${appId}:${appSecret}`).toString('base64')}`;



Use btoa for base64 encoding.
Try this: const credentials = Basic ${btoa(${appId}:${appSecret})};``

amahajan02 · 2023-11-27T08:52:55Z

src/plugin/datasource.ts

+        } catch(e) {
+            console.error(e);
+        }
+        this.requestConfigProto.headers["Authorization"] = "Bearer " + instanceSettings.jsonData.cspAPIToken;


I think we should set "Authorization" header to access token which we get after making call to CSP_OAUTH_TOKEN_URL. Not directly to csp api token. Please confirm this point from Gangadhar or Sadanand.
If they confirm, then change line#45 from :
.then((json) => console.log(json));
to:
then((accessToken) => this.requestConfigProto.headers["Authorization"] = accessToken)

Same with OAuth

amahajan02 · 2023-11-27T08:54:05Z

src/plugin/datasource.ts

@@ -515,4 +575,51 @@ export function WavefrontDatasource(instanceSettings, $q, backendSrv, templateSr
        return this.backendSrv.datasourceRequest(reqConfig);
    };

+
+    function refreshToken() {
+        if (instanceSettings.jsonData.cspAPIToken) {


This code is same as what we are doing at line#35 and 51.
Can we create two functions like: fetchAccessTokenUsingCSPAPIToken and fetchAccessTokenUsingCSPOAuth and use these functions during initialisation and interval update

amahajan02 · 2023-11-27T08:54:22Z

src/plugin/datasource.ts

+      }
+
+      // Execute the function initially
+      refreshToken();


Since, we are already calling it during initialisation at line#33, we can skip this initial call of refreshToken

amahajan02 · 2023-11-27T08:54:41Z

src/plugin/datasource.ts

+      refreshToken();
+
+      // Execute the function every 25 minutes (25 * 60 * 1000 milliseconds)
+      const interval = setInterval(refreshToken, 25 * 60 * 1000);


We are not stopping the interval at any time. No need to store the result in interval const. Calling the function should be sufficient.
setInterval(refreshToken, 25 * 60 * 1000);

adding CSP changes to grafana integration

f8b5320

gangadharaswamy approved these changes Nov 6, 2023

View reviewed changes

dkuldeep22 added 3 commits November 10, 2023 17:03

adding CSP OAuth token

0f4df13

Revert "adding CSP OAuth token"

bf6aa26

This reverts commit 0f4df13.

adding csp oauth changes

fdbbe4d

Margarita-Staneva reviewed Nov 14, 2023

View reviewed changes

amahajan02 suggested changes Nov 17, 2023

View reviewed changes

fixing build issue

fc0389d

amahajan02 suggested changes Nov 27, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adding CSP changes to grafana integration #14

adding CSP changes to grafana integration #14

dkuldeep22 commented Nov 3, 2023

gangadharaswamy left a comment

gangadharaswamy commented Nov 7, 2023

Margarita-Staneva left a comment

Margarita-Staneva Nov 14, 2023

amahajan02 commented Nov 17, 2023

amahajan02 Nov 17, 2023

amahajan02 Nov 17, 2023 •

edited

Loading

amahajan02 Nov 17, 2023

amahajan02 Nov 17, 2023

amahajan02 Nov 17, 2023

amahajan02 Nov 17, 2023

amahajan02 Nov 17, 2023

amahajan02 Nov 27, 2023

amahajan02 Nov 27, 2023

amahajan02 Nov 27, 2023

amahajan02 Nov 27, 2023

amahajan02 Nov 27, 2023

		const endSecs = dateToEpochSeconds(options.range.to);
		console.log("********endSecs", endSecs);

adding CSP changes to grafana integration #14

Are you sure you want to change the base?

adding CSP changes to grafana integration #14

Conversation

dkuldeep22 commented Nov 3, 2023

gangadharaswamy left a comment

Choose a reason for hiding this comment

gangadharaswamy commented Nov 7, 2023

Margarita-Staneva left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amahajan02 commented Nov 17, 2023

Choose a reason for hiding this comment

amahajan02 Nov 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amahajan02 Nov 17, 2023 •

edited

Loading