Merge branch 'feature-text_metrics' into grafana-3.0

Conflicts:
	zabbix/partials/query.editor.html

plugins/datasource-zabbix/partials/query.options.html

@@ -41,6 +41,11 @@
           IT service property
         </a>
       </li>
+      <li class="tight-form-item">
+        <a ng-click="toggleEditorHelp(4)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+          Text filter
+        </a>
+      </li>
     </ul>
     <div class="clearfix"></div>
   </div>
@@ -80,5 +85,12 @@
         <li>Down time - time the service was in scheduled downtime, in seconds</li>
       </ul>
     </div>
+
+    <div class="grafana-info-box span8" ng-if="editorHelpIndex === 4">
+      <h5>Text filter</h5>
+      <ul>
+        <li>Use regex to extract a part of the returned value.</li>
+      </ul>
+    </div>
   </div>
 </div>