Merge pull request #10556 from Ultimation/patch-1

Recommend a limit on database query for influxdb annotations

public/app/plugins/datasource/influxdb/partials/annotations.editor.html

@@ -1,7 +1,7 @@
 
 <div class="gf-form-group">
 	<div class="gf-form">
-		<input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder="select text from events where $timeFilter"></input>
+		<input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder="select text from events where $timeFilter limit 1000"></input>
 	</div>
 </div>