Merge branch 'cache-service' into grafana-3.0

plugins/datasource-zabbix/datasource.js

@@ -35,11 +35,15 @@ function (angular, _, dateMath, utils, metricFunctions) {
     this.trends           = instanceSettings.jsonData.trends;
     this.trendsFrom       = instanceSettings.jsonData.trendsFrom || '7d';
 
+    // Set cache update interval
+    var ttl = instanceSettings.jsonData.cacheTTL || '1h';
+    this.cacheTTL = utils.parseInterval(ttl);
+
     // Initialize Zabbix API
     this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials);
 
     // Initialize cache service
-    this.zabbixCache = new ZabbixCachingProxy(this.zabbixAPI);
+    this.zabbixCache = new ZabbixCachingProxy(this.zabbixAPI, this.cacheTTL);
 
     // Initialize query builder
     this.queryProcessor = new QueryProcessor(this.zabbixCache);

plugins/datasource-zabbix/partials/config.html

@@ -12,7 +12,7 @@
              ng-model='current.jsonData.username'
              placeholder="">
     </li>
-    <li class="tight-form-item">
+    <li class="tight-form-item" style="width: 80px">
       Password
     </li>
     <li>
@@ -25,6 +25,14 @@
 </div>
 <div class="tight-form last">
   <ul class="tight-form-list">
+    <li class="tight-form-item" style="width: 200px">
+      Cache update interval
+    </li>
+    <li>
+      <input type="text" class="tight-form-input input-small"
+             ng-model='current.jsonData.cacheTTL'
+             placeholder="1h">
+    </li>
     <li class="tight-form-item" style="width: 80px">
       Trends&nbsp;&nbsp;
       <input class="cr1" id="current.jsonData.trends" type="checkbox"

plugins/datasource-zabbix/zabbixCache.js

@@ -10,7 +10,7 @@ function (angular, _, utils) {
 
   // Use factory() instead service() for multiple datasources support.
   // Each datasource instance must initialize its own cache.
-  module.factory('ZabbixCachingProxy', function($q) {
+  module.factory('ZabbixCachingProxy', function($q, $interval) {
 
     function ZabbixCachingProxy(zabbixAPI, ttl) {
       this.zabbixAPI = zabbixAPI;
@@ -33,6 +33,9 @@ function (angular, _, utils) {
 
       // Wrap _refresh() method to call it once.
       this.refresh = callOnce(p._refresh, this.refreshPromise);
+
+      // Update cache periodically
+      $interval(_.bind(this.refresh, this), this.ttl);
     }
 
     var p = ZabbixCachingProxy.prototype;