Merge branch 'main' into 23

probe-lab · Feb 6, 2024 · 60d4c11 · 60d4c11
2 parents fc8b02b + f855683
commit 60d4c11
Show file tree

Hide file tree

Showing 65 changed files with 271 additions and 1,762 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The infrastructure is managed using Terraform and the tooling is written in Go.
 
 The thunderdome client is in [/cmd/thunderdome](cmd/thunderdome/README.md). 
 It's a command line utility that allows users to deploy and manage Thunderdome experiments.
-See the [Thunderdome Client Documentation](cmd/thunderdome/README.md) for information on how to use the client and the [Experiment File Syntax](https://github.com/ipfs-shipyard/thunderdome/blob/main/cmd/thunderdome/README.md#experiment-file-syntax) to understand how to define an experiment.
+See the [Thunderdome Client Documentation](cmd/thunderdome/README.md) for information on how to use the client and the [Experiment File Syntax](https://github.com/probe-lab/thunderdome/blob/main/cmd/thunderdome/README.md#experiment-file-syntax) to understand how to define an experiment.
 
 ### Thunderdome Infrastructure
 

diff --git a/cmd/dealgood/experiment.go b/cmd/dealgood/experiment.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"sync"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
+	"github.com/probe-lab/thunderdome/pkg/request"
 )
 
 type ExperimentJSON struct {

diff --git a/cmd/dealgood/loader.go b/cmd/dealgood/loader.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
+	"github.com/probe-lab/thunderdome/pkg/request"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/http2"
 )

diff --git a/cmd/dealgood/main.go b/cmd/dealgood/main.go
@@ -23,8 +23,8 @@ import (
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/sdk/trace"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/filter"
-	"github.com/ipfs-shipyard/thunderdome/pkg/loki"
+	"github.com/probe-lab/thunderdome/pkg/filter"
+	"github.com/probe-lab/thunderdome/pkg/loki"
 )
 
 const appName = "dealgood"

diff --git a/cmd/dealgood/requests.go b/cmd/dealgood/requests.go
@@ -18,10 +18,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/filter"
-	"github.com/ipfs-shipyard/thunderdome/pkg/loki"
-	"github.com/ipfs-shipyard/thunderdome/pkg/prom"
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
+	"github.com/probe-lab/thunderdome/pkg/filter"
+	"github.com/probe-lab/thunderdome/pkg/loki"
+	"github.com/probe-lab/thunderdome/pkg/prom"
+	"github.com/probe-lab/thunderdome/pkg/request"
 )
 
 // A RequestSource is a provider of a stream of requests that can be sent to workers.

diff --git a/cmd/dealgood/worker.go b/cmd/dealgood/worker.go
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
+	"github.com/probe-lab/thunderdome/pkg/request"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"

diff --git a/cmd/ironbar/main.go b/cmd/ironbar/main.go
@@ -9,8 +9,8 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/prom"
-	"github.com/ipfs-shipyard/thunderdome/pkg/run"
+	"github.com/probe-lab/thunderdome/pkg/prom"
+	"github.com/probe-lab/thunderdome/pkg/run"
 )
 
 func main() {

diff --git a/cmd/ironbar/server.go b/cmd/ironbar/server.go
@@ -15,8 +15,8 @@ import (
 	"github.com/gorilla/mux"
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/ironbar/api"
-	"github.com/ipfs-shipyard/thunderdome/pkg/prom"
+	"github.com/probe-lab/thunderdome/cmd/ironbar/api"
+	"github.com/probe-lab/thunderdome/pkg/prom"
 )
 
 type Server struct {

diff --git a/cmd/logtool/README.md b/cmd/logtool/README.md
@@ -6,7 +6,7 @@ logtool is a tool for working with gateway logs
 
 Install via the go command:
 
-	go install github.com/ipfs-shipyard/thunderdome/cmd/logtool
+	go install github.com/probe-lab/thunderdome/cmd/logtool
 
 
 ## Usage

diff --git a/cmd/logtool/tail.go b/cmd/logtool/tail.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/filter"
-	"github.com/ipfs-shipyard/thunderdome/pkg/loki"
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
-	"github.com/ipfs-shipyard/thunderdome/pkg/run"
+	"github.com/probe-lab/thunderdome/pkg/filter"
+	"github.com/probe-lab/thunderdome/pkg/loki"
+	"github.com/probe-lab/thunderdome/pkg/request"
+	"github.com/probe-lab/thunderdome/pkg/run"
 )
 
 var TailCommand = &cli.Command{

diff --git a/cmd/skyfish/main.go b/cmd/skyfish/main.go
@@ -13,9 +13,9 @@ import (
 	"github.com/pkg/profile"
 	"github.com/urfave/cli/v2"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/loki"
-	"github.com/ipfs-shipyard/thunderdome/pkg/prom"
-	"github.com/ipfs-shipyard/thunderdome/pkg/run"
+	"github.com/probe-lab/thunderdome/pkg/loki"
+	"github.com/probe-lab/thunderdome/pkg/prom"
+	"github.com/probe-lab/thunderdome/pkg/run"
 )
 
 const appName = "skyfish"

diff --git a/cmd/skyfish/publish.go b/cmd/skyfish/publish.go
@@ -12,9 +12,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/sns"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/loki"
-	"github.com/ipfs-shipyard/thunderdome/pkg/prom"
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
+	"github.com/probe-lab/thunderdome/pkg/loki"
+	"github.com/probe-lab/thunderdome/pkg/prom"
+	"github.com/probe-lab/thunderdome/pkg/request"
 )
 
 const MaxMessageSize = 256 * 1024 // sns has 256kb max message size

diff --git a/cmd/thunderdome/build/build.go b/cmd/thunderdome/build/build.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/exp"
+	"github.com/probe-lab/thunderdome/pkg/exp"
 	"golang.org/x/exp/slog"
 )
 

