ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Open cluster dashboard from SQL Dashboard (#7783)

Browse Source 
* Open cluster dashboard

* Remove old translated strings and update var name

* Add exported auth type

* Add newline

* PR feedback
This commit is contained in:
Charles Gagnon
2019-10-18 17:35:47 -07:00
committed by GitHub
parent 203ff3872f
commit ab31a7b964
18 changed files with 39 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardModel.ts
View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as azdata from 'azdata';
import * as vscode from 'vscode';
import { ClusterController } from '../controller/clusterControllerApi';
@@ -12,6 +10,8 @@ import { EndpointModel, BdcStatusModel } from '../controller/apiGenerated';
import { showErrorMessage, Endpoint } from '../utils';
import { AuthType } from '../constants';
export type BdcDashboardOptions = { url: string, auth: AuthType, username: string, password: string };
export class BdcDashboardModel {
private _clusterController: ClusterController;
@@ -24,8 +24,8 @@ export class BdcDashboardModel {
public onDidUpdateEndpoints = this._onDidUpdateEndpoints.event;
public onDidUpdateBdcStatus = this._onDidUpdateBdcStatus.event;
constructor(url: string, auth: AuthType, username: string, private password: string, ignoreSslVerification = true) {
this._clusterController = new ClusterController(url, auth, username, password, ignoreSslVerification);
constructor(private options: BdcDashboardOptions, ignoreSslVerification = true) {
this._clusterController = new ClusterController(options.url, options.auth, options.username, options.password, ignoreSslVerification);
this.refresh();
}
@@ -81,7 +81,7 @@ export class BdcDashboardModel {
serverName: sqlServerMasterEndpoint.endpoint,
databaseName: undefined,
userName: 'sa',
password: this.password,
password: this.options.password,
authenticationType: '',
savePassword: true,
groupFullName: undefined,

8
extensions/big-data-cluster/src/extension.ts
View File

@@ -14,7 +14,7 @@ import { TreeNode } from './bigDataCluster/tree/treeNode';
import { AddControllerDialogModel, AddControllerDialog } from './bigDataCluster/dialog/addControllerDialog';
import { ControllerNode } from './bigDataCluster/tree/controllerTreeNode';
import { BdcDashboard } from './bigDataCluster/dialog/bdcDashboard';
import { BdcDashboardModel } from './bigDataCluster/dialog/bdcDashboardModel';
import { BdcDashboardModel, BdcDashboardOptions } from './bigDataCluster/dialog/bdcDashboardModel';
import { MountHdfsDialogModel as MountHdfsModel, MountHdfsProperties, MountHdfsDialog, DeleteMountDialog, DeleteMountModel, RefreshMountDialog, RefreshMountModel } from './bigDataCluster/dialog/mountHdfsDialog';
import { getControllerEndpoint } from './bigDataCluster/utils';
@@ -62,9 +62,9 @@ function registerCommands(context: vscode.ExtensionContext, treeDataProvider: Co
treeDataProvider.notifyNodeChanged(node);
});
vscode.commands.registerCommand(ManageControllerCommand, async (node: ControllerNode) => {
const title: string = `${localize('bdc.dashboard.title', "Big Data Cluster Dashboard -")} ${ControllerNode.toIpAndPort(node.url)}`;
const dashboard: BdcDashboard = new BdcDashboard(title, new BdcDashboardModel(node.url, node.auth, node.username, node.password));
vscode.commands.registerCommand(ManageControllerCommand, async (info: ControllerNode | BdcDashboardOptions) => {
const title: string = `${localize('bdc.dashboard.title', "Big Data Cluster Dashboard -")} ${ControllerNode.toIpAndPort(info.url)}`;
const dashboard: BdcDashboard = new BdcDashboard(title, new BdcDashboardModel(info));
dashboard.showDashboard();
});

8
extensions/mssql/package.json
View File

@@ -77,8 +77,8 @@
}
},
{
"command": "mssqlCluster.task.openClusterStatusNotebook",
"title": "%title.openClusterStatusNotebook%",
"command": "mssqlCluster.task.openClusterDashboard",
"title": "%title.openClusterDashboard%",
"icon": {
"dark": "resources/dark/cluster_status_inverse.svg",
"light": "resources/light/cluster_status.svg"
@@ -251,7 +251,7 @@
"when": "false"
},
{
"command": "mssqlCluster.task.openClusterStatusNotebook",
"command": "mssqlCluster.task.openClusterDashboard",
"when": "false"
}
],
@@ -417,7 +417,7 @@
"mssqlCluster.task.newNotebook",
"mssqlCluster.task.openNotebook",
"mssqlCluster.livy.task.submitSparkJob",
"mssqlCluster.task.openClusterStatusNotebook"
"mssqlCluster.task.openClusterDashboard"
]
}
},

2
extensions/mssql/package.nls.json
View File

@@ -26,7 +26,7 @@
"title.tasks": "Tasks",
"title.installPackages": "Install Packages",
"title.configurePython": "Configure Python for Notebooks",
"title.openClusterStatusNotebook": "Cluster Status",
"title.openClusterDashboard": "Cluster\nDashboard",
"title.searchServers": "Search: Servers",
"title.clearSearchServerResult": "Search: Clear Search Server Results",

2
extensions/mssql/src/constants.ts
View File

@@ -64,7 +64,7 @@ export enum MssqlClusterItemsSubType {
// SPARK JOB SUBMISSION //////////////////////////////////////////////////////////
export const mssqlClusterNewNotebookTask = 'mssqlCluster.task.newNotebook';
export const mssqlClusterOpenNotebookTask = 'mssqlCluster.task.openNotebook';
export const mssqlopenClusterStatusNotebook = 'mssqlCluster.task.openClusterStatusNotebook';
export const mssqlOpenClusterDashboard = 'mssqlCluster.task.openClusterDashboard';
export const mssqlClusterLivySubmitSparkJobCommand = 'mssqlCluster.livy.cmd.submitSparkJob';
export const mssqlClusterLivySubmitSparkJobFromFileCommand = 'mssqlCluster.livy.cmd.submitFileToSparkJob';
export const mssqlClusterLivySubmitSparkJobTask = 'mssqlCluster.livy.task.submitSparkJob';

39
extensions/mssql/src/main.ts
View File

@@ -22,11 +22,11 @@ import { OpenSparkYarnHistoryTask } from './sparkFeature/historyTask';
import { MssqlObjectExplorerNodeProvider, mssqlOutputChannel } from './objectExplorerNodeProvider/objectExplorerNodeProvider';
import { registerSearchServerCommand } from './objectExplorerNodeProvider/command';
import { MssqlIconProvider } from './iconProvider';
import { registerServiceEndpoints } from './dashboard/serviceEndpoints';
import { registerServiceEndpoints, Endpoint } from './dashboard/serviceEndpoints';
import { getBookExtensionContributions } from './dashboard/bookExtensions';
import { registerBooksWidget } from './dashboard/bookWidget';
import { createMssqlApi } from './mssqlApiFactory';
import { AuthType } from './util/auth';
import { SqlToolsServer } from './sqlToolsServer';
import { promises as fs } from 'fs';
import { IconPathHelper } from './iconHelper';
@@ -131,8 +131,8 @@ function activateNotebookTask(appContext: AppContext): void {
apiWrapper.registerTaskHandler(Constants.mssqlClusterOpenNotebookTask, (profile: azdata.IConnectionProfile) => {
return handleOpenNotebookTask(profile);
});
apiWrapper.registerTaskHandler(Constants.mssqlopenClusterStatusNotebook, (profile: azdata.IConnectionProfile) => {
return handleOpenClusterStatusNotebookTask(profile, appContext);
apiWrapper.registerTaskHandler(Constants.mssqlOpenClusterDashboard, (profile: azdata.IConnectionProfile) => {
return handleOpenClusterDashboardTask(profile, appContext);
});
}
@@ -203,24 +203,21 @@ async function handleOpenNotebookTask(profile: azdata.IConnectionProfile): Promi
}
}
async function handleOpenClusterStatusNotebookTask(profile: azdata.IConnectionProfile, appContext: AppContext): Promise<void> {
const notebookRelativePath: string = 'notebooks/tsg/cluster-status.ipynb';
const notebookFullPath: string = path.join(appContext.extensionContext.extensionPath, notebookRelativePath);
if (!(await Utils.exists(notebookFullPath))) {
vscode.window.showErrorMessage(localize("fileNotFound", "Unable to find the file specified"));
} else {
const title: string = Utils.findNextUntitledEditorName(notebookFullPath);
const untitledFileName: vscode.Uri = vscode.Uri.parse(`untitled:${title}`);
vscode.workspace.openTextDocument(notebookFullPath).then((document) => {
let initialContent = document.getText();
azdata.nb.showNotebookDocument(untitledFileName, {
connectionProfile: profile,
preview: true,
initialContent: initialContent,
initialDirtyState: false
});
});
async function handleOpenClusterDashboardTask(profile: azdata.IConnectionProfile, appContext: AppContext): Promise<void> {
const serverInfo = await azdata.connection.getServerInfo(profile.id);
const controller = Utils.getClusterEndpoints(serverInfo).find(e => e.serviceName === Endpoint.controller);
if (!controller) {
appContext.apiWrapper.showErrorMessage(localize('noController', "Could not find the controller endpoint for this instance"));
return;
}
appContext.apiWrapper.executeCommand('bigDataClusters.command.manageController',
{
url: controller.endpoint,
auth: profile.authenticationType === 'Integrated' ? AuthType.Integrated : AuthType.Basic,
username: 'admin', // Default to admin as a best-guess, we'll prompt for re-entering credentials if that fails
password: profile.password
});
}
// this method is called when your extension is deactivated

5
extensions/mssql/src/util/auth.ts
View File

@@ -5,6 +5,11 @@
import * as kerberos from 'kerberos';
export enum AuthType {
Integrated = 'integrated',
Basic = 'basic'
}
export async function authenticateKerberos(hostname: string): Promise<string> {
const service = 'HTTP' + (process.platform === 'win32' ? '/' : '@') + hostname;
const mechOID = kerberos.GSS_MECH_OID_KRB5;

4
resources/xlf/de/mssql.de.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">Python für Notebooks konfigurieren</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">Clusterstatus</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">Suche: Server</target>

5
resources/xlf/en/mssql.xlf
View File

@@ -73,9 +73,6 @@
<trans-unit id="title.configurePython">
<source xml:lang="en">Configure Python for Notebooks</source>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
</trans-unit>
@@ -905,4 +902,4 @@
<source xml:lang="en">Done installing {0}</source>
</trans-unit>
</body></file>
</xliff>
</xliff>

4
resources/xlf/es/mssql.es.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">Configurar Python para Notebooks</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">Estado del clúster</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">Buscar: Servidores</target>

4
resources/xlf/fr/mssql.fr.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">Configurer Python pour Notebooks</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">État du cluster</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">Recherche : Serveurs</target>

4
resources/xlf/it/mssql.it.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">Configura Python per Notebooks</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">Stato cluster</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">Ricerca: Server</target>

4
resources/xlf/ja/mssql.ja.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">ノートブック用 Python の構成</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">クラスター状態</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">検索: サーバー</target>

4
resources/xlf/ko/mssql.ko.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">노트북용 Python 구성</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">클러스터 상태</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">검색: 서버</target>

4
resources/xlf/pt-br/mssql.pt-BR.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">Configurar o Python para notebooks</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">Status do cluster</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">Pesquisa: servidores</target>

4
resources/xlf/ru/mssql.ru.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">Настройка Python для Записных книжек</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">Состояние кластера</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">Поиск: Серверы</target>

4
resources/xlf/zh-hans/mssql.zh-Hans.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">为笔记本配置 Python</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">群集状态</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">搜索: 服务器</target>

4
resources/xlf/zh-hant/mssql.zh-Hant.xlf
View File

@@ -94,10 +94,6 @@
<source xml:lang="en">Configure Python for Notebooks</source>
<target state="translated">為 Notebooks 設定 Python</target>
</trans-unit>
<trans-unit id="title.openClusterStatusNotebook">
<source xml:lang="en">Cluster Status</source>
<target state="translated">叢集狀態</target>
</trans-unit>
<trans-unit id="title.searchServers">
<source xml:lang="en">Search: Servers</source>
<target state="translated">搜尋: 伺服器</target>