Merge pull request #51 from samcm/feat/repo-move

feat(ethpandaops): Prepare repo move

.github/workflows/publish.yml

@@ -23,6 +23,7 @@ jobs:
           # list of Docker images to use as base name for tags
           images: |
             samcm/ethereum-metrics-exporter
+            ethpandaops/ethereum-metrics-exporter
           # generate Docker tags based on the following events/attributes
           tags: |
             type=schedule

README.md

@@ -42,15 +42,15 @@ Flags:
 * [The Merge overview dashboard](https://grafana.com/grafana/dashboards/16395)
 
 ### Docker
-Available as a docker image at `samcm/ethereum-metrics-exporter`
+Available as a docker image at `ethpandaops/ethereum-metrics-exporter`
 
 **Quick start**
 ```
-docker run -d -it --name ethereum-metrics-exporter -p 9090:9090 -it samcm/ethereum-metrics-exporter --consensus-url=http://localhost:5052 --execution-url=http://localhost:8545
+docker run -d -it --name ethereum-metrics-exporter -p 9090:9090 -it ethpandaops/ethereum-metrics-exporter --consensus-url=http://localhost:5052 --execution-url=http://localhost:8545
 ````
 **With a config file**
 ```
-docker run -d -it --name ethereum-metrics-exporter -v $HOST_DIR_CHANGE_ME/config.yaml:/opt/exporter/config.yaml -p 9090:9090 -it samcm/ethereum-metrics-exporter --config /opt/exporter/config.yaml
+docker run -d -it --name ethereum-metrics-exporter -v $HOST_DIR_CHANGE_ME/config.yaml:/opt/exporter/config.yaml -p 9090:9090 -it ethpandaops/ethereum-metrics-exporter --config /opt/exporter/config.yaml
 
 ```
 ### Kubernetes via Helm
@@ -71,7 +71,7 @@ Coming soon.
 
 1. Clone the repo
    ```sh
-   go get github.com/samcm/ethereum-metrics-exporter
+   go get github.com/ethpandaops/ethereum-metrics-exporter
    ```
 2. Change directories
    ```sh

cmd/root.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"

go.mod

@@ -1,8 +1,8 @@
-module github.com/samcm/ethereum-metrics-exporter
+module github.com/ethpandaops/ethereum-metrics-exporter
 
 go 1.17
 
-// replace github.com/samcm/ethereum-metrics-exporter/pkg/exporter => ./pkg/ethereum-metrics-exporter
+// replace github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter => ./pkg/ethereum-metrics-exporter
 
 require (
 	github.com/spf13/cobra v1.4.0

main.go

@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/samcm/ethereum-metrics-exporter/cmd"
+	"github.com/ethpandaops/ethereum-metrics-exporter/cmd"
 )
 
 func main() {

pkg/exporter/consensus/api/api.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/beacon/beacon.go

@@ -10,11 +10,11 @@ import (
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
 	"github.com/go-co-op/gocron"
 	"github.com/nats-io/nats.go"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/beacon/event.go

@@ -3,8 +3,8 @@ package beacon
 import (
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
 )
 
 const (

pkg/exporter/consensus/beacon/publisher.go

@@ -5,8 +5,8 @@ import (
 
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
 )
 
 // Official beacon events that are proxied

pkg/exporter/consensus/jobs/beacon.go

@@ -9,9 +9,9 @@ import (
 	eth2client "github.com/attestantio/go-eth2-client"
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/jobs/event.go

@@ -6,8 +6,8 @@ import (
 
 	eth2client "github.com/attestantio/go-eth2-client"
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/jobs/forks.go

@@ -3,8 +3,8 @@ package jobs
 import (
 	"context"
 
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/sirupsen/logrus"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"

pkg/exporter/consensus/jobs/general.go

@@ -3,9 +3,9 @@ package jobs
 import (
 	"context"
 
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api/types"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/jobs/spec.go

@@ -5,9 +5,9 @@ import (
 	"math/big"
 	"time"
 
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon/state"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/jobs/syncstatus.go

@@ -3,8 +3,8 @@ package jobs
 import (
 	"context"
 
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/consensus/metrics.go

@@ -4,10 +4,10 @@ import (
 	"context"
 
 	eth2client "github.com/attestantio/go-eth2-client"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/jobs"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/jobs"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/api/api.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api/types"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api/types"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/execution.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/admin.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api/types"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api/types"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/block.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/general.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/net.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/syncstatus.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/txpool.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/jobs/web3.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/execution/metrics.go

@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/api"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution/jobs"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/api"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution/jobs"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/exporter.go

@@ -10,16 +10,16 @@ import (
 
 	eth2client "github.com/attestantio/go-eth2-client"
 	ehttp "github.com/attestantio/go-eth2-client/http"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/api"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/disk"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/pair"
 	"github.com/nats-io/nats-server/v2/server"
 	"github.com/nats-io/nats.go"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/rs/zerolog"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/api"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/disk"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/execution"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/pair"
 	"github.com/sirupsen/logrus"
 )
 

pkg/exporter/pair/pair.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/onrik/ethrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/samcm/ethereum-metrics-exporter/pkg/exporter/consensus/beacon"
 	"github.com/sirupsen/logrus"
 )