Skip to content

Commit 5e34823

Browse files
committed
Merge pull request grafana#2858 from mtanda/prometheus
fix unmatched tag
2 parents f44eaae + d0b7443 commit 5e34823

File tree

1 file changed

+18
-44
lines changed

1 file changed

+18
-44
lines changed

public/app/plugins/datasource/prometheus/partials/query.editor.html

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,22 @@
4141
Query
4242
</li>
4343
<li>
44-
<input type="text"
45-
class="input-xxlarge tight-form-input"
46-
ng-model="target.expr"
47-
spellcheck='false'
48-
placeholder="query expression"
49-
data-min-length=0 data-items=100
50-
ng-model-onblur
51-
ng-change="refreshMetricData()"
52-
>
53-
<a bs-tooltip="target.datasourceErrors.query"
54-
style="color: rgb(229, 189, 28)"
55-
ng-show="target.datasourceErrors.query">
44+
<input type="text" class="input-xxlarge tight-form-input" ng-model="target.expr"
45+
spellcheck='false' placeholder="query expression" data-min-length=0 data-items=100
46+
ng-model-onblur ng-change="refreshMetricData()">
47+
</input>
48+
<a bs-tooltip="target.datasourceErrors.query" style="color: rgb(229, 189, 28)" ng-show="target.datasourceErrors.query">
5649
<i class="fa fa-warning"></i>
5750
</a>
5851
</li>
5952
<li class="tight-form-item">
6053
Metric
6154
</li>
6255
<li>
63-
<input type="text"
64-
class="input-medium tight-form-input"
65-
ng-model="target.metric"
66-
spellcheck='false'
67-
bs-typeahead="suggestMetrics"
68-
placeholder="metric name"
69-
data-min-length=0 data-items=100
70-
>
71-
<a bs-tooltip="target.errors.metric"
72-
style="color: rgb(229, 189, 28)"
73-
ng-show="target.errors.metric">
56+
<input type="text" class="input-medium tight-form-input" ng-model="target.metric"
57+
spellcheck='false' bs-typeahead="suggestMetrics" placeholder="metric name" data-min-length=0 data-items=100>
58+
</input>
59+
<a bs-tooltip="target.errors.metric" style="color: rgb(229, 189, 28)" ng-show="target.errors.metric">
7460
<i class="fa fa-warning"></i>
7561
</a>
7662
</li>
@@ -86,15 +72,10 @@
8672
Legend format
8773
</li>
8874
<li>
89-
<input type="text"
90-
class="tight-form-input input-xxlarge"
91-
ng-model="target.legendFormat"
92-
spellcheck='false'
93-
placeholder="legend format"
94-
data-min-length=0 data-items=1000
95-
ng-model-onblur
96-
ng-change="refreshMetricData()"
97-
/>
75+
<input type="text" class="tight-form-input input-xxlarge" ng-model="target.legendFormat"
76+
spellcheck='false' placeholder="legend format" data-min-length=0 data-items=1000
77+
ng-model-onblur ng-change="refreshMetricData()">
78+
</input>
9879
</li>
9980
</ul>
10081

@@ -107,25 +88,18 @@
10788
Step
10889
</li>
10990
<li>
110-
<input type="text"
111-
class="input-mini tight-form-input"
112-
ng-model="target.interval"
91+
<input type="text" class="input-mini tight-form-input" ng-model="target.interval"
11392
bs-tooltip="'Leave blank for auto handling based on time range and panel width'"
114-
data-placement="right"
115-
spellcheck='false'
116-
placeholder="{{target.calculatedInterval}}"
117-
data-min-length=0 data-items=100
118-
ng-model-onblur
119-
ng-change="refreshMetricData()"
120-
/>
93+
data-placement="right" spellcheck='false' placeholder="{{target.calculatedInterval}}" data-min-length=0 data-items=100
94+
ng-model-onblur ng-change="refreshMetricData()">
95+
</input>
12196
</li>
12297

12398
<li class="tight-form-item">
12499
Resolution
125100
</li>
126101
<li>
127-
<select ng-model="target.intervalFactor"
128-
class="tight-form-input input-mini"
102+
<select ng-model="target.intervalFactor" class="tight-form-input input-mini"
129103
ng-options="r.factor as r.label for r in resolutions"
130104
ng-change="refreshMetricData()">
131105
</select>

0 commit comments

Comments
 (0)