implement CheckHealth

This commit is contained in:
Alexander Zobnin
2020-06-01 12:01:10 +03:00
parent 2491ccfc27
commit bf69d9037a
2 changed files with 19 additions and 16 deletions

View File

@@ -50,16 +50,24 @@ type ZabbixDatasourceInstance struct {
func (ds *ZabbixDatasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) { func (ds *ZabbixDatasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
res := &backend.CheckHealthResult{} res := &backend.CheckHealthResult{}
// Just checking that the plugin exe is alive and running dsInstance, err := ds.GetDatasource(req.PluginContext)
if req.PluginContext.DataSourceInstanceSettings == nil { if err != nil {
res.Status = backend.HealthStatusOk res.Status = backend.HealthStatusError
res.Message = "Plugin is running" res.Message = "Error getting datasource instance"
ds.logger.Error("Error getting datasource instance", "err", err)
return res, nil
}
message, err := dsInstance.TestConnection(ctx)
if err != nil {
res.Status = backend.HealthStatusError
res.Message = err.Error()
ds.logger.Error("Error connecting zabbix", "err", err)
return res, nil return res, nil
} }
// TODO? actually check datasource settings?
res.Status = backend.HealthStatusOk res.Status = backend.HealthStatusOk
res.Message = "Success" res.Message = message
return res, nil return res, nil
} }

View File

@@ -78,26 +78,21 @@ func (ds *ZabbixDatasourceInstance) ZabbixAPIQueryOld(ctx context.Context, tsdbR
} }
// TestConnection checks authentication and version of the Zabbix API and returns that info // TestConnection checks authentication and version of the Zabbix API and returns that info
func (ds *ZabbixDatasourceInstance) TestConnection(ctx context.Context, tsdbReq *datasource.DatasourceRequest) (*datasource.DatasourceResponse, error) { func (ds *ZabbixDatasourceInstance) TestConnection(ctx context.Context) (string, error) {
err := ds.loginWithDs(ctx) _, err := ds.getAllGroups(ctx)
if err != nil { if err != nil {
return BuildErrorResponse(fmt.Errorf("Authentication failed: %s", err)), nil return "", err
} }
response, err := ds.ZabbixAPIRequest(ctx, "apiinfo.version", ZabbixAPIParams{}, "") response, err := ds.ZabbixAPIRequest(ctx, "apiinfo.version", ZabbixAPIParams{}, "")
if err != nil { if err != nil {
ds.logger.Debug("TestConnection", "error", err) return "", err
return BuildErrorResponse(fmt.Errorf("Version check failed: %s", err)), nil
} }
resultByte, _ := response.MarshalJSON() resultByte, _ := response.MarshalJSON()
ds.logger.Debug("TestConnection", "result", string(resultByte)) ds.logger.Debug("TestConnection", "result", string(resultByte))
testResponse := connectionTestResponse{ return string(resultByte), nil
ZabbixVersion: response.MustString(),
}
return BuildResponse(testResponse)
} }
func (ds *ZabbixDatasourceInstance) queryNumericItems(ctx context.Context, query *QueryModel) (*data.Frame, error) { func (ds *ZabbixDatasourceInstance) queryNumericItems(ctx context.Context, query *QueryModel) (*data.Frame, error) {