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

feat: metris tab, moved data source selector

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-20 18:35:34 +02:00
parent 499e01d832
commit 4a2c405ac0
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/panel/partials/metrics.html
View File

@ -1 +0,0 @@
<metrics-tab panel-ctrl="ctrl"></metrics-tab>

33
public/app/features/panel/partials/metrics_tab.html
View File

@ -1,17 +1,3 @@
<div class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form">
<label class="gf-form-label">
Data Source
</label>
<metric-segment segment="ctrl.dsSegment"
get-options="ctrl.getOptions(true)"
on-change="ctrl.datasourceChanged()"></metric-segment>
</div>
</div>
</div>
<div class="query-editor-rows gf-form-group"> <div class="query-editor-rows gf-form-group">
<div ng-repeat="target in ctrl.panel.targets" ng-class="{'gf-form-disabled': target.hide}"> <div ng-repeat="target in ctrl.panel.targets" ng-class="{'gf-form-disabled': target.hide}">
<rebuild-on-change property="ctrl.panel.datasource || target.datasource" show-null="true"> <rebuild-on-change property="ctrl.panel.datasource || target.datasource" show-null="true">
@ -41,16 +27,25 @@
<query-troubleshooter panel-ctrl="ctrl.panelCtrl"></query-troubleshooter> <query-troubleshooter panel-ctrl="ctrl.panelCtrl"></query-troubleshooter>
<collapse-box title="Advanced Options & Data source help"> <collapse-box title="Data Source Options">
<collapse-box-body> <collapse-box-body>
<div class="gf-form-group"> <div class="gf-form-group">
<rebuild-on-change property="ctrl.panel.datasource" show-null="true"> <div class="gf-form-inline">
<plugin-component type="query-options-ctrl"> <div class="gf-form">
</plugin-component> <label class="gf-form-label">
</rebuild-on-change> Panel Data Source
</label>
<metric-segment segment="ctrl.dsSegment" get-options="ctrl.getOptions(true)" on-change="ctrl.datasourceChanged()"></metric-segment>
</div>
</div>
</div> </div>
<rebuild-on-change property="ctrl.panel.datasource" show-null="true">
<plugin-component type="query-options-ctrl">
</plugin-component>
</rebuild-on-change>
</collapse-box-body> </collapse-box-body>
</collapse-box> </collapse-box>