mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed sub url setting bug
This commit is contained in:
parent
04d03f73b3
commit
20c6925470
46
'
Normal file
46
'
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<div class="editor-row">
|
||||||
|
<div class="section">
|
||||||
|
<div>
|
||||||
|
<div class="tight-form">
|
||||||
|
<ul class="tight-form-list">
|
||||||
|
<li class="tight-form-item" style="width: 148px">
|
||||||
|
<strong>Relative time options</strong></small>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<input type="text" class="input-xlarge tight-form-input"
|
||||||
|
ng-model="panel.time_options" array-join>
|
||||||
|
</li>
|
||||||
|
<li class="tight-form-item">
|
||||||
|
Until
|
||||||
|
</li>
|
||||||
|
<li class="tight-form-item">
|
||||||
|
now-
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<input type="text" class="input-mini tight-form-input last"
|
||||||
|
ng-model="panel.nowDelay" placeholder="0m" bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'" data-placement="right">
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div class="clearfix"></div>
|
||||||
|
</div>
|
||||||
|
<div class="tight-form">
|
||||||
|
<ul class="tight-form-list">
|
||||||
|
<li class="tight-form-item" style="width: 148px">
|
||||||
|
<strong>Auto-refresh options</strong>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<input type="text" class="input-xlarge tight-form-input"
|
||||||
|
ng-model="panel.refresh_intervals" array-join>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div class="clearfix"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<br>
|
||||||
|
<i class="fa fa-info-circle"></i>
|
||||||
|
For these changes to fully take effect save and reload the dashboard.
|
||||||
|
</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
2
grafana
2
grafana
@ -1 +1 @@
|
|||||||
Subproject commit 740709da0493536269adfe1cafd0b93d975b02a2
|
Subproject commit 465c72d98ef80127ce75a32254ead85b0efd68a7
|
@ -139,7 +139,7 @@ func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if has app suburl.
|
// Check if has app suburl.
|
||||||
url, err := url.Parse(AppUrl)
|
url, err := url.Parse(appUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(4, "Invalid root_url(%s): %s", appUrl, err)
|
log.Fatal(4, "Invalid root_url(%s): %s", appUrl, err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user