Merge remote-tracking branch 'grafana/master' into annotations-created

* grafana/master:
  prevent angular from evaluating {{hostname}} in tooltip (#11514)
This commit is contained in:
ryan
2018-04-09 13:52:54 +02:00

View File

@@ -14,7 +14,7 @@
data-min-length=0 data-items=1000 ng-model-onblur ng-change="ctrl.refreshMetricData()">
</input>
<info-popover mode="right-absolute">
Controls the name of the time series, using name or pattern. For example {{hostname}} will be replaced with label value for
Controls the name of the time series, using name or pattern. For example <span ng-non-bindable>{{hostname}}</span> will be replaced with label value for
the label hostname.
</info-popover>
</div>