opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 03:41:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring out http settings to its own partial

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-13 18:42:46 +01:00
parent 448717a757
commit d705ee70f0
9 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/features/org/datasourceEditCtrl.js
View File

@ -10,6 +10,8 @@ function (angular) {
module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) {
$scope.httpConfigPartialSrc = 'app/features/org/partials/datasourceHttpConfig.html';
var defaults = {
name: '',
type: 'graphite',

49
src/app/features/org/partials/datasourceEdit.html
View File

@ -30,7 +30,7 @@
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Type
@ -42,54 +42,9 @@
<div class="clearfix"></div>
</div>
<br>
<h5>Http settings</h5>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Url
</li>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
</li>
<li class="tight-form-item">
Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
</li>
<li>
<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Basic Auth
</li>
<li class="tight-form-item">
Enable&nbsp;
<input class="cr1" id="current.basicAuth" type="checkbox" ng-model="current.basicAuth" ng-checked="current.basicAuth">
<label for="current.basicAuth" class="cr1"></label>
</li>
<li class="tight-form-item" ng-if="current.basicAuth">
User
</li>
<li ng-if="current.basicAuth">
<input type="text" class="tight-form-input input-medium" style="width: 139px" ng-model='current.basicAuthUser' placeholder="user" required></input>
</li>
<li class="tight-form-item" style="width: 67px" ng-if="current.basicAuth">
Password
</li>
<li ng-if="current.basicAuth">
<input type="password" class="tight-form-input input-medium" ng-model='current.basicAuthPassword' placeholder="password" required></input>
</li>
</ul>
<div class="clearfix"></div>
</div>
<br>
<div ng-include="datasourceMeta.partials.config" ng-if="datasourceMeta.partials.config"></div>
<br>
<br>
<div class="pull-right">
<button type="submit" class="btn btn-success" ng-show="isNew" ng-click="add()">Add</button>
<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="update()">Update</button>

46
src/app/features/org/partials/datasourceHttpConfig.html Normal file
View File

@ -0,0 +1,46 @@
<br>
<h5>Http settings</h5>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Url
</li>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
</li>
<li class="tight-form-item">
Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
</li>
<li>
<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Basic Auth
</li>
<li class="tight-form-item">
Enable&nbsp;
<input class="cr1" id="current.basicAuth" type="checkbox" ng-model="current.basicAuth" ng-checked="current.basicAuth">
<label for="current.basicAuth" class="cr1"></label>
</li>
<li class="tight-form-item" ng-if="current.basicAuth">
User
</li>
<li ng-if="current.basicAuth">
<input type="text" class="tight-form-input input-medium" style="width: 139px" ng-model='current.basicAuthUser' placeholder="user" required></input>
</li>
<li class="tight-form-item" style="width: 67px" ng-if="current.basicAuth">
Password
</li>
<li ng-if="current.basicAuth">
<input type="password" class="tight-form-input input-medium" ng-model='current.basicAuthPassword' placeholder="password" required></input>
</li>
</ul>
<div class="clearfix"></div>
</div>

3
src/app/plugins/datasource/elasticsearch/partials/config.html
View File

@ -1,3 +1,6 @@
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>Elastic search details</h5>
<div class="tight-form last">

3
src/app/plugins/datasource/graphite/partials/config.html
View File

@ -0,0 +1,3 @@
<div ng-include="httpConfigPartialSrc"></div>

4
src/app/plugins/datasource/influxdb/partials/config.html
View File

@ -1,3 +1,7 @@
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>InfluxDB Details</h5>
<div class="tight-form">

3
src/app/plugins/datasource/influxdb/plugin.json
View File

@ -13,6 +13,5 @@
"annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html"
},
"metrics": true,
"annotations": true
"metrics": true
}

4
src/app/plugins/datasource/influxdb_08/partials/config.html
View File

@ -1,3 +1,7 @@
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>InfluxDB Details</h5>
<div class="tight-form">

4
src/app/plugins/datasource/opentsdb/partials/config.html
View File

@ -0,0 +1,4 @@
<div ng-include="httpConfigPartialSrc"></div>
<br>