Skip to content

N
nexpie-grafana-theme
Commit 5e34823e by Torkel Ödegaard
Options

Merge pull request #2858 from mtanda/prometheus 

fix unmatched tag
parents f44eaae8 d0b74438
Showing with 18 additions and 44 deletions
public/app/plugins/datasource/prometheus/partials/query.editor.html
...@@ -41,18 +41,11 @@ ...@@ -41,18 +41,11 @@
Query Query
</li> </li>
<li> <li>
<input type="text" <input type="text" class="input-xxlarge tight-form-input" ng-model="target.expr"
class="input-xxlarge tight-form-input" spellcheck='false' placeholder="query expression" data-min-length=0 data-items=100
ng-model="target.expr" ng-model-onblur ng-change="refreshMetricData()">
spellcheck='false' </input>
placeholder="query expression" <a bs-tooltip="target.datasourceErrors.query" style="color: rgb(229, 189, 28)" ng-show="target.datasourceErrors.query">
data-min-length=0 data-items=100
ng-model-onblur
ng-change="refreshMetricData()"
>
<a bs-tooltip="target.datasourceErrors.query"
style="color: rgb(229, 189, 28)"
ng-show="target.datasourceErrors.query">
<i class="fa fa-warning"></i> <i class="fa fa-warning"></i>
</a> </a>
</li> </li>
...@@ -60,17 +53,10 @@ ...@@ -60,17 +53,10 @@
Metric Metric
</li> </li>
<li> <li>
<input type="text" <input type="text" class="input-medium tight-form-input" ng-model="target.metric"
class="input-medium tight-form-input" spellcheck='false' bs-typeahead="suggestMetrics" placeholder="metric name" data-min-length=0 data-items=100>
ng-model="target.metric" </input>
spellcheck='false' <a bs-tooltip="target.errors.metric" style="color: rgb(229, 189, 28)" ng-show="target.errors.metric">
bs-typeahead="suggestMetrics"
placeholder="metric name"
data-min-length=0 data-items=100
>
<a bs-tooltip="target.errors.metric"
style="color: rgb(229, 189, 28)"
ng-show="target.errors.metric">
<i class="fa fa-warning"></i> <i class="fa fa-warning"></i>
</a> </a>
</li> </li>
...@@ -86,15 +72,10 @@ ...@@ -86,15 +72,10 @@
Legend format Legend format
</li> </li>
<li> <li>
<input type="text" <input type="text" class="tight-form-input input-xxlarge" ng-model="target.legendFormat"
class="tight-form-input input-xxlarge" spellcheck='false' placeholder="legend format" data-min-length=0 data-items=1000
ng-model="target.legendFormat" ng-model-onblur ng-change="refreshMetricData()">
spellcheck='false' </input>
placeholder="legend format"
data-min-length=0 data-items=1000
ng-model-onblur
ng-change="refreshMetricData()"
/>
</li> </li>
</ul> </ul>
...@@ -107,25 +88,18 @@ ...@@ -107,25 +88,18 @@
Step Step
</li> </li>
<li> <li>
<input type="text" <input type="text" class="input-mini tight-form-input" ng-model="target.interval"
class="input-mini tight-form-input"
ng-model="target.interval"
bs-tooltip="'Leave blank for auto handling based on time range and panel width'" bs-tooltip="'Leave blank for auto handling based on time range and panel width'"
data-placement="right" data-placement="right" spellcheck='false' placeholder="{{target.calculatedInterval}}" data-min-length=0 data-items=100
spellcheck='false' ng-model-onblur ng-change="refreshMetricData()">
placeholder="{{target.calculatedInterval}}" </input>
data-min-length=0 data-items=100
ng-model-onblur
ng-change="refreshMetricData()"
/>
</li> </li>
<li class="tight-form-item"> <li class="tight-form-item">
Resolution Resolution
</li> </li>
<li> <li>
<select ng-model="target.intervalFactor" <select ng-model="target.intervalFactor" class="tight-form-input input-mini"
class="tight-form-input input-mini"
ng-options="r.factor as r.label for r in resolutions" ng-options="r.factor as r.label for r in resolutions"
ng-change="refreshMetricData()"> ng-change="refreshMetricData()">
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment