Separate Zabbix API and HTTP client

This commit is contained in:
Alexander Zobnin
2021-05-19 09:49:12 +03:00
parent 68c7e20d27
commit 762ea252b2
3 changed files with 13 additions and 15 deletions

View File

@@ -8,6 +8,7 @@ import (
"time"
"github.com/alexanderzobnin/grafana-zabbix/pkg/gtime"
"github.com/alexanderzobnin/grafana-zabbix/pkg/httpclient"
"github.com/alexanderzobnin/grafana-zabbix/pkg/zabbixapi"
"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -55,7 +56,12 @@ func newZabbixDatasourceInstance(settings backend.DataSourceInstanceSettings) (i
return nil, err
}
zabbixAPI, err := zabbixapi.New(&settings, zabbixSettings.Timeout)
client, err := httpclient.NewHttpClient(&settings, zabbixSettings.Timeout)
if err != nil {
return nil, err
}
zabbixAPI, err := zabbixapi.New(settings.URL, client)
if err != nil {
logger.Error("Error initializing Zabbix API", "error", err)
return nil, err