Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed #101 - Grafana sends 50 requests per second to Zabbix when the

Browse Source 
configured Zabbix username stops being valid.
This commit is contained in:
Alexander Zobnin
2016-02-01 23:52:33 +03:00
parent 164e2d282d
commit e83e4e923a
1 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/datasource-zabbix/zabbixAPI.js
View File

@@ -13,7 +13,7 @@ function (angular, _) {
* Creates Zabbix API instance with given parameters (url, credentials and other). * Creates Zabbix API instance with given parameters (url, credentials and other).
* Wraps API calls and provides high-level methods. * Wraps API calls and provides high-level methods.
*/ */
module.factory('ZabbixAPI', function($q, backendSrv, ZabbixAPIService) { module.factory('ZabbixAPI', function($q, backendSrv, alertSrv, ZabbixAPIService) {
// Initialize Zabbix API. // Initialize Zabbix API.
function ZabbixAPI(api_url, username, password, basicAuth, withCredentials) { function ZabbixAPI(api_url, username, password, basicAuth, withCredentials) {
@@ -38,22 +38,35 @@ function (angular, _) {
p.request = function(method, params) { p.request = function(method, params) {
var self = this; var self = this;
return ZabbixAPIService.request(this.url, method, params, this.requestOptions, this.auth) return ZabbixAPIService.request(this.url, method, params, this.requestOptions, this.auth)
.then(function(result) { .then(function(result) {
return result; return result;
}, },
// Handle API errors
// Handle errors
function(error) { function(error) {
if (isAuthError(error.data)) { if (isNotAuthorized(error.data)) {
return self.loginOnce().then(function() { return self.loginOnce().then(
return self.request(method, params); function() {
}); return self.request(method, params);
},
// Handle user.login method errors
function(error) {
self.alertAPIError(error.data);
});
} }
}); });
}; };
function isAuthError(message) { p.alertAPIError = function(message) {
alertSrv.set(
"Zabbix API Error",
message,
'error'
);
};
function isNotAuthorized(message) {
return ( return (
message === "Session terminated, re-login, please." || message === "Session terminated, re-login, please." ||
message === "Not authorised." || message === "Not authorised." ||
@@ -72,11 +85,17 @@ function (angular, _) {
var deferred = $q.defer(); var deferred = $q.defer();
if (!self.loginPromise) { if (!self.loginPromise) {
self.loginPromise = deferred.promise; self.loginPromise = deferred.promise;
self.login().then(function(auth) { self.login().then(
self.loginPromise = null; function(auth) {
self.auth = auth; self.loginPromise = null;
deferred.resolve(auth); self.auth = auth;
}); deferred.resolve(auth);
},
function(error) {
self.loginPromise = null;
deferred.reject(error);
}
);
} else { } else {
return self.loginPromise; return self.loginPromise;
} }