diff --git a/cmd/thunderdome/deploy.go b/cmd/thunderdome/deploy.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/infra"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/infra"
 )
 
 var DeployCommand = &cli.Command{

diff --git a/cmd/thunderdome/experiment.go b/cmd/thunderdome/experiment.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/exp"
+	"github.com/probe-lab/thunderdome/pkg/exp"
 )
 
 type ExperimentJSON struct {

diff --git a/cmd/thunderdome/image.go b/cmd/thunderdome/image.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/build"
-	"github.com/ipfs-shipyard/thunderdome/pkg/exp"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/build"
+	"github.com/probe-lab/thunderdome/pkg/exp"
 )
 
 var ImageCommand = &cli.Command{

diff --git a/cmd/thunderdome/infra/base.go b/cmd/thunderdome/infra/base.go
@@ -23,7 +23,7 @@ type BaseInfra struct {
 	EcsExecutionRoleArn           string
 	EfsFileSystemID               string
 	ExperimentsTableName          string
-	GrafanaPushSecretArn          string
+	PrometheusSecretArn           string
 	IronbarAddr                   string
 	LogGroupName                  string
 	RequestSNSTopicArn            string

diff --git a/cmd/thunderdome/infra/dealgood.go b/cmd/thunderdome/infra/dealgood.go
@@ -15,7 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/ironbar/api"
+	"github.com/probe-lab/thunderdome/cmd/ironbar/api"
 )
 
 type Dealgood struct {
@@ -299,7 +299,7 @@ func (d *Dealgood) createTaskDefinition() Task {
 					},
 					{
 						Name:  aws.String("grafana-agent"),
-						Image: aws.String("grafana/agent:v0.26.1"),
+						Image: aws.String("grafana/agent:v0.39.1"),
 						Command: []*string{
 							aws.String("-metrics.wal-directory=/data/grafana-agent"),
 							aws.String("-config.expand-env"),
@@ -334,12 +334,16 @@ func (d *Dealgood) createTaskDefinition() Task {
 						},
 						Secrets: []*ecs.Secret{
 							{
-								Name:      aws.String("GRAFANA_USER"),
-								ValueFrom: aws.String(d.base.GrafanaPushSecretArn + ":username::"),
+								Name:      aws.String("PROMETHEUS_URL"),
+								ValueFrom: aws.String(d.base.PrometheusSecretArn + ":url::"),
 							},
 							{
-								Name:      aws.String("GRAFANA_PASS"),
-								ValueFrom: aws.String(d.base.GrafanaPushSecretArn + ":password::"),
+								Name:      aws.String("PROMETHEUS_USER"),
+								ValueFrom: aws.String(d.base.PrometheusSecretArn + ":username::"),
+							},
+							{
+								Name:      aws.String("PROMETHEUS_PASS"),
+								ValueFrom: aws.String(d.base.PrometheusSecretArn + ":password::"),
 							},
 						},
 					},

diff --git a/cmd/thunderdome/infra/ironbar.go b/cmd/thunderdome/infra/ironbar.go
@@ -10,8 +10,8 @@ import (
 
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/ironbar/api"
-	"github.com/ipfs-shipyard/thunderdome/pkg/exp"
+	"github.com/probe-lab/thunderdome/cmd/ironbar/api"
+	"github.com/probe-lab/thunderdome/pkg/exp"
 )
 
 func RegisterExperiment(addr string, e *exp.Experiment, res []api.Resource) func(ctx context.Context) (bool, error) {

diff --git a/cmd/thunderdome/infra/provider.go b/cmd/thunderdome/infra/provider.go
@@ -8,9 +8,9 @@ import (
 
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/ironbar/api"
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/build"
-	"github.com/ipfs-shipyard/thunderdome/pkg/exp"
+	"github.com/probe-lab/thunderdome/cmd/ironbar/api"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/build"
+	"github.com/probe-lab/thunderdome/pkg/exp"
 )
 
 type Provider struct {

diff --git a/cmd/thunderdome/infra/target.go b/cmd/thunderdome/infra/target.go
@@ -15,7 +15,7 @@ import (
 	// "github.com/aws/aws-sdk-go/service/servicediscovery"
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/ironbar/api"
+	"github.com/probe-lab/thunderdome/cmd/ironbar/api"
 )
 
 type Target struct {
@@ -274,7 +274,7 @@ func (t *Target) createTaskDefinition() Task {
 					},
 					{
 						Name:  aws.String("grafana-agent"),
-						Image: aws.String("grafana/agent:v0.26.1"),
+						Image: aws.String("grafana/agent:v0.39.1"),
 						Command: []*string{
 							aws.String("-metrics.wal-directory=/data/grafana-agent"),
 							aws.String("-config.expand-env"),
@@ -313,12 +313,16 @@ func (t *Target) createTaskDefinition() Task {
 						},
 						Secrets: []*ecs.Secret{
 							{
-								Name:      aws.String("GRAFANA_USER"),
-								ValueFrom: aws.String(t.base.GrafanaPushSecretArn + ":username::"),
+								Name:      aws.String("PROMETHEUS_URL"),
+								ValueFrom: aws.String(t.base.PrometheusSecretArn + ":url::"),
 							},
 							{
-								Name:      aws.String("GRAFANA_PASS"),
-								ValueFrom: aws.String(t.base.GrafanaPushSecretArn + ":password::"),
+								Name:      aws.String("PROMETHEUS_USER"),
+								ValueFrom: aws.String(t.base.PrometheusSecretArn + ":username::"),
+							},
+							{
+								Name:      aws.String("PROMETHEUS_PASS"),
+								ValueFrom: aws.String(t.base.PrometheusSecretArn + ":password::"),
 							},
 						},
 					},

diff --git a/cmd/thunderdome/status.go b/cmd/thunderdome/status.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/infra"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/infra"
 )
 
 var StatusCommand = &cli.Command{

diff --git a/cmd/thunderdome/teardown.go b/cmd/thunderdome/teardown.go
@@ -6,7 +6,7 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/exp/slog"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/infra"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/infra"
 )
 
 var TeardownCommand = &cli.Command{

diff --git a/cmd/thunderdome/validate.go b/cmd/thunderdome/validate.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/build"
-	"github.com/ipfs-shipyard/thunderdome/cmd/thunderdome/infra"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/build"
+	"github.com/probe-lab/thunderdome/cmd/thunderdome/infra"
 )
 
 var ValidateCommand = &cli.Command{

diff --git a/docs/thunderdome-ipfs-camp-2022.pdf b/docs/thunderdome-ipfs-camp-2022.pdf
diff --git a/experiments/tweedles.json b/experiments/tweedles.json
@@ -6,7 +6,7 @@
 
 	"defaults": {
 		"instance_type": "io_medium",
-		"base_image": "ipfs/kubo:v0.22.0"
+		"base_image": "ipfs/kubo:v0.24.0"
 	},
 
 	"shared": {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/ipfs-shipyard/thunderdome
+module github.com/probe-lab/thunderdome
 
 go 1.20
 

diff --git a/pkg/filter/filter.go b/pkg/filter/filter.go
@@ -3,8 +3,8 @@ package filter
 import (
 	"strings"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/request"
 	ipfspath "github.com/ipfs/go-path"
+	"github.com/probe-lab/thunderdome/pkg/request"
 )
 
 // A RequestFilter reports whether a request meets a condition

diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go
@@ -19,7 +19,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/config"
 
-	"github.com/ipfs-shipyard/thunderdome/pkg/prom"
+	"github.com/probe-lab/thunderdome/pkg/prom"
 )
 
 const (