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

remove

Browse Source
This commit is contained in:
ryan 2018-03-15 12:57:09 +01:00
parent 3aed867b4b
commit ad88e5398c
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/pluginproxy/ds_proxy.go
View File

@ -180,9 +180,7 @@ func (proxy *DataSourceProxy) getDirector() func(req *http.Request) {
func (proxy *DataSourceProxy) validateRequest() error {
if proxy.ds.Type == m.DS_INFLUXDB {
if proxy.ctx.Query("db") != proxy.ds.Database {
if !proxy.ds.JsonData.Get("allowDatabaseQuery").MustBool(false) {
return errors.New("Datasource is not configured to allow this database")
}
return errors.New("Datasource is not configured to allow this database")
}
}

5
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -16,7 +16,6 @@ export default class InfluxDatasource {
basicAuth: any;
withCredentials: any;
interval: any;
allowDatabaseQuery: boolean;
supportAnnotations: boolean;
supportMetrics: boolean;
responseParser: any;
@ -35,7 +34,6 @@ export default class InfluxDatasource {
this.basicAuth = instanceSettings.basicAuth;
this.withCredentials = instanceSettings.withCredentials;
this.interval = (instanceSettings.jsonData || {}).timeInterval;
this.allowDatabaseQuery = (instanceSettings.jsonData || {}).allowDatabaseQuery === true;
this.supportAnnotations = true;
this.supportMetrics = true;
this.responseParser = new ResponseParser();
@ -240,9 +238,6 @@ export default class InfluxDatasource {
if (options && options.database) {
params.db = options.database;
if (params.db !== this.database && !this.allowDatabaseQuery) {
return this.$q.reject({ message: 'This datasource does not allow changing database' });
}
} else if (this.database) {
params.db = this.database;
}

20
public/app/plugins/datasource/influxdb/partials/config.html
View File

@ -23,16 +23,24 @@
</div>
</div>
<gf-form-switch class="gf-form"
label="Allow Database Queries"
label-class="gf-form-label width-14"
checked="ctrl.current.jsonData.allowDatabaseQuery"
tooltip="Support changing the database from a query"></gf-form-switch>
<div class="gf-form-group">
<div class="grafana-info-box">
<h5>Database Access</h5>
<p>
Setting the database for this datasource does not deny access to other databases. The InfluxDB query syntax allows
switching the database in the query. For example:
<code>SHOW MEASUREMENTS ON _internal</code> or <code>SELECT * FROM "_internal".."database" LIMIT 10</code>
<br/><br/>
To support data isolation and security, make sure appropriate permissions are configured in InfluxDB.
</p>
</div>
</div>
<div class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label width-14">Min time interval</span>
<span class="gf-form-label">Min time interval</span>
<input type="text" class="gf-form-input width-6" ng-model="ctrl.current.jsonData.timeInterval" spellcheck='false' placeholder="10s"></input>
<info-popover mode="right-absolute">
A lower limit for the auto group by time interval. Recommended to be set to write frequency,