Merge pull request #15 from grafana/bohandley/clearer-name

bohandley · web-flow · commit 95fa2e117055 · 2023-10-18T09:59:22.000-05:00
change name
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.0'
 
 services:
   grafana:
-    container_name: 'prometheus-amd-datasource'
+    container_name: 'prometheus-amazon-datasource'
     build:
       context: ./.config
       args:
@@ -11,5 +11,5 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ./dist:/var/lib/grafana/plugins/prometheus-amd-datasource
+      - ./dist:/var/lib/grafana/plugins/prometheus-amazon-datasource
       - ./provisioning:/etc/grafana/provisioning
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/grafana/prometheus-amd
+module github.com/grafana/prometheus-amazon
 
 go 1.19
 
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "prometheus-amd",
+  "name": "prometheus-amazon",
   "version": "1.0.0",
   "description": "A prometheus plugin for Amazon",
   "scripts": {
diff --git a/pkg/gcopypaste/converter/prom.go b/pkg/gcopypaste/converter/prom.go
@@ -10,7 +10,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	jsoniter "github.com/json-iterator/go"
 
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/converter/jsonitere"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/converter/jsonitere"
 )
 
 // helpful while debugging all the options that may appear
diff --git a/pkg/main.go b/pkg/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/prometheus-amd/pkg/prometheus"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus"
 )
 
 func main() {
diff --git a/pkg/prometheus/azureauth/azure.go b/pkg/prometheus/azureauth/azure.go
@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/utils"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/utils"
 )
 
 var (
diff --git a/pkg/prometheus/client/client.go b/pkg/prometheus/client/client.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 type doer interface {
diff --git a/pkg/prometheus/client/client_test.go b/pkg/prometheus/client/client_test.go
@@ -11,7 +11,7 @@ import (
 	logger "github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 type MockDoer struct {
diff --git a/pkg/prometheus/client/transport.go b/pkg/prometheus/client/transport.go
@@ -8,9 +8,9 @@ import (
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/maputil"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/middleware"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/utils"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/maputil"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/middleware"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/utils"
 )
 
 // CreateTransportOptions creates options for the http client. Probably should be shared and should not live in the
diff --git a/pkg/prometheus/healthcheck.go b/pkg/prometheus/healthcheck.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/kinds/dataquery"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/kinds/dataquery"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 const (
diff --git a/pkg/prometheus/models/query.go b/pkg/prometheus/models/query.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/intervalv2"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/kinds/dataquery"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/intervalv2"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/kinds/dataquery"
 )
 
 // Internal interval and range variables
diff --git a/pkg/prometheus/models/query_test.go b/pkg/prometheus/models/query_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/intervalv2"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/intervalv2"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 var (
diff --git a/pkg/prometheus/prometheus.go b/pkg/prometheus/prometheus.go
@@ -17,10 +17,10 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/client"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/instrumentation"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/querydata"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/resource"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/client"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/instrumentation"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/querydata"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/resource"
 )
 
 var plog = log.New()
diff --git a/pkg/prometheus/querydata/exemplar/sampler.go b/pkg/prometheus/querydata/exemplar/sampler.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 type Sampler interface {
diff --git a/pkg/prometheus/querydata/exemplar/sampler_stddev.go b/pkg/prometheus/querydata/exemplar/sampler_stddev.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 type StandardDeviationSampler struct {
diff --git a/pkg/prometheus/querydata/exemplar/sampler_stddev_test.go b/pkg/prometheus/querydata/exemplar/sampler_stddev_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/querydata/exemplar"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/querydata/exemplar"
 )
 
 func TestStdDevSampler(t *testing.T) {
diff --git a/pkg/prometheus/querydata/exemplar/sampler_test.go b/pkg/prometheus/querydata/exemplar/sampler_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/querydata/exemplar"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/querydata/exemplar"
 )
 
 const update = true
diff --git a/pkg/prometheus/querydata/framing_bench_test.go b/pkg/prometheus/querydata/framing_bench_test.go
@@ -18,13 +18,13 @@ import (
 	"github.com/grafana/kindsys"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/kinds/dataquery"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/kinds/dataquery"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 // when memory-profiling this benchmark, these commands are recommended:
-// - go test -benchmem -run=^$ -bench ^BenchmarkExemplarJson$ github.com/grafana/prometheus-amd/pkg/prometheus/querydata -memprofile memprofile.out -count 6 | tee old.txt
+// - go test -benchmem -run=^$ -bench ^BenchmarkExemplarJson$ github.com/grafana/prometheus-amazon/pkg/prometheus/querydata -memprofile memprofile.out -count 6 | tee old.txt
 // - go tool pprof -http=localhost:6061 memprofile.out
 func BenchmarkExemplarJson(b *testing.B) {
 	queryFileName := filepath.Join("../testdata", "exemplar.query.json")
@@ -58,7 +58,7 @@ func BenchmarkExemplarJson(b *testing.B) {
 var resp *backend.QueryDataResponse
 
 // when memory-profiling this benchmark, these commands are recommended:
-// - go test -benchmem -run=^$ -bench ^BenchmarkRangeJson$ github.com/grafana/prometheus-amd/pkg/prometheus/querydata -memprofile memprofile.out -count 6 | tee old.txt
+// - go test -benchmem -run=^$ -bench ^BenchmarkRangeJson$ github.com/grafana/prometheus-amazon/pkg/prometheus/querydata -memprofile memprofile.out -count 6 | tee old.txt
 // - go tool pprof -http=localhost:6061 memprofile.out
 // - benchstat old.txt new.txt
 func BenchmarkRangeJson(b *testing.B) {
diff --git a/pkg/prometheus/querydata/framing_test.go b/pkg/prometheus/querydata/framing_test.go
@@ -14,10 +14,10 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/kinds/dataquery"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/kinds/dataquery"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
 )
 
 var update = true
diff --git a/pkg/prometheus/querydata/request.go b/pkg/prometheus/querydata/request.go
@@ -13,12 +13,12 @@ import (
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/intervalv2"
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/maputil"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/client"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/querydata/exemplar"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/utils"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/intervalv2"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/maputil"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/client"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/querydata/exemplar"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/utils"
 )
 
 const legendFormatAuto = "__auto"
diff --git a/pkg/prometheus/querydata/request_test.go b/pkg/prometheus/querydata/request_test.go
@@ -19,15 +19,15 @@ import (
 	p "github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/prometheus-amd/pkg/prometheus/kinds/dataquery"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/kinds/dataquery"
 
 	"github.com/grafana/kindsys"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/client"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/querydata"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/client"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/querydata"
 )
 
 func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
diff --git a/pkg/prometheus/querydata/response.go b/pkg/prometheus/querydata/response.go
@@ -12,10 +12,10 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	jsoniter "github.com/json-iterator/go"
 
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/converter"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/models"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/querydata/exemplar"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/utils"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/converter"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/models"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/querydata/exemplar"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/utils"
 )
 
 func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *http.Response) backend.DataResponse {
diff --git a/pkg/prometheus/resource/resource.go b/pkg/prometheus/resource/resource.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/prometheus-amd/pkg/gcopypaste/maputil"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/client"
-	"github.com/grafana/prometheus-amd/pkg/prometheus/utils"
+	"github.com/grafana/prometheus-amazon/pkg/gcopypaste/maputil"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/client"
+	"github.com/grafana/prometheus-amazon/pkg/prometheus/utils"
 )
 
 type Resource struct {
diff --git a/src/plugin.json b/src/plugin.json
@@ -3,8 +3,8 @@
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/master/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
   "name": "Prometheus AMD",
-  "id": "prometheus-amd-datasource",
-  "executable": "gpx_prometheus_amd",
+  "id": "prometheus-amazon-datasource",
+  "executable": "gpx_prometheus_amazon",
   "routes": [
     {
       "method": "POST",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/grafana/prometheus-amd`
	`1`	`+module github.com/grafana/prometheus-amazon`
`2`	`2`
`3`	`3`	`go 1.19`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "prometheus-amd",`
	`2`	`+ "name": "prometheus-amazon",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "A prometheus plugin for Amazon",`
`5`	`5`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/grafana/grafana-plugin-sdk-go/data"`
`11`	`11`	`jsoniter "github.com/json-iterator/go"`
`12`	`12`
`13`		`- "github.com/grafana/prometheus-amd/pkg/gcopypaste/converter/jsonitere"`
	`13`	`+ "github.com/grafana/prometheus-amazon/pkg/gcopypaste/converter/jsonitere"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// helpful while debugging all the options that may appear`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"`
`7`	`7`	`"github.com/grafana/grafana-plugin-sdk-go/backend/log"`
`8`		`- "github.com/grafana/prometheus-amd/pkg/prometheus"`
	`8`	`+ "github.com/grafana/prometheus-amazon/pkg/prometheus"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/grafana/grafana-plugin-sdk-go/backend"`
`13`	`13`	`sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"`
`14`	`14`
`15`		`- "github.com/grafana/prometheus-amd/pkg/prometheus/utils"`
	`15`	`+ "github.com/grafana/prometheus-amazon/pkg/prometheus/utils"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`"github.com/grafana/grafana-plugin-sdk-go/backend"`
`15`	`15`
`16`		`- "github.com/grafana/prometheus-amd/pkg/prometheus/models"`
	`16`	`+ "github.com/grafana/prometheus-amazon/pkg/prometheus/models"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`type doer interface {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`logger "github.com/grafana/grafana-plugin-sdk-go/backend/log"`
`12`	`12`	`"github.com/stretchr/testify/require"`
`13`	`13`
`14`		`- "github.com/grafana/prometheus-amd/pkg/prometheus/models"`
	`14`	`+ "github.com/grafana/prometheus-amazon/pkg/prometheus/models"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type MockDoer struct {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/grafana/grafana-plugin-sdk-go/backend"`
`13`	`13`	`"github.com/grafana/grafana-plugin-sdk-go/backend/log"`
`14`		`- "github.com/grafana/prometheus-amd/pkg/prometheus/kinds/dataquery"`
`15`		`- "github.com/grafana/prometheus-amd/pkg/prometheus/models"`
	`14`	`+ "github.com/grafana/prometheus-amazon/pkg/prometheus/kinds/dataquery"`
	`15`	`+ "github.com/grafana/prometheus-amazon/pkg/prometheus/models"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const (`