IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option

Browse Source 
Add encrypt setting to MSSQL data source.
This commit is contained in:
Marcus Efraimsson
2018-10-16 19:07:00 +02:00
committed by GitHub
parent a825f42aaf 49a3bd3097
commit 3612a1c00e
6 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/datasource/mssql/config_ctrl.ts Normal file
View File

@@ -0,0 +1,10 @@
export class MssqlConfigCtrl {
static templateUrl = 'partials/config.html';
current: any;
/** @ngInject */
constructor($scope) {
this.current.jsonData.encrypt = this.current.jsonData.encrypt || 'false';
}
}

5
public/app/plugins/datasource/mssql/module.ts
View File

@@ -1,9 +1,6 @@
import { MssqlDatasource } from './datasource';
import { MssqlQueryCtrl } from './query_ctrl';
class MssqlConfigCtrl {
static templateUrl = 'partials/config.html';
}
import { MssqlConfigCtrl } from './config_ctrl';
const defaultQuery = `SELECT
<time_column> as time,

16
public/app/plugins/datasource/mssql/partials/config.html
View File

@@ -27,6 +27,22 @@
<a class="btn btn-secondary gf-form-btn" href="#" ng-click="ctrl.current.secureJsonFields.password = false">reset</a>
</div>
</div>
<div class="gf-form">
<label class="gf-form-label width-7">Encrypt</label>
<div class="gf-form-select-wrapper max-width-15 gf-form-select-wrapper--has-help-icon">
<select class="gf-form-input" ng-model="ctrl.current.jsonData.encrypt" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsonData.encrypt"></select>
<info-popover mode="right-absolute">
Determines whether or to which extent a secure SSL TCP/IP connection will be negotiated with the server.
<ul>
<li><i>disable</i> - Data sent between client and server is not encrypted.</li>
<li><i>false</i> - Data sent between client and server is not encrypted beyond the login packet. (default)</li>
<li><i>true</i> - Data sent between client and server is encrypted.</li>
</ul>
If you're using an older version of Microsoft SQL Server like 2008 and 2008R2 you may need to disable encryption to be able to connect.
</info-popover>
</div>
</div>
</div>
<b>Connection limits</b>