Revert "Prometheus: Type and flavor configuration (#56496)" (#57552)

This reverts commit 7ecbc98b3e.
This commit is contained in:
Galen Kistler
2022-10-24 12:33:11 -05:00
committed by GitHub
parent e7671bf909
commit 2432ce619a
21 changed files with 75 additions and 383 deletions

View File

@@ -6,9 +6,7 @@ import (
"errors"
"fmt"
"reflect"
"strings"
"sync"
"time"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
@@ -21,7 +19,6 @@ import (
"github.com/grafana/grafana/pkg/tsdb/prometheus/buffered"
"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata"
"github.com/grafana/grafana/pkg/tsdb/prometheus/resource"
"github.com/patrickmn/go-cache"
apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
"github.com/yudai/gojsondiff"
"github.com/yudai/gojsondiff/formatter"
@@ -35,10 +32,9 @@ type Service struct {
}
type instance struct {
buffered *buffered.Buffered
queryData *querydata.QueryData
resource *resource.Resource
versionCache *cache.Cache
buffered *buffered.Buffered
queryData *querydata.QueryData
resource *resource.Resource
}
func ProvideService(httpClientProvider httpclient.Provider, cfg *setting.Cfg, features featuremgmt.FeatureToggles, tracer tracing.Tracer) *Service {
@@ -79,10 +75,9 @@ func newInstanceSettings(httpClientProvider httpclient.Provider, cfg *setting.Cf
}
return instance{
buffered: b,
queryData: qd,
resource: r,
versionCache: cache.New(time.Minute*1, time.Minute*5),
buffered: b,
queryData: qd,
resource: r,
}, nil
}
}
@@ -140,20 +135,6 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
return err
}
if strings.EqualFold(req.Path, "version-detect") {
versionObj, found := i.versionCache.Get("version")
if found {
return sender.Send(versionObj.(*backend.CallResourceResponse))
}
vResp, err := i.resource.DetectVersion(ctx, req)
if err != nil {
return err
}
i.versionCache.Set("version", vResp, cache.DefaultExpiration)
return sender.Send(vResp)
}
resp, err := i.resource.Execute(ctx, req)
if err != nil {
return err