Read ds settings and use it for trends

pkg/zabbix_api_core.go

@@ -3,66 +3,18 @@ package main
 import (
 	"bytes"
 	"context"
-	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
-	"net/url"
 	"time"
 
 	simplejson "github.com/bitly/go-simplejson"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"golang.org/x/net/context/ctxhttp"
 )
 
-// ZabbixDatasourceInstance stores state about a specific datasource and provides methods to make
-// requests to the Zabbix API
-type ZabbixDatasourceInstance struct {
-	url        *url.URL
-	authToken  string
-	dsInfo     *backend.DataSourceInstanceSettings
-	queryCache *Cache
-	httpClient *http.Client
-	logger     log.Logger
-}
-
-// newZabbixDatasource returns an initialized ZabbixDatasource
-func newZabbixDatasource(dsInfo *backend.DataSourceInstanceSettings) (*ZabbixDatasourceInstance, error) {
-	zabbixURLStr := dsInfo.URL
-	zabbixURL, err := url.Parse(zabbixURLStr)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ZabbixDatasourceInstance{
-		url:        zabbixURL,
-		dsInfo:     dsInfo,
-		queryCache: NewCache(10*time.Minute, 10*time.Minute),
-		httpClient: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					Renegotiation: tls.RenegotiateFreelyAsClient,
-				},
-				Proxy: http.ProxyFromEnvironment,
-				Dial: (&net.Dialer{
-					Timeout:   30 * time.Second,
-					KeepAlive: 30 * time.Second,
-				}).Dial,
-				TLSHandshakeTimeout:   10 * time.Second,
-				ExpectContinueTimeout: 1 * time.Second,
-				MaxIdleConns:          100,
-				IdleConnTimeout:       90 * time.Second,
-			},
-			Timeout: time.Duration(time.Second * 30),
-		},
-	}, nil
-}
-
 // ZabbixRequest checks authentication and makes a request to the Zabbix API
 func (ds *ZabbixDatasourceInstance) ZabbixRequest(ctx context.Context, method string, params ZabbixAPIParams) (*simplejson.Json, error) {
 	var result *simplejson.Json