Merge branch 'master' of https://github.com/xiaohuiz/grafana-zabbix into xiaohuiz-master

src/datasource-zabbix/zabbixAPI.service.js

@@ -47,6 +47,7 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) {
         },
         // Handle API errors
         function(error) {
+          console.log('Zabbix error: '+error.data);
           if (isNotAuthorized(error.data)) {
             return self.loginOnce().then(
               function() {
@@ -113,6 +114,13 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) {
     ////////////////////////////////
     // Zabbix API method wrappers //
     ////////////////////////////////
+    acknowledgeEvent(eventid,message){
+      var params = {
+        eventids:eventid,
+        message:message
+      };
+      return this.request('event.acknowledge',params);
+    }
 
     getGroups() {
       var params = {