diff --git a/Makefile b/Makefile index 848f60077c..de4771c88f 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ include tools/make/*.mk ALLOY_IMAGE ?= grafana/alloy:latest ALLOY_BINARY ?= build/alloy SERVICE_BINARY ?= build/alloy-service -AGENTLINT_BINARY ?= build/agentlint +ALLOYLINT_BINARY ?= build/alloylint GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) GOARM ?= $(shell go env GOARM) @@ -102,7 +102,7 @@ GO_ENV := GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) CGO_ENABLED=$(CGO_ENABLED VERSION ?= $(shell bash ./tools/image-tag) GIT_REVISION := $(shell git rev-parse --short HEAD) GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) -VPREFIX := github.com/grafana/agent/internal/build +VPREFIX := github.com/grafana/alloy/internal/build GO_LDFLAGS := -X $(VPREFIX).Branch=$(GIT_BRANCH) \ -X $(VPREFIX).Version=$(VERSION) \ -X $(VPREFIX).Revision=$(GIT_REVISION) \ @@ -126,9 +126,9 @@ endif # .PHONY: lint -lint: agentlint +lint: alloylint find . -name go.mod -execdir golangci-lint run -v --timeout=10m \; - $(AGENTLINT_BINARY) ./... + $(ALLOYLINT_BINARY) ./... .PHONY: test # We have to run test twice: once for all packages with -race and then once @@ -169,11 +169,11 @@ else $(GO_ENV) go build $(GO_FLAGS) -o $(SERVICE_BINARY) ./cmd/alloy-service endif -agentlint: +alloylint: ifeq ($(USE_CONTAINER),1) $(RERUN_IN_CONTAINER) else - cd ./internal/cmd/agentlint && $(GO_ENV) go build $(GO_FLAGS) -o ../../../$(AGENTLINT_BINARY) . + cd ./internal/cmd/alloylint && $(GO_ENV) go build $(GO_FLAGS) -o ../../../$(ALLOYLINT_BINARY) . endif # diff --git a/README.md b/README.md index 0c7b9a1c05..078bfc57a5 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ To engage with the Alloy community: * Attend the monthly [community call][community-call]. -[discussions]: https://github.com/grafana/agent/discussions +[discussions]: https://github.com/grafana/alloy/discussions [issue]: https://github.com/grafana/alloy/issues/new [community-call]: https://docs.google.com/document/d/1TqaZD1JPfNadZ4V81OCBPCG_TksDYGlNlGdMnTWUSpo diff --git a/cmd/alloy-service/service_test.go b/cmd/alloy-service/service_test.go index 145879a243..561db0ce54 100644 --- a/cmd/alloy-service/service_test.go +++ b/cmd/alloy-service/service_test.go @@ -13,8 +13,8 @@ import ( "testing" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/phayes/freeport" "github.com/stretchr/testify/require" ) diff --git a/cmd/alloy/main.go b/cmd/alloy/main.go index 5bedc67367..ec6bee2895 100644 --- a/cmd/alloy/main.go +++ b/cmd/alloy/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/flowmode" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/flowmode" "github.com/prometheus/client_golang/prometheus" // Register Prometheus SD components @@ -10,7 +10,7 @@ import ( _ "github.com/prometheus/prometheus/discovery/install" // Register integrations - _ "github.com/grafana/agent/internal/static/integrations/install" + _ "github.com/grafana/alloy/internal/static/integrations/install" // Embed a set of fallback X.509 trusted roots // Allows the app to work correctly even when the OS does not provide a verifier or systems roots pool diff --git a/docs/developer/contributing.md b/docs/developer/contributing.md index 4d14fedbb7..5b4601fcd9 100644 --- a/docs/developer/contributing.md +++ b/docs/developer/contributing.md @@ -62,7 +62,7 @@ To build Grafana Agent from source code, please install the following tools: You can directly use the go tool to download and install the agent binary into your GOPATH: - $ GO111MODULE=on go install github.com/grafana/agent/cmd/alloy + $ GO111MODULE=on go install github.com/grafana/alloy/cmd/alloy $ alloy run your_config.river An example of the above configuration file can be found [here][example-config]. @@ -71,7 +71,7 @@ You can also clone the repository yourself and build using `make agent`: $ mkdir -p $GOPATH/src/github.com/grafana $ cd $GOPATH/src/github.com/grafana - $ git clone https://github.com/grafana/agent.git + $ git clone https://github.com/grafana/alloy.git $ cd agent $ make agent $ ./build/alloy run your_config.river @@ -197,13 +197,13 @@ acceptable, and remove the `replace` directive as soon as possible. If upstream is unresponsive, consider choosing a different dependency or making a hard fork (i.e., creating a new Go module with the same source). -[new-issue]: https://github.com/grafana/agent/issues/new +[new-issue]: https://github.com/grafana/alloy/issues/new [RFC]: ../rfcs/0001-designing-in-the-open.md [code-review-comments]: https://code.google.com/p/go-wiki/wiki/CodeReviewComments [best-practices]: https://peter.bourgon.org/go-in-production/#formatting-and-style [uber-style-guide]: https://github.com/uber-go/guide/blob/master/style.md -[CLA]: https://cla-assistant.io/grafana/agent -[good-first-issue]: https://github.com/grafana/agent/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22 +[CLA]: https://cla-assistant.io/grafana/alloy +[good-first-issue]: https://github.com/grafana/alloy/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22 [community-slack]: https://slack.grafana.com/ [example-config]: ../../cmd/alloy/example-config.river [go-modules]: https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more diff --git a/docs/developer/release/3-update-version-in-code.md b/docs/developer/release/3-update-version-in-code.md index 7a3c9cdc3b..218f2508b0 100644 --- a/docs/developer/release/3-update-version-in-code.md +++ b/docs/developer/release/3-update-version-in-code.md @@ -10,7 +10,7 @@ The project must be updated to reference the upcoming release tag whenever a new ## Steps -1. Create a branch from `main` for [grafana/agent](https://github.com/grafana/agent). +1. Create a branch from `main` for [grafana/alloy](https://github.com/grafana/alloy). 2. Update the `CHANGELOG.md`: diff --git a/docs/developer/release/6-publish-release.md b/docs/developer/release/6-publish-release.md index 48a492aeb4..a5d85f7458 100644 --- a/docs/developer/release/6-publish-release.md +++ b/docs/developer/release/6-publish-release.md @@ -4,7 +4,7 @@ This is how to publish the release in GitHub. ## Before you begin -1. You should see a new draft release created [here](https://github.com/grafana/agent/releases). If not go back to [Tag Release](./4-tag-release.md). +1. You should see a new draft release created [here](https://github.com/grafana/alloy/releases). If not go back to [Tag Release](./4-tag-release.md). ## Steps @@ -14,9 +14,9 @@ This is how to publish the release in GitHub. 3. Add a footer to the `Notable Changes` section: - `For a full list of changes, please refer to the [CHANGELOG](https://github.com/grafana/agent/blob/RELEASE_VERSION/CHANGELOG.md)!` - - Do not substitute the value for `CHANGELOG`. + `For a full list of changes, please refer to the [CHANGELOG](https://github.com/grafana/alloy/blob/RELEASE_VERSION/CHANGELOG.md)!` + + Do not substitute the value for `CHANGELOG`. 4. At the bottom of the release page, perform the following: - Tick the check box to "add a discussion" under the category for "announcements". @@ -26,4 +26,4 @@ This is how to publish the release in GitHub. 5. Optionally, have other team members review the release draft if you wish to feel more comfortable with it. -6. Publish the release! \ No newline at end of file +6. Publish the release! diff --git a/docs/developer/release/8-update-helm-charts.md b/docs/developer/release/8-update-helm-charts.md index 00dbaaa916..961cb6260a 100644 --- a/docs/developer/release/8-update-helm-charts.md +++ b/docs/developer/release/8-update-helm-charts.md @@ -28,7 +28,7 @@ Our Helm charts require some version updates as well. 3. Open a PR, following the pattern in PR [#2233](https://github.com/grafana/helm-charts/pull/2233). -4. Create a branch from `main` for [grafana/agent](https://github.com/grafana/agent). +4. Create a branch from `main` for [grafana/alloy](https://github.com/grafana/alloy). 5. Update the helm chart code in `$agentRepo/operations/helm`: diff --git a/docs/developer/release/9-announce-release.md b/docs/developer/release/9-announce-release.md index 4319bb5115..4a117ecd42 100644 --- a/docs/developer/release/9-announce-release.md +++ b/docs/developer/release/9-announce-release.md @@ -10,8 +10,8 @@ You made it! This is the last step for any release. ``` :grafana-agent: Grafana Agent RELEASE_VERSION is now available! :grafana-agent: - Release: https://github.com/grafana/agent/releases/tag/RELEASE_VERSION - Full changelog: https://github.com/grafana/agent/blob/RELEASE_VERSION/CHANGELOG.md + Release: https://github.com/grafana/alloy/releases/tag/RELEASE_VERSION + Full changelog: https://github.com/grafana/alloy/blob/RELEASE_VERSION/CHANGELOG.md We'll be publishing STABLE_RELEASE_VERSION on STABLE_RELEASE_DATE if we haven't heard about any major issues. ``` @@ -19,6 +19,6 @@ You made it! This is the last step for any release. ``` :grafana-agent: Grafana Agent RELEASE_VERSION is now available! :grafana-agent: - Release: https://github.com/grafana/agent/releases/tag/RELEASE_VERSION - Full changelog: https://github.com/grafana/agent/blob/RELEASE_VERSION/CHANGELOG.md - ``` \ No newline at end of file + Release: https://github.com/grafana/alloy/releases/tag/RELEASE_VERSION + Full changelog: https://github.com/grafana/alloy/blob/RELEASE_VERSION/CHANGELOG.md + ``` diff --git a/docs/developer/release/README.md b/docs/developer/release/README.md index 116cf69665..5486eed7f4 100644 --- a/docs/developer/release/README.md +++ b/docs/developer/release/README.md @@ -1,7 +1,7 @@ # Releasing This document describes the process of creating a release for the -`grafana/agent` repo. A release includes release assets for everything inside +`grafana/alloy` repo. A release includes release assets for everything inside the repository, including Grafana Agent and Grafana Agent Operator. The processes described here are for v0.24.0 and above. diff --git a/docs/rfcs/0000-template.md b/docs/rfcs/0000-template.md index c565ea04e5..97eab801c0 100644 --- a/docs/rfcs/0000-template.md +++ b/docs/rfcs/0000-template.md @@ -2,4 +2,4 @@ * Date: YYYY-MM-DD * Author: Full Name (@github_username) -* PR: [grafana/agent#XXXX](https://github.com/grafana/agent/pull/XXXX) +* PR: [grafana/agent#XXXX](https://github.com/grafana/alloy/pull/XXXX) diff --git a/docs/rfcs/0001-designing-in-the-open.md b/docs/rfcs/0001-designing-in-the-open.md index 7419b060a3..7976a1b3dc 100644 --- a/docs/rfcs/0001-designing-in-the-open.md +++ b/docs/rfcs/0001-designing-in-the-open.md @@ -57,7 +57,7 @@ Public proposals may take one of two forms: ### Issues Issues are the quickest path towards proposing a change. Issue proposals must -be opened at the [grafana/agent issues page](https://github.com/grafana/agent/issues). +be opened at the [issues page](https://github.com/grafana/alloy/issues). There are no strict set of rules for issue-based proposals, but authors are recommended to prefix the issue title with `Proposal:` so it may be found more @@ -155,5 +155,5 @@ A few existing public proposal processes have been examined for inspiration: All of these processes are similar, but in the end, the current objective is to start collecting proposals publicly rather than to be prescriptive yet. -[rough consensus]: https://github.com/grafana/agent/blob/main/GOVERNANCE.md#technical-decisions -[governance]: https://github.com/grafana/agent/blob/main/GOVERNANCE.md#team-members +[rough consensus]: https://github.com/grafana/alloy/blob/main/GOVERNANCE.md#technical-decisions +[governance]: https://github.com/grafana/alloy/blob/main/GOVERNANCE.md#team-members diff --git a/docs/sources/reference/components/prometheus.exporter.github.md b/docs/sources/reference/components/prometheus.exporter.github.md index a803653ccd..0167fbb347 100644 --- a/docs/sources/reference/components/prometheus.exporter.github.md +++ b/docs/sources/reference/components/prometheus.exporter.github.md @@ -62,7 +62,7 @@ from `prometheus.exporter.github`: ```river prometheus.exporter.github "example" { api_token_file = "/etc/github-api-token" - repositories = ["grafana/agent"] + repositories = ["grafana/alloy"] } // Configure a prometheus.scrape component to collect github metrics. diff --git a/docs/sources/reference/components/prometheus.exporter.unix.md b/docs/sources/reference/components/prometheus.exporter.unix.md index feda1ab9f5..7384e2aecc 100644 --- a/docs/sources/reference/components/prometheus.exporter.unix.md +++ b/docs/sources/reference/components/prometheus.exporter.unix.md @@ -130,7 +130,7 @@ The following blocks are supported inside the definition of ### filesystem block -The default values can vary by the operating system the agent runs on - refer to the [integration source](https://github.com/grafana/agent/blob/main/internal/static/integrations/node_exporter/config.go) for up-to-date values on each OS. +The default values can vary by the operating system the agent runs on - refer to the [integration source](https://github.com/grafana/alloy/blob/main/internal/static/integrations/node_exporter/config.go) for up-to-date values on each OS. | Name | Type | Description | Default | Required | | ---------------------- | ---------- | ------------------------------------------------------------------- | ----------------------------------------------- | -------- | diff --git a/docs/sources/tutorials/assets/runt.sh b/docs/sources/tutorials/assets/runt.sh index 195da7ef78..61d1f62c0e 100644 --- a/docs/sources/tutorials/assets/runt.sh +++ b/docs/sources/tutorials/assets/runt.sh @@ -24,5 +24,5 @@ curl https://raw.githubusercontent.com/grafana/agent/main/docs/sources/flow/tuto mkdir -p ./grafana/dashboards curl https://raw.githubusercontent.com/grafana/agent/main/docs/sources/flow/tutorials/assets/grafana/dashboards/template.jsonnet -o ./grafana/dashboards/template.jsonnet curl https://raw.githubusercontent.com/grafana/agent/main/docs/sources/flow/tutorials/assets/grafana/dashboards/agent.json -o ./grafana/dashboards/agent.json -docker pull grafana/agent:main +docker pull grafana/agent:main CONFIG_FILE=$1 docker-compose -f ./docker-compose.yaml up diff --git a/go.mod b/go.mod index 5b2eb5eacf..496c17a647 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/grafana/agent +module github.com/grafana/alloy go 1.22.1 diff --git a/internal/agentseed/agentseed.go b/internal/alloyseed/alloyseed.go similarity index 76% rename from internal/agentseed/agentseed.go rename to internal/alloyseed/alloyseed.go index 0275e81c33..13f1f661f7 100644 --- a/internal/agentseed/agentseed.go +++ b/internal/alloyseed/alloyseed.go @@ -1,4 +1,4 @@ -package agentseed +package alloyseed import ( "encoding/json" @@ -11,21 +11,29 @@ import ( "github.com/go-kit/log" "github.com/google/uuid" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/version" ) -// AgentSeed identifies a unique agent -type AgentSeed struct { +// Seed identifies a unique agent. +type Seed struct { UID string `json:"UID"` CreatedAt time.Time `json:"created_at"` Version string `json:"version"` } -const HeaderName = "X-Agent-Id" -const filename = "agent_seed.json" +const ( + // Both LegacyHeaderName and HeaderName should be used to identify the Alloy + // instance in the headers of requests. LegacyHeaderName is used for + // backwards compatibility. -var savedSeed *AgentSeed + LegacyHeaderName = "X-Agent-Id" // LegacyHeaderName represents the header name used prior to the Alloy release. + HeaderName = "X-Alloy-Id" // HeaderName represents the ID header to use for Alloy. +) + +const filename = "alloy_seed.json" + +var savedSeed *Seed var once sync.Once // Init should be called by an app entrypoint as soon as it can to configure where the unique seed will be stored. @@ -43,7 +51,7 @@ func Init(dir string, l log.Logger) { func loadOrGenerate(dir string, l log.Logger) { var err error - var seed *AgentSeed + var seed *Seed // list of paths in preference order. // we will always write to the first path paths := []string{} @@ -76,18 +84,18 @@ func loadOrGenerate(dir string, l log.Logger) { } } -func generateNew() *AgentSeed { - return &AgentSeed{ +func generateNew() *Seed { + return &Seed{ UID: uuid.NewString(), Version: version.Version, CreatedAt: time.Now(), } } -// Get will return a unique agent seed for this agent. +// Get returns a unique seed for this Alloy instance. // It will always return a valid seed, even if previous attempts to // load or save the seed file have failed -func Get() *AgentSeed { +func Get() *Seed { // Init should have been called before this. If not, call it now with defaults. once.Do(func() { loadOrGenerate("", log.NewNopLogger()) @@ -100,14 +108,14 @@ func Get() *AgentSeed { return generateNew() } -// readSeedFile reads the agent seed file -func readSeedFile(path string, logger log.Logger) (*AgentSeed, error) { +// readSeedFile reads the Alloy seed file +func readSeedFile(path string, logger log.Logger) (*Seed, error) { data, err := os.ReadFile(path) if err != nil { level.Error(logger).Log("msg", "Reading seed file", "err", err) return nil, err } - seed := &AgentSeed{} + seed := &Seed{} err = json.Unmarshal(data, seed) if err != nil { level.Error(logger).Log("msg", "Decoding seed file", "err", err) @@ -134,8 +142,8 @@ func fileExists(path string) bool { return !errors.Is(err, os.ErrNotExist) } -// writeSeedFile writes the agent seed file -func writeSeedFile(seed *AgentSeed, path string, logger log.Logger) { +// writeSeedFile writes the Alloy seed file +func writeSeedFile(seed *Seed, path string, logger log.Logger) { data, err := json.Marshal(*seed) if err != nil { level.Error(logger).Log("msg", "Encoding seed file", "err", err) diff --git a/internal/agentseed/agentseed_test.go b/internal/alloyseed/alloyseed_test.go similarity index 98% rename from internal/agentseed/agentseed_test.go rename to internal/alloyseed/alloyseed_test.go index 91650c59e7..e0ea4fee07 100644 --- a/internal/agentseed/agentseed_test.go +++ b/internal/alloyseed/alloyseed_test.go @@ -1,4 +1,4 @@ -package agentseed +package alloyseed import ( "os" diff --git a/internal/cmd/agentlint/go.mod b/internal/cmd/agentlint/go.mod deleted file mode 100644 index 8c68e5a43b..0000000000 --- a/internal/cmd/agentlint/go.mod +++ /dev/null @@ -1,7 +0,0 @@ -module github.com/grafana/agent/internal/cmd/agentlint - -go 1.21 - -require golang.org/x/tools v0.17.0 - -require golang.org/x/mod v0.14.0 // indirect diff --git a/internal/cmd/agentlint/go.sum b/internal/cmd/agentlint/go.sum deleted file mode 100644 index 84d5fdb7e0..0000000000 --- a/internal/cmd/agentlint/go.sum +++ /dev/null @@ -1,6 +0,0 @@ -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= diff --git a/internal/cmd/agentlint/main.go b/internal/cmd/agentlint/main.go deleted file mode 100644 index 551642f3ae..0000000000 --- a/internal/cmd/agentlint/main.go +++ /dev/null @@ -1,16 +0,0 @@ -// Command agentlint provides custom linting utilities for the grafana/agent -// repo. -package main - -import ( - "github.com/grafana/agent/internal/cmd/agentlint/internal/findcomponents" - "github.com/grafana/agent/internal/cmd/agentlint/internal/syntaxtags" - "golang.org/x/tools/go/analysis/multichecker" -) - -func main() { - multichecker.Main( - findcomponents.Analyzer, - syntaxtags.Analyzer, - ) -} diff --git a/internal/cmd/agentlint/internal/findcomponents/findcomponents.go b/internal/cmd/alloylint/internal/findcomponents/findcomponents.go similarity index 95% rename from internal/cmd/agentlint/internal/findcomponents/findcomponents.go rename to internal/cmd/alloylint/internal/findcomponents/findcomponents.go index 922798a89d..76d9386e9f 100644 --- a/internal/cmd/agentlint/internal/findcomponents/findcomponents.go +++ b/internal/cmd/alloylint/internal/findcomponents/findcomponents.go @@ -19,7 +19,7 @@ var Analyzer = &analysis.Analyzer{ var ( componentPattern = "./internal/component/..." - checkPackage = "github.com/grafana/agent/internal/component/all" + checkPackage = "github.com/grafana/alloy/internal/component/all" ) func init() { @@ -129,9 +129,9 @@ func declaresComponent(pkg *packages.Package, file *ast.File) bool { } // Check to see if the ident refers to - // github.com/grafana/agent/component. + // github.com/grafana/alloy/internal/component. if pkgName, ok := pkg.TypesInfo.Uses[ident].(*types.PkgName); ok { - if pkgName.Imported().Path() == "github.com/grafana/agent/internal/component" && + if pkgName.Imported().Path() == "github.com/grafana/alloy/internal/component" && sel.Sel.Name == "Register" { foundComponentDecl = true diff --git a/internal/cmd/agentlint/internal/syntaxtags/syntaxtags.go b/internal/cmd/alloylint/internal/syntaxtags/syntaxtags.go similarity index 100% rename from internal/cmd/agentlint/internal/syntaxtags/syntaxtags.go rename to internal/cmd/alloylint/internal/syntaxtags/syntaxtags.go diff --git a/internal/cmd/alloylint/main.go b/internal/cmd/alloylint/main.go new file mode 100644 index 0000000000..9ac7c80a99 --- /dev/null +++ b/internal/cmd/alloylint/main.go @@ -0,0 +1,16 @@ +// Command alloylint provides custom linting utilities for the grafana/alloy +// repo. +package main + +import ( + "github.com/grafana/alloy/internal/cmd/alloylint/internal/findcomponents" + "github.com/grafana/alloy/internal/cmd/alloylint/internal/syntaxtags" + "golang.org/x/tools/go/analysis/multichecker" +) + +func main() { + multichecker.Main( + findcomponents.Analyzer, + syntaxtags.Analyzer, + ) +} diff --git a/internal/cmd/integration-tests/tests/otlp-metrics/otlp_metrics_test.go b/internal/cmd/integration-tests/tests/otlp-metrics/otlp_metrics_test.go index 157f334448..4c4f4de2e4 100644 --- a/internal/cmd/integration-tests/tests/otlp-metrics/otlp_metrics_test.go +++ b/internal/cmd/integration-tests/tests/otlp-metrics/otlp_metrics_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/grafana/agent/internal/cmd/integration-tests/common" + "github.com/grafana/alloy/internal/cmd/integration-tests/common" ) func TestOTLPMetrics(t *testing.T) { diff --git a/internal/cmd/integration-tests/tests/otlp-metrics/otlp_to_prom_metrics_test.go b/internal/cmd/integration-tests/tests/otlp-metrics/otlp_to_prom_metrics_test.go index beca3f9ccf..42d0ca5d6d 100644 --- a/internal/cmd/integration-tests/tests/otlp-metrics/otlp_to_prom_metrics_test.go +++ b/internal/cmd/integration-tests/tests/otlp-metrics/otlp_to_prom_metrics_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/grafana/agent/internal/cmd/integration-tests/common" + "github.com/grafana/alloy/internal/cmd/integration-tests/common" ) func TestOTLPToPromMetrics(t *testing.T) { diff --git a/internal/cmd/integration-tests/tests/read-log-file/read_log_file_test.go b/internal/cmd/integration-tests/tests/read-log-file/read_log_file_test.go index 0549fcbb1e..b5095e5496 100644 --- a/internal/cmd/integration-tests/tests/read-log-file/read_log_file_test.go +++ b/internal/cmd/integration-tests/tests/read-log-file/read_log_file_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/grafana/agent/internal/cmd/integration-tests/common" + "github.com/grafana/alloy/internal/cmd/integration-tests/common" "github.com/stretchr/testify/assert" ) diff --git a/internal/cmd/integration-tests/tests/redis/redis_metrics_test.go b/internal/cmd/integration-tests/tests/redis/redis_metrics_test.go index 3063d8fdf1..296076e3f6 100644 --- a/internal/cmd/integration-tests/tests/redis/redis_metrics_test.go +++ b/internal/cmd/integration-tests/tests/redis/redis_metrics_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/grafana/agent/internal/cmd/integration-tests/common" + "github.com/grafana/alloy/internal/cmd/integration-tests/common" ) func TestRedisMetrics(t *testing.T) { diff --git a/internal/cmd/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go b/internal/cmd/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go index dbac235d18..4bd6a71aa8 100644 --- a/internal/cmd/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go +++ b/internal/cmd/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/grafana/agent/internal/cmd/integration-tests/common" + "github.com/grafana/alloy/internal/cmd/integration-tests/common" ) func TestScrapePromMetrics(t *testing.T) { diff --git a/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go b/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go index 1611a47959..22237bef1d 100644 --- a/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go +++ b/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/grafana/agent/internal/cmd/integration-tests/common" + "github.com/grafana/alloy/internal/cmd/integration-tests/common" ) func TestUnixMetrics(t *testing.T) { diff --git a/internal/component/all/all.go b/internal/component/all/all.go index 3369357d50..1f34796452 100644 --- a/internal/component/all/all.go +++ b/internal/component/all/all.go @@ -2,136 +2,136 @@ package all import ( - _ "github.com/grafana/agent/internal/component/discovery/aws" // Import discovery.aws.ec2 and discovery.aws.lightsail - _ "github.com/grafana/agent/internal/component/discovery/azure" // Import discovery.azure - _ "github.com/grafana/agent/internal/component/discovery/consul" // Import discovery.consul - _ "github.com/grafana/agent/internal/component/discovery/consulagent" // Import discovery.consulagent - _ "github.com/grafana/agent/internal/component/discovery/digitalocean" // Import discovery.digitalocean - _ "github.com/grafana/agent/internal/component/discovery/dns" // Import discovery.dns - _ "github.com/grafana/agent/internal/component/discovery/docker" // Import discovery.docker - _ "github.com/grafana/agent/internal/component/discovery/dockerswarm" // Import discovery.dockerswarm - _ "github.com/grafana/agent/internal/component/discovery/eureka" // Import discovery.eureka - _ "github.com/grafana/agent/internal/component/discovery/file" // Import discovery.file - _ "github.com/grafana/agent/internal/component/discovery/gce" // Import discovery.gce - _ "github.com/grafana/agent/internal/component/discovery/hetzner" // Import discovery.hetzner - _ "github.com/grafana/agent/internal/component/discovery/http" // Import discovery.http - _ "github.com/grafana/agent/internal/component/discovery/ionos" // Import discovery.ionos - _ "github.com/grafana/agent/internal/component/discovery/kubelet" // Import discovery.kubelet - _ "github.com/grafana/agent/internal/component/discovery/kubernetes" // Import discovery.kubernetes - _ "github.com/grafana/agent/internal/component/discovery/kuma" // Import discovery.kuma - _ "github.com/grafana/agent/internal/component/discovery/linode" // Import discovery.linode - _ "github.com/grafana/agent/internal/component/discovery/marathon" // Import discovery.marathon - _ "github.com/grafana/agent/internal/component/discovery/nerve" // Import discovery.nerve - _ "github.com/grafana/agent/internal/component/discovery/nomad" // Import discovery.nomad - _ "github.com/grafana/agent/internal/component/discovery/openstack" // Import discovery.openstack - _ "github.com/grafana/agent/internal/component/discovery/ovhcloud" // Import discovery.ovhcloud - _ "github.com/grafana/agent/internal/component/discovery/process" // Import discovery.process - _ "github.com/grafana/agent/internal/component/discovery/puppetdb" // Import discovery.puppetdb - _ "github.com/grafana/agent/internal/component/discovery/relabel" // Import discovery.relabel - _ "github.com/grafana/agent/internal/component/discovery/scaleway" // Import discovery.scaleway - _ "github.com/grafana/agent/internal/component/discovery/serverset" // Import discovery.serverset - _ "github.com/grafana/agent/internal/component/discovery/triton" // Import discovery.triton - _ "github.com/grafana/agent/internal/component/discovery/uyuni" // Import discovery.uyuni - _ "github.com/grafana/agent/internal/component/faro/receiver" // Import faro.receiver - _ "github.com/grafana/agent/internal/component/local/file" // Import local.file - _ "github.com/grafana/agent/internal/component/local/file_match" // Import local.file_match - _ "github.com/grafana/agent/internal/component/loki/echo" // Import loki.echo - _ "github.com/grafana/agent/internal/component/loki/process" // Import loki.process - _ "github.com/grafana/agent/internal/component/loki/relabel" // Import loki.relabel - _ "github.com/grafana/agent/internal/component/loki/rules/kubernetes" // Import loki.rules.kubernetes - _ "github.com/grafana/agent/internal/component/loki/source/api" // Import loki.source.api - _ "github.com/grafana/agent/internal/component/loki/source/aws_firehose" // Import loki.source.awsfirehose - _ "github.com/grafana/agent/internal/component/loki/source/azure_event_hubs" // Import loki.source.azure_event_hubs - _ "github.com/grafana/agent/internal/component/loki/source/cloudflare" // Import loki.source.cloudflare - _ "github.com/grafana/agent/internal/component/loki/source/docker" // Import loki.source.docker - _ "github.com/grafana/agent/internal/component/loki/source/file" // Import loki.source.file - _ "github.com/grafana/agent/internal/component/loki/source/gcplog" // Import loki.source.gcplog - _ "github.com/grafana/agent/internal/component/loki/source/gelf" // Import loki.source.gelf - _ "github.com/grafana/agent/internal/component/loki/source/heroku" // Import loki.source.heroku - _ "github.com/grafana/agent/internal/component/loki/source/journal" // Import loki.source.journal - _ "github.com/grafana/agent/internal/component/loki/source/kafka" // Import loki.source.kafka - _ "github.com/grafana/agent/internal/component/loki/source/kubernetes" // Import loki.source.kubernetes - _ "github.com/grafana/agent/internal/component/loki/source/kubernetes_events" // Import loki.source.kubernetes_events - _ "github.com/grafana/agent/internal/component/loki/source/podlogs" // Import loki.source.podlogs - _ "github.com/grafana/agent/internal/component/loki/source/syslog" // Import loki.source.syslog - _ "github.com/grafana/agent/internal/component/loki/source/windowsevent" // Import loki.source.windowsevent - _ "github.com/grafana/agent/internal/component/loki/write" // Import loki.write - _ "github.com/grafana/agent/internal/component/mimir/rules/kubernetes" // Import mimir.rules.kubernetes - _ "github.com/grafana/agent/internal/component/otelcol/auth/basic" // Import otelcol.auth.basic - _ "github.com/grafana/agent/internal/component/otelcol/auth/bearer" // Import otelcol.auth.bearer - _ "github.com/grafana/agent/internal/component/otelcol/auth/headers" // Import otelcol.auth.headers - _ "github.com/grafana/agent/internal/component/otelcol/auth/oauth2" // Import otelcol.auth.oauth2 - _ "github.com/grafana/agent/internal/component/otelcol/auth/sigv4" // Import otelcol.auth.sigv4 - _ "github.com/grafana/agent/internal/component/otelcol/connector/host_info" // Import otelcol.connector.host_info - _ "github.com/grafana/agent/internal/component/otelcol/connector/servicegraph" // Import otelcol.connector.servicegraph - _ "github.com/grafana/agent/internal/component/otelcol/connector/spanlogs" // Import otelcol.connector.spanlogs - _ "github.com/grafana/agent/internal/component/otelcol/connector/spanmetrics" // Import otelcol.connector.spanmetrics - _ "github.com/grafana/agent/internal/component/otelcol/exporter/loadbalancing" // Import otelcol.exporter.loadbalancing - _ "github.com/grafana/agent/internal/component/otelcol/exporter/logging" // Import otelcol.exporter.logging - _ "github.com/grafana/agent/internal/component/otelcol/exporter/loki" // Import otelcol.exporter.loki - _ "github.com/grafana/agent/internal/component/otelcol/exporter/otlp" // Import otelcol.exporter.otlp - _ "github.com/grafana/agent/internal/component/otelcol/exporter/otlphttp" // Import otelcol.exporter.otlphttp - _ "github.com/grafana/agent/internal/component/otelcol/exporter/prometheus" // Import otelcol.exporter.prometheus - _ "github.com/grafana/agent/internal/component/otelcol/extension/jaeger_remote_sampling" // Import otelcol.extension.jaeger_remote_sampling - _ "github.com/grafana/agent/internal/component/otelcol/processor/attributes" // Import otelcol.processor.attributes - _ "github.com/grafana/agent/internal/component/otelcol/processor/batch" // Import otelcol.processor.batch - _ "github.com/grafana/agent/internal/component/otelcol/processor/discovery" // Import otelcol.processor.discovery - _ "github.com/grafana/agent/internal/component/otelcol/processor/filter" // Import otelcol.processor.filter - _ "github.com/grafana/agent/internal/component/otelcol/processor/k8sattributes" // Import otelcol.processor.k8sattributes - _ "github.com/grafana/agent/internal/component/otelcol/processor/memorylimiter" // Import otelcol.processor.memory_limiter - _ "github.com/grafana/agent/internal/component/otelcol/processor/probabilistic_sampler" // Import otelcol.processor.probabilistic_sampler - _ "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection" // Import otelcol.processor.resourcedetection - _ "github.com/grafana/agent/internal/component/otelcol/processor/span" // Import otelcol.processor.span - _ "github.com/grafana/agent/internal/component/otelcol/processor/tail_sampling" // Import otelcol.processor.tail_sampling - _ "github.com/grafana/agent/internal/component/otelcol/processor/transform" // Import otelcol.processor.transform - _ "github.com/grafana/agent/internal/component/otelcol/receiver/jaeger" // Import otelcol.receiver.jaeger - _ "github.com/grafana/agent/internal/component/otelcol/receiver/kafka" // Import otelcol.receiver.kafka - _ "github.com/grafana/agent/internal/component/otelcol/receiver/loki" // Import otelcol.receiver.loki - _ "github.com/grafana/agent/internal/component/otelcol/receiver/opencensus" // Import otelcol.receiver.opencensus - _ "github.com/grafana/agent/internal/component/otelcol/receiver/otlp" // Import otelcol.receiver.otlp - _ "github.com/grafana/agent/internal/component/otelcol/receiver/prometheus" // Import otelcol.receiver.prometheus - _ "github.com/grafana/agent/internal/component/otelcol/receiver/vcenter" // Import otelcol.receiver.vcenter - _ "github.com/grafana/agent/internal/component/otelcol/receiver/zipkin" // Import otelcol.receiver.zipkin - _ "github.com/grafana/agent/internal/component/prometheus/exporter/apache" // Import prometheus.exporter.apache - _ "github.com/grafana/agent/internal/component/prometheus/exporter/azure" // Import prometheus.exporter.azure - _ "github.com/grafana/agent/internal/component/prometheus/exporter/blackbox" // Import prometheus.exporter.blackbox - _ "github.com/grafana/agent/internal/component/prometheus/exporter/cadvisor" // Import prometheus.exporter.cadvisor - _ "github.com/grafana/agent/internal/component/prometheus/exporter/cloudwatch" // Import prometheus.exporter.cloudwatch - _ "github.com/grafana/agent/internal/component/prometheus/exporter/consul" // Import prometheus.exporter.consul - _ "github.com/grafana/agent/internal/component/prometheus/exporter/dnsmasq" // Import prometheus.exporter.dnsmasq - _ "github.com/grafana/agent/internal/component/prometheus/exporter/elasticsearch" // Import prometheus.exporter.elasticsearch - _ "github.com/grafana/agent/internal/component/prometheus/exporter/gcp" // Import prometheus.exporter.gcp - _ "github.com/grafana/agent/internal/component/prometheus/exporter/github" // Import prometheus.exporter.github - _ "github.com/grafana/agent/internal/component/prometheus/exporter/kafka" // Import prometheus.exporter.kafka - _ "github.com/grafana/agent/internal/component/prometheus/exporter/memcached" // Import prometheus.exporter.memcached - _ "github.com/grafana/agent/internal/component/prometheus/exporter/mongodb" // Import prometheus.exporter.mongodb - _ "github.com/grafana/agent/internal/component/prometheus/exporter/mssql" // Import prometheus.exporter.mssql - _ "github.com/grafana/agent/internal/component/prometheus/exporter/mysql" // Import prometheus.exporter.mysql - _ "github.com/grafana/agent/internal/component/prometheus/exporter/oracledb" // Import prometheus.exporter.oracledb - _ "github.com/grafana/agent/internal/component/prometheus/exporter/postgres" // Import prometheus.exporter.postgres - _ "github.com/grafana/agent/internal/component/prometheus/exporter/process" // Import prometheus.exporter.process - _ "github.com/grafana/agent/internal/component/prometheus/exporter/redis" // Import prometheus.exporter.redis - _ "github.com/grafana/agent/internal/component/prometheus/exporter/self" // Import prometheus.exporter.self - _ "github.com/grafana/agent/internal/component/prometheus/exporter/snmp" // Import prometheus.exporter.snmp - _ "github.com/grafana/agent/internal/component/prometheus/exporter/snowflake" // Import prometheus.exporter.snowflake - _ "github.com/grafana/agent/internal/component/prometheus/exporter/squid" // Import prometheus.exporter.squid - _ "github.com/grafana/agent/internal/component/prometheus/exporter/statsd" // Import prometheus.exporter.statsd - _ "github.com/grafana/agent/internal/component/prometheus/exporter/unix" // Import prometheus.exporter.unix - _ "github.com/grafana/agent/internal/component/prometheus/exporter/windows" // Import prometheus.exporter.windows - _ "github.com/grafana/agent/internal/component/prometheus/operator/podmonitors" // Import prometheus.operator.podmonitors - _ "github.com/grafana/agent/internal/component/prometheus/operator/probes" // Import prometheus.operator.probes - _ "github.com/grafana/agent/internal/component/prometheus/operator/servicemonitors" // Import prometheus.operator.servicemonitors - _ "github.com/grafana/agent/internal/component/prometheus/receive_http" // Import prometheus.receive_http - _ "github.com/grafana/agent/internal/component/prometheus/relabel" // Import prometheus.relabel - _ "github.com/grafana/agent/internal/component/prometheus/remotewrite" // Import prometheus.remote_write - _ "github.com/grafana/agent/internal/component/prometheus/scrape" // Import prometheus.scrape - _ "github.com/grafana/agent/internal/component/pyroscope/ebpf" // Import pyroscope.ebpf - _ "github.com/grafana/agent/internal/component/pyroscope/java" // Import pyroscope.java - _ "github.com/grafana/agent/internal/component/pyroscope/scrape" // Import pyroscope.scrape - _ "github.com/grafana/agent/internal/component/pyroscope/write" // Import pyroscope.write - _ "github.com/grafana/agent/internal/component/remote/http" // Import remote.http - _ "github.com/grafana/agent/internal/component/remote/kubernetes/configmap" // Import remote.kubernetes.configmap - _ "github.com/grafana/agent/internal/component/remote/kubernetes/secret" // Import remote.kubernetes.secret - _ "github.com/grafana/agent/internal/component/remote/s3" // Import remote.s3 - _ "github.com/grafana/agent/internal/component/remote/vault" // Import remote.vault + _ "github.com/grafana/alloy/internal/component/discovery/aws" // Import discovery.aws.ec2 and discovery.aws.lightsail + _ "github.com/grafana/alloy/internal/component/discovery/azure" // Import discovery.azure + _ "github.com/grafana/alloy/internal/component/discovery/consul" // Import discovery.consul + _ "github.com/grafana/alloy/internal/component/discovery/consulagent" // Import discovery.consulagent + _ "github.com/grafana/alloy/internal/component/discovery/digitalocean" // Import discovery.digitalocean + _ "github.com/grafana/alloy/internal/component/discovery/dns" // Import discovery.dns + _ "github.com/grafana/alloy/internal/component/discovery/docker" // Import discovery.docker + _ "github.com/grafana/alloy/internal/component/discovery/dockerswarm" // Import discovery.dockerswarm + _ "github.com/grafana/alloy/internal/component/discovery/eureka" // Import discovery.eureka + _ "github.com/grafana/alloy/internal/component/discovery/file" // Import discovery.file + _ "github.com/grafana/alloy/internal/component/discovery/gce" // Import discovery.gce + _ "github.com/grafana/alloy/internal/component/discovery/hetzner" // Import discovery.hetzner + _ "github.com/grafana/alloy/internal/component/discovery/http" // Import discovery.http + _ "github.com/grafana/alloy/internal/component/discovery/ionos" // Import discovery.ionos + _ "github.com/grafana/alloy/internal/component/discovery/kubelet" // Import discovery.kubelet + _ "github.com/grafana/alloy/internal/component/discovery/kubernetes" // Import discovery.kubernetes + _ "github.com/grafana/alloy/internal/component/discovery/kuma" // Import discovery.kuma + _ "github.com/grafana/alloy/internal/component/discovery/linode" // Import discovery.linode + _ "github.com/grafana/alloy/internal/component/discovery/marathon" // Import discovery.marathon + _ "github.com/grafana/alloy/internal/component/discovery/nerve" // Import discovery.nerve + _ "github.com/grafana/alloy/internal/component/discovery/nomad" // Import discovery.nomad + _ "github.com/grafana/alloy/internal/component/discovery/openstack" // Import discovery.openstack + _ "github.com/grafana/alloy/internal/component/discovery/ovhcloud" // Import discovery.ovhcloud + _ "github.com/grafana/alloy/internal/component/discovery/process" // Import discovery.process + _ "github.com/grafana/alloy/internal/component/discovery/puppetdb" // Import discovery.puppetdb + _ "github.com/grafana/alloy/internal/component/discovery/relabel" // Import discovery.relabel + _ "github.com/grafana/alloy/internal/component/discovery/scaleway" // Import discovery.scaleway + _ "github.com/grafana/alloy/internal/component/discovery/serverset" // Import discovery.serverset + _ "github.com/grafana/alloy/internal/component/discovery/triton" // Import discovery.triton + _ "github.com/grafana/alloy/internal/component/discovery/uyuni" // Import discovery.uyuni + _ "github.com/grafana/alloy/internal/component/faro/receiver" // Import faro.receiver + _ "github.com/grafana/alloy/internal/component/local/file" // Import local.file + _ "github.com/grafana/alloy/internal/component/local/file_match" // Import local.file_match + _ "github.com/grafana/alloy/internal/component/loki/echo" // Import loki.echo + _ "github.com/grafana/alloy/internal/component/loki/process" // Import loki.process + _ "github.com/grafana/alloy/internal/component/loki/relabel" // Import loki.relabel + _ "github.com/grafana/alloy/internal/component/loki/rules/kubernetes" // Import loki.rules.kubernetes + _ "github.com/grafana/alloy/internal/component/loki/source/api" // Import loki.source.api + _ "github.com/grafana/alloy/internal/component/loki/source/aws_firehose" // Import loki.source.awsfirehose + _ "github.com/grafana/alloy/internal/component/loki/source/azure_event_hubs" // Import loki.source.azure_event_hubs + _ "github.com/grafana/alloy/internal/component/loki/source/cloudflare" // Import loki.source.cloudflare + _ "github.com/grafana/alloy/internal/component/loki/source/docker" // Import loki.source.docker + _ "github.com/grafana/alloy/internal/component/loki/source/file" // Import loki.source.file + _ "github.com/grafana/alloy/internal/component/loki/source/gcplog" // Import loki.source.gcplog + _ "github.com/grafana/alloy/internal/component/loki/source/gelf" // Import loki.source.gelf + _ "github.com/grafana/alloy/internal/component/loki/source/heroku" // Import loki.source.heroku + _ "github.com/grafana/alloy/internal/component/loki/source/journal" // Import loki.source.journal + _ "github.com/grafana/alloy/internal/component/loki/source/kafka" // Import loki.source.kafka + _ "github.com/grafana/alloy/internal/component/loki/source/kubernetes" // Import loki.source.kubernetes + _ "github.com/grafana/alloy/internal/component/loki/source/kubernetes_events" // Import loki.source.kubernetes_events + _ "github.com/grafana/alloy/internal/component/loki/source/podlogs" // Import loki.source.podlogs + _ "github.com/grafana/alloy/internal/component/loki/source/syslog" // Import loki.source.syslog + _ "github.com/grafana/alloy/internal/component/loki/source/windowsevent" // Import loki.source.windowsevent + _ "github.com/grafana/alloy/internal/component/loki/write" // Import loki.write + _ "github.com/grafana/alloy/internal/component/mimir/rules/kubernetes" // Import mimir.rules.kubernetes + _ "github.com/grafana/alloy/internal/component/otelcol/auth/basic" // Import otelcol.auth.basic + _ "github.com/grafana/alloy/internal/component/otelcol/auth/bearer" // Import otelcol.auth.bearer + _ "github.com/grafana/alloy/internal/component/otelcol/auth/headers" // Import otelcol.auth.headers + _ "github.com/grafana/alloy/internal/component/otelcol/auth/oauth2" // Import otelcol.auth.oauth2 + _ "github.com/grafana/alloy/internal/component/otelcol/auth/sigv4" // Import otelcol.auth.sigv4 + _ "github.com/grafana/alloy/internal/component/otelcol/connector/host_info" // Import otelcol.connector.host_info + _ "github.com/grafana/alloy/internal/component/otelcol/connector/servicegraph" // Import otelcol.connector.servicegraph + _ "github.com/grafana/alloy/internal/component/otelcol/connector/spanlogs" // Import otelcol.connector.spanlogs + _ "github.com/grafana/alloy/internal/component/otelcol/connector/spanmetrics" // Import otelcol.connector.spanmetrics + _ "github.com/grafana/alloy/internal/component/otelcol/exporter/loadbalancing" // Import otelcol.exporter.loadbalancing + _ "github.com/grafana/alloy/internal/component/otelcol/exporter/logging" // Import otelcol.exporter.logging + _ "github.com/grafana/alloy/internal/component/otelcol/exporter/loki" // Import otelcol.exporter.loki + _ "github.com/grafana/alloy/internal/component/otelcol/exporter/otlp" // Import otelcol.exporter.otlp + _ "github.com/grafana/alloy/internal/component/otelcol/exporter/otlphttp" // Import otelcol.exporter.otlphttp + _ "github.com/grafana/alloy/internal/component/otelcol/exporter/prometheus" // Import otelcol.exporter.prometheus + _ "github.com/grafana/alloy/internal/component/otelcol/extension/jaeger_remote_sampling" // Import otelcol.extension.jaeger_remote_sampling + _ "github.com/grafana/alloy/internal/component/otelcol/processor/attributes" // Import otelcol.processor.attributes + _ "github.com/grafana/alloy/internal/component/otelcol/processor/batch" // Import otelcol.processor.batch + _ "github.com/grafana/alloy/internal/component/otelcol/processor/discovery" // Import otelcol.processor.discovery + _ "github.com/grafana/alloy/internal/component/otelcol/processor/filter" // Import otelcol.processor.filter + _ "github.com/grafana/alloy/internal/component/otelcol/processor/k8sattributes" // Import otelcol.processor.k8sattributes + _ "github.com/grafana/alloy/internal/component/otelcol/processor/memorylimiter" // Import otelcol.processor.memory_limiter + _ "github.com/grafana/alloy/internal/component/otelcol/processor/probabilistic_sampler" // Import otelcol.processor.probabilistic_sampler + _ "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection" // Import otelcol.processor.resourcedetection + _ "github.com/grafana/alloy/internal/component/otelcol/processor/span" // Import otelcol.processor.span + _ "github.com/grafana/alloy/internal/component/otelcol/processor/tail_sampling" // Import otelcol.processor.tail_sampling + _ "github.com/grafana/alloy/internal/component/otelcol/processor/transform" // Import otelcol.processor.transform + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/jaeger" // Import otelcol.receiver.jaeger + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/kafka" // Import otelcol.receiver.kafka + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/loki" // Import otelcol.receiver.loki + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/opencensus" // Import otelcol.receiver.opencensus + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/otlp" // Import otelcol.receiver.otlp + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/prometheus" // Import otelcol.receiver.prometheus + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/vcenter" // Import otelcol.receiver.vcenter + _ "github.com/grafana/alloy/internal/component/otelcol/receiver/zipkin" // Import otelcol.receiver.zipkin + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/apache" // Import prometheus.exporter.apache + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/azure" // Import prometheus.exporter.azure + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/blackbox" // Import prometheus.exporter.blackbox + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/cadvisor" // Import prometheus.exporter.cadvisor + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/cloudwatch" // Import prometheus.exporter.cloudwatch + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/consul" // Import prometheus.exporter.consul + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/dnsmasq" // Import prometheus.exporter.dnsmasq + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/elasticsearch" // Import prometheus.exporter.elasticsearch + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/gcp" // Import prometheus.exporter.gcp + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/github" // Import prometheus.exporter.github + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/kafka" // Import prometheus.exporter.kafka + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/memcached" // Import prometheus.exporter.memcached + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/mongodb" // Import prometheus.exporter.mongodb + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/mssql" // Import prometheus.exporter.mssql + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/mysql" // Import prometheus.exporter.mysql + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/oracledb" // Import prometheus.exporter.oracledb + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/postgres" // Import prometheus.exporter.postgres + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/process" // Import prometheus.exporter.process + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/redis" // Import prometheus.exporter.redis + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/self" // Import prometheus.exporter.self + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/snmp" // Import prometheus.exporter.snmp + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/snowflake" // Import prometheus.exporter.snowflake + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/squid" // Import prometheus.exporter.squid + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/statsd" // Import prometheus.exporter.statsd + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/unix" // Import prometheus.exporter.unix + _ "github.com/grafana/alloy/internal/component/prometheus/exporter/windows" // Import prometheus.exporter.windows + _ "github.com/grafana/alloy/internal/component/prometheus/operator/podmonitors" // Import prometheus.operator.podmonitors + _ "github.com/grafana/alloy/internal/component/prometheus/operator/probes" // Import prometheus.operator.probes + _ "github.com/grafana/alloy/internal/component/prometheus/operator/servicemonitors" // Import prometheus.operator.servicemonitors + _ "github.com/grafana/alloy/internal/component/prometheus/receive_http" // Import prometheus.receive_http + _ "github.com/grafana/alloy/internal/component/prometheus/relabel" // Import prometheus.relabel + _ "github.com/grafana/alloy/internal/component/prometheus/remotewrite" // Import prometheus.remote_write + _ "github.com/grafana/alloy/internal/component/prometheus/scrape" // Import prometheus.scrape + _ "github.com/grafana/alloy/internal/component/pyroscope/ebpf" // Import pyroscope.ebpf + _ "github.com/grafana/alloy/internal/component/pyroscope/java" // Import pyroscope.java + _ "github.com/grafana/alloy/internal/component/pyroscope/scrape" // Import pyroscope.scrape + _ "github.com/grafana/alloy/internal/component/pyroscope/write" // Import pyroscope.write + _ "github.com/grafana/alloy/internal/component/remote/http" // Import remote.http + _ "github.com/grafana/alloy/internal/component/remote/kubernetes/configmap" // Import remote.kubernetes.configmap + _ "github.com/grafana/alloy/internal/component/remote/kubernetes/secret" // Import remote.kubernetes.secret + _ "github.com/grafana/alloy/internal/component/remote/s3" // Import remote.s3 + _ "github.com/grafana/alloy/internal/component/remote/vault" // Import remote.vault ) diff --git a/internal/component/all/all_test.go b/internal/component/all/all_test.go index 21030d559c..fe28c7739a 100644 --- a/internal/component/all/all_test.go +++ b/internal/component/all/all_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/component/common/kubernetes/event.go b/internal/component/common/kubernetes/event.go index 6850500582..785c743ca5 100644 --- a/internal/component/common/kubernetes/event.go +++ b/internal/component/common/kubernetes/event.go @@ -2,7 +2,7 @@ package kubernetes import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" ) diff --git a/internal/component/common/kubernetes/kubernetes.go b/internal/component/common/kubernetes/kubernetes.go index 01d8c009d5..1a6ad2aff4 100644 --- a/internal/component/common/kubernetes/kubernetes.go +++ b/internal/component/common/kubernetes/kubernetes.go @@ -5,9 +5,9 @@ import ( "reflect" "github.com/go-kit/log" - commoncfg "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/useragent" + commoncfg "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/useragent" promconfig "github.com/prometheus/common/config" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" diff --git a/internal/component/common/loki/client/batch.go b/internal/component/common/loki/client/batch.go index 7a15927cee..65bc3786a2 100644 --- a/internal/component/common/loki/client/batch.go +++ b/internal/component/common/loki/client/batch.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/common/model" "golang.org/x/exp/slices" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" ) diff --git a/internal/component/common/loki/client/batch_test.go b/internal/component/common/loki/client/batch_test.go index 255c0d38dc..cec96dc156 100644 --- a/internal/component/common/loki/client/batch_test.go +++ b/internal/component/common/loki/client/batch_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" ) diff --git a/internal/component/common/loki/client/client.go b/internal/component/common/loki/client/client.go index 8f127d9a73..857f56041f 100644 --- a/internal/component/common/loki/client/client.go +++ b/internal/component/common/loki/client/client.go @@ -13,15 +13,15 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/useragent" "github.com/grafana/dskit/backoff" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/config" "github.com/prometheus/common/model" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/util" lokiutil "github.com/grafana/loki/pkg/util" ) diff --git a/internal/component/common/loki/client/client_test.go b/internal/component/common/loki/client/client_test.go index 94f9e182e2..2ca5ee0442 100644 --- a/internal/component/common/loki/client/client_test.go +++ b/internal/component/common/loki/client/client_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/clients/pkg/promtail/utils" "github.com/grafana/loki/pkg/logproto" diff --git a/internal/component/common/loki/client/fake/client.go b/internal/component/common/loki/client/fake/client.go index e27f2c2c8a..c566504721 100644 --- a/internal/component/common/loki/client/fake/client.go +++ b/internal/component/common/loki/client/fake/client.go @@ -3,7 +3,7 @@ package fake import ( "sync" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) // Client is a fake client used for testing. diff --git a/internal/component/common/loki/client/internal/marker_file_handler.go b/internal/component/common/loki/client/internal/marker_file_handler.go index d96f14225d..143dcbcf15 100644 --- a/internal/component/common/loki/client/internal/marker_file_handler.go +++ b/internal/component/common/loki/client/internal/marker_file_handler.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/component/common/loki/wal" "github.com/natefinch/atomic" ) diff --git a/internal/component/common/loki/client/internal/marker_handler.go b/internal/component/common/loki/client/internal/marker_handler.go index 7b59e618f3..7bb78a9f6a 100644 --- a/internal/component/common/loki/client/internal/marker_handler.go +++ b/internal/component/common/loki/client/internal/marker_handler.go @@ -7,8 +7,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki/wal" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/flow/logging/level" ) type MarkerHandler interface { diff --git a/internal/component/common/loki/client/internal/metrics.go b/internal/component/common/loki/client/internal/metrics.go index baf2700763..85d83af5fb 100644 --- a/internal/component/common/loki/client/internal/metrics.go +++ b/internal/component/common/loki/client/internal/metrics.go @@ -1,7 +1,7 @@ package internal import ( - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/component/common/loki/client/logger.go b/internal/component/common/loki/client/logger.go index 7f9790a542..1a23c481a4 100644 --- a/internal/component/common/loki/client/logger.go +++ b/internal/component/common/loki/client/logger.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "gopkg.in/yaml.v2" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/limit" - "github.com/grafana/agent/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/limit" + "github.com/grafana/alloy/internal/component/common/loki/wal" ) var ( diff --git a/internal/component/common/loki/client/logger_test.go b/internal/component/common/loki/client/logger_test.go index fd8451095e..3f43e9040e 100644 --- a/internal/component/common/loki/client/logger_test.go +++ b/internal/component/common/loki/client/logger_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" util_log "github.com/grafana/loki/pkg/util/log" ) diff --git a/internal/component/common/loki/client/manager.go b/internal/component/common/loki/client/manager.go index b9fa13c7ce..b57b93e9cf 100644 --- a/internal/component/common/loki/client/manager.go +++ b/internal/component/common/loki/client/manager.go @@ -7,13 +7,13 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki/client/internal" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki/client/internal" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/limit" - "github.com/grafana/agent/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/limit" + "github.com/grafana/alloy/internal/component/common/loki/wal" ) // WriterEventsNotifier implements a notifier that's received by the Manager, to which wal.Watcher can subscribe for diff --git a/internal/component/common/loki/client/manager_test.go b/internal/component/common/loki/client/manager_test.go index c499e957d3..b6496dc6ce 100644 --- a/internal/component/common/loki/client/manager_test.go +++ b/internal/component/common/loki/client/manager_test.go @@ -16,10 +16,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/limit" - "github.com/grafana/agent/internal/component/common/loki/utils" - "github.com/grafana/agent/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/limit" + "github.com/grafana/alloy/internal/component/common/loki/utils" + "github.com/grafana/alloy/internal/component/common/loki/wal" "github.com/grafana/loki/pkg/logproto" lokiflag "github.com/grafana/loki/pkg/util/flagext" diff --git a/internal/component/common/loki/client/metrics.go b/internal/component/common/loki/client/metrics.go index 3bd8a2324a..66f8a53015 100644 --- a/internal/component/common/loki/client/metrics.go +++ b/internal/component/common/loki/client/metrics.go @@ -1,7 +1,7 @@ package client import ( - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/component/common/loki/client/queue_client.go b/internal/component/common/loki/client/queue_client.go index 51f14b91c6..0050406bb8 100644 --- a/internal/component/common/loki/client/queue_client.go +++ b/internal/component/common/loki/client/queue_client.go @@ -14,7 +14,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - agentWal "github.com/grafana/agent/internal/component/common/loki/wal" + agentWal "github.com/grafana/alloy/internal/component/common/loki/wal" "github.com/grafana/dskit/backoff" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/common/loki/client/queue_client_test.go b/internal/component/common/loki/client/queue_client_test.go index daf798a955..57228150e9 100644 --- a/internal/component/common/loki/client/queue_client_test.go +++ b/internal/component/common/loki/client/queue_client_test.go @@ -8,9 +8,9 @@ import ( "github.com/alecthomas/units" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/client/internal" - "github.com/grafana/agent/internal/component/common/loki/utils" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/client/internal" + "github.com/grafana/alloy/internal/component/common/loki/utils" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/common/loki/positions/positions.go b/internal/component/common/loki/positions/positions.go index 0201d39e47..cefcd17386 100644 --- a/internal/component/common/loki/positions/positions.go +++ b/internal/component/common/loki/positions/positions.go @@ -15,7 +15,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" yaml "gopkg.in/yaml.v2" ) diff --git a/internal/component/common/loki/wal/internal/watcher_state.go b/internal/component/common/loki/wal/internal/watcher_state.go index e9ae3614c2..5de6aacc43 100644 --- a/internal/component/common/loki/wal/internal/watcher_state.go +++ b/internal/component/common/loki/wal/internal/watcher_state.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" ) const ( diff --git a/internal/component/common/loki/wal/reader.go b/internal/component/common/loki/wal/reader.go index 41cdc19787..8599a3ea39 100644 --- a/internal/component/common/loki/wal/reader.go +++ b/internal/component/common/loki/wal/reader.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/ingester/wal" "github.com/grafana/loki/pkg/util" walUtils "github.com/grafana/loki/pkg/util/wal" diff --git a/internal/component/common/loki/wal/wal.go b/internal/component/common/loki/wal/wal.go index 277c7d67df..eb23b4e631 100644 --- a/internal/component/common/loki/wal/wal.go +++ b/internal/component/common/loki/wal/wal.go @@ -5,7 +5,7 @@ import ( "os" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/tsdb/wlog" diff --git a/internal/component/common/loki/wal/watcher.go b/internal/component/common/loki/wal/watcher.go index a7818ac491..6de3cf2578 100644 --- a/internal/component/common/loki/wal/watcher.go +++ b/internal/component/common/loki/wal/watcher.go @@ -10,8 +10,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki/wal/internal" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki/wal/internal" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/prometheus/tsdb/record" "github.com/prometheus/prometheus/tsdb/wlog" diff --git a/internal/component/common/loki/wal/watcher_metrics.go b/internal/component/common/loki/wal/watcher_metrics.go index 6c7d06b442..fac4ba80a3 100644 --- a/internal/component/common/loki/wal/watcher_metrics.go +++ b/internal/component/common/loki/wal/watcher_metrics.go @@ -1,7 +1,7 @@ package wal import ( - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/component/common/loki/wal/watcher_test.go b/internal/component/common/loki/wal/watcher_test.go index aa025bf302..714495860d 100644 --- a/internal/component/common/loki/wal/watcher_test.go +++ b/internal/component/common/loki/wal/watcher_test.go @@ -8,15 +8,15 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/utils" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/utils" "github.com/grafana/loki/pkg/ingester/wal" "github.com/grafana/loki/pkg/logproto" "github.com/grafana/loki/pkg/util" diff --git a/internal/component/common/loki/wal/writer.go b/internal/component/common/loki/wal/writer.go index a44b9e59dc..a3d29ad571 100644 --- a/internal/component/common/loki/wal/writer.go +++ b/internal/component/common/loki/wal/writer.go @@ -10,13 +10,13 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/record" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/ingester/wal" "github.com/grafana/loki/pkg/logproto" "github.com/grafana/loki/pkg/util" diff --git a/internal/component/common/loki/wal/writer_test.go b/internal/component/common/loki/wal/writer_test.go index 019506343e..cbfb378d5f 100644 --- a/internal/component/common/loki/wal/writer_test.go +++ b/internal/component/common/loki/wal/writer_test.go @@ -8,12 +8,12 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" ) diff --git a/internal/component/common/net/server.go b/internal/component/common/net/server.go index d892b341d2..eec9fb3a6e 100644 --- a/internal/component/common/net/server.go +++ b/internal/component/common/net/server.go @@ -5,7 +5,7 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" dskit "github.com/grafana/dskit/server" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/internal/component/common/net/server_test.go b/internal/component/common/net/server_test.go index 657aee26b2..7ec848adbc 100644 --- a/internal/component/common/net/server_test.go +++ b/internal/component/common/net/server_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/internal/component/component_health_test.go b/internal/component/component_health_test.go index 831fdc6c9e..d0bcbee08c 100644 --- a/internal/component/component_health_test.go +++ b/internal/component/component_health_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/stretchr/testify/require" ) diff --git a/internal/component/discovery/aws/ec2.go b/internal/component/discovery/aws/ec2.go index 971dd25863..ba0d2016fe 100644 --- a/internal/component/discovery/aws/ec2.go +++ b/internal/component/discovery/aws/ec2.go @@ -7,10 +7,10 @@ import ( awsConfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/aws/ec2_test.go b/internal/component/discovery/aws/ec2_test.go index d0239f43cd..845c1e0ceb 100644 --- a/internal/component/discovery/aws/ec2_test.go +++ b/internal/component/discovery/aws/ec2_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/stretchr/testify/require" "gotest.tools/assert" ) diff --git a/internal/component/discovery/aws/lightsail.go b/internal/component/discovery/aws/lightsail.go index b64f5f9ba4..97d93b3537 100644 --- a/internal/component/discovery/aws/lightsail.go +++ b/internal/component/discovery/aws/lightsail.go @@ -7,10 +7,10 @@ import ( awsConfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/azure/azure.go b/internal/component/discovery/azure/azure.go index beb7fb64e8..61c8ea6403 100644 --- a/internal/component/discovery/azure/azure.go +++ b/internal/component/discovery/azure/azure.go @@ -5,10 +5,10 @@ import ( "time" "github.com/Azure/go-autorest/autorest/azure" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" common "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/azure/azure_test.go b/internal/component/discovery/azure/azure_test.go index f05f16c0fb..c1ef359388 100644 --- a/internal/component/discovery/azure/azure_test.go +++ b/internal/component/discovery/azure/azure_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/internal/component/discovery/consul/consul.go b/internal/component/discovery/consul/consul.go index f68eb614ab..a5ce3dbb68 100644 --- a/internal/component/discovery/consul/consul.go +++ b/internal/component/discovery/consul/consul.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/consulagent/consulagent.go b/internal/component/discovery/consulagent/consulagent.go index d897072c9e..762ff6512f 100644 --- a/internal/component/discovery/consulagent/consulagent.go +++ b/internal/component/discovery/consulagent/consulagent.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/consulagent/promtail_consulagent.go b/internal/component/discovery/consulagent/promtail_consulagent.go index 2e5d92b336..7144394f30 100644 --- a/internal/component/discovery/consulagent/promtail_consulagent.go +++ b/internal/component/discovery/consulagent/promtail_consulagent.go @@ -22,7 +22,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" consul "github.com/hashicorp/consul/api" conntrack "github.com/mwitkow/go-conntrack" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/discovery/digitalocean/digitalocean.go b/internal/component/discovery/digitalocean/digitalocean.go index bb7315eb15..1a305b201f 100644 --- a/internal/component/discovery/digitalocean/digitalocean.go +++ b/internal/component/discovery/digitalocean/digitalocean.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/digitalocean" diff --git a/internal/component/discovery/digitalocean/digitalocean_test.go b/internal/component/discovery/digitalocean/digitalocean_test.go index 18a628fc3e..629dec3910 100644 --- a/internal/component/discovery/digitalocean/digitalocean_test.go +++ b/internal/component/discovery/digitalocean/digitalocean_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" prom_common_config "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/discovery.go b/internal/component/discovery/discovery.go index be260650d3..fc30bbcccc 100644 --- a/internal/component/discovery/discovery.go +++ b/internal/component/discovery/discovery.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/service/cluster" "github.com/grafana/ckit/shard" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery" diff --git a/internal/component/discovery/dns/dns.go b/internal/component/discovery/dns/dns.go index 4f1309f37c..749a778c3d 100644 --- a/internal/component/discovery/dns/dns.go +++ b/internal/component/discovery/dns/dns.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/dns" ) diff --git a/internal/component/discovery/docker/docker.go b/internal/component/discovery/docker/docker.go index 0712c20e63..54b2afc963 100644 --- a/internal/component/discovery/docker/docker.go +++ b/internal/component/discovery/docker/docker.go @@ -6,10 +6,10 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/moby" ) diff --git a/internal/component/discovery/dockerswarm/dockerswarm.go b/internal/component/discovery/dockerswarm/dockerswarm.go index f7caafc665..4d5ac4fd60 100644 --- a/internal/component/discovery/dockerswarm/dockerswarm.go +++ b/internal/component/discovery/dockerswarm/dockerswarm.go @@ -5,10 +5,10 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/moby" ) diff --git a/internal/component/discovery/dockerswarm/dockerswarm_test.go b/internal/component/discovery/dockerswarm/dockerswarm_test.go index d36d2198e7..c56b1fde59 100644 --- a/internal/component/discovery/dockerswarm/dockerswarm_test.go +++ b/internal/component/discovery/dockerswarm/dockerswarm_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" promConfig "github.com/prometheus/common/config" diff --git a/internal/component/discovery/eureka/eureka.go b/internal/component/discovery/eureka/eureka.go index 3221a681a9..ba4516b252 100644 --- a/internal/component/discovery/eureka/eureka.go +++ b/internal/component/discovery/eureka/eureka.go @@ -5,10 +5,10 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/eureka" ) diff --git a/internal/component/discovery/eureka/eureka_test.go b/internal/component/discovery/eureka/eureka_test.go index 618150e39a..f50213a0af 100644 --- a/internal/component/discovery/eureka/eureka_test.go +++ b/internal/component/discovery/eureka/eureka_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" promcfg "github.com/prometheus/common/config" diff --git a/internal/component/discovery/file/file.go b/internal/component/discovery/file/file.go index 4611df0e46..a98163a593 100644 --- a/internal/component/discovery/file/file.go +++ b/internal/component/discovery/file/file.go @@ -3,9 +3,9 @@ package file import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/file" ) diff --git a/internal/component/discovery/gce/gce.go b/internal/component/discovery/gce/gce.go index 5288f9b73d..60af462035 100644 --- a/internal/component/discovery/gce/gce.go +++ b/internal/component/discovery/gce/gce.go @@ -4,9 +4,9 @@ package gce import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/gce" ) diff --git a/internal/component/discovery/hetzner/hetzner.go b/internal/component/discovery/hetzner/hetzner.go index 974260e3da..631583da87 100644 --- a/internal/component/discovery/hetzner/hetzner.go +++ b/internal/component/discovery/hetzner/hetzner.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/hetzner" ) diff --git a/internal/component/discovery/http/http.go b/internal/component/discovery/http/http.go index 098d3eed12..257c9f6af3 100644 --- a/internal/component/discovery/http/http.go +++ b/internal/component/discovery/http/http.go @@ -3,10 +3,10 @@ package http import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/http" diff --git a/internal/component/discovery/http/http_test.go b/internal/component/discovery/http/http_test.go index 6c81591b9b..fb99660a38 100644 --- a/internal/component/discovery/http/http_test.go +++ b/internal/component/discovery/http/http_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" "github.com/grafana/alloy/syntax" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/internal/component/discovery/ionos/ionos.go b/internal/component/discovery/ionos/ionos.go index 117ae38e87..4d42caa04f 100644 --- a/internal/component/discovery/ionos/ionos.go +++ b/internal/component/discovery/ionos/ionos.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/ionos" ) diff --git a/internal/component/discovery/ionos/ionos_test.go b/internal/component/discovery/ionos/ionos_test.go index 4129eb7112..14a9adf08f 100644 --- a/internal/component/discovery/ionos/ionos_test.go +++ b/internal/component/discovery/ionos/ionos_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" promConfig "github.com/prometheus/common/config" diff --git a/internal/component/discovery/kubelet/kubelet.go b/internal/component/discovery/kubelet/kubelet.go index 835c0d24d3..5777b25565 100644 --- a/internal/component/discovery/kubelet/kubelet.go +++ b/internal/component/discovery/kubelet/kubelet.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" commonConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/refresh" diff --git a/internal/component/discovery/kubelet/kubelet_test.go b/internal/component/discovery/kubelet/kubelet_test.go index cec0e2b05d..29098ac7dd 100644 --- a/internal/component/discovery/kubelet/kubelet_test.go +++ b/internal/component/discovery/kubelet/kubelet_test.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/discovery/kubernetes/kubernetes.go b/internal/component/discovery/kubernetes/kubernetes.go index 1e622aa72a..e3a5b0bf6c 100644 --- a/internal/component/discovery/kubernetes/kubernetes.go +++ b/internal/component/discovery/kubernetes/kubernetes.go @@ -2,10 +2,10 @@ package kubernetes import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" promk8s "github.com/prometheus/prometheus/discovery/kubernetes" ) diff --git a/internal/component/discovery/kuma/kuma.go b/internal/component/discovery/kuma/kuma.go index c91aa3b5f4..4fdb2e2971 100644 --- a/internal/component/discovery/kuma/kuma.go +++ b/internal/component/discovery/kuma/kuma.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/xds" ) diff --git a/internal/component/discovery/kuma/kuma_test.go b/internal/component/discovery/kuma/kuma_test.go index 3a4942c71a..c82e97bd50 100644 --- a/internal/component/discovery/kuma/kuma_test.go +++ b/internal/component/discovery/kuma/kuma_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" promConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/linode/linode.go b/internal/component/discovery/linode/linode.go index 8031bde15b..8d5691ebbf 100644 --- a/internal/component/discovery/linode/linode.go +++ b/internal/component/discovery/linode/linode.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/linode" ) diff --git a/internal/component/discovery/linode/linode_test.go b/internal/component/discovery/linode/linode_test.go index 9c7361e623..4512a6ff59 100644 --- a/internal/component/discovery/linode/linode_test.go +++ b/internal/component/discovery/linode/linode_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" promconfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/marathon/marathon.go b/internal/component/discovery/marathon/marathon.go index e7630cf834..20081722a4 100644 --- a/internal/component/discovery/marathon/marathon.go +++ b/internal/component/discovery/marathon/marathon.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/marathon/marathon_test.go b/internal/component/discovery/marathon/marathon_test.go index bade375386..fcc094bdfb 100644 --- a/internal/component/discovery/marathon/marathon_test.go +++ b/internal/component/discovery/marathon/marathon_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" promConfig "github.com/prometheus/common/config" diff --git a/internal/component/discovery/nerve/nerve.go b/internal/component/discovery/nerve/nerve.go index d8521a80c9..85faad6cc8 100644 --- a/internal/component/discovery/nerve/nerve.go +++ b/internal/component/discovery/nerve/nerve.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/zookeeper" ) diff --git a/internal/component/discovery/nomad/nomad.go b/internal/component/discovery/nomad/nomad.go index b324add03e..22f06de73b 100644 --- a/internal/component/discovery/nomad/nomad.go +++ b/internal/component/discovery/nomad/nomad.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/nomad" ) diff --git a/internal/component/discovery/openstack/openstack.go b/internal/component/discovery/openstack/openstack.go index 892126ce8e..5ac5f038d1 100644 --- a/internal/component/discovery/openstack/openstack.go +++ b/internal/component/discovery/openstack/openstack.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/openstack/openstack_test.go b/internal/component/discovery/openstack/openstack_test.go index 1fec5b50d7..ea180b4347 100644 --- a/internal/component/discovery/openstack/openstack_test.go +++ b/internal/component/discovery/openstack/openstack_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/ovhcloud/ovhcloud.go b/internal/component/discovery/ovhcloud/ovhcloud.go index 1117b35381..c6a51bf641 100644 --- a/internal/component/discovery/ovhcloud/ovhcloud.go +++ b/internal/component/discovery/ovhcloud/ovhcloud.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/ovhcloud/ovhcloud_test.go b/internal/component/discovery/ovhcloud/ovhcloud_test.go index 064c5a5e01..b627bf89f3 100644 --- a/internal/component/discovery/ovhcloud/ovhcloud_test.go +++ b/internal/component/discovery/ovhcloud/ovhcloud_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/discovery/ovhcloud" + "github.com/grafana/alloy/internal/component/discovery/ovhcloud" "github.com/grafana/alloy/syntax" "github.com/prometheus/common/model" prom_ovh "github.com/prometheus/prometheus/discovery/ovhcloud" diff --git a/internal/component/discovery/process/args.go b/internal/component/discovery/process/args.go index 45ed6649bb..b01c693da4 100644 --- a/internal/component/discovery/process/args.go +++ b/internal/component/discovery/process/args.go @@ -3,7 +3,7 @@ package process import ( "time" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" ) type Arguments struct { diff --git a/internal/component/discovery/process/container.go b/internal/component/discovery/process/container.go index 89811eebd8..1ac7842818 100644 --- a/internal/component/discovery/process/container.go +++ b/internal/component/discovery/process/container.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" ) var ( diff --git a/internal/component/discovery/process/discover.go b/internal/component/discovery/process/discover.go index f17f40c989..009cac43be 100644 --- a/internal/component/discovery/process/discover.go +++ b/internal/component/discovery/process/discover.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" gopsutil "github.com/shirou/gopsutil/v3/process" "golang.org/x/sys/unix" ) diff --git a/internal/component/discovery/process/join.go b/internal/component/discovery/process/join.go index 5c3b612de4..5c2728cc6e 100644 --- a/internal/component/discovery/process/join.go +++ b/internal/component/discovery/process/join.go @@ -2,7 +2,7 @@ package process -import "github.com/grafana/agent/internal/component/discovery" +import "github.com/grafana/alloy/internal/component/discovery" func join(processes, containers []discovery.Target) []discovery.Target { res := make([]discovery.Target, 0, len(processes)+len(containers)) diff --git a/internal/component/discovery/process/join_test.go b/internal/component/discovery/process/join_test.go index 5aa05d3a00..3f2e9dfa5a 100644 --- a/internal/component/discovery/process/join_test.go +++ b/internal/component/discovery/process/join_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" "github.com/stretchr/testify/assert" ) diff --git a/internal/component/discovery/process/process.go b/internal/component/discovery/process/process.go index a5b2ec6258..933e169d2c 100644 --- a/internal/component/discovery/process/process.go +++ b/internal/component/discovery/process/process.go @@ -7,9 +7,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/discovery/process/process_stub.go b/internal/component/discovery/process/process_stub.go index 74c1f394ea..6266d77d99 100644 --- a/internal/component/discovery/process/process_stub.go +++ b/internal/component/discovery/process/process_stub.go @@ -5,10 +5,10 @@ package process import ( "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/discovery/puppetdb/puppetdb.go b/internal/component/discovery/puppetdb/puppetdb.go index 1b1b29ea87..297060cea4 100644 --- a/internal/component/discovery/puppetdb/puppetdb.go +++ b/internal/component/discovery/puppetdb/puppetdb.go @@ -5,10 +5,10 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/puppetdb" ) diff --git a/internal/component/discovery/relabel/relabel.go b/internal/component/discovery/relabel/relabel.go index dc75ba4418..c4f2c419db 100644 --- a/internal/component/discovery/relabel/relabel.go +++ b/internal/component/discovery/relabel/relabel.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "github.com/grafana/agent/internal/component" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" ) diff --git a/internal/component/discovery/relabel/relabel_test.go b/internal/component/discovery/relabel/relabel_test.go index eb6add2ca9..536ab7dd62 100644 --- a/internal/component/discovery/relabel/relabel_test.go +++ b/internal/component/discovery/relabel/relabel_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/relabel" - "github.com/grafana/agent/internal/flow/componenttest" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/relabel" + "github.com/grafana/alloy/internal/flow/componenttest" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/discovery/scaleway/scaleway.go b/internal/component/discovery/scaleway/scaleway.go index 2b2a30ce7a..c760a4d965 100644 --- a/internal/component/discovery/scaleway/scaleway.go +++ b/internal/component/discovery/scaleway/scaleway.go @@ -6,10 +6,10 @@ import ( "reflect" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" prom_config "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/serverset/serverset.go b/internal/component/discovery/serverset/serverset.go index e706e3a8e7..58e7844f34 100644 --- a/internal/component/discovery/serverset/serverset.go +++ b/internal/component/discovery/serverset/serverset.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/zookeeper" ) diff --git a/internal/component/discovery/triton/triton.go b/internal/component/discovery/triton/triton.go index c74e7c5283..7b7e990e6b 100644 --- a/internal/component/discovery/triton/triton.go +++ b/internal/component/discovery/triton/triton.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/prometheus/common/model" prom_discovery "github.com/prometheus/prometheus/discovery/triton" ) diff --git a/internal/component/discovery/uyuni/uyuni.go b/internal/component/discovery/uyuni/uyuni.go index f9408d0a22..6af2cea094 100644 --- a/internal/component/discovery/uyuni/uyuni.go +++ b/internal/component/discovery/uyuni/uyuni.go @@ -5,10 +5,10 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/discovery/uyuni/uyuni_test.go b/internal/component/discovery/uyuni/uyuni_test.go index e5b1536430..ee2e06ce76 100644 --- a/internal/component/discovery/uyuni/uyuni_test.go +++ b/internal/component/discovery/uyuni/uyuni_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/syntax" promcfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/faro/receiver/arguments.go b/internal/component/faro/receiver/arguments.go index 3effb1f964..7316de5678 100644 --- a/internal/component/faro/receiver/arguments.go +++ b/internal/component/faro/receiver/arguments.go @@ -4,8 +4,8 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/otelcol" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/component/faro/receiver/exporters.go b/internal/component/faro/receiver/exporters.go index 57514b417e..6609aa1aa9 100644 --- a/internal/component/faro/receiver/exporters.go +++ b/internal/component/faro/receiver/exporters.go @@ -8,10 +8,10 @@ import ( "github.com/go-kit/log" "github.com/go-logfmt/logfmt" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/faro/receiver/internal/payload" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/faro/receiver/internal/payload" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/internal/component/faro/receiver/exporters_test.go b/internal/component/faro/receiver/exporters_test.go index a6ec19ecf1..5217ad4ddc 100644 --- a/internal/component/faro/receiver/exporters_test.go +++ b/internal/component/faro/receiver/exporters_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/grafana/agent/internal/component/faro/receiver/internal/payload" + "github.com/grafana/alloy/internal/component/faro/receiver/internal/payload" "github.com/prometheus/client_golang/prometheus" promtestutil "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" diff --git a/internal/component/faro/receiver/handler.go b/internal/component/faro/receiver/handler.go index e6207e511a..68efa9c633 100644 --- a/internal/component/faro/receiver/handler.go +++ b/internal/component/faro/receiver/handler.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/faro/receiver/internal/payload" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/faro/receiver/internal/payload" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/rs/cors" "golang.org/x/time/rate" diff --git a/internal/component/faro/receiver/handler_test.go b/internal/component/faro/receiver/handler_test.go index 79f93fe744..228b8c87cd 100644 --- a/internal/component/faro/receiver/handler_test.go +++ b/internal/component/faro/receiver/handler_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/faro/receiver/internal/payload" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/faro/receiver/internal/payload" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/component/faro/receiver/receiver.go b/internal/component/faro/receiver/receiver.go index 1a77503498..2e7531950b 100644 --- a/internal/component/faro/receiver/receiver.go +++ b/internal/component/faro/receiver/receiver.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/log" "github.com/go-sourcemap/sourcemap" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/faro/receiver/receiver_test.go b/internal/component/faro/receiver/receiver_test.go index 4e6e78e04e..920faad024 100644 --- a/internal/component/faro/receiver/receiver_test.go +++ b/internal/component/faro/receiver/receiver_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/loki/pkg/logproto" "github.com/phayes/freeport" "github.com/prometheus/common/model" diff --git a/internal/component/faro/receiver/server.go b/internal/component/faro/receiver/server.go index 1b96fa1b4e..8207594700 100644 --- a/internal/component/faro/receiver/server.go +++ b/internal/component/faro/receiver/server.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/dskit/instrument" "github.com/grafana/dskit/middleware" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/faro/receiver/sourcemaps.go b/internal/component/faro/receiver/sourcemaps.go index 5dc1e7643f..4de618b983 100644 --- a/internal/component/faro/receiver/sourcemaps.go +++ b/internal/component/faro/receiver/sourcemaps.go @@ -16,9 +16,9 @@ import ( "github.com/go-kit/log" "github.com/go-sourcemap/sourcemap" - "github.com/grafana/agent/internal/component/faro/receiver/internal/payload" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util/wildcard" + "github.com/grafana/alloy/internal/component/faro/receiver/internal/payload" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util/wildcard" "github.com/prometheus/client_golang/prometheus" "github.com/vincent-petithory/dataurl" ) diff --git a/internal/component/faro/receiver/sourcemaps_test.go b/internal/component/faro/receiver/sourcemaps_test.go index 6ad1f7fcdd..87a7dbf4cc 100644 --- a/internal/component/faro/receiver/sourcemaps_test.go +++ b/internal/component/faro/receiver/sourcemaps_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "github.com/grafana/agent/internal/component/faro/receiver/internal/payload" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/faro/receiver/internal/payload" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/internal/component/local/file/file.go b/internal/component/local/file/file.go index eb7899a8d8..941d1c5140 100644 --- a/internal/component/local/file/file.go +++ b/internal/component/local/file/file.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - filedetector "github.com/grafana/agent/internal/filedetector" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + filedetector "github.com/grafana/alloy/internal/filedetector" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/component/local/file/file_test.go b/internal/component/local/file/file_test.go index 8f6e304d41..3f119a46d5 100644 --- a/internal/component/local/file/file_test.go +++ b/internal/component/local/file/file_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/local/file" - filedetector "github.com/grafana/agent/internal/filedetector" - "github.com/grafana/agent/internal/flow/componenttest" + "github.com/grafana/alloy/internal/component/local/file" + filedetector "github.com/grafana/alloy/internal/filedetector" + "github.com/grafana/alloy/internal/flow/componenttest" "github.com/grafana/alloy/syntax/alloytypes" "github.com/stretchr/testify/require" ) diff --git a/internal/component/local/file_match/file.go b/internal/component/local/file_match/file.go index 00f3ffad7d..c2421610fa 100644 --- a/internal/component/local/file_match/file.go +++ b/internal/component/local/file_match/file.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/local/file_match/file_test.go b/internal/component/local/file_match/file_test.go index 43795b6f6c..8a19074c32 100644 --- a/internal/component/local/file_match/file_test.go +++ b/internal/component/local/file_match/file_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/internal/component/local/file_match/watch.go b/internal/component/local/file_match/watch.go index 21a6778eb9..e66544478c 100644 --- a/internal/component/local/file_match/watch.go +++ b/internal/component/local/file_match/watch.go @@ -7,8 +7,8 @@ import ( "github.com/go-kit/log" "github.com/bmatcuk/doublestar" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/flow/logging/level" ) // watch handles a single discovery.target for file watching. diff --git a/internal/component/loki/echo/echo.go b/internal/component/loki/echo/echo.go index 9f0ca8d6a1..1596893c2c 100644 --- a/internal/component/loki/echo/echo.go +++ b/internal/component/loki/echo/echo.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/loki/process/process.go b/internal/component/loki/process/process.go index 4183c4b275..5fe4305841 100644 --- a/internal/component/loki/process/process.go +++ b/internal/component/loki/process/process.go @@ -8,10 +8,10 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/loki/process/stages" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/loki/process/stages" + "github.com/grafana/alloy/internal/featuregate" ) // TODO(thampiotr): We should reconsider which parts of this component should be exported and which should diff --git a/internal/component/loki/process/process_test.go b/internal/component/loki/process/process_test.go index cb3e4b925f..57db4bcfde 100644 --- a/internal/component/loki/process/process_test.go +++ b/internal/component/loki/process/process_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/loki/process/stages" - lsf "github.com/grafana/agent/internal/component/loki/source/file" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/loki/process/stages" + lsf "github.com/grafana/alloy/internal/component/loki/source/file" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/loki/process/stages/drop.go b/internal/component/loki/process/stages/drop.go index e1c3b44421..1cdc6a2f70 100644 --- a/internal/component/loki/process/stages/drop.go +++ b/internal/component/loki/process/stages/drop.go @@ -10,7 +10,7 @@ import ( "github.com/alecthomas/units" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/component/loki/process/stages/drop_test.go b/internal/component/loki/process/stages/drop_test.go index 820d597d0a..55e5c2a9f9 100644 --- a/internal/component/loki/process/stages/drop_test.go +++ b/internal/component/loki/process/stages/drop_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" dskit "github.com/grafana/dskit/server" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/internal/component/loki/process/stages/eventlogmessage.go b/internal/component/loki/process/stages/eventlogmessage.go index 58cab36a5d..884238bbe8 100644 --- a/internal/component/loki/process/stages/eventlogmessage.go +++ b/internal/component/loki/process/stages/eventlogmessage.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/extensions.go b/internal/component/loki/process/stages/extensions.go index 7b0cccd110..a2734542a3 100644 --- a/internal/component/loki/process/stages/extensions.go +++ b/internal/component/loki/process/stages/extensions.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/internal/component/loki/process/stages/geoip.go b/internal/component/loki/process/stages/geoip.go index 8822b9f20f..c60ce79e40 100644 --- a/internal/component/loki/process/stages/geoip.go +++ b/internal/component/loki/process/stages/geoip.go @@ -7,7 +7,7 @@ import ( "reflect" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/jmespath/go-jmespath" "github.com/oschwald/geoip2-golang" "github.com/oschwald/maxminddb-golang" diff --git a/internal/component/loki/process/stages/json.go b/internal/component/loki/process/stages/json.go index 4ee263cbc4..c80535a1f4 100644 --- a/internal/component/loki/process/stages/json.go +++ b/internal/component/loki/process/stages/json.go @@ -6,7 +6,7 @@ import ( "reflect" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/jmespath/go-jmespath" json "github.com/json-iterator/go" ) diff --git a/internal/component/loki/process/stages/json_test.go b/internal/component/loki/process/stages/json_test.go index 558cea0b42..6e695cef68 100644 --- a/internal/component/loki/process/stages/json_test.go +++ b/internal/component/loki/process/stages/json_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/loki/process/stages/labels.go b/internal/component/loki/process/stages/labels.go index 5bec9583ff..978faa506a 100644 --- a/internal/component/loki/process/stages/labels.go +++ b/internal/component/loki/process/stages/labels.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/limit.go b/internal/component/loki/process/stages/limit.go index 51b0c3e825..3179ec099b 100644 --- a/internal/component/loki/process/stages/limit.go +++ b/internal/component/loki/process/stages/limit.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "golang.org/x/time/rate" diff --git a/internal/component/loki/process/stages/logfmt.go b/internal/component/loki/process/stages/logfmt.go index 0cf006b265..aee22bfc7a 100644 --- a/internal/component/loki/process/stages/logfmt.go +++ b/internal/component/loki/process/stages/logfmt.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/log" "github.com/go-logfmt/logfmt" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/logfmt_test.go b/internal/component/loki/process/stages/logfmt_test.go index 961cc8ab44..ed620e73a9 100644 --- a/internal/component/loki/process/stages/logfmt_test.go +++ b/internal/component/loki/process/stages/logfmt_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" util_log "github.com/grafana/loki/pkg/util/log" ) diff --git a/internal/component/loki/process/stages/match_test.go b/internal/component/loki/process/stages/match_test.go index c35c85a160..5e0f52600b 100644 --- a/internal/component/loki/process/stages/match_test.go +++ b/internal/component/loki/process/stages/match_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" ) diff --git a/internal/component/loki/process/stages/metric.go b/internal/component/loki/process/stages/metric.go index 8d0ca48785..92f63da512 100644 --- a/internal/component/loki/process/stages/metric.go +++ b/internal/component/loki/process/stages/metric.go @@ -9,8 +9,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/loki/process/metric" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/loki/process/metric" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/metric_test.go b/internal/component/loki/process/stages/metric_test.go index 559c5fc913..23f06f1ce0 100644 --- a/internal/component/loki/process/stages/metric_test.go +++ b/internal/component/loki/process/stages/metric_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/loki/process/metric" + "github.com/grafana/alloy/internal/component/loki/process/metric" util_log "github.com/grafana/loki/pkg/util/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/internal/component/loki/process/stages/multiline.go b/internal/component/loki/process/stages/multiline.go index 0e4a7d234b..2b7b0af971 100644 --- a/internal/component/loki/process/stages/multiline.go +++ b/internal/component/loki/process/stages/multiline.go @@ -9,8 +9,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/multiline_test.go b/internal/component/loki/process/stages/multiline_test.go index 2f236e3a35..d85bf3479c 100644 --- a/internal/component/loki/process/stages/multiline_test.go +++ b/internal/component/loki/process/stages/multiline_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/util" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/internal/component/loki/process/stages/output.go b/internal/component/loki/process/stages/output.go index b82d3cd3fb..0a44f02f3d 100644 --- a/internal/component/loki/process/stages/output.go +++ b/internal/component/loki/process/stages/output.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/output_test.go b/internal/component/loki/process/stages/output_test.go index b2e6fbb021..d5ba6076db 100644 --- a/internal/component/loki/process/stages/output_test.go +++ b/internal/component/loki/process/stages/output_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/component/loki/process/stages/pack.go b/internal/component/loki/process/stages/pack.go index 2aece44982..11d223a7cc 100644 --- a/internal/component/loki/process/stages/pack.go +++ b/internal/component/loki/process/stages/pack.go @@ -9,7 +9,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logqlmodel" json "github.com/json-iterator/go" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/loki/process/stages/pack_test.go b/internal/component/loki/process/stages/pack_test.go index 1bf443f8bd..43f6a172c5 100644 --- a/internal/component/loki/process/stages/pack_test.go +++ b/internal/component/loki/process/stages/pack_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/util" "github.com/grafana/loki/pkg/logproto" "github.com/grafana/loki/pkg/logqlmodel" json "github.com/json-iterator/go" diff --git a/internal/component/loki/process/stages/pipeline.go b/internal/component/loki/process/stages/pipeline.go index 65885c9140..ab5b5ab1d5 100644 --- a/internal/component/loki/process/stages/pipeline.go +++ b/internal/component/loki/process/stages/pipeline.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/prometheus/client_golang/prometheus" "golang.org/x/time/rate" ) diff --git a/internal/component/loki/process/stages/pipeline_test.go b/internal/component/loki/process/stages/pipeline_test.go index 0fcf8917ff..8f50203d48 100644 --- a/internal/component/loki/process/stages/pipeline_test.go +++ b/internal/component/loki/process/stages/pipeline_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax" "github.com/grafana/loki/pkg/logproto" util_log "github.com/grafana/loki/pkg/util/log" diff --git a/internal/component/loki/process/stages/regex.go b/internal/component/loki/process/stages/regex.go index ef3f28abf6..cd1b754931 100644 --- a/internal/component/loki/process/stages/regex.go +++ b/internal/component/loki/process/stages/regex.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/mitchellh/mapstructure" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/regex_test.go b/internal/component/loki/process/stages/regex_test.go index f9928aa62a..d17ce2e7a9 100644 --- a/internal/component/loki/process/stages/regex_test.go +++ b/internal/component/loki/process/stages/regex_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/internal/component/loki/process/stages/replace.go b/internal/component/loki/process/stages/replace.go index 266b5a5d9e..35e63a7943 100644 --- a/internal/component/loki/process/stages/replace.go +++ b/internal/component/loki/process/stages/replace.go @@ -10,7 +10,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/replace_test.go b/internal/component/loki/process/stages/replace_test.go index b03ccee7a4..3f940fbd70 100644 --- a/internal/component/loki/process/stages/replace_test.go +++ b/internal/component/loki/process/stages/replace_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" ) diff --git a/internal/component/loki/process/stages/stage.go b/internal/component/loki/process/stages/stage.go index a5657d570e..aad532e72a 100644 --- a/internal/component/loki/process/stages/stage.go +++ b/internal/component/loki/process/stages/stage.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "gopkg.in/yaml.v2" diff --git a/internal/component/loki/process/stages/static_labels.go b/internal/component/loki/process/stages/static_labels.go index df8c5d244d..113d561111 100644 --- a/internal/component/loki/process/stages/static_labels.go +++ b/internal/component/loki/process/stages/static_labels.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/template.go b/internal/component/loki/process/stages/template.go index cf8c7ab50d..342b2254c0 100644 --- a/internal/component/loki/process/stages/template.go +++ b/internal/component/loki/process/stages/template.go @@ -13,7 +13,7 @@ import ( "github.com/Masterminds/sprig/v3" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" "golang.org/x/crypto/sha3" diff --git a/internal/component/loki/process/stages/tenant.go b/internal/component/loki/process/stages/tenant.go index a95cd2f1bc..4e93ab2ebb 100644 --- a/internal/component/loki/process/stages/tenant.go +++ b/internal/component/loki/process/stages/tenant.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/process/stages/timestamp.go b/internal/component/loki/process/stages/timestamp.go index e7f8d12e98..7474cf089a 100644 --- a/internal/component/loki/process/stages/timestamp.go +++ b/internal/component/loki/process/stages/timestamp.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" lru "github.com/hashicorp/golang-lru" "github.com/prometheus/common/model" diff --git a/internal/component/loki/process/stages/timestamp_test.go b/internal/component/loki/process/stages/timestamp_test.go index da95753cdf..7e7de1887d 100644 --- a/internal/component/loki/process/stages/timestamp_test.go +++ b/internal/component/loki/process/stages/timestamp_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/internal/component/loki/process/stages/util_test.go b/internal/component/loki/process/stages/util_test.go index a2d6313b6a..3b086ef6a6 100644 --- a/internal/component/loki/process/stages/util_test.go +++ b/internal/component/loki/process/stages/util_test.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" ) diff --git a/internal/component/loki/relabel/relabel.go b/internal/component/loki/relabel/relabel.go index 1da52e9d77..d094ddffe6 100644 --- a/internal/component/loki/relabel/relabel.go +++ b/internal/component/loki/relabel/relabel.go @@ -5,11 +5,11 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" lru "github.com/hashicorp/golang-lru" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/relabel/relabel_test.go b/internal/component/loki/relabel/relabel_test.go index bb123fc2a6..51f7837650 100644 --- a/internal/component/loki/relabel/relabel_test.go +++ b/internal/component/loki/relabel/relabel_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - lsf "github.com/grafana/agent/internal/component/loki/source/file" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + lsf "github.com/grafana/alloy/internal/component/loki/source/file" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/loki/rules/kubernetes/events.go b/internal/component/loki/rules/kubernetes/events.go index cde73f79cd..78d184339d 100644 --- a/internal/component/loki/rules/kubernetes/events.go +++ b/internal/component/loki/rules/kubernetes/events.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/hashicorp/go-multierror" promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/internal/component/loki/rules/kubernetes/events_test.go b/internal/component/loki/rules/kubernetes/events_test.go index 8c0b5f928e..62f1b4f444 100644 --- a/internal/component/loki/rules/kubernetes/events_test.go +++ b/internal/component/loki/rules/kubernetes/events_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/kubernetes" - lokiClient "github.com/grafana/agent/internal/loki/client" + "github.com/grafana/alloy/internal/component/common/kubernetes" + lokiClient "github.com/grafana/alloy/internal/loki/client" v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" promListers "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/internal/component/loki/rules/kubernetes/health.go b/internal/component/loki/rules/kubernetes/health.go index 101bfd1d0a..0b29d899f2 100644 --- a/internal/component/loki/rules/kubernetes/health.go +++ b/internal/component/loki/rules/kubernetes/health.go @@ -3,7 +3,7 @@ package rules import ( "time" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" ) func (c *Component) reportUnhealthy(err error) { diff --git a/internal/component/loki/rules/kubernetes/rules.go b/internal/component/loki/rules/kubernetes/rules.go index 081b1f283c..c38da8d005 100644 --- a/internal/component/loki/rules/kubernetes/rules.go +++ b/internal/component/loki/rules/kubernetes/rules.go @@ -7,11 +7,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - commonK8s "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - lokiClient "github.com/grafana/agent/internal/loki/client" + "github.com/grafana/alloy/internal/component" + commonK8s "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + lokiClient "github.com/grafana/alloy/internal/loki/client" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/instrument" promListers "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" diff --git a/internal/component/loki/rules/kubernetes/types.go b/internal/component/loki/rules/kubernetes/types.go index 1cb84f96ea..89cdeb90cc 100644 --- a/internal/component/loki/rules/kubernetes/types.go +++ b/internal/component/loki/rules/kubernetes/types.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/kubernetes" ) type Arguments struct { diff --git a/internal/component/loki/source/api/api.go b/internal/component/loki/source/api/api.go index cf3002ab65..244bc4dfaf 100644 --- a/internal/component/loki/source/api/api.go +++ b/internal/component/loki/source/api/api.go @@ -6,13 +6,13 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/api/internal/lokipush" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/api/internal/lokipush" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/source/api/api_test.go b/internal/component/loki/source/api/api_test.go index df5a9785b6..bc4263d045 100644 --- a/internal/component/loki/source/api/api_test.go +++ b/internal/component/loki/source/api/api_test.go @@ -9,13 +9,13 @@ import ( "github.com/phayes/freeport" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/client" - "github.com/grafana/agent/internal/component/common/loki/client/fake" - "github.com/grafana/agent/internal/component/common/net" - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/client" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/net" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/util" "github.com/grafana/dskit/flagext" "github.com/grafana/loki/pkg/logproto" "github.com/grafana/regexp" diff --git a/internal/component/loki/source/api/internal/lokipush/push_api_server.go b/internal/component/loki/source/api/internal/lokipush/push_api_server.go index 1842522dfa..33f06fc1ef 100644 --- a/internal/component/loki/source/api/internal/lokipush/push_api_server.go +++ b/internal/component/loki/source/api/internal/lokipush/push_api_server.go @@ -11,10 +11,10 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - frelabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + frelabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/dskit/tenant" "github.com/grafana/loki/pkg/loghttp/push" "github.com/grafana/loki/pkg/logproto" diff --git a/internal/component/loki/source/api/internal/lokipush/push_api_server_test.go b/internal/component/loki/source/api/internal/lokipush/push_api_server_test.go index 5c11ffffee..e58184ff7a 100644 --- a/internal/component/loki/source/api/internal/lokipush/push_api_server_test.go +++ b/internal/component/loki/source/api/internal/lokipush/push_api_server_test.go @@ -16,11 +16,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/client" - "github.com/grafana/agent/internal/component/common/loki/client/fake" - fnet "github.com/grafana/agent/internal/component/common/net" - frelabel "github.com/grafana/agent/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/client" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" + fnet "github.com/grafana/alloy/internal/component/common/net" + frelabel "github.com/grafana/alloy/internal/component/common/relabel" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/flagext" "github.com/grafana/loki/pkg/logproto" diff --git a/internal/component/loki/source/aws_firehose/component.go b/internal/component/loki/source/aws_firehose/component.go index 7088056e2e..274b00b100 100644 --- a/internal/component/loki/source/aws_firehose/component.go +++ b/internal/component/loki/source/aws_firehose/component.go @@ -8,17 +8,17 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/aws_firehose/internal" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/aws_firehose/internal" + "github.com/grafana/alloy/internal/util" ) func init() { diff --git a/internal/component/loki/source/aws_firehose/component_test.go b/internal/component/loki/source/aws_firehose/component_test.go index 164f4d5b45..05fa1ad0e8 100644 --- a/internal/component/loki/source/aws_firehose/component_test.go +++ b/internal/component/loki/source/aws_firehose/component_test.go @@ -15,11 +15,11 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/util" ) const singleRecordRequest = `{"requestId":"a1af4300-6c09-4916-ba8f-12f336176246","timestamp":1684422829730,"records":[{"data":"eyJDSEFOR0UiOi0wLjIzLCJQUklDRSI6NC44LCJUSUNLRVJfU1lNQk9MIjoiTkdDIiwiU0VDVE9SIjoiSEVBTFRIQ0FSRSJ9"}]}` diff --git a/internal/component/loki/source/aws_firehose/internal/handler.go b/internal/component/loki/source/aws_firehose/internal/handler.go index 38c98631c9..1a755065b0 100644 --- a/internal/component/loki/source/aws_firehose/internal/handler.go +++ b/internal/component/loki/source/aws_firehose/internal/handler.go @@ -15,14 +15,14 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component/common/loki" - lokiClient "github.com/grafana/agent/internal/component/common/loki/client" + "github.com/grafana/alloy/internal/component/common/loki" + lokiClient "github.com/grafana/alloy/internal/component/common/loki/client" ) const ( diff --git a/internal/component/loki/source/aws_firehose/internal/handler_test.go b/internal/component/loki/source/aws_firehose/internal/handler_test.go index 54848c9660..0f5a79a87f 100644 --- a/internal/component/loki/source/aws_firehose/internal/handler_test.go +++ b/internal/component/loki/source/aws_firehose/internal/handler_test.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) const ( diff --git a/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go b/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go index fe1c9b451e..b96486aa55 100644 --- a/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go +++ b/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go @@ -7,13 +7,13 @@ import ( "sync" "github.com/IBM/sarama" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/azure_event_hubs/internal/parser" - kt "github.com/grafana/agent/internal/component/loki/source/internal/kafkatarget" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/azure_event_hubs/internal/parser" + kt "github.com/grafana/alloy/internal/component/loki/source/internal/kafkatarget" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/dskit/flagext" "github.com/prometheus/common/model" diff --git a/internal/component/loki/source/azure_event_hubs/internal/parser/parser.go b/internal/component/loki/source/azure_event_hubs/internal/parser/parser.go index 227fad601a..214255a8a3 100644 --- a/internal/component/loki/source/azure_event_hubs/internal/parser/parser.go +++ b/internal/component/loki/source/azure_event_hubs/internal/parser/parser.go @@ -12,7 +12,7 @@ import ( "time" "github.com/IBM/sarama" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/source/cloudflare/cloudflare.go b/internal/component/loki/source/cloudflare/cloudflare.go index 2fcdc62ff0..3f8e514799 100644 --- a/internal/component/loki/source/cloudflare/cloudflare.go +++ b/internal/component/loki/source/cloudflare/cloudflare.go @@ -13,12 +13,12 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - cft "github.com/grafana/agent/internal/component/loki/source/cloudflare/internal/cloudflaretarget" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + cft "github.com/grafana/alloy/internal/component/loki/source/cloudflare/internal/cloudflaretarget" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target.go b/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target.go index dfe0d9a181..58a7aaf24f 100644 --- a/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target.go +++ b/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target.go @@ -13,9 +13,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/cloudflare-go" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/concurrency" diff --git a/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target_test.go b/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target_test.go index 5a0a54f2c3..58f7f56444 100644 --- a/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target_test.go +++ b/internal/component/loki/source/cloudflare/internal/cloudflaretarget/target_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/common/loki/positions" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/internal/component/loki/source/docker/docker.go b/internal/component/loki/source/docker/docker.go index 809f8e1219..453e1667bb 100644 --- a/internal/component/loki/source/docker/docker.go +++ b/internal/component/loki/source/docker/docker.go @@ -15,16 +15,16 @@ import ( "github.com/docker/docker/client" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - types "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - dt "github.com/grafana/agent/internal/component/loki/source/docker/internal/dockertarget" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/component" + types "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + dt "github.com/grafana/alloy/internal/component/loki/source/docker/internal/dockertarget" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/useragent" "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/loki/source/docker/docker_test.go b/internal/component/loki/source/docker/docker_test.go index f83db37cfa..9e529764cf 100644 --- a/internal/component/loki/source/docker/docker_test.go +++ b/internal/component/loki/source/docker/docker_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" diff --git a/internal/component/loki/source/docker/internal/dockertarget/target.go b/internal/component/loki/source/docker/internal/dockertarget/target.go index 5e118fab98..7960484113 100644 --- a/internal/component/loki/source/docker/internal/dockertarget/target.go +++ b/internal/component/loki/source/docker/internal/dockertarget/target.go @@ -18,9 +18,9 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/pkg/stdcopy" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/source/docker/internal/dockertarget/target_test.go b/internal/component/loki/source/docker/internal/dockertarget/target_test.go index e32ecb1010..1997b90d93 100644 --- a/internal/component/loki/source/docker/internal/dockertarget/target_test.go +++ b/internal/component/loki/source/docker/internal/dockertarget/target_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/common/loki/positions" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/loki/source/docker/runner.go b/internal/component/loki/source/docker/runner.go index 61fb9d6407..360df33a18 100644 --- a/internal/component/loki/source/docker/runner.go +++ b/internal/component/loki/source/docker/runner.go @@ -9,11 +9,11 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - dt "github.com/grafana/agent/internal/component/loki/source/docker/internal/dockertarget" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/runner" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + dt "github.com/grafana/alloy/internal/component/loki/source/docker/internal/dockertarget" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/runner" ) // A manager manages a set of running tailers. diff --git a/internal/component/loki/source/file/decompresser.go b/internal/component/loki/source/file/decompresser.go index 85696f3676..6336a388c3 100644 --- a/internal/component/loki/source/file/decompresser.go +++ b/internal/component/loki/source/file/decompresser.go @@ -19,9 +19,9 @@ import ( "unsafe" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" "go.uber.org/atomic" diff --git a/internal/component/loki/source/file/decompresser_test.go b/internal/component/loki/source/file/decompresser_test.go index d3ecc7d872..204fa55a0e 100644 --- a/internal/component/loki/source/file/decompresser_test.go +++ b/internal/component/loki/source/file/decompresser_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" "go.uber.org/atomic" diff --git a/internal/component/loki/source/file/file.go b/internal/component/loki/source/file/file.go index 3c418d9981..7bdb04048c 100644 --- a/internal/component/loki/source/file/file.go +++ b/internal/component/loki/source/file/file.go @@ -9,12 +9,12 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/tail/watch" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/source/file/file_test.go b/internal/component/loki/source/file/file_test.go index d7ca89b933..c1aa90912f 100644 --- a/internal/component/loki/source/file/file_test.go +++ b/internal/component/loki/source/file/file_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/internal/component/loki/source/file/tailer.go b/internal/component/loki/source/file/tailer.go index 94de433ae6..a3d8af4f66 100644 --- a/internal/component/loki/source/file/tailer.go +++ b/internal/component/loki/source/file/tailer.go @@ -12,9 +12,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" "github.com/grafana/loki/pkg/util" "github.com/grafana/tail" diff --git a/internal/component/loki/source/gcplog/gcplog.go b/internal/component/loki/source/gcplog/gcplog.go index f7ebd670ad..3f25c5c8c0 100644 --- a/internal/component/loki/source/gcplog/gcplog.go +++ b/internal/component/loki/source/gcplog/gcplog.go @@ -6,17 +6,17 @@ import ( "strings" "sync" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" - gt "github.com/grafana/agent/internal/component/loki/source/gcplog/internal/gcplogtarget" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" + gt "github.com/grafana/alloy/internal/component/loki/source/gcplog/internal/gcplogtarget" + "github.com/grafana/alloy/internal/util" ) func init() { diff --git a/internal/component/loki/source/gcplog/gcplog_test.go b/internal/component/loki/source/gcplog/gcplog_test.go index 1d54519369..12fa8c5f1a 100644 --- a/internal/component/loki/source/gcplog/gcplog_test.go +++ b/internal/component/loki/source/gcplog/gcplog_test.go @@ -14,12 +14,12 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" + "github.com/grafana/alloy/internal/util" ) // TODO (@tpaschalis) We can't test this easily as there's no way to inject diff --git a/internal/component/loki/source/gcplog/gcptypes/gcptypes.go b/internal/component/loki/source/gcplog/gcptypes/gcptypes.go index dad7d8e0a9..20ecf42f14 100644 --- a/internal/component/loki/source/gcplog/gcptypes/gcptypes.go +++ b/internal/component/loki/source/gcplog/gcptypes/gcptypes.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - fnet "github.com/grafana/agent/internal/component/common/net" + fnet "github.com/grafana/alloy/internal/component/common/net" ) // PullConfig configures a GCPLog target with the 'pull' strategy. diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter.go index 9085737c15..a1e036e44d 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter.go @@ -16,7 +16,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) // GCPLogEntry that will be written to the pubsub topic according to the following spec. diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go index 67fbf13675..1a9536bb39 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go @@ -13,14 +13,14 @@ import ( "cloud.google.com/go/pubsub" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/dskit/backoff" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" "google.golang.org/api/option" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" ) // PullTarget represents a target that scrapes logs from a GCP project id and diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target_test.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target_test.go index 669fc43031..9245a842ae 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target_test.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "gotest.tools/assert" - "github.com/grafana/agent/internal/component/common/loki/client/fake" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" ) func TestPullTarget_RunStop(t *testing.T) { diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target.go index c4091693ee..c0a013a035 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target.go @@ -14,14 +14,14 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" ) // PushTarget defines a server for receiving messages from a GCP PubSub push diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go index 68886b33c2..2b7c1462c4 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go @@ -16,10 +16,10 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/client/fake" - fnet "github.com/grafana/agent/internal/component/common/net" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" + fnet "github.com/grafana/alloy/internal/component/common/net" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" ) const localhost = "127.0.0.1" diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation.go index 624c0678be..d7b6a22f60 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) // ReservedLabelTenantID reserved to override the tenant ID while processing diff --git a/internal/component/loki/source/gelf/gelf.go b/internal/component/loki/source/gelf/gelf.go index ea889322d3..0e1343654e 100644 --- a/internal/component/loki/source/gelf/gelf.go +++ b/internal/component/loki/source/gelf/gelf.go @@ -4,11 +4,11 @@ import ( "context" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/gelf/internal/target" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/gelf/internal/target" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/loki/source/gelf/gelf_test.go b/internal/component/loki/source/gelf/gelf_test.go index 0e1104717c..b948528d1c 100644 --- a/internal/component/loki/source/gelf/gelf_test.go +++ b/internal/component/loki/source/gelf/gelf_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/util" "github.com/phayes/freeport" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" diff --git a/internal/component/loki/source/gelf/internal/target/gelftarget.go b/internal/component/loki/source/gelf/internal/target/gelftarget.go index 5868f59ba2..a1dce76315 100644 --- a/internal/component/loki/source/gelf/internal/target/gelftarget.go +++ b/internal/component/loki/source/gelf/internal/target/gelftarget.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/go-gelf/v2/gelf" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/source/heroku/heroku.go b/internal/component/loki/source/heroku/heroku.go index d551b1cf80..ca8015fe06 100644 --- a/internal/component/loki/source/heroku/heroku.go +++ b/internal/component/loki/source/heroku/heroku.go @@ -5,14 +5,14 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - ht "github.com/grafana/agent/internal/component/loki/source/heroku/internal/herokutarget" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + ht "github.com/grafana/alloy/internal/component/loki/source/heroku/internal/herokutarget" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/loki/source/heroku/heroku_test.go b/internal/component/loki/source/heroku/heroku_test.go index 8a6692aa09..a562e10ab1 100644 --- a/internal/component/loki/source/heroku/heroku_test.go +++ b/internal/component/loki/source/heroku/heroku_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/heroku/internal/herokutarget" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/heroku/internal/herokutarget" + "github.com/grafana/alloy/internal/util" "github.com/grafana/regexp" "github.com/phayes/freeport" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/loki/source/heroku/internal/herokutarget/herokutarget.go b/internal/component/loki/source/heroku/internal/herokutarget/herokutarget.go index 903285e16a..93725f938f 100644 --- a/internal/component/loki/source/heroku/internal/herokutarget/herokutarget.go +++ b/internal/component/loki/source/heroku/internal/herokutarget/herokutarget.go @@ -12,9 +12,9 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/component/common/loki" - fnet "github.com/grafana/agent/internal/component/common/net" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + fnet "github.com/grafana/alloy/internal/component/common/net" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/pkg/logproto" herokuEncoding "github.com/heroku/x/logplex/encoding" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/loki/source/heroku/internal/herokutarget/target_test.go b/internal/component/loki/source/heroku/internal/herokutarget/target_test.go index 4da6704e16..615564e1cc 100644 --- a/internal/component/loki/source/heroku/internal/herokutarget/target_test.go +++ b/internal/component/loki/source/heroku/internal/herokutarget/target_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/go-kit/log" "github.com/google/uuid" @@ -23,7 +23,7 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - fnet "github.com/grafana/agent/internal/component/common/net" + fnet "github.com/grafana/alloy/internal/component/common/net" ) const localhost = "127.0.0.1" diff --git a/internal/component/loki/source/internal/kafkatarget/config.go b/internal/component/loki/source/internal/kafkatarget/config.go index 1001bae451..01f4dc28cf 100644 --- a/internal/component/loki/source/internal/kafkatarget/config.go +++ b/internal/component/loki/source/internal/kafkatarget/config.go @@ -2,7 +2,7 @@ package kafkatarget import ( "github.com/IBM/sarama" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/dskit/flagext" promconfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/loki/source/internal/kafkatarget/consumer.go b/internal/component/loki/source/internal/kafkatarget/consumer.go index f22c8e2b7c..74fe76bb2a 100644 --- a/internal/component/loki/source/internal/kafkatarget/consumer.go +++ b/internal/component/loki/source/internal/kafkatarget/consumer.go @@ -12,7 +12,7 @@ import ( "github.com/IBM/sarama" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/dskit/backoff" "github.com/grafana/loki/clients/pkg/promtail/targets/target" diff --git a/internal/component/loki/source/internal/kafkatarget/kafkatarget.go b/internal/component/loki/source/internal/kafkatarget/kafkatarget.go index b0c90c0a6b..3bf5662db8 100644 --- a/internal/component/loki/source/internal/kafkatarget/kafkatarget.go +++ b/internal/component/loki/source/internal/kafkatarget/kafkatarget.go @@ -10,8 +10,8 @@ import ( "github.com/IBM/sarama" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/loki/clients/pkg/promtail/targets/target" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go b/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go index 6d90d94ab0..672aba066c 100644 --- a/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go +++ b/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/IBM/sarama" "github.com/prometheus/common/model" diff --git a/internal/component/loki/source/internal/kafkatarget/parser.go b/internal/component/loki/source/internal/kafkatarget/parser.go index f4b7baed83..e2c3e315b1 100644 --- a/internal/component/loki/source/internal/kafkatarget/parser.go +++ b/internal/component/loki/source/internal/kafkatarget/parser.go @@ -2,7 +2,7 @@ package kafkatarget import ( "github.com/IBM/sarama" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/loki/source/internal/kafkatarget/target_syncer.go b/internal/component/loki/source/internal/kafkatarget/target_syncer.go index dd58766f9f..9514d39138 100644 --- a/internal/component/loki/source/internal/kafkatarget/target_syncer.go +++ b/internal/component/loki/source/internal/kafkatarget/target_syncer.go @@ -13,14 +13,14 @@ import ( "github.com/IBM/sarama" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" promconfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/grafana/loki/clients/pkg/promtail/targets/target" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) var TopicPollInterval = 30 * time.Second diff --git a/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go b/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go index 4c11f46d8c..b5c6ea02f9 100644 --- a/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go +++ b/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/grafana/dskit/flagext" "github.com/prometheus/common/config" diff --git a/internal/component/loki/source/journal/internal/target/journaltarget.go b/internal/component/loki/source/journal/internal/target/journaltarget.go index 88377ba426..b7dbeea4dc 100644 --- a/internal/component/loki/source/journal/internal/target/journaltarget.go +++ b/internal/component/loki/source/journal/internal/target/journaltarget.go @@ -13,12 +13,12 @@ import ( "syscall" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" "github.com/coreos/go-systemd/sdjournal" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/internal/component/loki/source/journal/internal/target/journaltarget_test.go b/internal/component/loki/source/journal/internal/target/journaltarget_test.go index e8bd2653e3..d11d26217c 100644 --- a/internal/component/loki/source/journal/internal/target/journaltarget_test.go +++ b/internal/component/loki/source/journal/internal/target/journaltarget_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/coreos/go-systemd/sdjournal" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/common/loki/positions" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/loki/source/journal/journal.go b/internal/component/loki/source/journal/journal.go index 7bdb5b3127..971f6bfe4e 100644 --- a/internal/component/loki/source/journal/journal.go +++ b/internal/component/loki/source/journal/journal.go @@ -9,15 +9,15 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/journal/internal/target" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/journal/internal/target" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" "github.com/prometheus/common/model" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" ) func init() { diff --git a/internal/component/loki/source/journal/journal_stub.go b/internal/component/loki/source/journal/journal_stub.go index a18ec9f420..10cc145181 100644 --- a/internal/component/loki/source/journal/journal_stub.go +++ b/internal/component/loki/source/journal/journal_stub.go @@ -5,9 +5,9 @@ package journal import ( "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/loki/source/journal/journal_test.go b/internal/component/loki/source/journal/journal_test.go index 525d982998..d4da349bdb 100644 --- a/internal/component/loki/source/journal/journal_test.go +++ b/internal/component/loki/source/journal/journal_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/coreos/go-systemd/v22/journal" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/internal/component/loki/source/journal/types.go b/internal/component/loki/source/journal/types.go index 648f7e7cfd..d4b1bd673b 100644 --- a/internal/component/loki/source/journal/types.go +++ b/internal/component/loki/source/journal/types.go @@ -3,8 +3,8 @@ package journal import ( "time" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" ) // Arguments are the arguments for the component. diff --git a/internal/component/loki/source/kafka/kafka.go b/internal/component/loki/source/kafka/kafka.go index a22c3141a5..d44c8369df 100644 --- a/internal/component/loki/source/kafka/kafka.go +++ b/internal/component/loki/source/kafka/kafka.go @@ -5,13 +5,13 @@ import ( "sync" "github.com/IBM/sarama" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - kt "github.com/grafana/agent/internal/component/loki/source/internal/kafkatarget" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + kt "github.com/grafana/alloy/internal/component/loki/source/internal/kafkatarget" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax/alloytypes" "github.com/grafana/dskit/flagext" "github.com/prometheus/common/model" diff --git a/internal/component/loki/source/kubernetes/kubernetes.go b/internal/component/loki/source/kubernetes/kubernetes.go index 012e9082a8..b32942417c 100644 --- a/internal/component/loki/source/kubernetes/kubernetes.go +++ b/internal/component/loki/source/kubernetes/kubernetes.go @@ -11,15 +11,15 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - commonk8s "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/loki/source/kubernetes/kubetail" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component" + commonk8s "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/loki/source/kubernetes/kubetail" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" "k8s.io/client-go/kubernetes" ) diff --git a/internal/component/loki/source/kubernetes/kubetail/kubetail.go b/internal/component/loki/source/kubernetes/kubetail/kubetail.go index 10c5d64ee0..c40d44978b 100644 --- a/internal/component/loki/source/kubernetes/kubetail/kubetail.go +++ b/internal/component/loki/source/kubernetes/kubetail/kubetail.go @@ -6,10 +6,10 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/runner" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/runner" "k8s.io/client-go/kubernetes" ) diff --git a/internal/component/loki/source/kubernetes/kubetail/tailer.go b/internal/component/loki/source/kubernetes/kubetail/tailer.go index 4e30ab511a..477879c7c4 100644 --- a/internal/component/loki/source/kubernetes/kubetail/tailer.go +++ b/internal/component/loki/source/kubernetes/kubetail/tailer.go @@ -10,9 +10,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/runner" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/runner" "github.com/grafana/dskit/backoff" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" diff --git a/internal/component/loki/source/kubernetes_events/event_controller.go b/internal/component/loki/source/kubernetes_events/event_controller.go index 1a1bd4fdf4..686fa0ad8e 100644 --- a/internal/component/loki/source/kubernetes_events/event_controller.go +++ b/internal/component/loki/source/kubernetes_events/event_controller.go @@ -10,10 +10,10 @@ import ( "github.com/cespare/xxhash/v2" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/runner" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/runner" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" corev1 "k8s.io/api/core/v1" diff --git a/internal/component/loki/source/kubernetes_events/kubernetes_events.go b/internal/component/loki/source/kubernetes_events/kubernetes_events.go index 0f860d789b..40e4878289 100644 --- a/internal/component/loki/source/kubernetes_events/kubernetes_events.go +++ b/internal/component/loki/source/kubernetes_events/kubernetes_events.go @@ -12,13 +12,13 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/runner" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/runner" "github.com/oklog/run" "k8s.io/client-go/rest" ) diff --git a/internal/component/loki/source/podlogs/controller.go b/internal/component/loki/source/podlogs/controller.go index bf71b40c8f..0abdeea595 100644 --- a/internal/component/loki/source/podlogs/controller.go +++ b/internal/component/loki/source/podlogs/controller.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-kit/log" - monitoringv1alpha2 "github.com/grafana/agent/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2" - "github.com/grafana/agent/internal/flow/logging/level" + monitoringv1alpha2 "github.com/grafana/alloy/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2" + "github.com/grafana/alloy/internal/flow/logging/level" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" diff --git a/internal/component/loki/source/podlogs/podlogs.go b/internal/component/loki/source/podlogs/podlogs.go index 94323cc16a..4ec3bffba0 100644 --- a/internal/component/loki/source/podlogs/podlogs.go +++ b/internal/component/loki/source/podlogs/podlogs.go @@ -10,16 +10,16 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - commonk8s "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/positions" - "github.com/grafana/agent/internal/component/loki/source/kubernetes" - "github.com/grafana/agent/internal/component/loki/source/kubernetes/kubetail" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + commonk8s "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/positions" + "github.com/grafana/alloy/internal/component/loki/source/kubernetes" + "github.com/grafana/alloy/internal/component/loki/source/kubernetes/kubetail" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" "github.com/oklog/run" kubeclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" diff --git a/internal/component/loki/source/podlogs/reconciler.go b/internal/component/loki/source/podlogs/reconciler.go index 7f79807b6f..068dcdce06 100644 --- a/internal/component/loki/source/podlogs/reconciler.go +++ b/internal/component/loki/source/podlogs/reconciler.go @@ -9,10 +9,10 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/loki/source/kubernetes/kubetail" - monitoringv1alpha2 "github.com/grafana/agent/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component/loki/source/kubernetes/kubetail" + monitoringv1alpha2 "github.com/grafana/alloy/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" "github.com/grafana/ckit/shard" "github.com/prometheus/common/model" promlabels "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget.go b/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget.go index 087b59796a..d48512b31d 100644 --- a/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget.go +++ b/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget.go @@ -12,14 +12,14 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/influxdata/go-syslog/v3" "github.com/influxdata/go-syslog/v3/rfc5424" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" "github.com/grafana/loki/clients/pkg/promtail/targets/target" diff --git a/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go b/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go index 5754fb9693..40e0ccde4e 100644 --- a/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go +++ b/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go @@ -15,7 +15,7 @@ import ( "time" "unicode/utf8" - "github.com/grafana/agent/internal/component/common/loki/client/fake" + "github.com/grafana/alloy/internal/component/common/loki/client/fake" "github.com/go-kit/log" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" diff --git a/internal/component/loki/source/syslog/internal/syslogtarget/transport.go b/internal/component/loki/source/syslog/internal/syslogtarget/transport.go index d7360ecef4..6539b4594b 100644 --- a/internal/component/loki/source/syslog/internal/syslogtarget/transport.go +++ b/internal/component/loki/source/syslog/internal/syslogtarget/transport.go @@ -21,7 +21,7 @@ import ( "github.com/mwitkow/go-conntrack" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/influxdata/go-syslog/v3" "github.com/prometheus/common/config" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/loki/source/syslog/syslog.go b/internal/component/loki/source/syslog/syslog.go index 296a75453c..03a0150291 100644 --- a/internal/component/loki/source/syslog/syslog.go +++ b/internal/component/loki/source/syslog/syslog.go @@ -5,12 +5,12 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - st "github.com/grafana/agent/internal/component/loki/source/syslog/internal/syslogtarget" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + st "github.com/grafana/alloy/internal/component/loki/source/syslog/internal/syslogtarget" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/prometheus/model/relabel" ) diff --git a/internal/component/loki/source/syslog/syslog_test.go b/internal/component/loki/source/syslog/syslog_test.go index 481cd5a5c2..a6dc560035 100644 --- a/internal/component/loki/source/syslog/syslog_test.go +++ b/internal/component/loki/source/syslog/syslog_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/util" "github.com/grafana/regexp" "github.com/phayes/freeport" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/loki/source/syslog/types.go b/internal/component/loki/source/syslog/types.go index afc617ac32..18d4300df7 100644 --- a/internal/component/loki/source/syslog/types.go +++ b/internal/component/loki/source/syslog/types.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component/common/config" - st "github.com/grafana/agent/internal/component/loki/source/syslog/internal/syslogtarget" + "github.com/grafana/alloy/internal/component/common/config" + st "github.com/grafana/alloy/internal/component/loki/source/syslog/internal/syslogtarget" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" "github.com/prometheus/common/model" ) diff --git a/internal/component/loki/source/windowsevent/arguments.go b/internal/component/loki/source/windowsevent/arguments.go index eff4af2889..ae08fc1a00 100644 --- a/internal/component/loki/source/windowsevent/arguments.go +++ b/internal/component/loki/source/windowsevent/arguments.go @@ -7,7 +7,7 @@ package windowsevent import ( "time" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) // Arguments holds values which are used to configure the loki.source.windowsevent diff --git a/internal/component/loki/source/windowsevent/component_stub.go b/internal/component/loki/source/windowsevent/component_stub.go index bc7eba8ccb..6081c08e78 100644 --- a/internal/component/loki/source/windowsevent/component_stub.go +++ b/internal/component/loki/source/windowsevent/component_stub.go @@ -5,9 +5,9 @@ package windowsevent import ( "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/loki/source/windowsevent/component_test.go b/internal/component/loki/source/windowsevent/component_test.go index 49488e0313..45a4f15d50 100644 --- a/internal/component/loki/source/windowsevent/component_test.go +++ b/internal/component/loki/source/windowsevent/component_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/internal/component/loki/source/windowsevent/component_windows.go b/internal/component/loki/source/windowsevent/component_windows.go index 58a4a62234..19d3f9b0e6 100644 --- a/internal/component/loki/source/windowsevent/component_windows.go +++ b/internal/component/loki/source/windowsevent/component_windows.go @@ -6,10 +6,10 @@ import ( "path" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/utils" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/utils" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/loki/clients/pkg/promtail/api" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" ) diff --git a/internal/component/loki/write/types.go b/internal/component/loki/write/types.go index 9c73c88fde..943201893a 100644 --- a/internal/component/loki/write/types.go +++ b/internal/component/loki/write/types.go @@ -5,11 +5,11 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component/common/loki/client" - "github.com/grafana/agent/internal/component/common/loki/utils" + "github.com/grafana/alloy/internal/component/common/loki/client" + "github.com/grafana/alloy/internal/component/common/loki/utils" "github.com/alecthomas/units" - types "github.com/grafana/agent/internal/component/common/config" + types "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" lokiflagext "github.com/grafana/loki/pkg/util/flagext" diff --git a/internal/component/loki/write/write.go b/internal/component/loki/write/write.go index 59b1d8560f..4c86e5a01a 100644 --- a/internal/component/loki/write/write.go +++ b/internal/component/loki/write/write.go @@ -7,13 +7,13 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/agentseed" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/client" - "github.com/grafana/agent/internal/component/common/loki/limit" - "github.com/grafana/agent/internal/component/common/loki/wal" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/alloyseed" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/client" + "github.com/grafana/alloy/internal/component/common/loki/limit" + "github.com/grafana/alloy/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/featuregate" ) func init() { @@ -163,13 +163,14 @@ func (c *Component) Update(args component.Arguments) error { cfgs := newArgs.convertClientConfigs() - uid := agentseed.Get().UID + uid := alloyseed.Get().UID for i := range cfgs { //cfgs is slice of struct values, so we set by index if cfgs[i].Headers == nil { cfgs[i].Headers = map[string]string{} } - cfgs[i].Headers[agentseed.HeaderName] = uid + cfgs[i].Headers[alloyseed.LegacyHeaderName] = uid + cfgs[i].Headers[alloyseed.HeaderName] = uid } walCfg := wal.Config{ Enabled: newArgs.WAL.Enabled, diff --git a/internal/component/loki/write/write_test.go b/internal/component/loki/write/write_test.go index 8a4a366e71..63bdfb64b8 100644 --- a/internal/component/loki/write/write_test.go +++ b/internal/component/loki/write/write_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/loki/wal" - "github.com/grafana/agent/internal/component/discovery" - lsf "github.com/grafana/agent/internal/component/loki/source/file" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki/wal" + "github.com/grafana/alloy/internal/component/discovery" + lsf "github.com/grafana/alloy/internal/component/loki/source/file" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/internal/component/metadata/metadata.go b/internal/component/metadata/metadata.go index b566bd9139..768d9d95c0 100644 --- a/internal/component/metadata/metadata.go +++ b/internal/component/metadata/metadata.go @@ -4,12 +4,12 @@ import ( "fmt" "reflect" - "github.com/grafana/agent/internal/component" - _ "github.com/grafana/agent/internal/component/all" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component" + _ "github.com/grafana/alloy/internal/component/all" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/pyroscope" "github.com/prometheus/prometheus/storage" ) diff --git a/internal/component/mimir/rules/kubernetes/events.go b/internal/component/mimir/rules/kubernetes/events.go index 7752077d97..94f2155e56 100644 --- a/internal/component/mimir/rules/kubernetes/events.go +++ b/internal/component/mimir/rules/kubernetes/events.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/hashicorp/go-multierror" promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/internal/component/mimir/rules/kubernetes/events_test.go b/internal/component/mimir/rules/kubernetes/events_test.go index e177e41bd1..8b16ef78d1 100644 --- a/internal/component/mimir/rules/kubernetes/events_test.go +++ b/internal/component/mimir/rules/kubernetes/events_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/kubernetes" - mimirClient "github.com/grafana/agent/internal/mimir/client" + "github.com/grafana/alloy/internal/component/common/kubernetes" + mimirClient "github.com/grafana/alloy/internal/mimir/client" v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" promListers "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/internal/component/mimir/rules/kubernetes/health.go b/internal/component/mimir/rules/kubernetes/health.go index 101bfd1d0a..0b29d899f2 100644 --- a/internal/component/mimir/rules/kubernetes/health.go +++ b/internal/component/mimir/rules/kubernetes/health.go @@ -3,7 +3,7 @@ package rules import ( "time" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" ) func (c *Component) reportUnhealthy(err error) { diff --git a/internal/component/mimir/rules/kubernetes/rules.go b/internal/component/mimir/rules/kubernetes/rules.go index e6e6d03d8f..1f3106cc9a 100644 --- a/internal/component/mimir/rules/kubernetes/rules.go +++ b/internal/component/mimir/rules/kubernetes/rules.go @@ -7,11 +7,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - commonK8s "github.com/grafana/agent/internal/component/common/kubernetes" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - mimirClient "github.com/grafana/agent/internal/mimir/client" + "github.com/grafana/alloy/internal/component" + commonK8s "github.com/grafana/alloy/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + mimirClient "github.com/grafana/alloy/internal/mimir/client" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/instrument" promListers "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" diff --git a/internal/component/mimir/rules/kubernetes/types.go b/internal/component/mimir/rules/kubernetes/types.go index 701751a1db..ccdbe2b8c1 100644 --- a/internal/component/mimir/rules/kubernetes/types.go +++ b/internal/component/mimir/rules/kubernetes/types.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/kubernetes" ) type Arguments struct { diff --git a/internal/component/otelcol/auth/auth.go b/internal/component/otelcol/auth/auth.go index f1211c2e6f..6220f8fe54 100644 --- a/internal/component/otelcol/auth/auth.go +++ b/internal/component/otelcol/auth/auth.go @@ -9,11 +9,11 @@ import ( "context" "os" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol/internal/lazycollector" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazycollector" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/grafana/alloy/syntax" "github.com/prometheus/client_golang/prometheus" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/auth/auth_test.go b/internal/component/otelcol/auth/auth_test.go index 9bc8af90fe..70bd555564 100644 --- a/internal/component/otelcol/auth/auth_test.go +++ b/internal/component/otelcol/auth/auth_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/auth/basic/basic.go b/internal/component/otelcol/auth/basic/basic.go index 8432724832..25c6b55ac5 100644 --- a/internal/component/otelcol/auth/basic/basic.go +++ b/internal/component/otelcol/auth/basic/basic.go @@ -2,9 +2,9 @@ package basic import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/auth/basic/basic_test.go b/internal/component/otelcol/auth/basic/basic_test.go index aaad0abaa6..ee2804aa83 100644 --- a/internal/component/otelcol/auth/basic/basic_test.go +++ b/internal/component/otelcol/auth/basic/basic_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/auth/basic" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth/basic" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/auth/bearer/bearer.go b/internal/component/otelcol/auth/bearer/bearer.go index 43813c48b5..41ad2f779a 100644 --- a/internal/component/otelcol/auth/bearer/bearer.go +++ b/internal/component/otelcol/auth/bearer/bearer.go @@ -2,9 +2,9 @@ package bearer import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/auth/bearer/bearer_test.go b/internal/component/otelcol/auth/bearer/bearer_test.go index 7168980b63..bdbec3674d 100644 --- a/internal/component/otelcol/auth/bearer/bearer_test.go +++ b/internal/component/otelcol/auth/bearer/bearer_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/auth/bearer" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth/bearer" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/auth/headers/headers.go b/internal/component/otelcol/auth/headers/headers.go index f79f8506ca..21aeec00fd 100644 --- a/internal/component/otelcol/auth/headers/headers.go +++ b/internal/component/otelcol/auth/headers/headers.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension" diff --git a/internal/component/otelcol/auth/headers/headers_test.go b/internal/component/otelcol/auth/headers/headers_test.go index 0c9a586491..68a5a29db6 100644 --- a/internal/component/otelcol/auth/headers/headers_test.go +++ b/internal/component/otelcol/auth/headers/headers_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/auth/headers" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth/headers" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension" "github.com/stretchr/testify/assert" diff --git a/internal/component/otelcol/auth/oauth2/oauth2.go b/internal/component/otelcol/auth/oauth2/oauth2.go index 438096c4a4..6f1ae38663 100644 --- a/internal/component/otelcol/auth/oauth2/oauth2.go +++ b/internal/component/otelcol/auth/oauth2/oauth2.go @@ -4,10 +4,10 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/auth/oauth2/oauth2_test.go b/internal/component/otelcol/auth/oauth2/oauth2_test.go index 7de2719d73..8a0367ddef 100644 --- a/internal/component/otelcol/auth/oauth2/oauth2_test.go +++ b/internal/component/otelcol/auth/oauth2/oauth2_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/auth/oauth2" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth/oauth2" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" extauth "go.opentelemetry.io/collector/extension/auth" diff --git a/internal/component/otelcol/auth/sigv4/sigv4.go b/internal/component/otelcol/auth/sigv4/sigv4.go index e40f08352a..636a4accc9 100644 --- a/internal/component/otelcol/auth/sigv4/sigv4.go +++ b/internal/component/otelcol/auth/sigv4/sigv4.go @@ -1,9 +1,9 @@ package sigv4 import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/auth/sigv4/sigv4_test.go b/internal/component/otelcol/auth/sigv4/sigv4_test.go index a7db4e7ffe..05bf871867 100644 --- a/internal/component/otelcol/auth/sigv4/sigv4_test.go +++ b/internal/component/otelcol/auth/sigv4/sigv4_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/auth/sigv4" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth/sigv4" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/config_attraction_test.go b/internal/component/otelcol/config_attraction_test.go index 54d740b8b7..5879bde815 100644 --- a/internal/component/otelcol/config_attraction_test.go +++ b/internal/component/otelcol/config_attraction_test.go @@ -3,7 +3,7 @@ package otelcol_test import ( "testing" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" "github.com/stretchr/testify/require" ) diff --git a/internal/component/otelcol/config_filter_test.go b/internal/component/otelcol/config_filter_test.go index b55e02227b..2b57cde73a 100644 --- a/internal/component/otelcol/config_filter_test.go +++ b/internal/component/otelcol/config_filter_test.go @@ -5,7 +5,7 @@ import ( "k8s.io/utils/ptr" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/config_grpc.go b/internal/component/otelcol/config_grpc.go index 8d45332554..b2866aaa9e 100644 --- a/internal/component/otelcol/config_grpc.go +++ b/internal/component/otelcol/config_grpc.go @@ -4,7 +4,7 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth" otelcomponent "go.opentelemetry.io/collector/component" otelconfigauth "go.opentelemetry.io/collector/config/configauth" otelconfiggrpc "go.opentelemetry.io/collector/config/configgrpc" diff --git a/internal/component/otelcol/config_http.go b/internal/component/otelcol/config_http.go index 934a2a488c..f8a5554d4a 100644 --- a/internal/component/otelcol/config_http.go +++ b/internal/component/otelcol/config_http.go @@ -4,7 +4,7 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/auth" otelcomponent "go.opentelemetry.io/collector/component" otelconfigauth "go.opentelemetry.io/collector/config/configauth" otelconfighttp "go.opentelemetry.io/collector/config/confighttp" diff --git a/internal/component/otelcol/connector/connector.go b/internal/component/otelcol/connector/connector.go index 546465641a..63a1a38979 100644 --- a/internal/component/otelcol/connector/connector.go +++ b/internal/component/otelcol/connector/connector.go @@ -7,14 +7,14 @@ import ( "errors" "os" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/lazycollector" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazycollector" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/prometheus/client_golang/prometheus" otelcomponent "go.opentelemetry.io/collector/component" otelconnector "go.opentelemetry.io/collector/connector" diff --git a/internal/component/otelcol/connector/host_info/host_info.go b/internal/component/otelcol/connector/host_info/host_info.go index c756b80bfd..de15f89bab 100644 --- a/internal/component/otelcol/connector/host_info/host_info.go +++ b/internal/component/otelcol/connector/host_info/host_info.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/connector" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/connector" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/connector/servicegraph/servicegraph.go b/internal/component/otelcol/connector/servicegraph/servicegraph.go index 1d0298f45a..e48b6e7aab 100644 --- a/internal/component/otelcol/connector/servicegraph/servicegraph.go +++ b/internal/component/otelcol/connector/servicegraph/servicegraph.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/connector" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/connector" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" diff --git a/internal/component/otelcol/connector/servicegraph/servicegraph_test.go b/internal/component/otelcol/connector/servicegraph/servicegraph_test.go index 390c07bd2f..5b9b129809 100644 --- a/internal/component/otelcol/connector/servicegraph/servicegraph_test.go +++ b/internal/component/otelcol/connector/servicegraph/servicegraph_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/connector/servicegraph" + "github.com/grafana/alloy/internal/component/otelcol/connector/servicegraph" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/connector/spanlogs/spanlogs.go b/internal/component/otelcol/connector/spanlogs/spanlogs.go index bc749c02d8..10249d1bea 100644 --- a/internal/component/otelcol/connector/spanlogs/spanlogs.go +++ b/internal/component/otelcol/connector/spanlogs/spanlogs.go @@ -5,12 +5,12 @@ import ( "context" "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/connector/spanlogs/spanlogs_test.go b/internal/component/otelcol/connector/spanlogs/spanlogs_test.go index 093362aeeb..91fa3d5ee4 100644 --- a/internal/component/otelcol/connector/spanlogs/spanlogs_test.go +++ b/internal/component/otelcol/connector/spanlogs/spanlogs_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/connector/spanlogs" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/connector/spanlogs" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/otelcol/connector/spanmetrics/spanmetrics.go b/internal/component/otelcol/connector/spanmetrics/spanmetrics.go index 4de3a55f12..9ad227fcd3 100644 --- a/internal/component/otelcol/connector/spanmetrics/spanmetrics.go +++ b/internal/component/otelcol/connector/spanmetrics/spanmetrics.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/connector" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/connector" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go b/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go index 5a99a51de0..453bd91652 100644 --- a/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go +++ b/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/connector/spanmetrics" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/connector/spanmetrics" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/exporter/exporter.go b/internal/component/otelcol/exporter/exporter.go index 2524070aff..3cbdfa3fa3 100644 --- a/internal/component/otelcol/exporter/exporter.go +++ b/internal/component/otelcol/exporter/exporter.go @@ -7,14 +7,14 @@ import ( "errors" "os" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/lazycollector" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/component/otelcol/internal/views" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazycollector" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/component/otelcol/internal/views" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/prometheus/client_golang/prometheus" otelcomponent "go.opentelemetry.io/collector/component" otelexporter "go.opentelemetry.io/collector/exporter" diff --git a/internal/component/otelcol/exporter/exporter_test.go b/internal/component/otelcol/exporter/exporter_test.go index dd61355ec6..5498858044 100644 --- a/internal/component/otelcol/exporter/exporter_test.go +++ b/internal/component/otelcol/exporter/exporter_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" otelcomponent "go.opentelemetry.io/collector/component" otelconsumer "go.opentelemetry.io/collector/consumer" diff --git a/internal/component/otelcol/exporter/loadbalancing/loadbalancing.go b/internal/component/otelcol/exporter/loadbalancing/loadbalancing.go index 70bad94765..2757441959 100644 --- a/internal/component/otelcol/exporter/loadbalancing/loadbalancing.go +++ b/internal/component/otelcol/exporter/loadbalancing/loadbalancing.go @@ -6,11 +6,11 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/exporter" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/exporter" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/exporter/loadbalancing/loadbalancing_test.go b/internal/component/otelcol/exporter/loadbalancing/loadbalancing_test.go index 9b04ba1b23..9300f9c5f9 100644 --- a/internal/component/otelcol/exporter/loadbalancing/loadbalancing_test.go +++ b/internal/component/otelcol/exporter/loadbalancing/loadbalancing_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter/loadbalancing" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter/loadbalancing" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/exporter/logging/logging.go b/internal/component/otelcol/exporter/logging/logging.go index 3e09afa09d..45cff77cde 100644 --- a/internal/component/otelcol/exporter/logging/logging.go +++ b/internal/component/otelcol/exporter/logging/logging.go @@ -2,10 +2,10 @@ package logging import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" loggingexporter "go.opentelemetry.io/collector/exporter/loggingexporter" diff --git a/internal/component/otelcol/exporter/loki/internal/convert/convert.go b/internal/component/otelcol/exporter/loki/internal/convert/convert.go index 63446b8f3e..69ffff6edb 100644 --- a/internal/component/otelcol/exporter/loki/internal/convert/convert.go +++ b/internal/component/otelcol/exporter/loki/internal/convert/convert.go @@ -13,8 +13,8 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/flow/logging/level" loki_translator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki" "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/collector/consumer" diff --git a/internal/component/otelcol/exporter/loki/internal/convert/convert_test.go b/internal/component/otelcol/exporter/loki/internal/convert/convert_test.go index 016b8929fe..b7e8fbec10 100644 --- a/internal/component/otelcol/exporter/loki/internal/convert/convert_test.go +++ b/internal/component/otelcol/exporter/loki/internal/convert/convert_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/otelcol/exporter/loki/internal/convert" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/otelcol/exporter/loki/internal/convert" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/loki/pkg/push" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/internal/component/otelcol/exporter/loki/loki.go b/internal/component/otelcol/exporter/loki/loki.go index 5809d7edfc..983b3f0b1a 100644 --- a/internal/component/otelcol/exporter/loki/loki.go +++ b/internal/component/otelcol/exporter/loki/loki.go @@ -5,12 +5,12 @@ import ( "context" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter/loki/internal/convert" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter/loki/internal/convert" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/otelcol/exporter/otlp/otlp.go b/internal/component/otelcol/exporter/otlp/otlp.go index cd46c29901..56cd2835fd 100644 --- a/internal/component/otelcol/exporter/otlp/otlp.go +++ b/internal/component/otelcol/exporter/otlp/otlp.go @@ -4,10 +4,10 @@ package otlp import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" otelpexporterhelper "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/exporter/otlpexporter" diff --git a/internal/component/otelcol/exporter/otlp/otlp_test.go b/internal/component/otelcol/exporter/otlp/otlp_test.go index 88fa01e7b1..23ed07ad29 100644 --- a/internal/component/otelcol/exporter/otlp/otlp_test.go +++ b/internal/component/otelcol/exporter/otlp/otlp_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter/otlp" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter/otlp" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/backoff" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/exporter/otlphttp/otlphttp.go b/internal/component/otelcol/exporter/otlphttp/otlphttp.go index 6457d379ca..bb9124dbae 100644 --- a/internal/component/otelcol/exporter/otlphttp/otlphttp.go +++ b/internal/component/otelcol/exporter/otlphttp/otlphttp.go @@ -5,10 +5,10 @@ import ( "errors" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter/otlphttpexporter" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/exporter/otlphttp/otlphttp_test.go b/internal/component/otelcol/exporter/otlphttp/otlphttp_test.go index 1e49d8e63e..2277e0631f 100644 --- a/internal/component/otelcol/exporter/otlphttp/otlphttp_test.go +++ b/internal/component/otelcol/exporter/otlphttp/otlphttp_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter/otlphttp" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter/otlphttp" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/backoff" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/exporter/prometheus/internal/convert/convert.go b/internal/component/otelcol/exporter/prometheus/internal/convert/convert.go index a8f4d4a91c..dc3a218f38 100644 --- a/internal/component/otelcol/exporter/prometheus/internal/convert/convert.go +++ b/internal/component/otelcol/exporter/prometheus/internal/convert/convert.go @@ -18,7 +18,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/exemplar" diff --git a/internal/component/otelcol/exporter/prometheus/internal/convert/convert_test.go b/internal/component/otelcol/exporter/prometheus/internal/convert/convert_test.go index 37d001b9d5..08718deab9 100644 --- a/internal/component/otelcol/exporter/prometheus/internal/convert/convert_test.go +++ b/internal/component/otelcol/exporter/prometheus/internal/convert/convert_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - "github.com/grafana/agent/internal/component/otelcol/exporter/prometheus/internal/convert" - "github.com/grafana/agent/internal/util" - "github.com/grafana/agent/internal/util/testappender" + "github.com/grafana/alloy/internal/component/otelcol/exporter/prometheus/internal/convert" + "github.com/grafana/alloy/internal/util" + "github.com/grafana/alloy/internal/util/testappender" "github.com/prometheus/prometheus/storage" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/internal/component/otelcol/exporter/prometheus/prometheus.go b/internal/component/otelcol/exporter/prometheus/prometheus.go index f85f566bb0..0150b03fad 100644 --- a/internal/component/otelcol/exporter/prometheus/prometheus.go +++ b/internal/component/otelcol/exporter/prometheus/prometheus.go @@ -8,13 +8,13 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/exporter/prometheus/internal/convert" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/exporter/prometheus/internal/convert" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/prometheus/prometheus/storage" ) diff --git a/internal/component/otelcol/exporter/prometheus/prometheus_test.go b/internal/component/otelcol/exporter/prometheus/prometheus_test.go index f02b18f23b..3945c3ab96 100644 --- a/internal/component/otelcol/exporter/prometheus/prometheus_test.go +++ b/internal/component/otelcol/exporter/prometheus/prometheus_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/exporter/prometheus" + "github.com/grafana/alloy/internal/component/otelcol/exporter/prometheus" "github.com/grafana/alloy/syntax" "github.com/prometheus/prometheus/storage" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/extension/extension.go b/internal/component/otelcol/extension/extension.go index 8bdafad806..a832e7cc32 100644 --- a/internal/component/otelcol/extension/extension.go +++ b/internal/component/otelcol/extension/extension.go @@ -9,11 +9,11 @@ import ( "context" "os" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol/internal/lazycollector" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazycollector" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/prometheus/client_golang/prometheus" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/extension/extension_test.go b/internal/component/otelcol/extension/extension_test.go index fb83244343..ed5d6875c1 100644 --- a/internal/component/otelcol/extension/extension_test.go +++ b/internal/component/otelcol/extension/extension_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/extension" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/extension" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go b/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go index 84b8ca8a9f..34aa2fc41b 100644 --- a/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go +++ b/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go @@ -24,8 +24,8 @@ import ( otelextension "go.opentelemetry.io/collector/extension" "go.uber.org/zap" - "github.com/grafana/agent/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/internal" - "github.com/grafana/agent/internal/component/otelcol/extension/jaeger_remote_sampling/internal/strategy_store" + "github.com/grafana/alloy/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/internal" + "github.com/grafana/alloy/internal/component/otelcol/extension/jaeger_remote_sampling/internal/strategy_store" ) var _ otelextension.Extension = (*jrsExtension)(nil) diff --git a/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go b/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go index 815e734a82..babc653419 100644 --- a/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go +++ b/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/extension" - "github.com/grafana/agent/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/extension" + "github.com/grafana/alloy/internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" ) diff --git a/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling_test.go b/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling_test.go index 159ba0ccf6..2446466af4 100644 --- a/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling_test.go +++ b/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/extension/jaeger_remote_sampling" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/extension/jaeger_remote_sampling" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/phayes/freeport" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/internal/fakeconsumer/fake.go b/internal/component/otelcol/internal/fakeconsumer/fake.go index e90f508e65..c91a91e1ff 100644 --- a/internal/component/otelcol/internal/fakeconsumer/fake.go +++ b/internal/component/otelcol/internal/fakeconsumer/fake.go @@ -3,7 +3,7 @@ package fakeconsumer import ( "context" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" otelconsumer "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/internal/component/otelcol/internal/fanoutconsumer/logs.go b/internal/component/otelcol/internal/fanoutconsumer/logs.go index 1b6dc18945..6fc527bf01 100644 --- a/internal/component/otelcol/internal/fanoutconsumer/logs.go +++ b/internal/component/otelcol/internal/fanoutconsumer/logs.go @@ -9,7 +9,7 @@ package fanoutconsumer import ( "context" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" otelconsumer "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/multierr" diff --git a/internal/component/otelcol/internal/fanoutconsumer/metrics.go b/internal/component/otelcol/internal/fanoutconsumer/metrics.go index 4ace8e35a4..3669131b01 100644 --- a/internal/component/otelcol/internal/fanoutconsumer/metrics.go +++ b/internal/component/otelcol/internal/fanoutconsumer/metrics.go @@ -9,7 +9,7 @@ package fanoutconsumer import ( "context" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" otelconsumer "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/multierr" diff --git a/internal/component/otelcol/internal/fanoutconsumer/traces.go b/internal/component/otelcol/internal/fanoutconsumer/traces.go index 51403b6a04..785e286d5e 100644 --- a/internal/component/otelcol/internal/fanoutconsumer/traces.go +++ b/internal/component/otelcol/internal/fanoutconsumer/traces.go @@ -9,7 +9,7 @@ package fanoutconsumer import ( "context" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" otelconsumer "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/multierr" diff --git a/internal/component/otelcol/internal/scheduler/host.go b/internal/component/otelcol/internal/scheduler/host.go index 34bf664c63..aec74c35e9 100644 --- a/internal/component/otelcol/internal/scheduler/host.go +++ b/internal/component/otelcol/internal/scheduler/host.go @@ -2,7 +2,7 @@ package scheduler import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/internal/scheduler/scheduler.go b/internal/component/otelcol/internal/scheduler/scheduler.go index 5e553dd35a..5e345ff58b 100644 --- a/internal/component/otelcol/internal/scheduler/scheduler.go +++ b/internal/component/otelcol/internal/scheduler/scheduler.go @@ -9,8 +9,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/logging/level" otelcomponent "go.opentelemetry.io/collector/component" "go.uber.org/multierr" ) diff --git a/internal/component/otelcol/internal/scheduler/scheduler_test.go b/internal/component/otelcol/internal/scheduler/scheduler_test.go index 3d3e0de56e..28f20edccd 100644 --- a/internal/component/otelcol/internal/scheduler/scheduler_test.go +++ b/internal/component/otelcol/internal/scheduler/scheduler_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" otelcomponent "go.opentelemetry.io/collector/component" ) diff --git a/internal/component/otelcol/processor/attributes/attributes.go b/internal/component/otelcol/processor/attributes/attributes.go index 0f0cef5771..6fa270e5a6 100644 --- a/internal/component/otelcol/processor/attributes/attributes.go +++ b/internal/component/otelcol/processor/attributes/attributes.go @@ -4,10 +4,10 @@ package attributes import ( "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/processor/attributes/attributes_test.go b/internal/component/otelcol/processor/attributes/attributes_test.go index 3a488c45f1..4c29fd5ec4 100644 --- a/internal/component/otelcol/processor/attributes/attributes_test.go +++ b/internal/component/otelcol/processor/attributes/attributes_test.go @@ -6,11 +6,11 @@ import ( "net" "testing" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/attributes" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/attributes" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" diff --git a/internal/component/otelcol/processor/batch/batch.go b/internal/component/otelcol/processor/batch/batch.go index 3f659fb6bd..db433d4c62 100644 --- a/internal/component/otelcol/processor/batch/batch.go +++ b/internal/component/otelcol/processor/batch/batch.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/processor/batchprocessor" diff --git a/internal/component/otelcol/processor/batch/batch_test.go b/internal/component/otelcol/processor/batch/batch_test.go index 10b7add2d8..2fd6b3ffd6 100644 --- a/internal/component/otelcol/processor/batch/batch_test.go +++ b/internal/component/otelcol/processor/batch/batch_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/component/otelcol/processor/batch" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/component/otelcol/processor/batch" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/backoff" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/processor/discovery/discovery.go b/internal/component/otelcol/processor/discovery/discovery.go index 24de52597a..6001f488e6 100644 --- a/internal/component/otelcol/processor/discovery/discovery.go +++ b/internal/component/otelcol/processor/discovery/discovery.go @@ -6,14 +6,14 @@ import ( "fmt" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - promsdconsumer "github.com/grafana/agent/internal/static/traces/promsdprocessor/consumer" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + promsdconsumer "github.com/grafana/alloy/internal/static/traces/promsdprocessor/consumer" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/discovery/discovery_test.go b/internal/component/otelcol/processor/discovery/discovery_test.go index ab0aa96658..1b5d935372 100644 --- a/internal/component/otelcol/processor/discovery/discovery_test.go +++ b/internal/component/otelcol/processor/discovery/discovery_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - "github.com/grafana/agent/internal/component/otelcol/processor/discovery" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/flow/componenttest" - promsdconsumer "github.com/grafana/agent/internal/static/traces/promsdprocessor/consumer" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/processor/discovery" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/flow/componenttest" + promsdconsumer "github.com/grafana/alloy/internal/static/traces/promsdprocessor/consumer" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" semconv "go.opentelemetry.io/collector/semconv/v1.5.0" diff --git a/internal/component/otelcol/processor/filter/filter.go b/internal/component/otelcol/processor/filter/filter.go index 64c01d15b6..19dcdd3d37 100644 --- a/internal/component/otelcol/processor/filter/filter.go +++ b/internal/component/otelcol/processor/filter/filter.go @@ -1,10 +1,10 @@ package filter import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" diff --git a/internal/component/otelcol/processor/filter/filter_test.go b/internal/component/otelcol/processor/filter/filter_test.go index 9589e646cb..eff73e6aef 100644 --- a/internal/component/otelcol/processor/filter/filter_test.go +++ b/internal/component/otelcol/processor/filter/filter_test.go @@ -3,7 +3,7 @@ package filter_test import ( "testing" - "github.com/grafana/agent/internal/component/otelcol/processor/filter" + "github.com/grafana/alloy/internal/component/otelcol/processor/filter" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" diff --git a/internal/component/otelcol/processor/k8sattributes/k8sattributes.go b/internal/component/otelcol/processor/k8sattributes/k8sattributes.go index c5805c525d..08616ff6ea 100644 --- a/internal/component/otelcol/processor/k8sattributes/k8sattributes.go +++ b/internal/component/otelcol/processor/k8sattributes/k8sattributes.go @@ -2,10 +2,10 @@ package k8sattributes import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/processor/k8sattributes/k8sattributes_test.go b/internal/component/otelcol/processor/k8sattributes/k8sattributes_test.go index a10d18abf7..bc9e5b7966 100644 --- a/internal/component/otelcol/processor/k8sattributes/k8sattributes_test.go +++ b/internal/component/otelcol/processor/k8sattributes/k8sattributes_test.go @@ -3,7 +3,7 @@ package k8sattributes_test import ( "testing" - "github.com/grafana/agent/internal/component/otelcol/processor/k8sattributes" + "github.com/grafana/alloy/internal/component/otelcol/processor/k8sattributes" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/processor/memorylimiter/memorylimiter.go b/internal/component/otelcol/processor/memorylimiter/memorylimiter.go index 745409749c..3ec6ef0b8d 100644 --- a/internal/component/otelcol/processor/memorylimiter/memorylimiter.go +++ b/internal/component/otelcol/processor/memorylimiter/memorylimiter.go @@ -6,10 +6,10 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" diff --git a/internal/component/otelcol/processor/memorylimiter/memorylimiter_test.go b/internal/component/otelcol/processor/memorylimiter/memorylimiter_test.go index d95ec2c483..96e676d7b2 100644 --- a/internal/component/otelcol/processor/memorylimiter/memorylimiter_test.go +++ b/internal/component/otelcol/processor/memorylimiter/memorylimiter_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/component/otelcol/processor/memorylimiter" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/component/otelcol/processor/memorylimiter" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/backoff" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler.go b/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler.go index e23d183818..b7fb40324d 100644 --- a/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler.go +++ b/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler.go @@ -2,10 +2,10 @@ package probabilistic_sampler import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go b/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go index bf0192a1d4..46f907de02 100644 --- a/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go +++ b/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - probabilisticsampler "github.com/grafana/agent/internal/component/otelcol/processor/probabilistic_sampler" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + probabilisticsampler "github.com/grafana/alloy/internal/component/otelcol/processor/probabilistic_sampler" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/processor/processor.go b/internal/component/otelcol/processor/processor.go index 43d626ba5e..449b09dca8 100644 --- a/internal/component/otelcol/processor/processor.go +++ b/internal/component/otelcol/processor/processor.go @@ -7,14 +7,14 @@ import ( "errors" "os" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/lazycollector" - "github.com/grafana/agent/internal/component/otelcol/internal/lazyconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazycollector" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazyconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/prometheus/client_golang/prometheus" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/processor/processor_test.go b/internal/component/otelcol/processor/processor_test.go index 3beb97bc88..9c3d8bf649 100644 --- a/internal/component/otelcol/processor/processor_test.go +++ b/internal/component/otelcol/processor/processor_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" otelcomponent "go.opentelemetry.io/collector/component" otelconsumer "go.opentelemetry.io/collector/consumer" diff --git a/internal/component/otelcol/processor/processortest/processortest.go b/internal/component/otelcol/processor/processortest/processortest.go index 40b8eba4b1..2eda5e2909 100644 --- a/internal/component/otelcol/processor/processortest/processortest.go +++ b/internal/component/otelcol/processor/processortest/processortest.go @@ -6,11 +6,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/dskit/backoff" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/plog" diff --git a/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2/config.go b/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2/config.go index ac8a772da9..9aa4fe0365 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2/config.go @@ -1,7 +1,7 @@ package ec2 import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs/config.go b/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs/config.go index e9c8a43506..d5d23fb8c1 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs/config.go @@ -1,7 +1,7 @@ package ecs import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/aws/eks/config.go b/internal/component/otelcol/processor/resourcedetection/internal/aws/eks/config.go index c44b42a639..f339419220 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/aws/eks/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/aws/eks/config.go @@ -1,7 +1,7 @@ package eks import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk/config.go b/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk/config.go index 3500bc8b33..b16c3c3bc3 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk/config.go @@ -1,7 +1,7 @@ package elasticbeanstalk import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda/config.go b/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda/config.go index 6f185d9b2d..21afa01aef 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda/config.go @@ -1,7 +1,7 @@ package lambda import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/azure/aks/config.go b/internal/component/otelcol/processor/resourcedetection/internal/azure/aks/config.go index 656875bd27..2fa5991335 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/azure/aks/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/azure/aks/config.go @@ -1,7 +1,7 @@ package aks import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/azure/config.go b/internal/component/otelcol/processor/resourcedetection/internal/azure/config.go index 871ea577ac..9d878295f2 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/azure/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/azure/config.go @@ -1,7 +1,7 @@ package azure import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go b/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go index b9c6b20886..c0e4b0d00a 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go @@ -1,7 +1,7 @@ package consul import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" "go.opentelemetry.io/collector/config/configopaque" diff --git a/internal/component/otelcol/processor/resourcedetection/internal/docker/config.go b/internal/component/otelcol/processor/resourcedetection/internal/docker/config.go index badceabdbe..7edfcc1607 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/docker/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/docker/config.go @@ -1,7 +1,7 @@ package docker import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/gcp/config.go b/internal/component/otelcol/processor/resourcedetection/internal/gcp/config.go index da95652600..897c5ba794 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/gcp/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/gcp/config.go @@ -1,7 +1,7 @@ package gcp import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/heroku/config.go b/internal/component/otelcol/processor/resourcedetection/internal/heroku/config.go index 3420a4df07..4b96f95441 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/heroku/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/heroku/config.go @@ -1,7 +1,7 @@ package heroku import ( - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/k8snode/config.go b/internal/component/otelcol/processor/resourcedetection/internal/k8snode/config.go index 7e4c365862..071126b3e1 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/k8snode/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/k8snode/config.go @@ -1,8 +1,8 @@ package k8snode import ( - "github.com/grafana/agent/internal/component/otelcol" - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + "github.com/grafana/alloy/internal/component/otelcol" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/openshift/config.go b/internal/component/otelcol/processor/resourcedetection/internal/openshift/config.go index 3e6e38af5a..07c0130caa 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/openshift/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/openshift/config.go @@ -1,8 +1,8 @@ package openshift import ( - "github.com/grafana/agent/internal/component/otelcol" - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + "github.com/grafana/alloy/internal/component/otelcol" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/internal/system/config.go b/internal/component/otelcol/processor/resourcedetection/internal/system/config.go index 8c90539a33..9141db2c90 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/system/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/system/config.go @@ -3,7 +3,7 @@ package system import ( "fmt" - rac "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" + rac "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/resource_attribute_config" "github.com/grafana/alloy/syntax" ) diff --git a/internal/component/otelcol/processor/resourcedetection/resourcedetection.go b/internal/component/otelcol/processor/resourcedetection/resourcedetection.go index 7e5d617163..6fa2252ac2 100644 --- a/internal/component/otelcol/processor/resourcedetection/resourcedetection.go +++ b/internal/component/otelcol/processor/resourcedetection/resourcedetection.go @@ -4,24 +4,24 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/eks" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/azure" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/azure/aks" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/consul" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/docker" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/gcp" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/heroku" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/k8snode" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/openshift" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/system" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/eks" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/azure" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/azure/aks" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/consul" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/docker" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/gcp" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/heroku" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/k8snode" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/openshift" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/system" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" diff --git a/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go b/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go index 8a70f5d96d..ae2374405e 100644 --- a/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go +++ b/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go @@ -4,21 +4,21 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/eks" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/azure" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/azure/aks" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/consul" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/docker" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/gcp" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/heroku" - kubernetes_node "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/k8snode" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/openshift" - "github.com/grafana/agent/internal/component/otelcol/processor/resourcedetection/internal/system" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/ec2" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/ecs" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/eks" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/elasticbeanstalk" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/aws/lambda" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/azure" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/azure/aks" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/consul" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/docker" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/gcp" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/heroku" + kubernetes_node "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/k8snode" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/openshift" + "github.com/grafana/alloy/internal/component/otelcol/processor/resourcedetection/internal/system" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" diff --git a/internal/component/otelcol/processor/span/span.go b/internal/component/otelcol/processor/span/span.go index 57e4884709..66e317f863 100644 --- a/internal/component/otelcol/processor/span/span.go +++ b/internal/component/otelcol/processor/span/span.go @@ -4,10 +4,10 @@ package span import ( "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/processor/span/span_test.go b/internal/component/otelcol/processor/span/span_test.go index 6a02063fba..11c1d25edf 100644 --- a/internal/component/otelcol/processor/span/span_test.go +++ b/internal/component/otelcol/processor/span/span_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/grafana/agent/internal/component/otelcol/processor/processortest" - "github.com/grafana/agent/internal/component/otelcol/processor/span" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol/processor/processortest" + "github.com/grafana/alloy/internal/component/otelcol/processor/span" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" diff --git a/internal/component/otelcol/processor/tail_sampling/tail_sampling.go b/internal/component/otelcol/processor/tail_sampling/tail_sampling.go index 9eb6c627dc..f2bf705a09 100644 --- a/internal/component/otelcol/processor/tail_sampling/tail_sampling.go +++ b/internal/component/otelcol/processor/tail_sampling/tail_sampling.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" tsp "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go b/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go index 4ae4e53801..668f7adb7c 100644 --- a/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go +++ b/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/backoff" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/processor/transform/transform.go b/internal/component/otelcol/processor/transform/transform.go index 3dd62edb7f..75f7168007 100644 --- a/internal/component/otelcol/processor/transform/transform.go +++ b/internal/component/otelcol/processor/transform/transform.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor" + "github.com/grafana/alloy/internal/featuregate" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" diff --git a/internal/component/otelcol/processor/transform/transform_test.go b/internal/component/otelcol/processor/transform/transform_test.go index 291e3492f4..79bd6935e3 100644 --- a/internal/component/otelcol/processor/transform/transform_test.go +++ b/internal/component/otelcol/processor/transform/transform_test.go @@ -3,7 +3,7 @@ package transform_test import ( "testing" - "github.com/grafana/agent/internal/component/otelcol/processor/transform" + "github.com/grafana/alloy/internal/component/otelcol/processor/transform" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" diff --git a/internal/component/otelcol/receiver/jaeger/jaeger.go b/internal/component/otelcol/receiver/jaeger/jaeger.go index 81d11952b8..5a63af4c74 100644 --- a/internal/component/otelcol/receiver/jaeger/jaeger.go +++ b/internal/component/otelcol/receiver/jaeger/jaeger.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" otelcomponent "go.opentelemetry.io/collector/component" otelconfiggrpc "go.opentelemetry.io/collector/config/configgrpc" diff --git a/internal/component/otelcol/receiver/jaeger/jaeger_test.go b/internal/component/otelcol/receiver/jaeger/jaeger_test.go index d8296a210d..85d8164f28 100644 --- a/internal/component/otelcol/receiver/jaeger/jaeger_test.go +++ b/internal/component/otelcol/receiver/jaeger/jaeger_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/jaeger" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/jaeger" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/phayes/freeport" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/receiver/kafka/kafka.go b/internal/component/otelcol/receiver/kafka/kafka.go index aa1a3e4e52..5ba5ad61af 100644 --- a/internal/component/otelcol/receiver/kafka/kafka.go +++ b/internal/component/otelcol/receiver/kafka/kafka.go @@ -4,10 +4,10 @@ package kafka import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" diff --git a/internal/component/otelcol/receiver/kafka/kafka_test.go b/internal/component/otelcol/receiver/kafka/kafka_test.go index 4238a19c91..b6c10c5d31 100644 --- a/internal/component/otelcol/receiver/kafka/kafka_test.go +++ b/internal/component/otelcol/receiver/kafka/kafka_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/kafka" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/kafka" "github.com/grafana/alloy/syntax" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" diff --git a/internal/component/otelcol/receiver/loki/loki.go b/internal/component/otelcol/receiver/loki/loki.go index 7ff2e594c1..5f2042d1cb 100644 --- a/internal/component/otelcol/receiver/loki/loki.go +++ b/internal/component/otelcol/receiver/loki/loki.go @@ -8,12 +8,12 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" loki_translator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/plog" diff --git a/internal/component/otelcol/receiver/loki/loki_test.go b/internal/component/otelcol/receiver/loki/loki_test.go index 23b766f59e..54969000c1 100644 --- a/internal/component/otelcol/receiver/loki/loki_test.go +++ b/internal/component/otelcol/receiver/loki/loki_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - lokiapi "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + lokiapi "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" diff --git a/internal/component/otelcol/receiver/opencensus/opencensus.go b/internal/component/otelcol/receiver/opencensus/opencensus.go index 64ed1f25ba..1500a560fb 100644 --- a/internal/component/otelcol/receiver/opencensus/opencensus.go +++ b/internal/component/otelcol/receiver/opencensus/opencensus.go @@ -3,10 +3,10 @@ package opencensus import ( "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver" otelcomponent "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/receiver/opencensus/opencensus_test.go b/internal/component/otelcol/receiver/opencensus/opencensus_test.go index 07e3eae23f..b49e472bc1 100644 --- a/internal/component/otelcol/receiver/opencensus/opencensus_test.go +++ b/internal/component/otelcol/receiver/opencensus/opencensus_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/opencensus" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/opencensus" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver" "github.com/phayes/freeport" diff --git a/internal/component/otelcol/receiver/otlp/otlp.go b/internal/component/otelcol/receiver/otlp/otlp.go index 55863fadee..36c0638d6f 100644 --- a/internal/component/otelcol/receiver/otlp/otlp.go +++ b/internal/component/otelcol/receiver/otlp/otlp.go @@ -6,10 +6,10 @@ import ( net_url "net/url" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/featuregate" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/receiver/otlpreceiver" diff --git a/internal/component/otelcol/receiver/otlp/otlp_test.go b/internal/component/otelcol/receiver/otlp/otlp_test.go index 315753b77a..64e2ea601f 100644 --- a/internal/component/otelcol/receiver/otlp/otlp_test.go +++ b/internal/component/otelcol/receiver/otlp/otlp_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/component/otelcol/receiver/otlp" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/component/otelcol/receiver/otlp" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/dskit/backoff" "github.com/phayes/freeport" diff --git a/internal/component/otelcol/receiver/prometheus/prometheus.go b/internal/component/otelcol/receiver/prometheus/prometheus.go index c6aa4ebf59..c3540188e3 100644 --- a/internal/component/otelcol/receiver/prometheus/prometheus.go +++ b/internal/component/otelcol/receiver/prometheus/prometheus.go @@ -9,13 +9,13 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/component/otelcol/receiver/prometheus/internal" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/component/otelcol/receiver/prometheus/internal" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/component/otelcol/receiver/prometheus/prometheus_test.go b/internal/component/otelcol/receiver/prometheus/prometheus_test.go index 7d1836ad29..fd2c32e3dc 100644 --- a/internal/component/otelcol/receiver/prometheus/prometheus_test.go +++ b/internal/component/otelcol/receiver/prometheus/prometheus_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/component/otelcol/receiver/prometheus" - flowprometheus "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/component/otelcol/receiver/prometheus" + flowprometheus "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/exemplar" diff --git a/internal/component/otelcol/receiver/receiver.go b/internal/component/otelcol/receiver/receiver.go index 55cfebc604..2591b5f4e4 100644 --- a/internal/component/otelcol/receiver/receiver.go +++ b/internal/component/otelcol/receiver/receiver.go @@ -7,14 +7,14 @@ import ( "errors" "os" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fanoutconsumer" - "github.com/grafana/agent/internal/component/otelcol/internal/lazycollector" - "github.com/grafana/agent/internal/component/otelcol/internal/scheduler" - "github.com/grafana/agent/internal/component/otelcol/internal/views" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fanoutconsumer" + "github.com/grafana/alloy/internal/component/otelcol/internal/lazycollector" + "github.com/grafana/alloy/internal/component/otelcol/internal/scheduler" + "github.com/grafana/alloy/internal/component/otelcol/internal/views" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/prometheus/client_golang/prometheus" otelcomponent "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/receiver/receiver_test.go b/internal/component/otelcol/receiver/receiver_test.go index 989b40fa9f..5c8ff582ad 100644 --- a/internal/component/otelcol/receiver/receiver_test.go +++ b/internal/component/otelcol/receiver/receiver_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/internal/fakeconsumer" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" otelcomponent "go.opentelemetry.io/collector/component" otelconsumer "go.opentelemetry.io/collector/consumer" diff --git a/internal/component/otelcol/receiver/vcenter/vcenter.go b/internal/component/otelcol/receiver/vcenter/vcenter.go index e1bad99588..2004e9fdd5 100644 --- a/internal/component/otelcol/receiver/vcenter/vcenter.go +++ b/internal/component/otelcol/receiver/vcenter/vcenter.go @@ -5,10 +5,10 @@ import ( "fmt" "net/url" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver" diff --git a/internal/component/otelcol/receiver/vcenter/vcenter_test.go b/internal/component/otelcol/receiver/vcenter/vcenter_test.go index 5e2cd07128..a42811a7f6 100644 --- a/internal/component/otelcol/receiver/vcenter/vcenter_test.go +++ b/internal/component/otelcol/receiver/vcenter/vcenter_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/vcenter" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/vcenter" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver" "github.com/stretchr/testify/require" diff --git a/internal/component/otelcol/receiver/zipkin/zipkin.go b/internal/component/otelcol/receiver/zipkin/zipkin.go index f63cc06183..ac6a85dd85 100644 --- a/internal/component/otelcol/receiver/zipkin/zipkin.go +++ b/internal/component/otelcol/receiver/zipkin/zipkin.go @@ -2,10 +2,10 @@ package zipkin import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver" + "github.com/grafana/alloy/internal/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" otelcomponent "go.opentelemetry.io/collector/component" otelextension "go.opentelemetry.io/collector/extension" diff --git a/internal/component/otelcol/receiver/zipkin/zipkin_test.go b/internal/component/otelcol/receiver/zipkin/zipkin_test.go index 29839c46b7..a83237dff3 100644 --- a/internal/component/otelcol/receiver/zipkin/zipkin_test.go +++ b/internal/component/otelcol/receiver/zipkin/zipkin_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/zipkin" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/zipkin" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" "github.com/phayes/freeport" diff --git a/internal/component/prometheus/exporter/apache/apache.go b/internal/component/prometheus/exporter/apache/apache.go index 5cc988cf1c..0d2b95c5fd 100644 --- a/internal/component/prometheus/exporter/apache/apache.go +++ b/internal/component/prometheus/exporter/apache/apache.go @@ -1,11 +1,11 @@ package apache import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/apache_http" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/apache_http" ) func init() { diff --git a/internal/component/prometheus/exporter/azure/azure.go b/internal/component/prometheus/exporter/azure/azure.go index ed410e7029..e51fd7f744 100644 --- a/internal/component/prometheus/exporter/azure/azure.go +++ b/internal/component/prometheus/exporter/azure/azure.go @@ -1,11 +1,11 @@ package azure import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/azure_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/azure_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/blackbox/blackbox.go b/internal/component/prometheus/exporter/blackbox/blackbox.go index e32a630660..def1b0560e 100644 --- a/internal/component/prometheus/exporter/blackbox/blackbox.go +++ b/internal/component/prometheus/exporter/blackbox/blackbox.go @@ -8,13 +8,13 @@ import ( blackbox_config "github.com/prometheus/blackbox_exporter/config" "gopkg.in/yaml.v2" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/component/prometheus/exporter/blackbox/blackbox_test.go b/internal/component/prometheus/exporter/blackbox/blackbox_test.go index 39ecf1bb79..ba0f63e123 100644 --- a/internal/component/prometheus/exporter/blackbox/blackbox_test.go +++ b/internal/component/prometheus/exporter/blackbox/blackbox_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" "github.com/grafana/alloy/syntax" blackbox_config "github.com/prometheus/blackbox_exporter/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/exporter/cadvisor/cadvisor.go b/internal/component/prometheus/exporter/cadvisor/cadvisor.go index 223203dffa..0e3584a7d6 100644 --- a/internal/component/prometheus/exporter/cadvisor/cadvisor.go +++ b/internal/component/prometheus/exporter/cadvisor/cadvisor.go @@ -3,11 +3,11 @@ package cadvisor import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/cadvisor" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/cadvisor" ) func init() { diff --git a/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go b/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go index fd9c4edaf2..2e9b44d39a 100644 --- a/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go +++ b/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/static/integrations/cadvisor" + "github.com/grafana/alloy/internal/static/integrations/cadvisor" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go b/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go index a7ec9a96af..b87a7b2b8b 100644 --- a/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go +++ b/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go @@ -3,11 +3,11 @@ package cloudwatch import ( "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/cloudwatch_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/cloudwatch/config.go b/internal/component/prometheus/exporter/cloudwatch/config.go index c87de8b372..75680c83ac 100644 --- a/internal/component/prometheus/exporter/cloudwatch/config.go +++ b/internal/component/prometheus/exporter/cloudwatch/config.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "time" - "github.com/grafana/agent/internal/static/integrations/cloudwatch_exporter" + "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" "github.com/grafana/alloy/syntax" yaceConf "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/config" yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" diff --git a/internal/component/prometheus/exporter/consul/consul.go b/internal/component/prometheus/exporter/consul/consul.go index 9647dc32b2..4cc528ff8f 100644 --- a/internal/component/prometheus/exporter/consul/consul.go +++ b/internal/component/prometheus/exporter/consul/consul.go @@ -3,11 +3,11 @@ package consul import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/consul_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/consul_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go b/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go index bd3abc2077..adacaf997b 100644 --- a/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go +++ b/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go @@ -1,11 +1,11 @@ package dnsmasq import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/dnsmasq_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/dnsmasq_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go b/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go index 07c863f334..21b54aa817 100644 --- a/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go +++ b/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go @@ -3,7 +3,7 @@ package dnsmasq import ( "testing" - "github.com/grafana/agent/internal/static/integrations/dnsmasq_exporter" + "github.com/grafana/alloy/internal/static/integrations/dnsmasq_exporter" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/assert" ) diff --git a/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go b/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go index 6cd3b98c3c..84996d7db1 100644 --- a/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go +++ b/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go @@ -3,12 +3,12 @@ package elasticsearch import ( "time" - "github.com/grafana/agent/internal/component" - commonCfg "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/elasticsearch_exporter" + "github.com/grafana/alloy/internal/component" + commonCfg "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/elasticsearch_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go b/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go index 4983258419..9f4deedfb9 100644 --- a/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go +++ b/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - commonCfg "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/static/integrations/elasticsearch_exporter" + commonCfg "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/static/integrations/elasticsearch_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" promCfg "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/exporter/exporter.go b/internal/component/prometheus/exporter/exporter.go index 40572f21a0..67f21fd89f 100644 --- a/internal/component/prometheus/exporter/exporter.go +++ b/internal/component/prometheus/exporter/exporter.go @@ -9,11 +9,11 @@ import ( "strings" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/flow/logging/level" - http_service "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/flow/logging/level" + http_service "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/static/integrations" "github.com/prometheus/common/model" ) diff --git a/internal/component/prometheus/exporter/gcp/gcp.go b/internal/component/prometheus/exporter/gcp/gcp.go index b3fb702f7a..cceed35743 100644 --- a/internal/component/prometheus/exporter/gcp/gcp.go +++ b/internal/component/prometheus/exporter/gcp/gcp.go @@ -3,11 +3,11 @@ package gcp import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/gcp_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/gcp_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/github/github.go b/internal/component/prometheus/exporter/github/github.go index 1b321f0ce5..25d442d4e3 100644 --- a/internal/component/prometheus/exporter/github/github.go +++ b/internal/component/prometheus/exporter/github/github.go @@ -1,11 +1,11 @@ package github import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/github_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/github_exporter" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/github/github_test.go b/internal/component/prometheus/exporter/github/github_test.go index d22248ce96..2a729298a8 100644 --- a/internal/component/prometheus/exporter/github/github_test.go +++ b/internal/component/prometheus/exporter/github/github_test.go @@ -10,7 +10,7 @@ import ( func TestUnmarshalRiver(t *testing.T) { riverCfg := ` api_token_file = "/etc/github-api-token" - repositories = ["grafana/agent"] + repositories = ["grafana/alloy"] organizations = ["grafana", "prometheus"] users = ["jcreixell"] api_url = "https://some-other-api.github.com" @@ -19,7 +19,7 @@ func TestUnmarshalRiver(t *testing.T) { err := syntax.Unmarshal([]byte(riverCfg), &args) require.NoError(t, err) require.Equal(t, "/etc/github-api-token", args.APITokenFile) - require.Equal(t, []string{"grafana/agent"}, args.Repositories) + require.Equal(t, []string{"grafana/alloy"}, args.Repositories) require.Contains(t, args.Organizations, "grafana") require.Contains(t, args.Organizations, "prometheus") require.Equal(t, []string{"jcreixell"}, args.Users) @@ -29,7 +29,7 @@ func TestUnmarshalRiver(t *testing.T) { func TestConvert(t *testing.T) { args := Arguments{ APITokenFile: "/etc/github-api-token", - Repositories: []string{"grafana/agent"}, + Repositories: []string{"grafana/alloy"}, Organizations: []string{"grafana", "prometheus"}, Users: []string{"jcreixell"}, APIURL: "https://some-other-api.github.com", @@ -37,7 +37,7 @@ func TestConvert(t *testing.T) { res := args.Convert() require.Equal(t, "/etc/github-api-token", res.APITokenFile) - require.Equal(t, []string{"grafana/agent"}, res.Repositories) + require.Equal(t, []string{"grafana/alloy"}, res.Repositories) require.Contains(t, res.Organizations, "grafana") require.Contains(t, res.Organizations, "prometheus") require.Equal(t, []string{"jcreixell"}, res.Users) diff --git a/internal/component/prometheus/exporter/kafka/kafka.go b/internal/component/prometheus/exporter/kafka/kafka.go index 95738f53d8..e4f32aea2e 100644 --- a/internal/component/prometheus/exporter/kafka/kafka.go +++ b/internal/component/prometheus/exporter/kafka/kafka.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/IBM/sarama" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/kafka_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/kafka_exporter" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/kafka/kafka_test.go b/internal/component/prometheus/exporter/kafka/kafka_test.go index 287d2a601f..a3d34fc311 100644 --- a/internal/component/prometheus/exporter/kafka/kafka_test.go +++ b/internal/component/prometheus/exporter/kafka/kafka_test.go @@ -3,8 +3,8 @@ package kafka import ( "testing" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/static/integrations/kafka_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/static/integrations/kafka_exporter" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/prometheus/exporter/memcached/memcached.go b/internal/component/prometheus/exporter/memcached/memcached.go index 2a1a6d3588..fcecc69b77 100644 --- a/internal/component/prometheus/exporter/memcached/memcached.go +++ b/internal/component/prometheus/exporter/memcached/memcached.go @@ -3,12 +3,12 @@ package memcached import ( "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/memcached_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/memcached_exporter" ) func init() { diff --git a/internal/component/prometheus/exporter/memcached/memcached_test.go b/internal/component/prometheus/exporter/memcached/memcached_test.go index 167600a9d1..75659b6675 100644 --- a/internal/component/prometheus/exporter/memcached/memcached_test.go +++ b/internal/component/prometheus/exporter/memcached/memcached_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/static/integrations/memcached_exporter" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/static/integrations/memcached_exporter" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/assert" ) diff --git a/internal/component/prometheus/exporter/mongodb/mongodb.go b/internal/component/prometheus/exporter/mongodb/mongodb.go index c59c3eeaab..674562fed2 100644 --- a/internal/component/prometheus/exporter/mongodb/mongodb.go +++ b/internal/component/prometheus/exporter/mongodb/mongodb.go @@ -1,11 +1,11 @@ package mongodb import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/mongodb_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/mongodb_exporter" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/mongodb/mongodb_test.go b/internal/component/prometheus/exporter/mongodb/mongodb_test.go index 94f3c0152f..4b1937567b 100644 --- a/internal/component/prometheus/exporter/mongodb/mongodb_test.go +++ b/internal/component/prometheus/exporter/mongodb/mongodb_test.go @@ -3,7 +3,7 @@ package mongodb import ( "testing" - "github.com/grafana/agent/internal/static/integrations/mongodb_exporter" + "github.com/grafana/alloy/internal/static/integrations/mongodb_exporter" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/prometheus/exporter/mssql/mssql.go b/internal/component/prometheus/exporter/mssql/mssql.go index e50f064919..dd0efb3bd9 100644 --- a/internal/component/prometheus/exporter/mssql/mssql.go +++ b/internal/component/prometheus/exporter/mssql/mssql.go @@ -6,12 +6,12 @@ import ( "time" "github.com/burningalchemist/sql_exporter/config" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/mssql" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/mssql" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" "gopkg.in/yaml.v2" diff --git a/internal/component/prometheus/exporter/mssql/mssql_test.go b/internal/component/prometheus/exporter/mssql/mssql_test.go index 12f3fcc7e7..9b7762f8a7 100644 --- a/internal/component/prometheus/exporter/mssql/mssql_test.go +++ b/internal/component/prometheus/exporter/mssql/mssql_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/burningalchemist/sql_exporter/config" - "github.com/grafana/agent/internal/static/integrations/mssql" + "github.com/grafana/alloy/internal/static/integrations/mssql" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/exporter/mysql/mysql.go b/internal/component/prometheus/exporter/mysql/mysql.go index 3fb75f2c52..38887556b4 100644 --- a/internal/component/prometheus/exporter/mysql/mysql.go +++ b/internal/component/prometheus/exporter/mysql/mysql.go @@ -2,11 +2,11 @@ package mysql import ( "github.com/go-sql-driver/mysql" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/mysqld_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/mysqld_exporter" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/mysql/mysql_test.go b/internal/component/prometheus/exporter/mysql/mysql_test.go index a42c212e5b..4018d30511 100644 --- a/internal/component/prometheus/exporter/mysql/mysql_test.go +++ b/internal/component/prometheus/exporter/mysql/mysql_test.go @@ -3,7 +3,7 @@ package mysql import ( "testing" - "github.com/grafana/agent/internal/static/integrations/mysqld_exporter" + "github.com/grafana/alloy/internal/static/integrations/mysqld_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" "github.com/stretchr/testify/require" diff --git a/internal/component/prometheus/exporter/oracledb/oracledb.go b/internal/component/prometheus/exporter/oracledb/oracledb.go index dd71616d68..b5425ca83a 100644 --- a/internal/component/prometheus/exporter/oracledb/oracledb.go +++ b/internal/component/prometheus/exporter/oracledb/oracledb.go @@ -5,11 +5,11 @@ import ( "fmt" "net/url" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/oracledb_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/oracledb_exporter" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/oracledb/oracledb_test.go b/internal/component/prometheus/exporter/oracledb/oracledb_test.go index 6ae79e1143..56794e46f8 100644 --- a/internal/component/prometheus/exporter/oracledb/oracledb_test.go +++ b/internal/component/prometheus/exporter/oracledb/oracledb_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/grafana/agent/internal/static/integrations/oracledb_exporter" + "github.com/grafana/alloy/internal/static/integrations/oracledb_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/exporter/postgres/postgres.go b/internal/component/prometheus/exporter/postgres/postgres.go index ec227308a3..79ee26406e 100644 --- a/internal/component/prometheus/exporter/postgres/postgres.go +++ b/internal/component/prometheus/exporter/postgres/postgres.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/postgres_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" "github.com/grafana/alloy/syntax/alloytypes" "github.com/lib/pq" config_util "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/exporter/postgres/postgres_test.go b/internal/component/prometheus/exporter/postgres/postgres_test.go index 3306425e5d..c88f31c4da 100644 --- a/internal/component/prometheus/exporter/postgres/postgres_test.go +++ b/internal/component/prometheus/exporter/postgres/postgres_test.go @@ -3,7 +3,7 @@ package postgres import ( "testing" - "github.com/grafana/agent/internal/static/integrations/postgres_exporter" + "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" rivertypes "github.com/grafana/alloy/syntax/alloytypes" diff --git a/internal/component/prometheus/exporter/process/process.go b/internal/component/prometheus/exporter/process/process.go index fbf27a256a..ffdfb90a14 100644 --- a/internal/component/prometheus/exporter/process/process.go +++ b/internal/component/prometheus/exporter/process/process.go @@ -1,11 +1,11 @@ package process import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/process_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/process_exporter" exporter_config "github.com/ncabatoff/process-exporter/config" ) diff --git a/internal/component/prometheus/exporter/redis/redis.go b/internal/component/prometheus/exporter/redis/redis.go index 61bd9977c4..93d5b5326b 100644 --- a/internal/component/prometheus/exporter/redis/redis.go +++ b/internal/component/prometheus/exporter/redis/redis.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/redis_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/redis_exporter" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/redis/redis_test.go b/internal/component/prometheus/exporter/redis/redis_test.go index 5c4f926c1d..777daecf3b 100644 --- a/internal/component/prometheus/exporter/redis/redis_test.go +++ b/internal/component/prometheus/exporter/redis/redis_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/static/integrations/redis_exporter" + "github.com/grafana/alloy/internal/static/integrations/redis_exporter" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/component/prometheus/exporter/self/self.go b/internal/component/prometheus/exporter/self/self.go index 32735c19e5..90f046c52d 100644 --- a/internal/component/prometheus/exporter/self/self.go +++ b/internal/component/prometheus/exporter/self/self.go @@ -1,11 +1,11 @@ package self import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/agent" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/agent" ) func init() { diff --git a/internal/component/prometheus/exporter/snmp/snmp.go b/internal/component/prometheus/exporter/snmp/snmp.go index 5ad5df6bfa..2d2994f7b6 100644 --- a/internal/component/prometheus/exporter/snmp/snmp.go +++ b/internal/component/prometheus/exporter/snmp/snmp.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/snmp_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" "github.com/grafana/alloy/syntax/alloytypes" snmp_config "github.com/prometheus/snmp_exporter/config" "gopkg.in/yaml.v2" diff --git a/internal/component/prometheus/exporter/snmp/snmp_test.go b/internal/component/prometheus/exporter/snmp/snmp_test.go index 296f2792c1..26a5df6370 100644 --- a/internal/component/prometheus/exporter/snmp/snmp_test.go +++ b/internal/component/prometheus/exporter/snmp/snmp_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" "github.com/grafana/alloy/syntax" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/exporter/snowflake/snowflake.go b/internal/component/prometheus/exporter/snowflake/snowflake.go index 72bd01e4b7..b4d7e63732 100644 --- a/internal/component/prometheus/exporter/snowflake/snowflake.go +++ b/internal/component/prometheus/exporter/snowflake/snowflake.go @@ -1,11 +1,11 @@ package snowflake import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/snowflake_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/snowflake_exporter" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/snowflake/snowflake_test.go b/internal/component/prometheus/exporter/snowflake/snowflake_test.go index 1a70433c56..47f8a2ae43 100644 --- a/internal/component/prometheus/exporter/snowflake/snowflake_test.go +++ b/internal/component/prometheus/exporter/snowflake/snowflake_test.go @@ -3,7 +3,7 @@ package snowflake import ( "testing" - "github.com/grafana/agent/internal/static/integrations/snowflake_exporter" + "github.com/grafana/alloy/internal/static/integrations/snowflake_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/exporter/squid/squid.go b/internal/component/prometheus/exporter/squid/squid.go index e08e404cbf..1beb43ec26 100644 --- a/internal/component/prometheus/exporter/squid/squid.go +++ b/internal/component/prometheus/exporter/squid/squid.go @@ -3,11 +3,11 @@ package squid import ( "net" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/squid_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/squid_exporter" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/config" ) diff --git a/internal/component/prometheus/exporter/squid/squid_test.go b/internal/component/prometheus/exporter/squid/squid_test.go index 522ca90bac..ff5bb03850 100644 --- a/internal/component/prometheus/exporter/squid/squid_test.go +++ b/internal/component/prometheus/exporter/squid/squid_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/grafana/agent/internal/static/integrations/squid_exporter" + "github.com/grafana/alloy/internal/static/integrations/squid_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/exporter/statsd/config.go b/internal/component/prometheus/exporter/statsd/config.go index 18525450a9..0bda74fbd6 100644 --- a/internal/component/prometheus/exporter/statsd/config.go +++ b/internal/component/prometheus/exporter/statsd/config.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/grafana/agent/internal/static/integrations/statsd_exporter" + "github.com/grafana/alloy/internal/static/integrations/statsd_exporter" "gopkg.in/yaml.v3" ) @@ -35,7 +35,7 @@ type Arguments struct { // DefaultConfig holds non-zero default options for the Config when it is // unmarshaled from YAML. // -// Some defaults are populated from init functions in the github.com/grafana/agent/internal/static/integrations/statsd_exporter package. +// Some defaults are populated from init functions in the github.com/grafana/alloy/internal/static/integrations/statsd_exporter package. var DefaultConfig = Arguments{ ListenUDP: statsd_exporter.DefaultConfig.ListenUDP, @@ -56,7 +56,7 @@ var DefaultConfig = Arguments{ RelayPacketLength: statsd_exporter.DefaultConfig.RelayPacketLength, } -// Convert gives a config suitable for use with github.com/grafana/agent/internal/static/integrations/statsd_exporter. +// Convert gives a config suitable for use with github.com/grafana/alloy/internal/static/integrations/statsd_exporter. func (c *Arguments) Convert() (*statsd_exporter.Config, error) { var ( mappingConfig any diff --git a/internal/component/prometheus/exporter/statsd/statsd.go b/internal/component/prometheus/exporter/statsd/statsd.go index fe09c168ec..3323971f69 100644 --- a/internal/component/prometheus/exporter/statsd/statsd.go +++ b/internal/component/prometheus/exporter/statsd/statsd.go @@ -1,10 +1,10 @@ package statsd import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" ) func init() { diff --git a/internal/component/prometheus/exporter/unix/config.go b/internal/component/prometheus/exporter/unix/config.go index f5303566e0..04ce1a90cf 100644 --- a/internal/component/prometheus/exporter/unix/config.go +++ b/internal/component/prometheus/exporter/unix/config.go @@ -3,14 +3,14 @@ package unix import ( "time" - node_integration "github.com/grafana/agent/internal/static/integrations/node_exporter" + node_integration "github.com/grafana/alloy/internal/static/integrations/node_exporter" "github.com/grafana/dskit/flagext" ) // DefaultArguments holds non-zero default options for Arguments when it is // unmarshaled from YAML. // -// Some defaults are populated from init functions in the github.com/grafana/agent/internal/static/integrations/node_exporter package. +// Some defaults are populated from init functions in the github.com/grafana/alloy/internal/static/integrations/node_exporter package. var DefaultArguments = Arguments{ ProcFSPath: node_integration.DefaultConfig.ProcFSPath, RootFSPath: node_integration.DefaultConfig.RootFSPath, @@ -101,7 +101,7 @@ type Arguments struct { VMStat VMStatConfig `alloy:"vmstat,block,optional"` } -// Convert gives a config suitable for use with github.com/grafana/agent/internal/static/integrations/node_exporter. +// Convert gives a config suitable for use with github.com/grafana/alloy/internal/static/integrations/node_exporter. func (a *Arguments) Convert() *node_integration.Config { return &node_integration.Config{ IncludeExporterMetrics: a.IncludeExporterMetrics, diff --git a/internal/component/prometheus/exporter/unix/unix.go b/internal/component/prometheus/exporter/unix/unix.go index 8bf988b08a..9f5f3666c9 100644 --- a/internal/component/prometheus/exporter/unix/unix.go +++ b/internal/component/prometheus/exporter/unix/unix.go @@ -1,10 +1,10 @@ package unix import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" ) func init() { diff --git a/internal/component/prometheus/exporter/windows/config.go b/internal/component/prometheus/exporter/windows/config.go index e4bff8c46c..cc114196bb 100644 --- a/internal/component/prometheus/exporter/windows/config.go +++ b/internal/component/prometheus/exporter/windows/config.go @@ -3,7 +3,7 @@ package windows import ( "strings" - windows_integration "github.com/grafana/agent/internal/static/integrations/windows_exporter" + windows_integration "github.com/grafana/alloy/internal/static/integrations/windows_exporter" ) // Arguments is used for controlling for this exporter. diff --git a/internal/component/prometheus/exporter/windows/config_windows.go b/internal/component/prometheus/exporter/windows/config_windows.go index d1e138b9b5..de4d29eff1 100644 --- a/internal/component/prometheus/exporter/windows/config_windows.go +++ b/internal/component/prometheus/exporter/windows/config_windows.go @@ -3,7 +3,7 @@ package windows import ( "strings" - windows_integration "github.com/grafana/agent/internal/static/integrations/windows_exporter" + windows_integration "github.com/grafana/alloy/internal/static/integrations/windows_exporter" col "github.com/prometheus-community/windows_exporter/pkg/collector" ) diff --git a/internal/component/prometheus/exporter/windows/windows.go b/internal/component/prometheus/exporter/windows/windows.go index 0b7f151b75..6387208493 100644 --- a/internal/component/prometheus/exporter/windows/windows.go +++ b/internal/component/prometheus/exporter/windows/windows.go @@ -1,10 +1,10 @@ package windows import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/exporter" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/exporter" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/static/integrations" ) func init() { diff --git a/internal/component/prometheus/fanout.go b/internal/component/prometheus/fanout.go index e25e37141f..98886cb787 100644 --- a/internal/component/prometheus/fanout.go +++ b/internal/component/prometheus/fanout.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/hashicorp/go-multierror" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/exemplar" diff --git a/internal/component/prometheus/fanout_test.go b/internal/component/prometheus/fanout_test.go index 8b89201604..a06d163970 100644 --- a/internal/component/prometheus/fanout_test.go +++ b/internal/component/prometheus/fanout_test.go @@ -3,7 +3,7 @@ package prometheus import ( "testing" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/storage" diff --git a/internal/component/prometheus/interceptor.go b/internal/component/prometheus/interceptor.go index d8e515ec5d..3ada4a2120 100644 --- a/internal/component/prometheus/interceptor.go +++ b/internal/component/prometheus/interceptor.go @@ -3,7 +3,7 @@ package prometheus import ( "context" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/histogram" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/prometheus/operator/common/component.go b/internal/component/prometheus/operator/common/component.go index 7df6d5aa5c..006f014259 100644 --- a/internal/component/prometheus/operator/common/component.go +++ b/internal/component/prometheus/operator/common/component.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" + "github.com/grafana/alloy/internal/service/labelstore" "gopkg.in/yaml.v3" ) diff --git a/internal/component/prometheus/operator/common/crdmanager.go b/internal/component/prometheus/operator/common/crdmanager.go index d5f4b9bbb9..51414fc75b 100644 --- a/internal/component/prometheus/operator/common/crdmanager.go +++ b/internal/component/prometheus/operator/common/crdmanager.go @@ -10,12 +10,12 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" - "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" + "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/grafana/ckit/shard" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/config" @@ -28,9 +28,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/component/prometheus/operator/configgen" - compscrape "github.com/grafana/agent/internal/component/prometheus/scrape" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/component/prometheus/operator/configgen" + compscrape "github.com/grafana/alloy/internal/component/prometheus/scrape" promopv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/component/prometheus/operator/common/crdmanager_test.go b/internal/component/prometheus/operator/common/crdmanager_test.go index abd6aeffb3..e1fb880bbf 100644 --- a/internal/component/prometheus/operator/common/crdmanager_test.go +++ b/internal/component/prometheus/operator/common/crdmanager_test.go @@ -6,10 +6,10 @@ import ( "golang.org/x/exp/maps" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/service/cluster" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/service/cluster" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" diff --git a/internal/component/prometheus/operator/configgen/config_gen.go b/internal/component/prometheus/operator/configgen/config_gen.go index 5c215b3b8f..53f7bf5ed6 100644 --- a/internal/component/prometheus/operator/configgen/config_gen.go +++ b/internal/component/prometheus/operator/configgen/config_gen.go @@ -5,9 +5,9 @@ package configgen import ( "regexp" - k8sConfig "github.com/grafana/agent/internal/component/common/kubernetes" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/prometheus/operator" + k8sConfig "github.com/grafana/alloy/internal/component/common/kubernetes" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/prometheus/operator" promopv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" commonConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go b/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go index fca82b1d1d..7f9a6b68f5 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/kubernetes" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/kubernetes" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/util" promopv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" commonConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/operator/configgen/config_gen_probe_test.go b/internal/component/prometheus/operator/configgen/config_gen_probe_test.go index 25b2910a3f..41d59321aa 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_probe_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_probe_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/kubernetes" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/kubernetes" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/util" promopv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" commonConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go b/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go index 80fb36e87e..1e77469bf1 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/kubernetes" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/common/kubernetes" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/util" promopv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" commonConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/operator/configgen/config_gen_test.go b/internal/component/prometheus/operator/configgen/config_gen_test.go index e399b1ba4b..fad7bfcc83 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/common/kubernetes" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/kubernetes" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/prometheus/operator" promopv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" promConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/operator/podmonitors/operator.go b/internal/component/prometheus/operator/podmonitors/operator.go index b420b404d4..ed3cf1bec1 100644 --- a/internal/component/prometheus/operator/podmonitors/operator.go +++ b/internal/component/prometheus/operator/podmonitors/operator.go @@ -1,10 +1,10 @@ package podmonitors import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/component/prometheus/operator/common" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/component/prometheus/operator/common" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/prometheus/operator/probes/probes.go b/internal/component/prometheus/operator/probes/probes.go index 42fb6ace17..be75ba0c9a 100644 --- a/internal/component/prometheus/operator/probes/probes.go +++ b/internal/component/prometheus/operator/probes/probes.go @@ -1,10 +1,10 @@ package probes import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/component/prometheus/operator/common" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/component/prometheus/operator/common" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/prometheus/operator/servicemonitors/servicemonitors.go b/internal/component/prometheus/operator/servicemonitors/servicemonitors.go index 8c86c8d07d..d6231b92ec 100644 --- a/internal/component/prometheus/operator/servicemonitors/servicemonitors.go +++ b/internal/component/prometheus/operator/servicemonitors/servicemonitors.go @@ -1,10 +1,10 @@ package servicemonitors import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus/operator" - "github.com/grafana/agent/internal/component/prometheus/operator/common" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus/operator" + "github.com/grafana/alloy/internal/component/prometheus/operator/common" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/prometheus/operator/types.go b/internal/component/prometheus/operator/types.go index 7f06f2f040..14c42410f6 100644 --- a/internal/component/prometheus/operator/types.go +++ b/internal/component/prometheus/operator/types.go @@ -3,11 +3,11 @@ package operator import ( "time" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/common/kubernetes" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/prometheus/scrape" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/common/kubernetes" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/prometheus/scrape" + "github.com/grafana/alloy/internal/service/cluster" "github.com/prometheus/common/model" promconfig "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/storage" diff --git a/internal/component/prometheus/receive_http/receive_http.go b/internal/component/prometheus/receive_http/receive_http.go index 54200481bd..c6c511fff8 100644 --- a/internal/component/prometheus/receive_http/receive_http.go +++ b/internal/component/prometheus/receive_http/receive_http.go @@ -8,13 +8,13 @@ import ( "sync" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/component" - fnet "github.com/grafana/agent/internal/component/common/net" - agentprom "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/labelstore" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + fnet "github.com/grafana/alloy/internal/component/common/net" + agentprom "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/labelstore" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage/remote" diff --git a/internal/component/prometheus/receive_http/receive_http_test.go b/internal/component/prometheus/receive_http/receive_http_test.go index 9d72dae277..37a1dd2e37 100644 --- a/internal/component/prometheus/receive_http/receive_http_test.go +++ b/internal/component/prometheus/receive_http/receive_http_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/golang/snappy" - "github.com/grafana/agent/internal/component" - fnet "github.com/grafana/agent/internal/component/common/net" - agentprom "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/service/labelstore" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + fnet "github.com/grafana/alloy/internal/component/common/net" + agentprom "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/service/labelstore" + "github.com/grafana/alloy/internal/util" "github.com/phayes/freeport" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/config" diff --git a/internal/component/prometheus/relabel/relabel.go b/internal/component/prometheus/relabel/relabel.go index 0a4a81510c..9db46df950 100644 --- a/internal/component/prometheus/relabel/relabel.go +++ b/internal/component/prometheus/relabel/relabel.go @@ -5,11 +5,11 @@ import ( "fmt" "sync" - "github.com/grafana/agent/internal/component" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/component" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/service/labelstore" lru "github.com/hashicorp/golang-lru/v2" prometheus_client "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/exemplar" diff --git a/internal/component/prometheus/relabel/relabel_test.go b/internal/component/prometheus/relabel/relabel_test.go index c7d0a04442..69692050ad 100644 --- a/internal/component/prometheus/relabel/relabel_test.go +++ b/internal/component/prometheus/relabel/relabel_test.go @@ -8,12 +8,12 @@ import ( "context" - "github.com/grafana/agent/internal/component" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/service/labelstore" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/service/labelstore" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/prometheus/remotewrite/cli.go b/internal/component/prometheus/remotewrite/cli.go index df6dfee346..74a21ee2dd 100644 --- a/internal/component/prometheus/remotewrite/cli.go +++ b/internal/component/prometheus/remotewrite/cli.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sort" - "github.com/grafana/agent/internal/static/agentctl/waltools" + "github.com/grafana/alloy/internal/static/agentctl/waltools" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/internal/component/prometheus/remotewrite/remote_write.go b/internal/component/prometheus/remotewrite/remote_write.go index b5b00b78b8..747311a64f 100644 --- a/internal/component/prometheus/remotewrite/remote_write.go +++ b/internal/component/prometheus/remotewrite/remote_write.go @@ -10,14 +10,14 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/agentseed" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/labelstore" - "github.com/grafana/agent/internal/static/metrics/wal" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/alloyseed" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/labelstore" + "github.com/grafana/alloy/internal/static/metrics/wal" + "github.com/grafana/alloy/internal/useragent" "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/histogram" "github.com/prometheus/prometheus/model/labels" @@ -257,12 +257,13 @@ func (c *Component) Update(newConfig component.Arguments) error { if err != nil { return err } - uid := agentseed.Get().UID + uid := alloyseed.Get().UID for _, cfg := range convertedConfig.RemoteWriteConfigs { if cfg.Headers == nil { cfg.Headers = map[string]string{} } - cfg.Headers[agentseed.HeaderName] = uid + cfg.Headers[alloyseed.LegacyHeaderName] = uid + cfg.Headers[alloyseed.HeaderName] = uid } err = c.remoteStore.ApplyConfig(convertedConfig) if err != nil { diff --git a/internal/component/prometheus/remotewrite/remote_write_test.go b/internal/component/prometheus/remotewrite/remote_write_test.go index 51f528d6a4..654cb06a83 100644 --- a/internal/component/prometheus/remotewrite/remote_write_test.go +++ b/internal/component/prometheus/remotewrite/remote_write_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/prometheus/remotewrite" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/prometheus/remotewrite" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/prompb" diff --git a/internal/component/prometheus/remotewrite/types.go b/internal/component/prometheus/remotewrite/types.go index f678e0ca51..6d365270a7 100644 --- a/internal/component/prometheus/remotewrite/types.go +++ b/internal/component/prometheus/remotewrite/types.go @@ -6,8 +6,8 @@ import ( "sort" "time" - types "github.com/grafana/agent/internal/component/common/config" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" + types "github.com/grafana/alloy/internal/component/common/config" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" "github.com/grafana/alloy/syntax/alloytypes" "github.com/google/uuid" diff --git a/internal/component/prometheus/scrape/scrape.go b/internal/component/prometheus/scrape/scrape.go index 31ea701251..fe3a8b46c9 100644 --- a/internal/component/prometheus/scrape/scrape.go +++ b/internal/component/prometheus/scrape/scrape.go @@ -8,16 +8,16 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component" - component_config "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" - "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/service/labelstore" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/component" + component_config "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" + "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/service/labelstore" + "github.com/grafana/alloy/internal/useragent" client_prometheus "github.com/prometheus/client_golang/prometheus" config_util "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/internal/component/prometheus/scrape/scrape_test.go b/internal/component/prometheus/scrape/scrape_test.go index 630a3d7f5c..c700be4a3d 100644 --- a/internal/component/prometheus/scrape/scrape_test.go +++ b/internal/component/prometheus/scrape/scrape_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/prometheus" - "github.com/grafana/agent/internal/service/cluster" - http_service "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/service/labelstore" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/prometheus" + "github.com/grafana/alloy/internal/service/cluster" + http_service "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/service/labelstore" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/ckit/memconn" prometheus_client "github.com/prometheus/client_golang/prometheus" diff --git a/internal/component/pyroscope/ebpf/args.go b/internal/component/pyroscope/ebpf/args.go index 808a121d82..d01840f427 100644 --- a/internal/component/pyroscope/ebpf/args.go +++ b/internal/component/pyroscope/ebpf/args.go @@ -3,8 +3,8 @@ package ebpf import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/pyroscope" ) type Arguments struct { diff --git a/internal/component/pyroscope/ebpf/ebpf_linux.go b/internal/component/pyroscope/ebpf/ebpf_linux.go index 7416ee8854..bc5c16f56d 100644 --- a/internal/component/pyroscope/ebpf/ebpf_linux.go +++ b/internal/component/pyroscope/ebpf/ebpf_linux.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ebpfspy "github.com/grafana/pyroscope/ebpf" demangle2 "github.com/grafana/pyroscope/ebpf/cpp/demangle" "github.com/grafana/pyroscope/ebpf/pprof" diff --git a/internal/component/pyroscope/ebpf/ebpf_linux_test.go b/internal/component/pyroscope/ebpf/ebpf_linux_test.go index 71e49f53c2..97baf8f8f6 100644 --- a/internal/component/pyroscope/ebpf/ebpf_linux_test.go +++ b/internal/component/pyroscope/ebpf/ebpf_linux_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" ebpfspy "github.com/grafana/pyroscope/ebpf" "github.com/grafana/pyroscope/ebpf/pprof" diff --git a/internal/component/pyroscope/ebpf/ebpf_placeholder.go b/internal/component/pyroscope/ebpf/ebpf_placeholder.go index 18e6aabe5c..b7da8f531a 100644 --- a/internal/component/pyroscope/ebpf/ebpf_placeholder.go +++ b/internal/component/pyroscope/ebpf/ebpf_placeholder.go @@ -5,9 +5,9 @@ package ebpf import ( "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/pyroscope/java/args.go b/internal/component/pyroscope/java/args.go index b6529ef368..85ba52b77a 100644 --- a/internal/component/pyroscope/java/args.go +++ b/internal/component/pyroscope/java/args.go @@ -3,8 +3,8 @@ package java import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/pyroscope" ) type Arguments struct { diff --git a/internal/component/pyroscope/java/java.go b/internal/component/pyroscope/java/java.go index d2832df519..27e489780f 100644 --- a/internal/component/pyroscope/java/java.go +++ b/internal/component/pyroscope/java/java.go @@ -9,11 +9,11 @@ import ( "strconv" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/component/pyroscope/java/asprof" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component/pyroscope/java/asprof" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) const ( diff --git a/internal/component/pyroscope/java/java_stub.go b/internal/component/pyroscope/java/java_stub.go index 25daeaf182..6548e77715 100644 --- a/internal/component/pyroscope/java/java_stub.go +++ b/internal/component/pyroscope/java/java_stub.go @@ -5,9 +5,9 @@ package java import ( "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/component/pyroscope/java/loop.go b/internal/component/pyroscope/java/loop.go index 0e591b9501..3fd7f1c271 100644 --- a/internal/component/pyroscope/java/loop.go +++ b/internal/component/pyroscope/java/loop.go @@ -13,10 +13,10 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/component/pyroscope/java/asprof" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component/pyroscope/java/asprof" + "github.com/grafana/alloy/internal/flow/logging/level" jfrpprof "github.com/grafana/jfr-parser/pprof" jfrpprofPyroscope "github.com/grafana/jfr-parser/pprof/pyroscope" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/pyroscope/java/target.go b/internal/component/pyroscope/java/target.go index 52fa2d7a97..cffdf967b5 100644 --- a/internal/component/pyroscope/java/target.go +++ b/internal/component/pyroscope/java/target.go @@ -3,7 +3,7 @@ package java import ( "fmt" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" ) const ( diff --git a/internal/component/pyroscope/scrape/delta_profiles.go b/internal/component/pyroscope/scrape/delta_profiles.go index 96ac80e5ae..926b7179cc 100644 --- a/internal/component/pyroscope/scrape/delta_profiles.go +++ b/internal/component/pyroscope/scrape/delta_profiles.go @@ -8,8 +8,8 @@ import ( "io" "sync" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/component/pyroscope/scrape/internal/fastdelta" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component/pyroscope/scrape/internal/fastdelta" "github.com/klauspost/compress/gzip" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/pyroscope/scrape/delta_profiles_test.go b/internal/component/pyroscope/scrape/delta_profiles_test.go index 40d807c87c..29cbfd86f2 100644 --- a/internal/component/pyroscope/scrape/delta_profiles_test.go +++ b/internal/component/pyroscope/scrape/delta_profiles_test.go @@ -9,7 +9,7 @@ import ( googlev1 "github.com/grafana/pyroscope/api/gen/proto/go/google/v1" - "github.com/grafana/agent/internal/component/pyroscope" + "github.com/grafana/alloy/internal/component/pyroscope" "github.com/klauspost/compress/gzip" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/pyroscope/scrape/internal/fastdelta/delta_map.go b/internal/component/pyroscope/scrape/internal/fastdelta/delta_map.go index 9d247bcc8b..94db57720a 100644 --- a/internal/component/pyroscope/scrape/internal/fastdelta/delta_map.go +++ b/internal/component/pyroscope/scrape/internal/fastdelta/delta_map.go @@ -10,7 +10,7 @@ import ( "github.com/spaolacci/murmur3" - "github.com/grafana/agent/internal/component/pyroscope/scrape/internal/pproflite" + "github.com/grafana/alloy/internal/component/pyroscope/scrape/internal/pproflite" ) // As of Go 1.19, the Go heap profile has 4 values per sample, with 2 of them diff --git a/internal/component/pyroscope/scrape/internal/fastdelta/fd.go b/internal/component/pyroscope/scrape/internal/fastdelta/fd.go index d956e5f0fa..d1e1699c49 100644 --- a/internal/component/pyroscope/scrape/internal/fastdelta/fd.go +++ b/internal/component/pyroscope/scrape/internal/fastdelta/fd.go @@ -67,7 +67,7 @@ import ( "github.com/spaolacci/murmur3" - "github.com/grafana/agent/internal/component/pyroscope/scrape/internal/pproflite" + "github.com/grafana/alloy/internal/component/pyroscope/scrape/internal/pproflite" ) // ValueType describes the type and unit of a value. diff --git a/internal/component/pyroscope/scrape/internal/fastdelta/fuzz_test.go b/internal/component/pyroscope/scrape/internal/fastdelta/fuzz_test.go index eeef83459d..432ed0b3be 100644 --- a/internal/component/pyroscope/scrape/internal/fastdelta/fuzz_test.go +++ b/internal/component/pyroscope/scrape/internal/fastdelta/fuzz_test.go @@ -11,7 +11,7 @@ import ( "io" "testing" - "github.com/grafana/agent/internal/component/pyroscope/scrape/internal/fastdelta" + "github.com/grafana/alloy/internal/component/pyroscope/scrape/internal/fastdelta" ) // FuzzDelta looks for inputs to delta which cause crashes. This is to account diff --git a/internal/component/pyroscope/scrape/internal/fastdelta/hasher.go b/internal/component/pyroscope/scrape/internal/fastdelta/hasher.go index 52ede6de9f..dd96ed8042 100644 --- a/internal/component/pyroscope/scrape/internal/fastdelta/hasher.go +++ b/internal/component/pyroscope/scrape/internal/fastdelta/hasher.go @@ -13,7 +13,7 @@ import ( "github.com/spaolacci/murmur3" - "github.com/grafana/agent/internal/component/pyroscope/scrape/internal/pproflite" + "github.com/grafana/alloy/internal/component/pyroscope/scrape/internal/pproflite" ) // Hash is a 128-bit hash representing sample identity diff --git a/internal/component/pyroscope/scrape/internal/pproflite/pproflite_test.go b/internal/component/pyroscope/scrape/internal/pproflite/pproflite_test.go index b240b1dd61..7c93708912 100644 --- a/internal/component/pyroscope/scrape/internal/pproflite/pproflite_test.go +++ b/internal/component/pyroscope/scrape/internal/pproflite/pproflite_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/pprof/profile" "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/component/pyroscope/scrape/internal/pproflite" + "github.com/grafana/alloy/internal/component/pyroscope/scrape/internal/pproflite" ) func TestDecoderEncoder(t *testing.T) { diff --git a/internal/component/pyroscope/scrape/manager.go b/internal/component/pyroscope/scrape/manager.go index 7eddeb31cd..d9f67b8c06 100644 --- a/internal/component/pyroscope/scrape/manager.go +++ b/internal/component/pyroscope/scrape/manager.go @@ -6,8 +6,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/prometheus/discovery/targetgroup" ) diff --git a/internal/component/pyroscope/scrape/manager_test.go b/internal/component/pyroscope/scrape/manager_test.go index 8b56cf2cbc..4ea5035216 100644 --- a/internal/component/pyroscope/scrape/manager_test.go +++ b/internal/component/pyroscope/scrape/manager_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/pyroscope/scrape/scrape.go b/internal/component/pyroscope/scrape/scrape.go index 9507eced24..7c5f00662a 100644 --- a/internal/component/pyroscope/scrape/scrape.go +++ b/internal/component/pyroscope/scrape/scrape.go @@ -7,17 +7,17 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" - "github.com/grafana/agent/internal/component" - component_config "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/scrape" + "github.com/grafana/alloy/internal/component" + component_config "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/scrape" ) const ( diff --git a/internal/component/pyroscope/scrape/scrape_loop.go b/internal/component/pyroscope/scrape/scrape_loop.go index 8851249927..34d94a7b30 100644 --- a/internal/component/pyroscope/scrape/scrape_loop.go +++ b/internal/component/pyroscope/scrape/scrape_loop.go @@ -11,9 +11,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/useragent" commonconfig "github.com/prometheus/common/config" "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/util/pool" diff --git a/internal/component/pyroscope/scrape/scrape_loop_test.go b/internal/component/pyroscope/scrape/scrape_loop_test.go index 2b2ea5278d..075051adf5 100644 --- a/internal/component/pyroscope/scrape/scrape_loop_test.go +++ b/internal/component/pyroscope/scrape/scrape_loop_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/component/pyroscope/scrape/scrape_test.go b/internal/component/pyroscope/scrape/scrape_test.go index 1193b0b37c..57c5c8d6bb 100644 --- a/internal/component/pyroscope/scrape/scrape_test.go +++ b/internal/component/pyroscope/scrape/scrape_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/scrape" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/service/cluster" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/scrape" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/service/cluster" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/internal/component/pyroscope/write/write.go b/internal/component/pyroscope/write/write.go index 7ecd1b20fe..067687aae9 100644 --- a/internal/component/pyroscope/write/write.go +++ b/internal/component/pyroscope/write/write.go @@ -7,19 +7,19 @@ import ( "time" "connectrpc.com/connect" - "github.com/grafana/agent/internal/agentseed" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/alloyseed" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/useragent" "github.com/oklog/run" commonconfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "go.uber.org/multierr" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/config" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/dskit/backoff" pushv1 "github.com/grafana/pyroscope/api/gen/proto/go/push/v1" "github.com/grafana/pyroscope/api/gen/proto/go/push/v1/pushv1connect" @@ -159,12 +159,13 @@ type fanOutClient struct { // NewFanOut creates a new fan out client that will fan out to all endpoints. func NewFanOut(opts component.Options, config Arguments, metrics *metrics) (*fanOutClient, error) { clients := make([]pushv1connect.PusherServiceClient, 0, len(config.Endpoints)) - uid := agentseed.Get().UID + uid := alloyseed.Get().UID for _, endpoint := range config.Endpoints { if endpoint.Headers == nil { endpoint.Headers = map[string]string{} } - endpoint.Headers[agentseed.HeaderName] = uid + endpoint.Headers[alloyseed.LegacyHeaderName] = uid + endpoint.Headers[alloyseed.HeaderName] = uid httpClient, err := commonconfig.NewClientFromConfig(*endpoint.HTTPClientConfig.Convert(), endpoint.Name) if err != nil { return nil, err diff --git a/internal/component/pyroscope/write/write_test.go b/internal/component/pyroscope/write/write_test.go index d803c3a4d7..73172bb99d 100644 --- a/internal/component/pyroscope/write/write_test.go +++ b/internal/component/pyroscope/write/write_test.go @@ -10,9 +10,9 @@ import ( "time" "connectrpc.com/connect" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/pyroscope" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/pyroscope" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" pushv1 "github.com/grafana/pyroscope/api/gen/proto/go/push/v1" "github.com/grafana/pyroscope/api/gen/proto/go/push/v1/pushv1connect" diff --git a/internal/component/registry.go b/internal/component/registry.go index b382719bcd..47695215a5 100644 --- a/internal/component/registry.go +++ b/internal/component/registry.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/go-kit/log" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/regexp" "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/trace" diff --git a/internal/component/remote/http/http.go b/internal/component/remote/http/http.go index 3f9669bbc8..8e22254dad 100644 --- a/internal/component/remote/http/http.go +++ b/internal/component/remote/http/http.go @@ -11,11 +11,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - common_config "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/component" + common_config "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/useragent" "github.com/grafana/alloy/syntax/alloytypes" prom_config "github.com/prometheus/common/config" ) diff --git a/internal/component/remote/http/http_test.go b/internal/component/remote/http/http_test.go index ec89669436..dcb0529582 100644 --- a/internal/component/remote/http/http_test.go +++ b/internal/component/remote/http/http_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - http_component "github.com/grafana/agent/internal/component/remote/http" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/util" + http_component "github.com/grafana/alloy/internal/component/remote/http" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" "github.com/grafana/dskit/backoff" diff --git a/internal/component/remote/kubernetes/configmap/configmap.go b/internal/component/remote/kubernetes/configmap/configmap.go index bb45426238..5489f2dcd2 100644 --- a/internal/component/remote/kubernetes/configmap/configmap.go +++ b/internal/component/remote/kubernetes/configmap/configmap.go @@ -1,9 +1,9 @@ package configmap import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/remote/kubernetes" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/remote/kubernetes" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/remote/kubernetes/kubernetes.go b/internal/component/remote/kubernetes/kubernetes.go index 251cc2d9ae..d0bb046b73 100644 --- a/internal/component/remote/kubernetes/kubernetes.go +++ b/internal/component/remote/kubernetes/kubernetes.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/common/kubernetes" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/common/kubernetes" "github.com/grafana/alloy/syntax/alloytypes" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/component/remote/kubernetes/secret/secret.go b/internal/component/remote/kubernetes/secret/secret.go index f7b3d14758..203889ce4f 100644 --- a/internal/component/remote/kubernetes/secret/secret.go +++ b/internal/component/remote/kubernetes/secret/secret.go @@ -1,9 +1,9 @@ package secret import ( - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/remote/kubernetes" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/remote/kubernetes" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/component/remote/s3/s3.go b/internal/component/remote/s3/s3.go index d6ae76810c..cf1820b9b5 100644 --- a/internal/component/remote/s3/s3.go +++ b/internal/component/remote/s3/s3.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" aws_config "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/component/remote/s3/s3_test.go b/internal/component/remote/s3/s3_test.go index 2672f8da3a..37d711bc4c 100644 --- a/internal/component/remote/s3/s3_test.go +++ b/internal/component/remote/s3/s3_test.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/stretchr/testify/require" ) diff --git a/internal/component/remote/vault/refresher.go b/internal/component/remote/vault/refresher.go index 479e7184eb..70338304a9 100644 --- a/internal/component/remote/vault/refresher.go +++ b/internal/component/remote/vault/refresher.go @@ -7,8 +7,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/logging/level" vault "github.com/hashicorp/vault/api" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/component/remote/vault/vault.go b/internal/component/remote/vault/vault.go index cfe4fe85ee..0438d3d491 100644 --- a/internal/component/remote/vault/vault.go +++ b/internal/component/remote/vault/vault.go @@ -7,9 +7,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax/alloytypes" "github.com/oklog/run" diff --git a/internal/component/remote/vault/vault_test.go b/internal/component/remote/vault/vault_test.go index bf26c4d06f..4920c13dd4 100644 --- a/internal/component/remote/vault/vault_test.go +++ b/internal/component/remote/vault/vault_test.go @@ -12,8 +12,8 @@ import ( "github.com/docker/go-connections/nat" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" "github.com/stretchr/testify/require" diff --git a/internal/converter/converter.go b/internal/converter/converter.go index 3b9cf459bb..124a1c0513 100644 --- a/internal/converter/converter.go +++ b/internal/converter/converter.go @@ -5,10 +5,10 @@ package converter import ( "fmt" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert" - "github.com/grafana/agent/internal/converter/internal/promtailconvert" - "github.com/grafana/agent/internal/converter/internal/staticconvert" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert" + "github.com/grafana/alloy/internal/converter/internal/promtailconvert" + "github.com/grafana/alloy/internal/converter/internal/staticconvert" ) // Input represents the type of config file being fed into the converter. diff --git a/internal/converter/internal/common/convert_logs_receiver.go b/internal/converter/internal/common/convert_logs_receiver.go index b3110af4d8..ed0aacb8a2 100644 --- a/internal/converter/internal/common/convert_logs_receiver.go +++ b/internal/converter/internal/common/convert_logs_receiver.go @@ -1,7 +1,7 @@ package common import ( - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/token" "github.com/grafana/alloy/syntax/token/builder" diff --git a/internal/converter/internal/common/convert_targets.go b/internal/converter/internal/common/convert_targets.go index 15a7116deb..a10d3bfb48 100644 --- a/internal/converter/internal/common/convert_targets.go +++ b/internal/converter/internal/common/convert_targets.go @@ -1,7 +1,7 @@ package common import ( - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/token" "github.com/grafana/alloy/syntax/token/builder" diff --git a/internal/converter/internal/common/convert_targets_test.go b/internal/converter/internal/common/convert_targets_test.go index ecc847f2d8..cfcb20bae9 100644 --- a/internal/converter/internal/common/convert_targets_test.go +++ b/internal/converter/internal/common/convert_targets_test.go @@ -3,8 +3,8 @@ package common_test import ( "testing" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/token/builder" "github.com/stretchr/testify/require" ) diff --git a/internal/converter/internal/common/http_client_config.go b/internal/converter/internal/common/http_client_config.go index f144f748fc..8c267d2a3a 100644 --- a/internal/converter/internal/common/http_client_config.go +++ b/internal/converter/internal/common/http_client_config.go @@ -3,8 +3,8 @@ package common import ( "reflect" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/converter/diag" "github.com/grafana/alloy/syntax/alloytypes" prom_config "github.com/prometheus/common/config" ) diff --git a/internal/converter/internal/common/river_utils.go b/internal/converter/internal/common/river_utils.go index 4ee518babc..81e1a38ca5 100644 --- a/internal/converter/internal/common/river_utils.go +++ b/internal/converter/internal/common/river_utils.go @@ -11,10 +11,10 @@ import ( "github.com/grafana/alloy/syntax/printer" "github.com/grafana/alloy/syntax/scanner" - "github.com/grafana/agent/internal/component" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/component" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/converter/diag" "github.com/grafana/alloy/syntax/token/builder" ) diff --git a/internal/converter/internal/common/river_utils_test.go b/internal/converter/internal/common/river_utils_test.go index 57ccd53fb8..509b03904f 100644 --- a/internal/converter/internal/common/river_utils_test.go +++ b/internal/converter/internal/common/river_utils_test.go @@ -3,7 +3,7 @@ package common_test import ( "testing" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax" "github.com/stretchr/testify/require" ) diff --git a/internal/converter/internal/common/validate.go b/internal/converter/internal/common/validate.go index 57e750f6c1..9921ee1dcd 100644 --- a/internal/converter/internal/common/validate.go +++ b/internal/converter/internal/common/validate.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/diag" "github.com/grafana/alloy/syntax/token/builder" ) diff --git a/internal/converter/internal/common/validate_test.go b/internal/converter/internal/common/validate_test.go index 64b95e4de9..b693b6eed8 100644 --- a/internal/converter/internal/common/validate_test.go +++ b/internal/converter/internal/common/validate_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/stretchr/testify/require" ) diff --git a/internal/converter/internal/common/weaveworks_server.go b/internal/converter/internal/common/weaveworks_server.go index b0ed5f038a..6730e0c55f 100644 --- a/internal/converter/internal/common/weaveworks_server.go +++ b/internal/converter/internal/common/weaveworks_server.go @@ -3,8 +3,8 @@ package common import ( "github.com/grafana/dskit/server" - fnet "github.com/grafana/agent/internal/component/common/net" - "github.com/grafana/agent/internal/converter/diag" + fnet "github.com/grafana/alloy/internal/component/common/net" + "github.com/grafana/alloy/internal/converter/diag" ) func DefaultWeaveWorksServerCfg() server.Config { diff --git a/internal/converter/internal/otelcolconvert/converter.go b/internal/converter/internal/otelcolconvert/converter.go index 147a18ad65..128fb1683d 100644 --- a/internal/converter/internal/otelcolconvert/converter.go +++ b/internal/converter/internal/otelcolconvert/converter.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/token/builder" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/otelcol" diff --git a/internal/converter/internal/otelcolconvert/converter_attributesprocessor.go b/internal/converter/internal/otelcolconvert/converter_attributesprocessor.go index c9b9486b26..7c6b9371df 100644 --- a/internal/converter/internal/otelcolconvert/converter_attributesprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_attributesprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/attributes" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/attributes" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_basicauthextension.go b/internal/converter/internal/otelcolconvert/converter_basicauthextension.go index 9bbd6c29d2..ce95cfb82c 100644 --- a/internal/converter/internal/otelcolconvert/converter_basicauthextension.go +++ b/internal/converter/internal/otelcolconvert/converter_basicauthextension.go @@ -3,9 +3,9 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol/auth/basic" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol/auth/basic" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension" "go.opentelemetry.io/collector/component" diff --git a/internal/converter/internal/otelcolconvert/converter_batchprocessor.go b/internal/converter/internal/otelcolconvert/converter_batchprocessor.go index df234aee2f..b6c24fb914 100644 --- a/internal/converter/internal/otelcolconvert/converter_batchprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_batchprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/batch" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/batch" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/processor/batchprocessor" ) diff --git a/internal/converter/internal/otelcolconvert/converter_bearertokenauthextension.go b/internal/converter/internal/otelcolconvert/converter_bearertokenauthextension.go index 5b498b4fa5..1c68636636 100644 --- a/internal/converter/internal/otelcolconvert/converter_bearertokenauthextension.go +++ b/internal/converter/internal/otelcolconvert/converter_bearertokenauthextension.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component/local/file" - "github.com/grafana/agent/internal/component/otelcol/auth/bearer" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/local/file" + "github.com/grafana/alloy/internal/component/otelcol/auth/bearer" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "github.com/grafana/alloy/syntax/token/builder" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension" diff --git a/internal/converter/internal/otelcolconvert/converter_filterprocessor.go b/internal/converter/internal/otelcolconvert/converter_filterprocessor.go index 71cb6749d3..06ea80f2c1 100644 --- a/internal/converter/internal/otelcolconvert/converter_filterprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_filterprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/filter" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/filter" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_headerssetterextension.go b/internal/converter/internal/otelcolconvert/converter_headerssetterextension.go index 658270ff1e..64e8bb4cce 100644 --- a/internal/converter/internal/otelcolconvert/converter_headerssetterextension.go +++ b/internal/converter/internal/otelcolconvert/converter_headerssetterextension.go @@ -3,9 +3,9 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol/auth/headers" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol/auth/headers" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension" "go.opentelemetry.io/collector/component" diff --git a/internal/converter/internal/otelcolconvert/converter_helpers.go b/internal/converter/internal/otelcolconvert/converter_helpers.go index 7942e74254..2a33faf56c 100644 --- a/internal/converter/internal/otelcolconvert/converter_helpers.go +++ b/internal/converter/internal/otelcolconvert/converter_helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" "github.com/grafana/alloy/syntax/token" "github.com/grafana/alloy/syntax/token/builder" "github.com/mitchellh/mapstructure" diff --git a/internal/converter/internal/otelcolconvert/converter_jaegerreceiver.go b/internal/converter/internal/otelcolconvert/converter_jaegerreceiver.go index c7cb41c5ea..9ee1a2723c 100644 --- a/internal/converter/internal/otelcolconvert/converter_jaegerreceiver.go +++ b/internal/converter/internal/otelcolconvert/converter_jaegerreceiver.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/jaeger" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/jaeger" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" diff --git a/internal/converter/internal/otelcolconvert/converter_jaegerremotesamplingextension.go b/internal/converter/internal/otelcolconvert/converter_jaegerremotesamplingextension.go index 2076a7290d..51e66fa29e 100644 --- a/internal/converter/internal/otelcolconvert/converter_jaegerremotesamplingextension.go +++ b/internal/converter/internal/otelcolconvert/converter_jaegerremotesamplingextension.go @@ -3,9 +3,9 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol/extension/jaeger_remote_sampling" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol/extension/jaeger_remote_sampling" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_k8sattributesprocessor.go b/internal/converter/internal/otelcolconvert/converter_k8sattributesprocessor.go index abd109bbd9..bb0db334e9 100644 --- a/internal/converter/internal/otelcolconvert/converter_k8sattributesprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_k8sattributesprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/k8sattributes" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/k8sattributes" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go b/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go index 7236438908..dee9d99aef 100644 --- a/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go +++ b/internal/converter/internal/otelcolconvert/converter_kafkareceiver.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/kafka" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/kafka" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" diff --git a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go index a01136e1d2..961c170832 100644 --- a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go +++ b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go @@ -5,11 +5,11 @@ import ( "strings" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/exporter/loadbalancing" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/exporter/loadbalancing" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_loggingexporter.go b/internal/converter/internal/otelcolconvert/converter_loggingexporter.go index 76d85cd2f0..226fc9d28f 100644 --- a/internal/converter/internal/otelcolconvert/converter_loggingexporter.go +++ b/internal/converter/internal/otelcolconvert/converter_loggingexporter.go @@ -3,9 +3,9 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol/exporter/logging" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol/exporter/logging" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.uber.org/zap/zapcore" diff --git a/internal/converter/internal/otelcolconvert/converter_memorylimiterprocessor.go b/internal/converter/internal/otelcolconvert/converter_memorylimiterprocessor.go index f870cf4848..f9e39a7b08 100644 --- a/internal/converter/internal/otelcolconvert/converter_memorylimiterprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_memorylimiterprocessor.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/memorylimiter" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/memorylimiter" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" ) diff --git a/internal/converter/internal/otelcolconvert/converter_oauth2clientauthextension.go b/internal/converter/internal/otelcolconvert/converter_oauth2clientauthextension.go index 94eda15664..95f82414be 100644 --- a/internal/converter/internal/otelcolconvert/converter_oauth2clientauthextension.go +++ b/internal/converter/internal/otelcolconvert/converter_oauth2clientauthextension.go @@ -3,9 +3,9 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol/auth/oauth2" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol/auth/oauth2" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension" "go.opentelemetry.io/collector/component" diff --git a/internal/converter/internal/otelcolconvert/converter_opencensusreceiver.go b/internal/converter/internal/otelcolconvert/converter_opencensusreceiver.go index 78ae892ce4..4745582e30 100644 --- a/internal/converter/internal/otelcolconvert/converter_opencensusreceiver.go +++ b/internal/converter/internal/otelcolconvert/converter_opencensusreceiver.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/opencensus" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/opencensus" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_otlpexporter.go b/internal/converter/internal/otelcolconvert/converter_otlpexporter.go index 230478144c..5584ed8686 100644 --- a/internal/converter/internal/otelcolconvert/converter_otlpexporter.go +++ b/internal/converter/internal/otelcolconvert/converter_otlpexporter.go @@ -5,11 +5,11 @@ import ( "strings" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/exporter/otlp" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/exporter/otlp" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configopaque" diff --git a/internal/converter/internal/otelcolconvert/converter_otlphttpexporter.go b/internal/converter/internal/otelcolconvert/converter_otlphttpexporter.go index d978e89c6a..abc363514e 100644 --- a/internal/converter/internal/otelcolconvert/converter_otlphttpexporter.go +++ b/internal/converter/internal/otelcolconvert/converter_otlphttpexporter.go @@ -6,11 +6,11 @@ import ( "time" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/auth" - "github.com/grafana/agent/internal/component/otelcol/exporter/otlphttp" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/auth" + "github.com/grafana/alloy/internal/component/otelcol/exporter/otlphttp" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/otlphttpexporter" diff --git a/internal/converter/internal/otelcolconvert/converter_otlpreceiver.go b/internal/converter/internal/otelcolconvert/converter_otlpreceiver.go index 6e5202aeca..7e23bab1a9 100644 --- a/internal/converter/internal/otelcolconvert/converter_otlpreceiver.go +++ b/internal/converter/internal/otelcolconvert/converter_otlpreceiver.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/otlp" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/otlp" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" diff --git a/internal/converter/internal/otelcolconvert/converter_probabilisticsamplerprocessor.go b/internal/converter/internal/otelcolconvert/converter_probabilisticsamplerprocessor.go index de800410ae..f7ef7d482f 100644 --- a/internal/converter/internal/otelcolconvert/converter_probabilisticsamplerprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_probabilisticsamplerprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/probabilistic_sampler" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/probabilistic_sampler" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_spanmetricsconnector.go b/internal/converter/internal/otelcolconvert/converter_spanmetricsconnector.go index 5b26f953e2..d72ce66d1b 100644 --- a/internal/converter/internal/otelcolconvert/converter_spanmetricsconnector.go +++ b/internal/converter/internal/otelcolconvert/converter_spanmetricsconnector.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/connector/spanmetrics" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/connector/spanmetrics" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_spanprocessor.go b/internal/converter/internal/otelcolconvert/converter_spanprocessor.go index 6604fc9601..fe6f887699 100644 --- a/internal/converter/internal/otelcolconvert/converter_spanprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_spanprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/span" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/span" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/plog" diff --git a/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go b/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go index 1bd2828c5f..b292d00d66 100644 --- a/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_tailsamplingprocessor.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/tail_sampling" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/tail_sampling" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_transformprocessor.go b/internal/converter/internal/otelcolconvert/converter_transformprocessor.go index 694046bb21..dec37c3c1d 100644 --- a/internal/converter/internal/otelcolconvert/converter_transformprocessor.go +++ b/internal/converter/internal/otelcolconvert/converter_transformprocessor.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/processor/transform" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/processor/transform" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/converter_zipkinreceiver.go b/internal/converter/internal/otelcolconvert/converter_zipkinreceiver.go index 66c0f7d52e..28ca8126c9 100644 --- a/internal/converter/internal/otelcolconvert/converter_zipkinreceiver.go +++ b/internal/converter/internal/otelcolconvert/converter_zipkinreceiver.go @@ -3,10 +3,10 @@ package otelcolconvert import ( "fmt" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/component/otelcol/receiver/zipkin" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol/receiver/zipkin" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" "go.opentelemetry.io/collector/component" ) diff --git a/internal/converter/internal/otelcolconvert/otelcolconvert.go b/internal/converter/internal/otelcolconvert/otelcolconvert.go index 97ae03a387..d6b04c0e9d 100644 --- a/internal/converter/internal/otelcolconvert/otelcolconvert.go +++ b/internal/converter/internal/otelcolconvert/otelcolconvert.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/token/builder" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" diff --git a/internal/converter/internal/otelcolconvert/otelcolconvert_test.go b/internal/converter/internal/otelcolconvert/otelcolconvert_test.go index 570a5dc08a..fa5255cf9a 100644 --- a/internal/converter/internal/otelcolconvert/otelcolconvert_test.go +++ b/internal/converter/internal/otelcolconvert/otelcolconvert_test.go @@ -3,8 +3,8 @@ package otelcolconvert_test import ( "testing" - "github.com/grafana/agent/internal/converter/internal/otelcolconvert" - "github.com/grafana/agent/internal/converter/internal/test_common" + "github.com/grafana/alloy/internal/converter/internal/otelcolconvert" + "github.com/grafana/alloy/internal/converter/internal/test_common" ) func TestConvert(t *testing.T) { diff --git a/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go b/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go index 69e3493186..176ac89ef7 100644 --- a/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go +++ b/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/diag" "github.com/grafana/alloy/syntax/token/builder" ) diff --git a/internal/converter/internal/prometheusconvert/component/azure.go b/internal/converter/internal/prometheusconvert/component/azure.go index 5f98bbee56..47505a5e09 100644 --- a/internal/converter/internal/prometheusconvert/component/azure.go +++ b/internal/converter/internal/prometheusconvert/component/azure.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/azure" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/azure" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_azure "github.com/prometheus/prometheus/discovery/azure" ) diff --git a/internal/converter/internal/prometheusconvert/component/consul.go b/internal/converter/internal/prometheusconvert/component/consul.go index 6e6bf672e8..39ac98321c 100644 --- a/internal/converter/internal/prometheusconvert/component/consul.go +++ b/internal/converter/internal/prometheusconvert/component/consul.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/consul" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/consul" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_consul "github.com/prometheus/prometheus/discovery/consul" ) diff --git a/internal/converter/internal/prometheusconvert/component/digitalocean.go b/internal/converter/internal/prometheusconvert/component/digitalocean.go index 2d5d653d97..6ab669e51c 100644 --- a/internal/converter/internal/prometheusconvert/component/digitalocean.go +++ b/internal/converter/internal/prometheusconvert/component/digitalocean.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/digitalocean" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/digitalocean" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_config "github.com/prometheus/common/config" prom_digitalocean "github.com/prometheus/prometheus/discovery/digitalocean" diff --git a/internal/converter/internal/prometheusconvert/component/dns.go b/internal/converter/internal/prometheusconvert/component/dns.go index 995d57d10f..5e487c48f1 100644 --- a/internal/converter/internal/prometheusconvert/component/dns.go +++ b/internal/converter/internal/prometheusconvert/component/dns.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/dns" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/dns" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_dns "github.com/prometheus/prometheus/discovery/dns" ) diff --git a/internal/converter/internal/prometheusconvert/component/docker.go b/internal/converter/internal/prometheusconvert/component/docker.go index 8523d39484..2fb0be2894 100644 --- a/internal/converter/internal/prometheusconvert/component/docker.go +++ b/internal/converter/internal/prometheusconvert/component/docker.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/docker" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/docker" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_moby "github.com/prometheus/prometheus/discovery/moby" ) diff --git a/internal/converter/internal/prometheusconvert/component/dockerswarm.go b/internal/converter/internal/prometheusconvert/component/dockerswarm.go index 46d4ce9af3..852f720af1 100644 --- a/internal/converter/internal/prometheusconvert/component/dockerswarm.go +++ b/internal/converter/internal/prometheusconvert/component/dockerswarm.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/dockerswarm" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/dockerswarm" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_moby "github.com/prometheus/prometheus/discovery/moby" ) diff --git a/internal/converter/internal/prometheusconvert/component/ec2.go b/internal/converter/internal/prometheusconvert/component/ec2.go index 46bf78ff11..7afa8996d5 100644 --- a/internal/converter/internal/prometheusconvert/component/ec2.go +++ b/internal/converter/internal/prometheusconvert/component/ec2.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/aws" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/aws" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_aws "github.com/prometheus/prometheus/discovery/aws" ) diff --git a/internal/converter/internal/prometheusconvert/component/file.go b/internal/converter/internal/prometheusconvert/component/file.go index 0ff6f32fc6..396b016212 100644 --- a/internal/converter/internal/prometheusconvert/component/file.go +++ b/internal/converter/internal/prometheusconvert/component/file.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/file" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/file" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_file "github.com/prometheus/prometheus/discovery/file" ) diff --git a/internal/converter/internal/prometheusconvert/component/gce.go b/internal/converter/internal/prometheusconvert/component/gce.go index 755dab6995..7cf8cd6b23 100644 --- a/internal/converter/internal/prometheusconvert/component/gce.go +++ b/internal/converter/internal/prometheusconvert/component/gce.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/gce" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/gce" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_gce "github.com/prometheus/prometheus/discovery/gce" ) diff --git a/internal/converter/internal/prometheusconvert/component/http.go b/internal/converter/internal/prometheusconvert/component/http.go index 5a39a97657..922cd90019 100644 --- a/internal/converter/internal/prometheusconvert/component/http.go +++ b/internal/converter/internal/prometheusconvert/component/http.go @@ -4,12 +4,12 @@ import ( "net/url" "time" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/http" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/http" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_http "github.com/prometheus/prometheus/discovery/http" ) diff --git a/internal/converter/internal/prometheusconvert/component/ionos.go b/internal/converter/internal/prometheusconvert/component/ionos.go index 76a34c587a..aa236dca4a 100644 --- a/internal/converter/internal/prometheusconvert/component/ionos.go +++ b/internal/converter/internal/prometheusconvert/component/ionos.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/ionos" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/ionos" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_ionos "github.com/prometheus/prometheus/discovery/ionos" ) diff --git a/internal/converter/internal/prometheusconvert/component/kubernetes.go b/internal/converter/internal/prometheusconvert/component/kubernetes.go index bd3595dc6e..06e9a5b353 100644 --- a/internal/converter/internal/prometheusconvert/component/kubernetes.go +++ b/internal/converter/internal/prometheusconvert/component/kubernetes.go @@ -1,12 +1,12 @@ package component import ( - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/kubernetes" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/kubernetes" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_kubernetes "github.com/prometheus/prometheus/discovery/kubernetes" ) diff --git a/internal/converter/internal/prometheusconvert/component/kuma.go b/internal/converter/internal/prometheusconvert/component/kuma.go index 6de9b6a26e..a4ea2cfa6f 100644 --- a/internal/converter/internal/prometheusconvert/component/kuma.go +++ b/internal/converter/internal/prometheusconvert/component/kuma.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/kuma" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/kuma" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_kuma "github.com/prometheus/prometheus/discovery/xds" ) diff --git a/internal/converter/internal/prometheusconvert/component/lightsail.go b/internal/converter/internal/prometheusconvert/component/lightsail.go index 765d504ad8..a0fcfd1f7c 100644 --- a/internal/converter/internal/prometheusconvert/component/lightsail.go +++ b/internal/converter/internal/prometheusconvert/component/lightsail.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/aws" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/aws" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_aws "github.com/prometheus/prometheus/discovery/aws" ) diff --git a/internal/converter/internal/prometheusconvert/component/linode.go b/internal/converter/internal/prometheusconvert/component/linode.go index 42d00efc03..074d058e70 100644 --- a/internal/converter/internal/prometheusconvert/component/linode.go +++ b/internal/converter/internal/prometheusconvert/component/linode.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/linode" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/linode" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_linode "github.com/prometheus/prometheus/discovery/linode" ) diff --git a/internal/converter/internal/prometheusconvert/component/marathon.go b/internal/converter/internal/prometheusconvert/component/marathon.go index 21cb6be3ef..fc4d116234 100644 --- a/internal/converter/internal/prometheusconvert/component/marathon.go +++ b/internal/converter/internal/prometheusconvert/component/marathon.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/marathon" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/marathon" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_marathon "github.com/prometheus/prometheus/discovery/marathon" ) diff --git a/internal/converter/internal/prometheusconvert/component/nerve.go b/internal/converter/internal/prometheusconvert/component/nerve.go index 499228a3ad..5f1bc9d4b7 100644 --- a/internal/converter/internal/prometheusconvert/component/nerve.go +++ b/internal/converter/internal/prometheusconvert/component/nerve.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/nerve" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/nerve" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_nerve "github.com/prometheus/prometheus/discovery/zookeeper" ) diff --git a/internal/converter/internal/prometheusconvert/component/openstack.go b/internal/converter/internal/prometheusconvert/component/openstack.go index 0ae31971ea..6e6f537d25 100644 --- a/internal/converter/internal/prometheusconvert/component/openstack.go +++ b/internal/converter/internal/prometheusconvert/component/openstack.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/openstack" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/openstack" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_openstack "github.com/prometheus/prometheus/discovery/openstack" ) diff --git a/internal/converter/internal/prometheusconvert/component/ovhcloud.go b/internal/converter/internal/prometheusconvert/component/ovhcloud.go index cef30cd058..67a0a04a71 100644 --- a/internal/converter/internal/prometheusconvert/component/ovhcloud.go +++ b/internal/converter/internal/prometheusconvert/component/ovhcloud.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/ovhcloud" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/ovhcloud" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_discovery "github.com/prometheus/prometheus/discovery/ovhcloud" ) diff --git a/internal/converter/internal/prometheusconvert/component/relabel.go b/internal/converter/internal/prometheusconvert/component/relabel.go index 3102bb576d..7e8264473d 100644 --- a/internal/converter/internal/prometheusconvert/component/relabel.go +++ b/internal/converter/internal/prometheusconvert/component/relabel.go @@ -3,12 +3,12 @@ package component import ( "fmt" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - disc_relabel "github.com/grafana/agent/internal/component/discovery/relabel" - "github.com/grafana/agent/internal/component/prometheus/relabel" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + disc_relabel "github.com/grafana/alloy/internal/component/discovery/relabel" + "github.com/grafana/alloy/internal/component/prometheus/relabel" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_relabel "github.com/prometheus/prometheus/model/relabel" "github.com/prometheus/prometheus/storage" ) diff --git a/internal/converter/internal/prometheusconvert/component/remote_write.go b/internal/converter/internal/prometheusconvert/component/remote_write.go index e2f44ad947..4b1156babd 100644 --- a/internal/converter/internal/prometheusconvert/component/remote_write.go +++ b/internal/converter/internal/prometheusconvert/component/remote_write.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/component/prometheus/remotewrite" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/prometheus/remotewrite" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" "github.com/prometheus/common/sigv4" prom_config "github.com/prometheus/prometheus/config" diff --git a/internal/converter/internal/prometheusconvert/component/scaleway.go b/internal/converter/internal/prometheusconvert/component/scaleway.go index aef4bc0187..98e17ae468 100644 --- a/internal/converter/internal/prometheusconvert/component/scaleway.go +++ b/internal/converter/internal/prometheusconvert/component/scaleway.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/scaleway" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/scaleway" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/alloy/syntax/alloytypes" prom_scaleway "github.com/prometheus/prometheus/discovery/scaleway" ) diff --git a/internal/converter/internal/prometheusconvert/component/scrape.go b/internal/converter/internal/prometheusconvert/component/scrape.go index c22b8470da..a5f6da29ad 100644 --- a/internal/converter/internal/prometheusconvert/component/scrape.go +++ b/internal/converter/internal/prometheusconvert/component/scrape.go @@ -7,12 +7,12 @@ import ( "golang.org/x/exp/maps" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/scrape" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/scrape" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/service/cluster" prom_config "github.com/prometheus/prometheus/config" prom_discovery "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/storage" diff --git a/internal/converter/internal/prometheusconvert/component/serverset.go b/internal/converter/internal/prometheusconvert/component/serverset.go index 6cea232a09..d0351ab1a9 100644 --- a/internal/converter/internal/prometheusconvert/component/serverset.go +++ b/internal/converter/internal/prometheusconvert/component/serverset.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/serverset" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/serverset" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_zk "github.com/prometheus/prometheus/discovery/zookeeper" ) diff --git a/internal/converter/internal/prometheusconvert/component/service_discovery.go b/internal/converter/internal/prometheusconvert/component/service_discovery.go index 566af1ef56..6dcca0fac8 100644 --- a/internal/converter/internal/prometheusconvert/component/service_discovery.go +++ b/internal/converter/internal/prometheusconvert/component/service_discovery.go @@ -3,10 +3,10 @@ package component import ( "fmt" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_discover "github.com/prometheus/prometheus/discovery" prom_http "github.com/prometheus/prometheus/discovery/http" diff --git a/internal/converter/internal/prometheusconvert/component/triton.go b/internal/converter/internal/prometheusconvert/component/triton.go index 4868327ca3..40ecae8015 100644 --- a/internal/converter/internal/prometheusconvert/component/triton.go +++ b/internal/converter/internal/prometheusconvert/component/triton.go @@ -3,11 +3,11 @@ package component import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/triton" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/triton" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" prom_triton "github.com/prometheus/prometheus/discovery/triton" ) diff --git a/internal/converter/internal/prometheusconvert/prometheusconvert.go b/internal/converter/internal/prometheusconvert/prometheusconvert.go index 328da9903d..7c6d00897f 100644 --- a/internal/converter/internal/prometheusconvert/prometheusconvert.go +++ b/internal/converter/internal/prometheusconvert/prometheusconvert.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/remotewrite" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/remotewrite" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/component" prom_config "github.com/prometheus/prometheus/config" prom_discover "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/storage" diff --git a/internal/converter/internal/prometheusconvert/prometheusconvert_test.go b/internal/converter/internal/prometheusconvert/prometheusconvert_test.go index 0e7b88fd35..f9c13ce874 100644 --- a/internal/converter/internal/prometheusconvert/prometheusconvert_test.go +++ b/internal/converter/internal/prometheusconvert/prometheusconvert_test.go @@ -3,9 +3,9 @@ package prometheusconvert_test import ( "testing" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert" - "github.com/grafana/agent/internal/converter/internal/test_common" - _ "github.com/grafana/agent/internal/static/metrics/instance" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert" + "github.com/grafana/alloy/internal/converter/internal/test_common" + _ "github.com/grafana/alloy/internal/static/metrics/instance" ) func TestConvert(t *testing.T) { diff --git a/internal/converter/internal/prometheusconvert/validate.go b/internal/converter/internal/prometheusconvert/validate.go index 0bca959958..e5c6f7941f 100644 --- a/internal/converter/internal/prometheusconvert/validate.go +++ b/internal/converter/internal/prometheusconvert/validate.go @@ -1,9 +1,9 @@ package prometheusconvert import ( - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/component" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/component" prom_config "github.com/prometheus/prometheus/config" prom_discover "github.com/prometheus/prometheus/discovery" diff --git a/internal/converter/internal/promtailconvert/internal/build/azure_event_hub.go b/internal/converter/internal/promtailconvert/internal/build/azure_event_hub.go index 417f54fa3c..f7a3f7ff0d 100644 --- a/internal/converter/internal/promtailconvert/internal/build/azure_event_hub.go +++ b/internal/converter/internal/promtailconvert/internal/build/azure_event_hub.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/azure_event_hubs" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/azure_event_hubs" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendAzureEventHubs() { diff --git a/internal/converter/internal/promtailconvert/internal/build/cloudflare.go b/internal/converter/internal/promtailconvert/internal/build/cloudflare.go index 00a6cd0f54..05100b94f7 100644 --- a/internal/converter/internal/promtailconvert/internal/build/cloudflare.go +++ b/internal/converter/internal/promtailconvert/internal/build/cloudflare.go @@ -3,9 +3,9 @@ package build import ( "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/loki/source/cloudflare" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/loki/source/cloudflare" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/promtailconvert/internal/build/consul_agent.go b/internal/converter/internal/promtailconvert/internal/build/consul_agent.go index 2b7d29a1e1..f97544f157 100644 --- a/internal/converter/internal/promtailconvert/internal/build/consul_agent.go +++ b/internal/converter/internal/promtailconvert/internal/build/consul_agent.go @@ -3,9 +3,9 @@ package build import ( "time" - "github.com/grafana/agent/internal/component/discovery/consulagent" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/discovery/consulagent" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" promtail_consulagent "github.com/grafana/loki/clients/pkg/promtail/discovery/consulagent" ) diff --git a/internal/converter/internal/promtailconvert/internal/build/docker_sd.go b/internal/converter/internal/promtailconvert/internal/build/docker_sd.go index 8a337faf6a..f50d92634c 100644 --- a/internal/converter/internal/promtailconvert/internal/build/docker_sd.go +++ b/internal/converter/internal/promtailconvert/internal/build/docker_sd.go @@ -3,12 +3,12 @@ package build import ( "time" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/docker" - loki_docker "github.com/grafana/agent/internal/component/loki/source/docker" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/docker" + loki_docker "github.com/grafana/alloy/internal/component/loki/source/docker" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/prometheus/prometheus/discovery/moby" ) diff --git a/internal/converter/internal/promtailconvert/internal/build/gcplog.go b/internal/converter/internal/promtailconvert/internal/build/gcplog.go index b45efa2d51..71af0e89de 100644 --- a/internal/converter/internal/promtailconvert/internal/build/gcplog.go +++ b/internal/converter/internal/promtailconvert/internal/build/gcplog.go @@ -1,11 +1,11 @@ package build import ( - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/gcplog" - "github.com/grafana/agent/internal/component/loki/source/gcplog/gcptypes" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/gcplog" + "github.com/grafana/alloy/internal/component/loki/source/gcplog/gcptypes" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendGCPLog() { diff --git a/internal/converter/internal/promtailconvert/internal/build/gelf.go b/internal/converter/internal/promtailconvert/internal/build/gelf.go index 2aed0bc6aa..43d9e7bd78 100644 --- a/internal/converter/internal/promtailconvert/internal/build/gelf.go +++ b/internal/converter/internal/promtailconvert/internal/build/gelf.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/gelf" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/gelf" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendGelfConfig() { diff --git a/internal/converter/internal/promtailconvert/internal/build/global_context.go b/internal/converter/internal/promtailconvert/internal/build/global_context.go index a47ad122ce..1589ce2884 100644 --- a/internal/converter/internal/promtailconvert/internal/build/global_context.go +++ b/internal/converter/internal/promtailconvert/internal/build/global_context.go @@ -3,7 +3,7 @@ package build import ( "time" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" ) type GlobalContext struct { diff --git a/internal/converter/internal/promtailconvert/internal/build/herokudrain.go b/internal/converter/internal/promtailconvert/internal/build/herokudrain.go index 59b7d197e9..efe009e32b 100644 --- a/internal/converter/internal/promtailconvert/internal/build/herokudrain.go +++ b/internal/converter/internal/promtailconvert/internal/build/herokudrain.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/heroku" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/heroku" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendHerokuDrainConfig() { diff --git a/internal/converter/internal/promtailconvert/internal/build/journal.go b/internal/converter/internal/promtailconvert/internal/build/journal.go index e693f310b4..4d1b617527 100644 --- a/internal/converter/internal/promtailconvert/internal/build/journal.go +++ b/internal/converter/internal/promtailconvert/internal/build/journal.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - flowrelabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/journal" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + flowrelabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/journal" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendJournalConfig() { diff --git a/internal/converter/internal/promtailconvert/internal/build/kafka.go b/internal/converter/internal/promtailconvert/internal/build/kafka.go index d00a6c98c4..e40332ea2f 100644 --- a/internal/converter/internal/promtailconvert/internal/build/kafka.go +++ b/internal/converter/internal/promtailconvert/internal/build/kafka.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/kafka" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/kafka" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/alloytypes" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" ) diff --git a/internal/converter/internal/promtailconvert/internal/build/loki_write.go b/internal/converter/internal/promtailconvert/internal/build/loki_write.go index acca65d958..208249f843 100644 --- a/internal/converter/internal/promtailconvert/internal/build/loki_write.go +++ b/internal/converter/internal/promtailconvert/internal/build/loki_write.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/common/loki" - lokiwrite "github.com/grafana/agent/internal/component/loki/write" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/loki" + lokiwrite "github.com/grafana/alloy/internal/component/loki/write" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" "github.com/grafana/alloy/syntax/token/builder" "github.com/grafana/loki/clients/pkg/promtail/client" lokiflag "github.com/grafana/loki/pkg/util/flagext" diff --git a/internal/converter/internal/promtailconvert/internal/build/push_api.go b/internal/converter/internal/promtailconvert/internal/build/push_api.go index 849066a733..12f20df51e 100644 --- a/internal/converter/internal/promtailconvert/internal/build/push_api.go +++ b/internal/converter/internal/promtailconvert/internal/build/push_api.go @@ -3,10 +3,10 @@ package build import ( "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/api" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/api" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendPushAPI() { diff --git a/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go b/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go index 4db2f44abc..2efb4a1271 100644 --- a/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go +++ b/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go @@ -5,17 +5,17 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/discovery/relabel" - filematch "github.com/grafana/agent/internal/component/local/file_match" - "github.com/grafana/agent/internal/component/loki/process" - "github.com/grafana/agent/internal/component/loki/process/stages" - lokirelabel "github.com/grafana/agent/internal/component/loki/relabel" - lokisourcefile "github.com/grafana/agent/internal/component/loki/source/file" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/component" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery/relabel" + filematch "github.com/grafana/alloy/internal/component/local/file_match" + "github.com/grafana/alloy/internal/component/loki/process" + "github.com/grafana/alloy/internal/component/loki/process/stages" + lokirelabel "github.com/grafana/alloy/internal/component/loki/relabel" + lokisourcefile "github.com/grafana/alloy/internal/component/loki/source/file" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/component" "github.com/grafana/alloy/syntax/scanner" "github.com/grafana/alloy/syntax/token/builder" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" diff --git a/internal/converter/internal/promtailconvert/internal/build/service_discovery.go b/internal/converter/internal/promtailconvert/internal/build/service_discovery.go index 533f5c8c2b..717cfda439 100644 --- a/internal/converter/internal/promtailconvert/internal/build/service_discovery.go +++ b/internal/converter/internal/promtailconvert/internal/build/service_discovery.go @@ -3,11 +3,11 @@ package build import ( "fmt" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert/build" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert/build" "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" "github.com/prometheus/common/model" diff --git a/internal/converter/internal/promtailconvert/internal/build/stages.go b/internal/converter/internal/promtailconvert/internal/build/stages.go index a303949e18..294c786fe0 100644 --- a/internal/converter/internal/promtailconvert/internal/build/stages.go +++ b/internal/converter/internal/promtailconvert/internal/build/stages.go @@ -12,9 +12,9 @@ import ( "github.com/grafana/loki/pkg/util/flagext" "github.com/mitchellh/mapstructure" - "github.com/grafana/agent/internal/component/loki/process/metric" - "github.com/grafana/agent/internal/component/loki/process/stages" - "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/component/loki/process/metric" + "github.com/grafana/alloy/internal/component/loki/process/stages" + "github.com/grafana/alloy/internal/converter/diag" ) func convertStage(st interface{}, diags *diag.Diagnostics) (stages.StageConfig, bool) { diff --git a/internal/converter/internal/promtailconvert/internal/build/syslog.go b/internal/converter/internal/promtailconvert/internal/build/syslog.go index 31ac4983c4..8dfcae1847 100644 --- a/internal/converter/internal/promtailconvert/internal/build/syslog.go +++ b/internal/converter/internal/promtailconvert/internal/build/syslog.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/source/syslog" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/source/syslog" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendSyslogConfig() { diff --git a/internal/converter/internal/promtailconvert/internal/build/windows_events.go b/internal/converter/internal/promtailconvert/internal/build/windows_events.go index e1784535b3..c3bcd81858 100644 --- a/internal/converter/internal/promtailconvert/internal/build/windows_events.go +++ b/internal/converter/internal/promtailconvert/internal/build/windows_events.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/loki/source/windowsevent" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/loki/source/windowsevent" + "github.com/grafana/alloy/internal/converter/internal/common" ) func (s *ScrapeConfigBuilder) AppendWindowsEventsConfig() { diff --git a/internal/converter/internal/promtailconvert/promtailconvert.go b/internal/converter/internal/promtailconvert/promtailconvert.go index de30dd7d17..b99db61bdc 100644 --- a/internal/converter/internal/promtailconvert/promtailconvert.go +++ b/internal/converter/internal/promtailconvert/promtailconvert.go @@ -5,10 +5,10 @@ import ( "flag" "fmt" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/promtailconvert/internal/build" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/promtailconvert/internal/build" "github.com/grafana/alloy/syntax/token/builder" "github.com/grafana/dskit/flagext" promtailcfg "github.com/grafana/loki/clients/pkg/promtail/config" diff --git a/internal/converter/internal/promtailconvert/promtailconvert_test.go b/internal/converter/internal/promtailconvert/promtailconvert_test.go index 63ea75afbe..985efa49ee 100644 --- a/internal/converter/internal/promtailconvert/promtailconvert_test.go +++ b/internal/converter/internal/promtailconvert/promtailconvert_test.go @@ -3,9 +3,9 @@ package promtailconvert_test import ( "testing" - "github.com/grafana/agent/internal/converter/internal/promtailconvert" - "github.com/grafana/agent/internal/converter/internal/test_common" - _ "github.com/grafana/agent/internal/static/metrics/instance" // Imported to override default values via the init function. + "github.com/grafana/alloy/internal/converter/internal/promtailconvert" + "github.com/grafana/alloy/internal/converter/internal/test_common" + _ "github.com/grafana/alloy/internal/static/metrics/instance" // Imported to override default values via the init function. ) func TestConvert(t *testing.T) { diff --git a/internal/converter/internal/promtailconvert/validate.go b/internal/converter/internal/promtailconvert/validate.go index 182203e287..8833b36c57 100644 --- a/internal/converter/internal/promtailconvert/validate.go +++ b/internal/converter/internal/promtailconvert/validate.go @@ -1,7 +1,7 @@ package promtailconvert import ( - "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/diag" promtailcfg "github.com/grafana/loki/clients/pkg/promtail/config" ) diff --git a/internal/converter/internal/staticconvert/internal/build/apache_exporter.go b/internal/converter/internal/staticconvert/internal/build/apache_exporter.go index df368bb744..a8a1aaef8e 100644 --- a/internal/converter/internal/staticconvert/internal/build/apache_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/apache_exporter.go @@ -1,10 +1,10 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/apache" - "github.com/grafana/agent/internal/static/integrations/apache_http" - apache_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/apache_http" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/apache" + "github.com/grafana/alloy/internal/static/integrations/apache_http" + apache_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/apache_http" ) func (b *ConfigBuilder) appendApacheExporter(config *apache_http.Config) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/app_agent_receiver.go b/internal/converter/internal/staticconvert/internal/build/app_agent_receiver.go index f3ebf96185..a3e2b1c9bb 100644 --- a/internal/converter/internal/staticconvert/internal/build/app_agent_receiver.go +++ b/internal/converter/internal/staticconvert/internal/build/app_agent_receiver.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/alecthomas/units" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/component/faro/receiver" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - app_agent_receiver_v2 "github.com/grafana/agent/internal/static/integrations/v2/app_agent_receiver" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/faro/receiver" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + app_agent_receiver_v2 "github.com/grafana/alloy/internal/static/integrations/v2/app_agent_receiver" "github.com/grafana/alloy/syntax/alloytypes" "github.com/grafana/alloy/syntax/scanner" ) diff --git a/internal/converter/internal/staticconvert/internal/build/azure_exporter.go b/internal/converter/internal/staticconvert/internal/build/azure_exporter.go index d099c67849..fad38b1c2d 100644 --- a/internal/converter/internal/staticconvert/internal/build/azure_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/azure_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/azure" - "github.com/grafana/agent/internal/static/integrations/azure_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/azure" + "github.com/grafana/alloy/internal/static/integrations/azure_exporter" ) func (b *ConfigBuilder) appendAzureExporter(config *azure_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/blackbox_exporter.go b/internal/converter/internal/staticconvert/internal/build/blackbox_exporter.go index 2de0c0de82..f355221ba0 100644 --- a/internal/converter/internal/staticconvert/internal/build/blackbox_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/blackbox_exporter.go @@ -3,10 +3,10 @@ package build import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/blackbox" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - blackbox_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/blackbox_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/blackbox" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + blackbox_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/blackbox_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/builder.go b/internal/converter/internal/staticconvert/internal/build/builder.go index c36d51fa30..21276d59f6 100644 --- a/internal/converter/internal/staticconvert/internal/build/builder.go +++ b/internal/converter/internal/staticconvert/internal/build/builder.go @@ -3,8 +3,8 @@ package build import ( "strings" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/static/config" "github.com/grafana/alloy/syntax/token/builder" ) diff --git a/internal/converter/internal/staticconvert/internal/build/builder_integrations.go b/internal/converter/internal/staticconvert/internal/build/builder_integrations.go index 369210bcd7..f5bf89c9a0 100644 --- a/internal/converter/internal/staticconvert/internal/build/builder_integrations.go +++ b/internal/converter/internal/staticconvert/internal/build/builder_integrations.go @@ -4,48 +4,48 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/remotewrite" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert" - "github.com/grafana/agent/internal/static/config" - agent_exporter "github.com/grafana/agent/internal/static/integrations/agent" - "github.com/grafana/agent/internal/static/integrations/apache_http" - "github.com/grafana/agent/internal/static/integrations/azure_exporter" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - "github.com/grafana/agent/internal/static/integrations/cadvisor" - "github.com/grafana/agent/internal/static/integrations/cloudwatch_exporter" - int_config "github.com/grafana/agent/internal/static/integrations/config" - "github.com/grafana/agent/internal/static/integrations/consul_exporter" - "github.com/grafana/agent/internal/static/integrations/dnsmasq_exporter" - "github.com/grafana/agent/internal/static/integrations/elasticsearch_exporter" - "github.com/grafana/agent/internal/static/integrations/gcp_exporter" - "github.com/grafana/agent/internal/static/integrations/github_exporter" - "github.com/grafana/agent/internal/static/integrations/kafka_exporter" - "github.com/grafana/agent/internal/static/integrations/memcached_exporter" - "github.com/grafana/agent/internal/static/integrations/mongodb_exporter" - mssql_exporter "github.com/grafana/agent/internal/static/integrations/mssql" - "github.com/grafana/agent/internal/static/integrations/mysqld_exporter" - "github.com/grafana/agent/internal/static/integrations/node_exporter" - "github.com/grafana/agent/internal/static/integrations/oracledb_exporter" - "github.com/grafana/agent/internal/static/integrations/postgres_exporter" - "github.com/grafana/agent/internal/static/integrations/process_exporter" - "github.com/grafana/agent/internal/static/integrations/redis_exporter" - "github.com/grafana/agent/internal/static/integrations/snmp_exporter" - "github.com/grafana/agent/internal/static/integrations/snowflake_exporter" - "github.com/grafana/agent/internal/static/integrations/squid_exporter" - "github.com/grafana/agent/internal/static/integrations/statsd_exporter" - agent_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/agent" - apache_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/apache_http" - app_agent_receiver_v2 "github.com/grafana/agent/internal/static/integrations/v2/app_agent_receiver" - blackbox_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/blackbox_exporter" - common_v2 "github.com/grafana/agent/internal/static/integrations/v2/common" - eventhandler_v2 "github.com/grafana/agent/internal/static/integrations/v2/eventhandler" - metricsutils_v2 "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" - snmp_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/snmp_exporter" - "github.com/grafana/agent/internal/static/integrations/windows_exporter" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/remotewrite" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert" + "github.com/grafana/alloy/internal/static/config" + agent_exporter "github.com/grafana/alloy/internal/static/integrations/agent" + "github.com/grafana/alloy/internal/static/integrations/apache_http" + "github.com/grafana/alloy/internal/static/integrations/azure_exporter" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + "github.com/grafana/alloy/internal/static/integrations/cadvisor" + "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" + int_config "github.com/grafana/alloy/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/consul_exporter" + "github.com/grafana/alloy/internal/static/integrations/dnsmasq_exporter" + "github.com/grafana/alloy/internal/static/integrations/elasticsearch_exporter" + "github.com/grafana/alloy/internal/static/integrations/gcp_exporter" + "github.com/grafana/alloy/internal/static/integrations/github_exporter" + "github.com/grafana/alloy/internal/static/integrations/kafka_exporter" + "github.com/grafana/alloy/internal/static/integrations/memcached_exporter" + "github.com/grafana/alloy/internal/static/integrations/mongodb_exporter" + mssql_exporter "github.com/grafana/alloy/internal/static/integrations/mssql" + "github.com/grafana/alloy/internal/static/integrations/mysqld_exporter" + "github.com/grafana/alloy/internal/static/integrations/node_exporter" + "github.com/grafana/alloy/internal/static/integrations/oracledb_exporter" + "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" + "github.com/grafana/alloy/internal/static/integrations/process_exporter" + "github.com/grafana/alloy/internal/static/integrations/redis_exporter" + "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" + "github.com/grafana/alloy/internal/static/integrations/snowflake_exporter" + "github.com/grafana/alloy/internal/static/integrations/squid_exporter" + "github.com/grafana/alloy/internal/static/integrations/statsd_exporter" + agent_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/agent" + apache_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/apache_http" + app_agent_receiver_v2 "github.com/grafana/alloy/internal/static/integrations/v2/app_agent_receiver" + blackbox_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/blackbox_exporter" + common_v2 "github.com/grafana/alloy/internal/static/integrations/v2/common" + eventhandler_v2 "github.com/grafana/alloy/internal/static/integrations/v2/eventhandler" + metricsutils_v2 "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" + snmp_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/snmp_exporter" + "github.com/grafana/alloy/internal/static/integrations/windows_exporter" "github.com/grafana/alloy/syntax/scanner" "github.com/prometheus/common/model" prom_config "github.com/prometheus/prometheus/config" diff --git a/internal/converter/internal/staticconvert/internal/build/builder_logging.go b/internal/converter/internal/staticconvert/internal/build/builder_logging.go index cda77f4849..6862146cc0 100644 --- a/internal/converter/internal/staticconvert/internal/build/builder_logging.go +++ b/internal/converter/internal/staticconvert/internal/build/builder_logging.go @@ -3,9 +3,9 @@ package build import ( "reflect" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/static/server" ) func (b *ConfigBuilder) appendLogging(config *server.Config) { diff --git a/internal/converter/internal/staticconvert/internal/build/builder_server.go b/internal/converter/internal/staticconvert/internal/build/builder_server.go index be742a448b..ed2c3a4f5a 100644 --- a/internal/converter/internal/staticconvert/internal/build/builder_server.go +++ b/internal/converter/internal/staticconvert/internal/build/builder_server.go @@ -3,9 +3,9 @@ package build import ( "reflect" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/static/server" ) func (b *ConfigBuilder) appendServer(config *server.Config) { diff --git a/internal/converter/internal/staticconvert/internal/build/builder_traces.go b/internal/converter/internal/staticconvert/internal/build/builder_traces.go index b37b658924..8573ddeae4 100644 --- a/internal/converter/internal/staticconvert/internal/build/builder_traces.go +++ b/internal/converter/internal/staticconvert/internal/build/builder_traces.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/otelcolconvert" - "github.com/grafana/agent/internal/static/traces" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/otelcolconvert" + "github.com/grafana/alloy/internal/static/traces" otel_component "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/otelcol" diff --git a/internal/converter/internal/staticconvert/internal/build/cadvisor_exporter.go b/internal/converter/internal/staticconvert/internal/build/cadvisor_exporter.go index eab148d9f0..474dbdbcc4 100644 --- a/internal/converter/internal/staticconvert/internal/build/cadvisor_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/cadvisor_exporter.go @@ -3,9 +3,9 @@ package build import ( "time" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/cadvisor" - cadvisor_integration "github.com/grafana/agent/internal/static/integrations/cadvisor" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/cadvisor" + cadvisor_integration "github.com/grafana/alloy/internal/static/integrations/cadvisor" ) func (b *ConfigBuilder) appendCadvisorExporter(config *cadvisor_integration.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go b/internal/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go index 3e35cc4d4e..9879208d32 100644 --- a/internal/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/cloudwatch" - "github.com/grafana/agent/internal/static/integrations/cloudwatch_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/cloudwatch" + "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" ) func (b *ConfigBuilder) appendCloudwatchExporter(config *cloudwatch_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/consul_exporter.go b/internal/converter/internal/staticconvert/internal/build/consul_exporter.go index e6c5231a9c..87b7880ddd 100644 --- a/internal/converter/internal/staticconvert/internal/build/consul_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/consul_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/consul" - "github.com/grafana/agent/internal/static/integrations/consul_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/consul" + "github.com/grafana/alloy/internal/static/integrations/consul_exporter" ) func (b *ConfigBuilder) appendConsulExporter(config *consul_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go b/internal/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go index a3cc9edfdd..8f40954809 100644 --- a/internal/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/dnsmasq" - "github.com/grafana/agent/internal/static/integrations/dnsmasq_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/dnsmasq" + "github.com/grafana/alloy/internal/static/integrations/dnsmasq_exporter" ) func (b *ConfigBuilder) appendDnsmasqExporter(config *dnsmasq_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go b/internal/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go index 4fa85919ad..141820d760 100644 --- a/internal/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go @@ -1,10 +1,10 @@ package build import ( - commonCfg "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/elasticsearch" - "github.com/grafana/agent/internal/static/integrations/elasticsearch_exporter" + commonCfg "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/elasticsearch" + "github.com/grafana/alloy/internal/static/integrations/elasticsearch_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/eventhandler.go b/internal/converter/internal/staticconvert/internal/build/eventhandler.go index a99bff8e62..e0485eb9c0 100644 --- a/internal/converter/internal/staticconvert/internal/build/eventhandler.go +++ b/internal/converter/internal/staticconvert/internal/build/eventhandler.go @@ -3,13 +3,13 @@ package build import ( "fmt" - "github.com/grafana/agent/internal/component/common/loki" - flow_relabel "github.com/grafana/agent/internal/component/common/relabel" - "github.com/grafana/agent/internal/component/loki/relabel" - "github.com/grafana/agent/internal/component/loki/source/kubernetes_events" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - eventhandler_v2 "github.com/grafana/agent/internal/static/integrations/v2/eventhandler" + "github.com/grafana/alloy/internal/component/common/loki" + flow_relabel "github.com/grafana/alloy/internal/component/common/relabel" + "github.com/grafana/alloy/internal/component/loki/relabel" + "github.com/grafana/alloy/internal/component/loki/source/kubernetes_events" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + eventhandler_v2 "github.com/grafana/alloy/internal/static/integrations/v2/eventhandler" "github.com/grafana/alloy/syntax/scanner" ) diff --git a/internal/converter/internal/staticconvert/internal/build/gcp_exporter.go b/internal/converter/internal/staticconvert/internal/build/gcp_exporter.go index 27a984fac0..51a51f1fdb 100644 --- a/internal/converter/internal/staticconvert/internal/build/gcp_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/gcp_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/gcp" - "github.com/grafana/agent/internal/static/integrations/gcp_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/gcp" + "github.com/grafana/alloy/internal/static/integrations/gcp_exporter" ) func (b *ConfigBuilder) appendGcpExporter(config *gcp_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/github_exporter.go b/internal/converter/internal/staticconvert/internal/build/github_exporter.go index 860f0bde0d..eadf179377 100644 --- a/internal/converter/internal/staticconvert/internal/build/github_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/github_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/github" - "github.com/grafana/agent/internal/static/integrations/github_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/github" + "github.com/grafana/alloy/internal/static/integrations/github_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/global_context.go b/internal/converter/internal/staticconvert/internal/build/global_context.go index 9ffaceaa6a..0f59ef5e0e 100644 --- a/internal/converter/internal/staticconvert/internal/build/global_context.go +++ b/internal/converter/internal/staticconvert/internal/build/global_context.go @@ -1,8 +1,8 @@ package build import ( - "github.com/grafana/agent/internal/component/prometheus/remotewrite" - "github.com/grafana/agent/internal/converter/internal/common" + "github.com/grafana/alloy/internal/component/prometheus/remotewrite" + "github.com/grafana/alloy/internal/converter/internal/common" ) type GlobalContext struct { diff --git a/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go b/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go index 4842e936b7..89e0cf572a 100644 --- a/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/kafka" - "github.com/grafana/agent/internal/static/integrations/kafka_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/kafka" + "github.com/grafana/alloy/internal/static/integrations/kafka_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/memcached_exporter.go b/internal/converter/internal/staticconvert/internal/build/memcached_exporter.go index fd9b428aab..23c3b136e7 100644 --- a/internal/converter/internal/staticconvert/internal/build/memcached_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/memcached_exporter.go @@ -1,10 +1,10 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/memcached" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/static/integrations/memcached_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/memcached" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/static/integrations/memcached_exporter" ) func (b *ConfigBuilder) appendMemcachedExporter(config *memcached_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/mongodb_exporter.go b/internal/converter/internal/staticconvert/internal/build/mongodb_exporter.go index 0dfb2328b8..d872ce8f98 100644 --- a/internal/converter/internal/staticconvert/internal/build/mongodb_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/mongodb_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/mongodb" - "github.com/grafana/agent/internal/static/integrations/mongodb_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/mongodb" + "github.com/grafana/alloy/internal/static/integrations/mongodb_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/mssql_exporter.go b/internal/converter/internal/staticconvert/internal/build/mssql_exporter.go index 6f5b4beb85..5151c5e2e0 100644 --- a/internal/converter/internal/staticconvert/internal/build/mssql_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/mssql_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/mssql" - mssql_exporter "github.com/grafana/agent/internal/static/integrations/mssql" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/mssql" + mssql_exporter "github.com/grafana/alloy/internal/static/integrations/mssql" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/mysqld_exporter.go b/internal/converter/internal/staticconvert/internal/build/mysqld_exporter.go index 91cfee1ae0..11ec660854 100644 --- a/internal/converter/internal/staticconvert/internal/build/mysqld_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/mysqld_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/mysql" - "github.com/grafana/agent/internal/static/integrations/mysqld_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/mysql" + "github.com/grafana/alloy/internal/static/integrations/mysqld_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/node_exporter.go b/internal/converter/internal/staticconvert/internal/build/node_exporter.go index 59a4762f30..cd9174a7f4 100644 --- a/internal/converter/internal/staticconvert/internal/build/node_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/node_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/unix" - "github.com/grafana/agent/internal/static/integrations/node_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/unix" + "github.com/grafana/alloy/internal/static/integrations/node_exporter" ) func (b *ConfigBuilder) appendNodeExporter(config *node_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/oracledb_exporter.go b/internal/converter/internal/staticconvert/internal/build/oracledb_exporter.go index b1bd031ce1..a5b41c4f73 100644 --- a/internal/converter/internal/staticconvert/internal/build/oracledb_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/oracledb_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/oracledb" - "github.com/grafana/agent/internal/static/integrations/oracledb_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/oracledb" + "github.com/grafana/alloy/internal/static/integrations/oracledb_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/postgres_exporter.go b/internal/converter/internal/staticconvert/internal/build/postgres_exporter.go index 13bc519b4a..8689bcdfe8 100644 --- a/internal/converter/internal/staticconvert/internal/build/postgres_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/postgres_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/postgres" - "github.com/grafana/agent/internal/static/integrations/postgres_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/postgres" + "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/process_exporter.go b/internal/converter/internal/staticconvert/internal/build/process_exporter.go index d8136cfa55..8474b7be7b 100644 --- a/internal/converter/internal/staticconvert/internal/build/process_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/process_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/process" - "github.com/grafana/agent/internal/static/integrations/process_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/process" + "github.com/grafana/alloy/internal/static/integrations/process_exporter" ) func (b *ConfigBuilder) appendProcessExporter(config *process_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/redis_exporter.go b/internal/converter/internal/staticconvert/internal/build/redis_exporter.go index 4d77d009c6..f8975ac340 100644 --- a/internal/converter/internal/staticconvert/internal/build/redis_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/redis_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/redis" - "github.com/grafana/agent/internal/static/integrations/redis_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/redis" + "github.com/grafana/alloy/internal/static/integrations/redis_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/self_exporter.go b/internal/converter/internal/staticconvert/internal/build/self_exporter.go index 31e7b50551..3c2cea7867 100644 --- a/internal/converter/internal/staticconvert/internal/build/self_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/self_exporter.go @@ -1,10 +1,10 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/self" - agent_exporter "github.com/grafana/agent/internal/static/integrations/agent" - agent_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/agent" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/self" + agent_exporter "github.com/grafana/alloy/internal/static/integrations/agent" + agent_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/agent" ) func (b *ConfigBuilder) appendAgentExporter(config *agent_exporter.Config) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/snmp_exporter.go b/internal/converter/internal/staticconvert/internal/build/snmp_exporter.go index 1f58d1097e..29004aa9bb 100644 --- a/internal/converter/internal/staticconvert/internal/build/snmp_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/snmp_exporter.go @@ -1,11 +1,11 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/snmp" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/static/integrations/snmp_exporter" - snmp_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/snmp_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/snmp" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" + snmp_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/snmp_exporter" "github.com/grafana/alloy/syntax/alloytypes" snmp_config "github.com/prometheus/snmp_exporter/config" ) diff --git a/internal/converter/internal/staticconvert/internal/build/snowflake_exporter.go b/internal/converter/internal/staticconvert/internal/build/snowflake_exporter.go index 16eff2c7d7..66858b0a01 100644 --- a/internal/converter/internal/staticconvert/internal/build/snowflake_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/snowflake_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/snowflake" - "github.com/grafana/agent/internal/static/integrations/snowflake_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/snowflake" + "github.com/grafana/alloy/internal/static/integrations/snowflake_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/squid_exporter.go b/internal/converter/internal/staticconvert/internal/build/squid_exporter.go index 5e485b4972..6ce80e8607 100644 --- a/internal/converter/internal/staticconvert/internal/build/squid_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/squid_exporter.go @@ -1,9 +1,9 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/squid" - "github.com/grafana/agent/internal/static/integrations/squid_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/squid" + "github.com/grafana/alloy/internal/static/integrations/squid_exporter" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/converter/internal/staticconvert/internal/build/statsd_exporter.go b/internal/converter/internal/staticconvert/internal/build/statsd_exporter.go index 78aca3ec37..3ec90e3009 100644 --- a/internal/converter/internal/staticconvert/internal/build/statsd_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/statsd_exporter.go @@ -1,10 +1,10 @@ package build import ( - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/statsd" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/static/integrations/statsd_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/statsd" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/static/integrations/statsd_exporter" ) func (b *ConfigBuilder) appendStatsdExporter(config *statsd_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/internal/build/windows_exporter.go b/internal/converter/internal/staticconvert/internal/build/windows_exporter.go index 079c68d489..a2e1e98853 100644 --- a/internal/converter/internal/staticconvert/internal/build/windows_exporter.go +++ b/internal/converter/internal/staticconvert/internal/build/windows_exporter.go @@ -3,9 +3,9 @@ package build import ( "strings" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/component/prometheus/exporter/windows" - "github.com/grafana/agent/internal/static/integrations/windows_exporter" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/component/prometheus/exporter/windows" + "github.com/grafana/alloy/internal/static/integrations/windows_exporter" ) func (b *ConfigBuilder) appendWindowsExporter(config *windows_exporter.Config, instanceKey *string) discovery.Exports { diff --git a/internal/converter/internal/staticconvert/staticconvert.go b/internal/converter/internal/staticconvert/staticconvert.go index f2529386e3..844537200b 100644 --- a/internal/converter/internal/staticconvert/staticconvert.go +++ b/internal/converter/internal/staticconvert/staticconvert.go @@ -5,14 +5,14 @@ import ( "flag" "fmt" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/converter/internal/prometheusconvert" - "github.com/grafana/agent/internal/converter/internal/promtailconvert" - "github.com/grafana/agent/internal/converter/internal/staticconvert/internal/build" - "github.com/grafana/agent/internal/static/config" - "github.com/grafana/agent/internal/static/logs" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/converter/internal/prometheusconvert" + "github.com/grafana/alloy/internal/converter/internal/promtailconvert" + "github.com/grafana/alloy/internal/converter/internal/staticconvert/internal/build" + "github.com/grafana/alloy/internal/static/config" + "github.com/grafana/alloy/internal/static/logs" "github.com/grafana/alloy/syntax/scanner" "github.com/grafana/alloy/syntax/token/builder" promtail_config "github.com/grafana/loki/clients/pkg/promtail/config" @@ -20,7 +20,7 @@ import ( "github.com/grafana/loki/clients/pkg/promtail/targets/file" prom_config "github.com/prometheus/prometheus/config" - _ "github.com/grafana/agent/internal/static/integrations/install" // Install integrations + _ "github.com/grafana/alloy/internal/static/integrations/install" // Install integrations ) // Convert implements a Static config converter. diff --git a/internal/converter/internal/staticconvert/staticconvert_test.go b/internal/converter/internal/staticconvert/staticconvert_test.go index a38de5d018..c9c2a54346 100644 --- a/internal/converter/internal/staticconvert/staticconvert_test.go +++ b/internal/converter/internal/staticconvert/staticconvert_test.go @@ -4,9 +4,9 @@ import ( "runtime" "testing" - "github.com/grafana/agent/internal/converter/internal/staticconvert" - "github.com/grafana/agent/internal/converter/internal/test_common" - _ "github.com/grafana/agent/internal/static/metrics/instance" // Imported to override default values via the init function. + "github.com/grafana/alloy/internal/converter/internal/staticconvert" + "github.com/grafana/alloy/internal/converter/internal/test_common" + _ "github.com/grafana/alloy/internal/static/metrics/instance" // Imported to override default values via the init function. ) func TestConvert(t *testing.T) { diff --git a/internal/converter/internal/staticconvert/validate.go b/internal/converter/internal/staticconvert/validate.go index 216b791f59..36e2937528 100644 --- a/internal/converter/internal/staticconvert/validate.go +++ b/internal/converter/internal/staticconvert/validate.go @@ -3,49 +3,49 @@ package staticconvert import ( "fmt" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/converter/internal/common" - "github.com/grafana/agent/internal/static/config" - v1 "github.com/grafana/agent/internal/static/integrations" - agent_exporter "github.com/grafana/agent/internal/static/integrations/agent" - "github.com/grafana/agent/internal/static/integrations/apache_http" - "github.com/grafana/agent/internal/static/integrations/azure_exporter" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - "github.com/grafana/agent/internal/static/integrations/cadvisor" - "github.com/grafana/agent/internal/static/integrations/cloudwatch_exporter" - "github.com/grafana/agent/internal/static/integrations/consul_exporter" - "github.com/grafana/agent/internal/static/integrations/dnsmasq_exporter" - "github.com/grafana/agent/internal/static/integrations/elasticsearch_exporter" - "github.com/grafana/agent/internal/static/integrations/gcp_exporter" - "github.com/grafana/agent/internal/static/integrations/github_exporter" - "github.com/grafana/agent/internal/static/integrations/kafka_exporter" - "github.com/grafana/agent/internal/static/integrations/memcached_exporter" - "github.com/grafana/agent/internal/static/integrations/mongodb_exporter" - mssql_exporter "github.com/grafana/agent/internal/static/integrations/mssql" - "github.com/grafana/agent/internal/static/integrations/mysqld_exporter" - "github.com/grafana/agent/internal/static/integrations/node_exporter" - "github.com/grafana/agent/internal/static/integrations/oracledb_exporter" - "github.com/grafana/agent/internal/static/integrations/postgres_exporter" - "github.com/grafana/agent/internal/static/integrations/process_exporter" - "github.com/grafana/agent/internal/static/integrations/redis_exporter" - "github.com/grafana/agent/internal/static/integrations/snmp_exporter" - "github.com/grafana/agent/internal/static/integrations/snowflake_exporter" - "github.com/grafana/agent/internal/static/integrations/squid_exporter" - "github.com/grafana/agent/internal/static/integrations/statsd_exporter" - v2 "github.com/grafana/agent/internal/static/integrations/v2" - agent_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/agent" - apache_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/apache_http" - app_agent_receiver_v2 "github.com/grafana/agent/internal/static/integrations/v2/app_agent_receiver" - blackbox_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/blackbox_exporter" - eventhandler_v2 "github.com/grafana/agent/internal/static/integrations/v2/eventhandler" - metricsutils_v2 "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" - snmp_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/snmp_exporter" - vmware_exporter_v2 "github.com/grafana/agent/internal/static/integrations/v2/vmware_exporter" - "github.com/grafana/agent/internal/static/integrations/windows_exporter" - "github.com/grafana/agent/internal/static/logs" - "github.com/grafana/agent/internal/static/metrics" - "github.com/grafana/agent/internal/static/server" - "github.com/grafana/agent/internal/static/traces" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/converter/internal/common" + "github.com/grafana/alloy/internal/static/config" + v1 "github.com/grafana/alloy/internal/static/integrations" + agent_exporter "github.com/grafana/alloy/internal/static/integrations/agent" + "github.com/grafana/alloy/internal/static/integrations/apache_http" + "github.com/grafana/alloy/internal/static/integrations/azure_exporter" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + "github.com/grafana/alloy/internal/static/integrations/cadvisor" + "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" + "github.com/grafana/alloy/internal/static/integrations/consul_exporter" + "github.com/grafana/alloy/internal/static/integrations/dnsmasq_exporter" + "github.com/grafana/alloy/internal/static/integrations/elasticsearch_exporter" + "github.com/grafana/alloy/internal/static/integrations/gcp_exporter" + "github.com/grafana/alloy/internal/static/integrations/github_exporter" + "github.com/grafana/alloy/internal/static/integrations/kafka_exporter" + "github.com/grafana/alloy/internal/static/integrations/memcached_exporter" + "github.com/grafana/alloy/internal/static/integrations/mongodb_exporter" + mssql_exporter "github.com/grafana/alloy/internal/static/integrations/mssql" + "github.com/grafana/alloy/internal/static/integrations/mysqld_exporter" + "github.com/grafana/alloy/internal/static/integrations/node_exporter" + "github.com/grafana/alloy/internal/static/integrations/oracledb_exporter" + "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" + "github.com/grafana/alloy/internal/static/integrations/process_exporter" + "github.com/grafana/alloy/internal/static/integrations/redis_exporter" + "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" + "github.com/grafana/alloy/internal/static/integrations/snowflake_exporter" + "github.com/grafana/alloy/internal/static/integrations/squid_exporter" + "github.com/grafana/alloy/internal/static/integrations/statsd_exporter" + v2 "github.com/grafana/alloy/internal/static/integrations/v2" + agent_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/agent" + apache_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/apache_http" + app_agent_receiver_v2 "github.com/grafana/alloy/internal/static/integrations/v2/app_agent_receiver" + blackbox_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/blackbox_exporter" + eventhandler_v2 "github.com/grafana/alloy/internal/static/integrations/v2/eventhandler" + metricsutils_v2 "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" + snmp_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/snmp_exporter" + vmware_exporter_v2 "github.com/grafana/alloy/internal/static/integrations/v2/vmware_exporter" + "github.com/grafana/alloy/internal/static/integrations/windows_exporter" + "github.com/grafana/alloy/internal/static/logs" + "github.com/grafana/alloy/internal/static/metrics" + "github.com/grafana/alloy/internal/static/server" + "github.com/grafana/alloy/internal/static/traces" _ "github.com/prometheus/prometheus/discovery/install" // Register Prometheus SDs ) diff --git a/internal/converter/internal/test_common/testing.go b/internal/converter/internal/test_common/testing.go index fec09f30af..f81130d729 100644 --- a/internal/converter/internal/test_common/testing.go +++ b/internal/converter/internal/test_common/testing.go @@ -12,14 +12,14 @@ import ( "strings" "testing" - "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" - cluster_service "github.com/grafana/agent/internal/service/cluster" - http_service "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" + cluster_service "github.com/grafana/alloy/internal/service/cluster" + http_service "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/internal/filedetector/detector.go b/internal/filedetector/detector.go index 7379527fc7..58cbfb6635 100644 --- a/internal/filedetector/detector.go +++ b/internal/filedetector/detector.go @@ -9,7 +9,7 @@ import ( "github.com/fsnotify/fsnotify" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" ) // Detector is used to specify how changes to the file should be detected. diff --git a/internal/flow/componenttest/componenttest.go b/internal/flow/componenttest/componenttest.go index be3a117d40..b3b4de7af4 100644 --- a/internal/flow/componenttest/componenttest.go +++ b/internal/flow/componenttest/componenttest.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/service/labelstore" + "github.com/grafana/alloy/internal/service/labelstore" "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/logging" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/logging" "go.opentelemetry.io/otel/trace/noop" ) diff --git a/internal/flow/componenttest/testfailmodule.go b/internal/flow/componenttest/testfailmodule.go index ddd5c4ae18..996467a337 100644 --- a/internal/flow/componenttest/testfailmodule.go +++ b/internal/flow/componenttest/testfailmodule.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - mod "github.com/grafana/agent/internal/flow/internal/testcomponents/module" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + mod "github.com/grafana/alloy/internal/flow/internal/testcomponents/module" ) func init() { diff --git a/internal/flow/declare_test.go b/internal/flow/declare_test.go index d66505c8fb..20fca527bf 100644 --- a/internal/flow/declare_test.go +++ b/internal/flow/declare_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/internal/testcomponents" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/internal/testcomponents" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" "github.com/stretchr/testify/require" ) diff --git a/internal/flow/flow.go b/internal/flow/flow.go index 7fbc10ac30..2bf4048259 100644 --- a/internal/flow/flow.go +++ b/internal/flow/flow.go @@ -51,13 +51,13 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/worker" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/flow/tracing" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/worker" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/tracing" + "github.com/grafana/alloy/internal/service" "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" ) diff --git a/internal/flow/flow_components.go b/internal/flow/flow_components.go index d23b1da6b5..63ea62fa89 100644 --- a/internal/flow/flow_components.go +++ b/internal/flow/flow_components.go @@ -3,9 +3,9 @@ package flow import ( "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/dag" ) // GetComponent implements [component.Provider]. diff --git a/internal/flow/flow_services.go b/internal/flow/flow_services.go index f55380118c..d04298ef39 100644 --- a/internal/flow/flow_services.go +++ b/internal/flow/flow_services.go @@ -3,10 +3,10 @@ package flow import ( "context" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/dag" - "github.com/grafana/agent/internal/flow/internal/worker" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/flow/internal/worker" + "github.com/grafana/alloy/internal/service" ) // GetServiceConsumers implements [service.Host]. It returns a slice of diff --git a/internal/flow/flow_services_test.go b/internal/flow/flow_services_test.go index b6674ad9dc..4ec5d6d359 100644 --- a/internal/flow/flow_services_test.go +++ b/internal/flow/flow_services_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/testcomponents" - "github.com/grafana/agent/internal/flow/internal/testservices" - "github.com/grafana/agent/internal/service" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/testcomponents" + "github.com/grafana/alloy/internal/flow/internal/testservices" + "github.com/grafana/alloy/internal/service" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" "go.uber.org/atomic" ) diff --git a/internal/flow/flow_test.go b/internal/flow/flow_test.go index d750568303..7a29e48d36 100644 --- a/internal/flow/flow_test.go +++ b/internal/flow/flow_test.go @@ -5,12 +5,12 @@ import ( "os" "testing" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/dag" - "github.com/grafana/agent/internal/flow/internal/testcomponents" - "github.com/grafana/agent/internal/flow/logging" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/flow/internal/testcomponents" + "github.com/grafana/alloy/internal/flow/logging" "github.com/stretchr/testify/require" "go.uber.org/goleak" ) diff --git a/internal/flow/flow_updates_test.go b/internal/flow/flow_updates_test.go index 4eb8935478..fa8efdd915 100644 --- a/internal/flow/flow_updates_test.go +++ b/internal/flow/flow_updates_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/flow/internal/testcomponents" - "github.com/grafana/agent/internal/flow/internal/worker" + "github.com/grafana/alloy/internal/flow/internal/testcomponents" + "github.com/grafana/alloy/internal/flow/internal/worker" "github.com/stretchr/testify/require" ) diff --git a/internal/flow/import_test.go b/internal/flow/import_test.go index 89fddafc46..707c203867 100644 --- a/internal/flow/import_test.go +++ b/internal/flow/import_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/internal/testcomponents" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/internal/testcomponents" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" "github.com/stretchr/testify/require" "golang.org/x/tools/txtar" - _ "github.com/grafana/agent/internal/flow/internal/testcomponents/module/string" + _ "github.com/grafana/alloy/internal/flow/internal/testcomponents/module/string" ) // use const to avoid lint error diff --git a/internal/flow/internal/controller/block_node.go b/internal/flow/internal/controller/block_node.go index b43e639a5b..83d0ed1263 100644 --- a/internal/flow/internal/controller/block_node.go +++ b/internal/flow/internal/controller/block_node.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/grafana/agent/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/flow/internal/dag" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/controller/component_node.go b/internal/flow/internal/controller/component_node.go index 1deb18df35..8c797b6100 100644 --- a/internal/flow/internal/controller/component_node.go +++ b/internal/flow/internal/controller/component_node.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" ) // ComponentNode is a generic representation of a Flow component. diff --git a/internal/flow/internal/controller/component_references.go b/internal/flow/internal/controller/component_references.go index c767535d96..7f505a0b35 100644 --- a/internal/flow/internal/controller/component_references.go +++ b/internal/flow/internal/controller/component_references.go @@ -3,7 +3,7 @@ package controller import ( "fmt" - "github.com/grafana/agent/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/flow/internal/dag" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/diag" "github.com/grafana/alloy/syntax/vm" diff --git a/internal/flow/internal/controller/component_registry.go b/internal/flow/internal/controller/component_registry.go index f5359e6308..1b585033f8 100644 --- a/internal/flow/internal/controller/component_registry.go +++ b/internal/flow/internal/controller/component_registry.go @@ -3,8 +3,8 @@ package controller import ( "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" ) // ComponentRegistry is a collection of registered components. @@ -19,7 +19,7 @@ type defaultComponentRegistry struct { } // NewDefaultComponentRegistry creates a new [ComponentRegistry] which gets -// components registered to github.com/grafana/agent/component. +// components registered to github.com/grafana/alloy/internal/component. func NewDefaultComponentRegistry(minStability featuregate.Stability) ComponentRegistry { return defaultComponentRegistry{ minStability: minStability, diff --git a/internal/flow/internal/controller/loader.go b/internal/flow/internal/controller/loader.go index b265eb9408..d99a9c5256 100644 --- a/internal/flow/internal/controller/loader.go +++ b/internal/flow/internal/controller/loader.go @@ -10,12 +10,12 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/dag" - "github.com/grafana/agent/internal/flow/internal/worker" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/flow/tracing" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/flow/internal/worker" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/tracing" + "github.com/grafana/alloy/internal/service" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/diag" "github.com/grafana/dskit/backoff" diff --git a/internal/flow/internal/controller/loader_test.go b/internal/flow/internal/controller/loader_test.go index 1fdd42b0ee..dec59e98ce 100644 --- a/internal/flow/internal/controller/loader_test.go +++ b/internal/flow/internal/controller/loader_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/dag" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/dag" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/diag" "github.com/grafana/alloy/syntax/parser" @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace/noop" - _ "github.com/grafana/agent/internal/flow/internal/testcomponents" // Include test components + _ "github.com/grafana/alloy/internal/flow/internal/testcomponents" // Include test components ) func TestLoader(t *testing.T) { diff --git a/internal/flow/internal/controller/module.go b/internal/flow/internal/controller/module.go index 25a639e399..b514b65e5e 100644 --- a/internal/flow/internal/controller/module.go +++ b/internal/flow/internal/controller/module.go @@ -3,7 +3,7 @@ package controller import ( "context" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/grafana/alloy/syntax/ast" ) diff --git a/internal/flow/internal/controller/node_builtin_component.go b/internal/flow/internal/controller/node_builtin_component.go index 2ba6a9b158..313a77f9a5 100644 --- a/internal/flow/internal/controller/node_builtin_component.go +++ b/internal/flow/internal/controller/node_builtin_component.go @@ -13,11 +13,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/flow/tracing" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/tracing" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/flow/internal/controller/node_builtin_component_test.go b/internal/flow/internal/controller/node_builtin_component_test.go index 3be8307dd8..feb87de377 100644 --- a/internal/flow/internal/controller/node_builtin_component_test.go +++ b/internal/flow/internal/controller/node_builtin_component_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/featuregate" "github.com/stretchr/testify/require" ) diff --git a/internal/flow/internal/controller/node_config.go b/internal/flow/internal/controller/node_config.go index 8bd233f517..f10d02a899 100644 --- a/internal/flow/internal/controller/node_config.go +++ b/internal/flow/internal/controller/node_config.go @@ -3,7 +3,7 @@ package controller import ( "fmt" - "github.com/grafana/agent/internal/flow/internal/importsource" + "github.com/grafana/alloy/internal/flow/internal/importsource" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/diag" ) diff --git a/internal/flow/internal/controller/node_config_import.go b/internal/flow/internal/controller/node_config_import.go index 25efab3f86..4c268b5857 100644 --- a/internal/flow/internal/controller/node_config_import.go +++ b/internal/flow/internal/controller/node_config_import.go @@ -14,11 +14,11 @@ import ( "go.uber.org/atomic" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/internal/importsource" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/flow/tracing" - "github.com/grafana/agent/internal/runner" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/internal/importsource" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/tracing" + "github.com/grafana/alloy/internal/runner" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/parser" "github.com/grafana/alloy/syntax/vm" diff --git a/internal/flow/internal/controller/node_config_logging.go b/internal/flow/internal/controller/node_config_logging.go index dd923e01fd..e18532988b 100644 --- a/internal/flow/internal/controller/node_config_logging.go +++ b/internal/flow/internal/controller/node_config_logging.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/controller/node_config_tracing.go b/internal/flow/internal/controller/node_config_tracing.go index 8b4fe17ddf..c87fa4dfa9 100644 --- a/internal/flow/internal/controller/node_config_tracing.go +++ b/internal/flow/internal/controller/node_config_tracing.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/grafana/agent/internal/flow/tracing" + "github.com/grafana/alloy/internal/flow/tracing" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" "go.opentelemetry.io/otel/trace" diff --git a/internal/flow/internal/controller/node_custom_component.go b/internal/flow/internal/controller/node_custom_component.go index d53457c6e3..d8a50d94a6 100644 --- a/internal/flow/internal/controller/node_custom_component.go +++ b/internal/flow/internal/controller/node_custom_component.go @@ -10,8 +10,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/controller/node_service.go b/internal/flow/internal/controller/node_service.go index c5f2bfc034..504b647e63 100644 --- a/internal/flow/internal/controller/node_service.go +++ b/internal/flow/internal/controller/node_service.go @@ -6,8 +6,8 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/service" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/controller/scheduler_test.go b/internal/flow/internal/controller/scheduler_test.go index aaf809a8f0..41561733eb 100644 --- a/internal/flow/internal/controller/scheduler_test.go +++ b/internal/flow/internal/controller/scheduler_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/internal/controller" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/vm" "github.com/stretchr/testify/require" diff --git a/internal/flow/internal/controller/service_map.go b/internal/flow/internal/controller/service_map.go index a6dfc55a50..dd7424de57 100644 --- a/internal/flow/internal/controller/service_map.go +++ b/internal/flow/internal/controller/service_map.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/service" "golang.org/x/exp/maps" ) diff --git a/internal/flow/internal/controller/value_cache.go b/internal/flow/internal/controller/value_cache.go index b9e66aca38..76bfd05f7a 100644 --- a/internal/flow/internal/controller/value_cache.go +++ b/internal/flow/internal/controller/value_cache.go @@ -4,7 +4,7 @@ import ( "reflect" "sync" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/importsource/import_file.go b/internal/flow/internal/importsource/import_file.go index 06e83bf166..a5106a132f 100644 --- a/internal/flow/internal/importsource/import_file.go +++ b/internal/flow/internal/importsource/import_file.go @@ -13,9 +13,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - filedetector "github.com/grafana/agent/internal/filedetector" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + filedetector "github.com/grafana/alloy/internal/filedetector" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/importsource/import_git.go b/internal/flow/internal/importsource/import_git.go index d0eec75a5e..6bb3a02fea 100644 --- a/internal/flow/internal/importsource/import_git.go +++ b/internal/flow/internal/importsource/import_git.go @@ -12,9 +12,9 @@ import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/vcs" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/vcs" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/importsource/import_http.go b/internal/flow/internal/importsource/import_http.go index 30c2e19338..383fe85db2 100644 --- a/internal/flow/internal/importsource/import_http.go +++ b/internal/flow/internal/importsource/import_http.go @@ -7,9 +7,9 @@ import ( "reflect" "time" - "github.com/grafana/agent/internal/component" - common_config "github.com/grafana/agent/internal/component/common/config" - remote_http "github.com/grafana/agent/internal/component/remote/http" + "github.com/grafana/alloy/internal/component" + common_config "github.com/grafana/alloy/internal/component/common/config" + remote_http "github.com/grafana/alloy/internal/component/remote/http" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/importsource/import_source.go b/internal/flow/internal/importsource/import_source.go index 87faa86f35..99f51c6241 100644 --- a/internal/flow/internal/importsource/import_source.go +++ b/internal/flow/internal/importsource/import_source.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/importsource/import_string.go b/internal/flow/internal/importsource/import_string.go index b66970821f..91057f9994 100644 --- a/internal/flow/internal/importsource/import_string.go +++ b/internal/flow/internal/importsource/import_string.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" "github.com/grafana/alloy/syntax/alloytypes" "github.com/grafana/alloy/syntax/vm" ) diff --git a/internal/flow/internal/testcomponents/count.go b/internal/flow/internal/testcomponents/count.go index fb7d81a87f..0cb1f11a43 100644 --- a/internal/flow/internal/testcomponents/count.go +++ b/internal/flow/internal/testcomponents/count.go @@ -7,9 +7,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "go.uber.org/atomic" ) diff --git a/internal/flow/internal/testcomponents/experimental.go b/internal/flow/internal/testcomponents/experimental.go index 73721d2394..677794a886 100644 --- a/internal/flow/internal/testcomponents/experimental.go +++ b/internal/flow/internal/testcomponents/experimental.go @@ -4,8 +4,8 @@ import ( "context" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" ) func init() { diff --git a/internal/flow/internal/testcomponents/fake.go b/internal/flow/internal/testcomponents/fake.go index c75ea304a8..c94502c7fe 100644 --- a/internal/flow/internal/testcomponents/fake.go +++ b/internal/flow/internal/testcomponents/fake.go @@ -3,7 +3,7 @@ package testcomponents import ( "context" - "github.com/grafana/agent/internal/component" + "github.com/grafana/alloy/internal/component" ) // Fake is a fake component instance which invokes fields when its methods are diff --git a/internal/flow/internal/testcomponents/module/file/file.go b/internal/flow/internal/testcomponents/module/file/file.go index bb223f53be..0941df8418 100644 --- a/internal/flow/internal/testcomponents/module/file/file.go +++ b/internal/flow/internal/testcomponents/module/file/file.go @@ -6,10 +6,10 @@ import ( "go.uber.org/atomic" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/local/file" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/testcomponents/module" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/local/file" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/testcomponents/module" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/flow/internal/testcomponents/module/git/git.go b/internal/flow/internal/testcomponents/module/git/git.go index 5fafe6894a..d5e9a2ec4e 100644 --- a/internal/flow/internal/testcomponents/module/git/git.go +++ b/internal/flow/internal/testcomponents/module/git/git.go @@ -10,11 +10,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/testcomponents/module" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/vcs" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/testcomponents/module" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/vcs" ) func init() { diff --git a/internal/flow/internal/testcomponents/module/http/http.go b/internal/flow/internal/testcomponents/module/http/http.go index fd69a6cd64..ffb18d4e17 100644 --- a/internal/flow/internal/testcomponents/module/http/http.go +++ b/internal/flow/internal/testcomponents/module/http/http.go @@ -6,10 +6,10 @@ import ( "go.uber.org/atomic" - "github.com/grafana/agent/internal/component" - remote_http "github.com/grafana/agent/internal/component/remote/http" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/testcomponents/module" + "github.com/grafana/alloy/internal/component" + remote_http "github.com/grafana/alloy/internal/component/remote/http" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/testcomponents/module" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/flow/internal/testcomponents/module/module.go b/internal/flow/internal/testcomponents/module/module.go index e83df417a8..2fe70e5e8e 100644 --- a/internal/flow/internal/testcomponents/module/module.go +++ b/internal/flow/internal/testcomponents/module/module.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow/logging/level" ) // ModuleComponent holds the common properties for module components. diff --git a/internal/flow/internal/testcomponents/module/string/string.go b/internal/flow/internal/testcomponents/module/string/string.go index e5b92416d8..7012aa1b9a 100644 --- a/internal/flow/internal/testcomponents/module/string/string.go +++ b/internal/flow/internal/testcomponents/module/string/string.go @@ -3,9 +3,9 @@ package string import ( "context" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/testcomponents/module" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/testcomponents/module" "github.com/grafana/alloy/syntax/alloytypes" ) diff --git a/internal/flow/internal/testcomponents/passthrough.go b/internal/flow/internal/testcomponents/passthrough.go index 4a079a4f53..278f35b578 100644 --- a/internal/flow/internal/testcomponents/passthrough.go +++ b/internal/flow/internal/testcomponents/passthrough.go @@ -5,9 +5,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/flow/internal/testcomponents/sumation.go b/internal/flow/internal/testcomponents/sumation.go index 7df8fb0f2f..c4207c2892 100644 --- a/internal/flow/internal/testcomponents/sumation.go +++ b/internal/flow/internal/testcomponents/sumation.go @@ -4,9 +4,9 @@ import ( "context" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" "go.uber.org/atomic" ) diff --git a/internal/flow/internal/testcomponents/tick.go b/internal/flow/internal/testcomponents/tick.go index 1e16f60cab..1be12fda39 100644 --- a/internal/flow/internal/testcomponents/tick.go +++ b/internal/flow/internal/testcomponents/tick.go @@ -7,9 +7,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" ) func init() { diff --git a/internal/flow/internal/testservices/fake.go b/internal/flow/internal/testservices/fake.go index 2963f1057b..eae4ad495c 100644 --- a/internal/flow/internal/testservices/fake.go +++ b/internal/flow/internal/testservices/fake.go @@ -3,7 +3,7 @@ package testservices import ( "context" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/service" ) // The Fake service allows injecting custom behavior for interface methods. diff --git a/internal/flow/logging/level/level.go b/internal/flow/logging/level/level.go index d343a1b9da..0cce098d37 100644 --- a/internal/flow/logging/level/level.go +++ b/internal/flow/logging/level/level.go @@ -6,7 +6,7 @@ import ( "github.com/go-kit/log" gokitlevel "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging" ) const ( diff --git a/internal/flow/logging/logger.go b/internal/flow/logging/logger.go index 39fbab54e8..2a81d57b41 100644 --- a/internal/flow/logging/logger.go +++ b/internal/flow/logging/logger.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/slogadapter" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/slogadapter" "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/common/model" ) diff --git a/internal/flow/logging/logger_test.go b/internal/flow/logging/logger_test.go index 79c84d6307..cb6823fe4a 100644 --- a/internal/flow/logging/logger_test.go +++ b/internal/flow/logging/logger_test.go @@ -11,9 +11,9 @@ import ( "github.com/go-kit/log" gokitlevel "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/component/common/loki" - "github.com/grafana/agent/internal/flow/logging" - flowlevel "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/component/common/loki" + "github.com/grafana/alloy/internal/flow/logging" + flowlevel "github.com/grafana/alloy/internal/flow/logging/level" "github.com/stretchr/testify/require" ) diff --git a/internal/flow/logging/options.go b/internal/flow/logging/options.go index 0fbb576456..1d084bd2e7 100644 --- a/internal/flow/logging/options.go +++ b/internal/flow/logging/options.go @@ -6,7 +6,7 @@ import ( "log/slog" "math" - "github.com/grafana/agent/internal/component/common/loki" + "github.com/grafana/alloy/internal/component/common/loki" "github.com/grafana/alloy/syntax" ) diff --git a/internal/flow/module.go b/internal/flow/module.go index 3744187beb..9684e631cd 100644 --- a/internal/flow/module.go +++ b/internal/flow/module.go @@ -6,13 +6,13 @@ import ( "path" "sync" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/worker" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/flow/tracing" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/worker" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/tracing" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/scanner" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/flow/module_eval_test.go b/internal/flow/module_eval_test.go index 7e4c632e1a..0eeb41b58c 100644 --- a/internal/flow/module_eval_test.go +++ b/internal/flow/module_eval_test.go @@ -10,21 +10,21 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/internal/testcomponents" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" - cluster_service "github.com/grafana/agent/internal/service/cluster" - http_service "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/service/labelstore" - otel_service "github.com/grafana/agent/internal/service/otel" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/internal/testcomponents" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" + cluster_service "github.com/grafana/alloy/internal/service/cluster" + http_service "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/service/labelstore" + otel_service "github.com/grafana/alloy/internal/service/otel" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" "go.uber.org/goleak" - _ "github.com/grafana/agent/internal/flow/internal/testcomponents/module/string" + _ "github.com/grafana/alloy/internal/flow/internal/testcomponents/module/string" ) func TestUpdates_EmptyModule(t *testing.T) { diff --git a/internal/flow/module_fail_test.go b/internal/flow/module_fail_test.go index a6ec2eeec6..0c300b71e7 100644 --- a/internal/flow/module_fail_test.go +++ b/internal/flow/module_fail_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/internal/controller" "github.com/stretchr/testify/require" ) diff --git a/internal/flow/module_test.go b/internal/flow/module_test.go index 6b2b25981c..3f262e9308 100644 --- a/internal/flow/module_test.go +++ b/internal/flow/module_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/internal/controller" - "github.com/grafana/agent/internal/flow/internal/worker" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/internal/controller" + "github.com/grafana/alloy/internal/flow/internal/worker" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/internal/flow/source.go b/internal/flow/source.go index 2ed0eee186..70953591e1 100644 --- a/internal/flow/source.go +++ b/internal/flow/source.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/grafana/agent/internal/static/config/encoder" + "github.com/grafana/alloy/internal/static/config/encoder" "github.com/grafana/alloy/syntax/ast" "github.com/grafana/alloy/syntax/diag" "github.com/grafana/alloy/syntax/parser" diff --git a/internal/flow/source_test.go b/internal/flow/source_test.go index 054e3bbcec..d453d2b530 100644 --- a/internal/flow/source_test.go +++ b/internal/flow/source_test.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/alloy/syntax/diag" "github.com/stretchr/testify/require" - _ "github.com/grafana/agent/internal/flow/internal/testcomponents" // Include test components + _ "github.com/grafana/alloy/internal/flow/internal/testcomponents" // Include test components ) func TestParseSource(t *testing.T) { diff --git a/internal/flow/tracing/internal/jaegerremote/sampler.go b/internal/flow/tracing/internal/jaegerremote/sampler.go index 9d24aaa899..a21359cbb5 100644 --- a/internal/flow/tracing/internal/jaegerremote/sampler.go +++ b/internal/flow/tracing/internal/jaegerremote/sampler.go @@ -23,7 +23,7 @@ import ( "math" "sync" - "github.com/grafana/agent/internal/flow/tracing/internal/jaegerremote/utils" + "github.com/grafana/alloy/internal/flow/tracing/internal/jaegerremote/utils" jaeger_api_v2 "github.com/jaegertracing/jaeger/proto-gen/api_v2" "go.opentelemetry.io/otel/sdk/trace" oteltrace "go.opentelemetry.io/otel/trace" diff --git a/internal/flow/tracing/otelcol_client.go b/internal/flow/tracing/otelcol_client.go index 13d0c6631b..8d9e3163d6 100644 --- a/internal/flow/tracing/otelcol_client.go +++ b/internal/flow/tracing/otelcol_client.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/grafana/agent/internal/component/otelcol" + "github.com/grafana/alloy/internal/component/otelcol" "github.com/hashicorp/go-multierror" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/internal/flow/tracing/tracing.go b/internal/flow/tracing/tracing.go index 1da4c26d1b..69b29a41c5 100644 --- a/internal/flow/tracing/tracing.go +++ b/internal/flow/tracing/tracing.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/component/otelcol" - "github.com/grafana/agent/internal/flow/tracing/internal/jaegerremote" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/component/otelcol" + "github.com/grafana/alloy/internal/flow/tracing/internal/jaegerremote" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/sdk/resource" tracesdk "go.opentelemetry.io/otel/sdk/trace" diff --git a/internal/flowmode/cluster_builder.go b/internal/flowmode/cluster_builder.go index 70422c4574..292f04c947 100644 --- a/internal/flowmode/cluster_builder.go +++ b/internal/flowmode/cluster_builder.go @@ -9,8 +9,8 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service/cluster" "github.com/grafana/ckit/advertise" "github.com/hashicorp/go-discover" "github.com/hashicorp/go-discover/provider/k8s" diff --git a/internal/flowmode/cmd_convert.go b/internal/flowmode/cmd_convert.go index fa9fe81a95..e7c77b82e4 100644 --- a/internal/flowmode/cmd_convert.go +++ b/internal/flowmode/cmd_convert.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/grafana/agent/internal/converter" - convert_diag "github.com/grafana/agent/internal/converter/diag" + "github.com/grafana/alloy/internal/converter" + convert_diag "github.com/grafana/alloy/internal/converter/diag" "github.com/grafana/alloy/syntax/diag" ) diff --git a/internal/flowmode/cmd_run.go b/internal/flowmode/cmd_run.go index c9d7585e5c..fa37b1cac9 100644 --- a/internal/flowmode/cmd_run.go +++ b/internal/flowmode/cmd_run.go @@ -17,24 +17,24 @@ import ( "github.com/fatih/color" "github.com/go-kit/log" - "github.com/grafana/agent/internal/agentseed" - "github.com/grafana/agent/internal/boringcrypto" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/converter" - convert_diag "github.com/grafana/agent/internal/converter/diag" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/flow/tracing" - "github.com/grafana/agent/internal/service" - httpservice "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/service/labelstore" - otel_service "github.com/grafana/agent/internal/service/otel" - remotecfgservice "github.com/grafana/agent/internal/service/remotecfg" - uiservice "github.com/grafana/agent/internal/service/ui" - "github.com/grafana/agent/internal/static/config/instrumentation" - "github.com/grafana/agent/internal/usagestats" + "github.com/grafana/alloy/internal/alloyseed" + "github.com/grafana/alloy/internal/boringcrypto" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/converter" + convert_diag "github.com/grafana/alloy/internal/converter/diag" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/tracing" + "github.com/grafana/alloy/internal/service" + httpservice "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/service/labelstore" + otel_service "github.com/grafana/alloy/internal/service/otel" + remotecfgservice "github.com/grafana/alloy/internal/service/remotecfg" + uiservice "github.com/grafana/alloy/internal/service/ui" + "github.com/grafana/alloy/internal/static/config/instrumentation" + "github.com/grafana/alloy/internal/usagestats" "github.com/grafana/alloy/syntax/diag" "github.com/grafana/ckit/advertise" "github.com/grafana/ckit/peer" @@ -44,7 +44,7 @@ import ( "golang.org/x/exp/maps" // Install Components - _ "github.com/grafana/agent/internal/component/all" + _ "github.com/grafana/alloy/internal/component/all" ) func runCommand() *cobra.Command { @@ -274,7 +274,7 @@ func (fr *flowRun) Run(configPath string) error { } labelService := labelstore.New(l, reg) - agentseed.Init(fr.storagePath, l) + alloyseed.Init(fr.storagePath, l) f := flow.New(flow.Options{ Logger: l, @@ -302,7 +302,7 @@ func (fr *flowRun) Run(configPath string) error { return nil, fmt.Errorf("reading config path %q: %w", configPath, err) } if err := f.LoadSource(flowSource, nil); err != nil { - return flowSource, fmt.Errorf("error during the initial grafana/agent load: %w", err) + return flowSource, fmt.Errorf("error during the initial load: %w", err) } return flowSource, nil diff --git a/internal/flowmode/cmd_tools.go b/internal/flowmode/cmd_tools.go index 7224668ab0..3fdca9d1e0 100644 --- a/internal/flowmode/cmd_tools.go +++ b/internal/flowmode/cmd_tools.go @@ -3,7 +3,7 @@ package flowmode import ( "fmt" - "github.com/grafana/agent/internal/component/prometheus/remotewrite" + "github.com/grafana/alloy/internal/component/prometheus/remotewrite" "github.com/spf13/cobra" ) diff --git a/internal/flowmode/flowmode.go b/internal/flowmode/flowmode.go index d5edcb48b4..0c588fa15f 100644 --- a/internal/flowmode/flowmode.go +++ b/internal/flowmode/flowmode.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/grafana/agent/internal/build" + "github.com/grafana/alloy/internal/build" "github.com/spf13/cobra" ) diff --git a/internal/flowmode/resources_collector.go b/internal/flowmode/resources_collector.go index f4a1123734..c972c2cd1d 100644 --- a/internal/flowmode/resources_collector.go +++ b/internal/flowmode/resources_collector.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging/level" + "github.com/grafana/alloy/internal/flow/logging/level" "github.com/prometheus/client_golang/prometheus" "github.com/shirou/gopsutil/v3/net" "github.com/shirou/gopsutil/v3/process" diff --git a/internal/loki/client/client.go b/internal/loki/client/client.go index 46c40bbdfc..d52022939d 100644 --- a/internal/loki/client/client.go +++ b/internal/loki/client/client.go @@ -12,7 +12,7 @@ import ( "strings" log "github.com/go-kit/log" - "github.com/grafana/agent/internal/loki/client/internal" + "github.com/grafana/alloy/internal/loki/client/internal" "github.com/grafana/dskit/instrument" "github.com/grafana/dskit/user" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/mimir/client/client.go b/internal/mimir/client/client.go index 802c40d6ac..afa2516cf0 100644 --- a/internal/mimir/client/client.go +++ b/internal/mimir/client/client.go @@ -12,7 +12,7 @@ import ( "strings" log "github.com/go-kit/log" - "github.com/grafana/agent/internal/mimir/client/internal" + "github.com/grafana/alloy/internal/mimir/client/internal" "github.com/grafana/dskit/instrument" "github.com/grafana/dskit/user" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/runner/runner_test.go b/internal/runner/runner_test.go index 60fc84068c..ac636dc3cb 100644 --- a/internal/runner/runner_test.go +++ b/internal/runner/runner_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/cespare/xxhash/v2" - "github.com/grafana/agent/internal/runner" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/runner" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" "go.uber.org/atomic" ) diff --git a/internal/service/cluster/cluster.go b/internal/service/cluster/cluster.go index d98b5faf69..dfc4efe35b 100644 --- a/internal/service/cluster/cluster.go +++ b/internal/service/cluster/cluster.go @@ -14,11 +14,11 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service" - http_service "github.com/grafana/agent/internal/service/http" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service" + http_service "github.com/grafana/alloy/internal/service/http" "github.com/grafana/ckit" "github.com/grafana/ckit/peer" "github.com/grafana/ckit/shard" diff --git a/internal/service/http/handler.go b/internal/service/http/handler.go index 98796530dd..434e0ab28d 100644 --- a/internal/service/http/handler.go +++ b/internal/service/http/handler.go @@ -6,7 +6,7 @@ import ( "crypto/tls" "fmt" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/static/server" ) // tlsConfig generates a tls.Config from args. diff --git a/internal/service/http/handler_windows.go b/internal/service/http/handler_windows.go index 2b5cb4efab..6759abae1a 100644 --- a/internal/service/http/handler_windows.go +++ b/internal/service/http/handler_windows.go @@ -3,7 +3,7 @@ package http import ( "crypto/tls" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/static/server" ) // tlsConfig generates a tls.Config from args. diff --git a/internal/service/http/http.go b/internal/service/http/http.go index 516d037a7a..3cdb2549bd 100644 --- a/internal/service/http/http.go +++ b/internal/service/http/http.go @@ -15,12 +15,12 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service" + "github.com/grafana/alloy/internal/static/server" "github.com/grafana/ckit/memconn" _ "github.com/grafana/pyroscope-go/godeltaprof/http/pprof" // Register godeltaprof handler "github.com/prometheus/client_golang/prometheus" diff --git a/internal/service/http/http_test.go b/internal/service/http/http_test.go index b34d66f927..a46292f0fc 100644 --- a/internal/service/http/http_test.go +++ b/internal/service/http/http_test.go @@ -6,11 +6,11 @@ import ( "net/http" "testing" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/service" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/service" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/phayes/freeport" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/service/http/split_path.go b/internal/service/http/split_path.go index 93cdfbda05..d96834ae77 100644 --- a/internal/service/http/split_path.go +++ b/internal/service/http/split_path.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/service" ) // splitURLPath splits a path from a URL into two parts: a component ID and the diff --git a/internal/service/http/split_path_test.go b/internal/service/http/split_path_test.go index c580f830dd..5b881ce347 100644 --- a/internal/service/http/split_path_test.go +++ b/internal/service/http/split_path_test.go @@ -3,8 +3,8 @@ package http import ( "testing" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/service/labelstore/service.go b/internal/service/labelstore/service.go index 3a536ff2dc..3749e5b7bf 100644 --- a/internal/service/labelstore/service.go +++ b/internal/service/labelstore/service.go @@ -6,10 +6,10 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - agent_service "github.com/grafana/agent/internal/service" - flow_service "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + agent_service "github.com/grafana/alloy/internal/service" + flow_service "github.com/grafana/alloy/internal/service" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/value" diff --git a/internal/service/otel/otel.go b/internal/service/otel/otel.go index 4713abaeaf..5415277c10 100644 --- a/internal/service/otel/otel.go +++ b/internal/service/otel/otel.go @@ -8,9 +8,9 @@ import ( "fmt" "github.com/go-kit/log" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/service" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/service" + "github.com/grafana/alloy/internal/util" ) // ServiceName defines the name used for the otel service. diff --git a/internal/service/remotecfg/remotecfg.go b/internal/service/remotecfg/remotecfg.go index 75bafd8071..f45f80ae19 100644 --- a/internal/service/remotecfg/remotecfg.go +++ b/internal/service/remotecfg/remotecfg.go @@ -15,11 +15,11 @@ import ( "github.com/go-kit/log" agentv1 "github.com/grafana/agent-remote-config/api/gen/proto/go/agent/v1" "github.com/grafana/agent-remote-config/api/gen/proto/go/agent/v1/agentv1connect" - "github.com/grafana/agent/internal/agentseed" - "github.com/grafana/agent/internal/component/common/config" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow/logging/level" - "github.com/grafana/agent/internal/service" + "github.com/grafana/alloy/internal/alloyseed" + "github.com/grafana/alloy/internal/component/common/config" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow/logging/level" + "github.com/grafana/alloy/internal/service" "github.com/grafana/alloy/syntax" commonconfig "github.com/prometheus/common/config" ) @@ -72,7 +72,7 @@ type Arguments struct { // GetDefaultArguments populates the default values for the Arguments struct. func GetDefaultArguments() Arguments { return Arguments{ - ID: agentseed.Get().UID, + ID: alloyseed.Get().UID, Metadata: make(map[string]string), PollFrequency: 1 * time.Minute, HTTPClientConfig: config.CloneDefaultHTTPClientConfig(), diff --git a/internal/service/remotecfg/remotecfg_test.go b/internal/service/remotecfg/remotecfg_test.go index e8d8f7c61f..143eb0905d 100644 --- a/internal/service/remotecfg/remotecfg_test.go +++ b/internal/service/remotecfg/remotecfg_test.go @@ -11,14 +11,14 @@ import ( "connectrpc.com/connect" agentv1 "github.com/grafana/agent-remote-config/api/gen/proto/go/agent/v1" - "github.com/grafana/agent/internal/component" - _ "github.com/grafana/agent/internal/component/loki/process" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/flow" - "github.com/grafana/agent/internal/flow/componenttest" - "github.com/grafana/agent/internal/flow/logging" - "github.com/grafana/agent/internal/service" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component" + _ "github.com/grafana/alloy/internal/component/loki/process" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/flow" + "github.com/grafana/alloy/internal/flow/componenttest" + "github.com/grafana/alloy/internal/flow/logging" + "github.com/grafana/alloy/internal/service" + "github.com/grafana/alloy/internal/util" "github.com/grafana/alloy/syntax" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" diff --git a/internal/service/service.go b/internal/service/service.go index 62751d464c..8901947813 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -10,8 +10,8 @@ import ( "context" "fmt" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/featuregate" ) // Definition describes an individual Flow service. Services have unique names diff --git a/internal/service/ui/ui.go b/internal/service/ui/ui.go index ebc56943f8..6ba32ef415 100644 --- a/internal/service/ui/ui.go +++ b/internal/service/ui/ui.go @@ -8,11 +8,11 @@ import ( "path" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/featuregate" - "github.com/grafana/agent/internal/service" - http_service "github.com/grafana/agent/internal/service/http" - "github.com/grafana/agent/internal/web/api" - "github.com/grafana/agent/internal/web/ui" + "github.com/grafana/alloy/internal/featuregate" + "github.com/grafana/alloy/internal/service" + http_service "github.com/grafana/alloy/internal/service/http" + "github.com/grafana/alloy/internal/web/api" + "github.com/grafana/alloy/internal/web/ui" ) // ServiceName defines the name used for the UI service. diff --git a/internal/static/config/config.go b/internal/static/config/config.go index 2ec8f4f590..411360f848 100644 --- a/internal/static/config/config.go +++ b/internal/static/config/config.go @@ -10,14 +10,14 @@ import ( "unicode" "github.com/drone/envsubst/v2" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/static/config/encoder" - "github.com/grafana/agent/internal/static/config/features" - "github.com/grafana/agent/internal/static/logs" - "github.com/grafana/agent/internal/static/metrics" - "github.com/grafana/agent/internal/static/server" - "github.com/grafana/agent/internal/static/traces" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/static/config/encoder" + "github.com/grafana/alloy/internal/static/config/features" + "github.com/grafana/alloy/internal/static/logs" + "github.com/grafana/alloy/internal/static/metrics" + "github.com/grafana/alloy/internal/static/server" + "github.com/grafana/alloy/internal/static/traces" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/internal/static/config/config_test.go b/internal/static/config/config_test.go index 364f2f2513..7affe45129 100644 --- a/internal/static/config/config_test.go +++ b/internal/static/config/config_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/static/config/encoder" - "github.com/grafana/agent/internal/static/metrics" - "github.com/grafana/agent/internal/static/metrics/instance" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/config/encoder" + "github.com/grafana/alloy/internal/static/metrics" + "github.com/grafana/alloy/internal/static/metrics/instance" + "github.com/grafana/alloy/internal/util" commonCfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" promCfg "github.com/prometheus/prometheus/config" diff --git a/internal/static/config/integrations.go b/internal/static/config/integrations.go index f0d2652e6d..c35fdba61d 100644 --- a/internal/static/config/integrations.go +++ b/internal/static/config/integrations.go @@ -4,11 +4,11 @@ import ( "fmt" "reflect" - v1 "github.com/grafana/agent/internal/static/integrations" - v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/metrics" - "github.com/grafana/agent/internal/static/server" - "github.com/grafana/agent/internal/util" + v1 "github.com/grafana/alloy/internal/static/integrations" + v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/metrics" + "github.com/grafana/alloy/internal/static/server" + "github.com/grafana/alloy/internal/util" "gopkg.in/yaml.v2" ) diff --git a/internal/static/config/integrations_test.go b/internal/static/config/integrations_test.go index d3537997e0..0a0c159dee 100644 --- a/internal/static/config/integrations_test.go +++ b/internal/static/config/integrations_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - _ "github.com/grafana/agent/internal/static/integrations/install" // Install integrations for tests - "github.com/grafana/agent/internal/util" + _ "github.com/grafana/alloy/internal/static/integrations/install" // Install integrations for tests + "github.com/grafana/alloy/internal/util" ) func TestIntegrations_v1(t *testing.T) { diff --git a/internal/static/integrations/agent/agent.go b/internal/static/integrations/agent/agent.go index 4134dc13c3..72d274ecbc 100644 --- a/internal/static/integrations/agent/agent.go +++ b/internal/static/integrations/agent/agent.go @@ -8,8 +8,8 @@ import ( "net/http" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/config" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/internal/static/integrations/apache_http/apache_http.go b/internal/static/integrations/apache_http/apache_http.go index 522de99aef..7d3295a14d 100644 --- a/internal/static/integrations/apache_http/apache_http.go +++ b/internal/static/integrations/apache_http/apache_http.go @@ -7,7 +7,7 @@ import ( ae "github.com/Lusitaniae/apache_exporter/collector" "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations" ) // DefaultConfig holds the default settings for the apache_http integration diff --git a/internal/static/integrations/azure_exporter/azure_exporter.go b/internal/static/integrations/azure_exporter/azure_exporter.go index dd8e6b2677..d7103f004d 100644 --- a/internal/static/integrations/azure_exporter/azure_exporter.go +++ b/internal/static/integrations/azure_exporter/azure_exporter.go @@ -14,7 +14,7 @@ import ( "github.com/webdevops/azure-metrics-exporter/metrics" "github.com/webdevops/go-common/azuresdk/armclient" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) type Exporter struct { diff --git a/internal/static/integrations/azure_exporter/config.go b/internal/static/integrations/azure_exporter/config.go index 3cef29da56..d3dfb791d6 100644 --- a/internal/static/integrations/azure_exporter/config.go +++ b/internal/static/integrations/azure_exporter/config.go @@ -16,10 +16,10 @@ import ( "github.com/webdevops/go-common/azuresdk/cloudconfig" "gopkg.in/yaml.v3" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/util/zapadapter" ) func init() { diff --git a/internal/static/integrations/azure_exporter/config_test.go b/internal/static/integrations/azure_exporter/config_test.go index 1065286ffc..75f9fd037f 100644 --- a/internal/static/integrations/azure_exporter/config_test.go +++ b/internal/static/integrations/azure_exporter/config_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/webdevops/azure-metrics-exporter/metrics" - "github.com/grafana/agent/internal/static/integrations/azure_exporter" + "github.com/grafana/alloy/internal/static/integrations/azure_exporter" ) func TestConfig_ToScrapeSettings(t *testing.T) { diff --git a/internal/static/integrations/blackbox_exporter/blackbox_exporter.go b/internal/static/integrations/blackbox_exporter/blackbox_exporter.go index 28ffdaf95c..6f20fa5db7 100644 --- a/internal/static/integrations/blackbox_exporter/blackbox_exporter.go +++ b/internal/static/integrations/blackbox_exporter/blackbox_exporter.go @@ -7,9 +7,9 @@ import ( "net/url" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/config" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/config" + "github.com/grafana/alloy/internal/util" blackbox_config "github.com/prometheus/blackbox_exporter/config" "github.com/prometheus/blackbox_exporter/prober" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/static/integrations/blackbox_exporter/blackbox_exporter_test.go b/internal/static/integrations/blackbox_exporter/blackbox_exporter_test.go index eb3bfb22bc..d2b69b5cc3 100644 --- a/internal/static/integrations/blackbox_exporter/blackbox_exporter_test.go +++ b/internal/static/integrations/blackbox_exporter/blackbox_exporter_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - integrations "github.com/grafana/agent/internal/static/integrations/config" + integrations "github.com/grafana/alloy/internal/static/integrations/config" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/internal/static/integrations/cadvisor/cadvisor.go b/internal/static/integrations/cadvisor/cadvisor.go index ec1094ab68..7b0b998bab 100644 --- a/internal/static/integrations/cadvisor/cadvisor.go +++ b/internal/static/integrations/cadvisor/cadvisor.go @@ -20,7 +20,7 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/clock" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations" // Register container providers diff --git a/internal/static/integrations/cadvisor/cadvisor_stub.go b/internal/static/integrations/cadvisor/cadvisor_stub.go index 35bdd3455b..b1aa592459 100644 --- a/internal/static/integrations/cadvisor/cadvisor_stub.go +++ b/internal/static/integrations/cadvisor/cadvisor_stub.go @@ -6,8 +6,8 @@ import ( "context" "net/http" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/config" "github.com/go-kit/log" "github.com/go-kit/log/level" diff --git a/internal/static/integrations/cadvisor/cadvisor_test.go b/internal/static/integrations/cadvisor/cadvisor_test.go index 17d2ebc49c..4d28723987 100644 --- a/internal/static/integrations/cadvisor/cadvisor_test.go +++ b/internal/static/integrations/cadvisor/cadvisor_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" ) diff --git a/internal/static/integrations/cadvisor/common.go b/internal/static/integrations/cadvisor/common.go index 979f3e0f13..4959090418 100644 --- a/internal/static/integrations/cadvisor/common.go +++ b/internal/static/integrations/cadvisor/common.go @@ -4,9 +4,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) const name = "cadvisor" diff --git a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go index 81a2d876be..9aa97b6163 100644 --- a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go +++ b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) type cachingFactory interface { diff --git a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go index cd418c4eeb..c813fad492 100644 --- a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go +++ b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/atomic" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) // asyncExporter wraps YACE entrypoint around an Integration implementation diff --git a/internal/static/integrations/cloudwatch_exporter/config.go b/internal/static/integrations/cloudwatch_exporter/config.go index 04390c1d36..eebe985f8b 100644 --- a/internal/static/integrations/cloudwatch_exporter/config.go +++ b/internal/static/integrations/cloudwatch_exporter/config.go @@ -11,9 +11,9 @@ import ( yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" "gopkg.in/yaml.v2" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) const ( diff --git a/internal/static/integrations/collector_integration.go b/internal/static/integrations/collector_integration.go index 54c3e4ffed..76c7197d80 100644 --- a/internal/static/integrations/collector_integration.go +++ b/internal/static/integrations/collector_integration.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/static/integrations/config" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/internal/static/integrations/consul_exporter/consul_exporter.go b/internal/static/integrations/consul_exporter/consul_exporter.go index 83518f5bb9..42a279b2fc 100644 --- a/internal/static/integrations/consul_exporter/consul_exporter.go +++ b/internal/static/integrations/consul_exporter/consul_exporter.go @@ -7,9 +7,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" consul_api "github.com/hashicorp/consul/api" "github.com/prometheus/consul_exporter/pkg/exporter" ) diff --git a/internal/static/integrations/dnsmasq_exporter/dnsmasq_exporter.go b/internal/static/integrations/dnsmasq_exporter/dnsmasq_exporter.go index 67bdd03f6b..abe471ef3a 100644 --- a/internal/static/integrations/dnsmasq_exporter/dnsmasq_exporter.go +++ b/internal/static/integrations/dnsmasq_exporter/dnsmasq_exporter.go @@ -4,9 +4,9 @@ package dnsmasq_exporter import ( "github.com/go-kit/log" "github.com/google/dnsmasq_exporter/collector" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/miekg/dns" ) diff --git a/internal/static/integrations/elasticsearch_exporter/elasticsearch_exporter.go b/internal/static/integrations/elasticsearch_exporter/elasticsearch_exporter.go index 980d491cd0..a824a1ae66 100644 --- a/internal/static/integrations/elasticsearch_exporter/elasticsearch_exporter.go +++ b/internal/static/integrations/elasticsearch_exporter/elasticsearch_exporter.go @@ -14,9 +14,9 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/client_golang/prometheus" promCfg "github.com/prometheus/common/config" diff --git a/internal/static/integrations/gcp_exporter/gcp_exporter.go b/internal/static/integrations/gcp_exporter/gcp_exporter.go index 3b684e402f..fed0251416 100644 --- a/internal/static/integrations/gcp_exporter/gcp_exporter.go +++ b/internal/static/integrations/gcp_exporter/gcp_exporter.go @@ -22,9 +22,9 @@ import ( "google.golang.org/api/option" "gopkg.in/yaml.v2" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) func init() { diff --git a/internal/static/integrations/gcp_exporter/gcp_exporter_test.go b/internal/static/integrations/gcp_exporter/gcp_exporter_test.go index 075fd267b6..ff3dfbb2c7 100644 --- a/internal/static/integrations/gcp_exporter/gcp_exporter_test.go +++ b/internal/static/integrations/gcp_exporter/gcp_exporter_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/agent/internal/static/integrations/gcp_exporter" + "github.com/grafana/alloy/internal/static/integrations/gcp_exporter" ) func TestConfig_Validate(t *testing.T) { diff --git a/internal/static/integrations/github_exporter/github_exporter.go b/internal/static/integrations/github_exporter/github_exporter.go index a28e8226ab..2b495390d1 100644 --- a/internal/static/integrations/github_exporter/github_exporter.go +++ b/internal/static/integrations/github_exporter/github_exporter.go @@ -8,9 +8,9 @@ import ( "github.com/githubexporter/github-exporter/exporter" "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" config_util "github.com/prometheus/common/config" ) diff --git a/internal/static/integrations/github_exporter/github_test.go b/internal/static/integrations/github_exporter/github_test.go index 146db3f660..1ecc8b1f98 100644 --- a/internal/static/integrations/github_exporter/github_test.go +++ b/internal/static/integrations/github_exporter/github_test.go @@ -3,7 +3,7 @@ package github_exporter //nolint:golint import ( "testing" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/static/config" // register github_exporter ) diff --git a/internal/static/integrations/handler_integration.go b/internal/static/integrations/handler_integration.go index c3d02388d4..b6b137cda1 100644 --- a/internal/static/integrations/handler_integration.go +++ b/internal/static/integrations/handler_integration.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) // NewHandlerIntegration creates a new named integration that will call handler diff --git a/internal/static/integrations/install/install.go b/internal/static/integrations/install/install.go index 8ce2be4a3b..c96ceebf57 100644 --- a/internal/static/integrations/install/install.go +++ b/internal/static/integrations/install/install.go @@ -6,43 +6,43 @@ import ( // v1 integrations // - _ "github.com/grafana/agent/internal/static/integrations/agent" // register agent - _ "github.com/grafana/agent/internal/static/integrations/apache_http" // register apache_exporter - _ "github.com/grafana/agent/internal/static/integrations/azure_exporter" // register azure_exporter - _ "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" // register blackbox_exporter - _ "github.com/grafana/agent/internal/static/integrations/cadvisor" // register cadvisor - _ "github.com/grafana/agent/internal/static/integrations/cloudwatch_exporter" // register cloudwatch_exporter - _ "github.com/grafana/agent/internal/static/integrations/consul_exporter" // register consul_exporter - _ "github.com/grafana/agent/internal/static/integrations/dnsmasq_exporter" // register dnsmasq_exporter - _ "github.com/grafana/agent/internal/static/integrations/elasticsearch_exporter" // register elasticsearch_exporter - _ "github.com/grafana/agent/internal/static/integrations/gcp_exporter" // register gcp_exporter - _ "github.com/grafana/agent/internal/static/integrations/github_exporter" // register github_exporter - _ "github.com/grafana/agent/internal/static/integrations/kafka_exporter" // register kafka_exporter - _ "github.com/grafana/agent/internal/static/integrations/memcached_exporter" // register memcached_exporter - _ "github.com/grafana/agent/internal/static/integrations/mongodb_exporter" // register mongodb_exporter - _ "github.com/grafana/agent/internal/static/integrations/mssql" // register mssql - _ "github.com/grafana/agent/internal/static/integrations/mysqld_exporter" // register mysqld_exporter - _ "github.com/grafana/agent/internal/static/integrations/node_exporter" // register node_exporter - _ "github.com/grafana/agent/internal/static/integrations/oracledb_exporter" // register oracledb_exporter - _ "github.com/grafana/agent/internal/static/integrations/postgres_exporter" // register postgres_exporter - _ "github.com/grafana/agent/internal/static/integrations/process_exporter" // register process_exporter - _ "github.com/grafana/agent/internal/static/integrations/redis_exporter" // register redis_exporter - _ "github.com/grafana/agent/internal/static/integrations/snmp_exporter" // register snmp_exporter - _ "github.com/grafana/agent/internal/static/integrations/snowflake_exporter" // register snowflake_exporter - _ "github.com/grafana/agent/internal/static/integrations/squid_exporter" // register squid_exporter - _ "github.com/grafana/agent/internal/static/integrations/statsd_exporter" // register statsd_exporter - _ "github.com/grafana/agent/internal/static/integrations/vmware_exporter" // register vmware_exporter - _ "github.com/grafana/agent/internal/static/integrations/windows_exporter" // register windows_exporter + _ "github.com/grafana/alloy/internal/static/integrations/agent" // register agent + _ "github.com/grafana/alloy/internal/static/integrations/apache_http" // register apache_exporter + _ "github.com/grafana/alloy/internal/static/integrations/azure_exporter" // register azure_exporter + _ "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" // register blackbox_exporter + _ "github.com/grafana/alloy/internal/static/integrations/cadvisor" // register cadvisor + _ "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" // register cloudwatch_exporter + _ "github.com/grafana/alloy/internal/static/integrations/consul_exporter" // register consul_exporter + _ "github.com/grafana/alloy/internal/static/integrations/dnsmasq_exporter" // register dnsmasq_exporter + _ "github.com/grafana/alloy/internal/static/integrations/elasticsearch_exporter" // register elasticsearch_exporter + _ "github.com/grafana/alloy/internal/static/integrations/gcp_exporter" // register gcp_exporter + _ "github.com/grafana/alloy/internal/static/integrations/github_exporter" // register github_exporter + _ "github.com/grafana/alloy/internal/static/integrations/kafka_exporter" // register kafka_exporter + _ "github.com/grafana/alloy/internal/static/integrations/memcached_exporter" // register memcached_exporter + _ "github.com/grafana/alloy/internal/static/integrations/mongodb_exporter" // register mongodb_exporter + _ "github.com/grafana/alloy/internal/static/integrations/mssql" // register mssql + _ "github.com/grafana/alloy/internal/static/integrations/mysqld_exporter" // register mysqld_exporter + _ "github.com/grafana/alloy/internal/static/integrations/node_exporter" // register node_exporter + _ "github.com/grafana/alloy/internal/static/integrations/oracledb_exporter" // register oracledb_exporter + _ "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" // register postgres_exporter + _ "github.com/grafana/alloy/internal/static/integrations/process_exporter" // register process_exporter + _ "github.com/grafana/alloy/internal/static/integrations/redis_exporter" // register redis_exporter + _ "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" // register snmp_exporter + _ "github.com/grafana/alloy/internal/static/integrations/snowflake_exporter" // register snowflake_exporter + _ "github.com/grafana/alloy/internal/static/integrations/squid_exporter" // register squid_exporter + _ "github.com/grafana/alloy/internal/static/integrations/statsd_exporter" // register statsd_exporter + _ "github.com/grafana/alloy/internal/static/integrations/vmware_exporter" // register vmware_exporter + _ "github.com/grafana/alloy/internal/static/integrations/windows_exporter" // register windows_exporter // // v2 integrations // - _ "github.com/grafana/agent/internal/static/integrations/v2/agent" // register agent - _ "github.com/grafana/agent/internal/static/integrations/v2/apache_http" // register apache_exporter - _ "github.com/grafana/agent/internal/static/integrations/v2/app_agent_receiver" // register app_agent_receiver - _ "github.com/grafana/agent/internal/static/integrations/v2/blackbox_exporter" // register blackbox_exporter - _ "github.com/grafana/agent/internal/static/integrations/v2/eventhandler" // register eventhandler - _ "github.com/grafana/agent/internal/static/integrations/v2/snmp_exporter" // register snmp_exporter - _ "github.com/grafana/agent/internal/static/integrations/v2/vmware_exporter" // register vmware_exporter + _ "github.com/grafana/alloy/internal/static/integrations/v2/agent" // register agent + _ "github.com/grafana/alloy/internal/static/integrations/v2/apache_http" // register apache_exporter + _ "github.com/grafana/alloy/internal/static/integrations/v2/app_agent_receiver" // register app_agent_receiver + _ "github.com/grafana/alloy/internal/static/integrations/v2/blackbox_exporter" // register blackbox_exporter + _ "github.com/grafana/alloy/internal/static/integrations/v2/eventhandler" // register eventhandler + _ "github.com/grafana/alloy/internal/static/integrations/v2/snmp_exporter" // register snmp_exporter + _ "github.com/grafana/alloy/internal/static/integrations/v2/vmware_exporter" // register vmware_exporter ) diff --git a/internal/static/integrations/install/install_test.go b/internal/static/integrations/install/install_test.go index fd7c2da767..3f5f640e27 100644 --- a/internal/static/integrations/install/install_test.go +++ b/internal/static/integrations/install/install_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - v1 "github.com/grafana/agent/internal/static/integrations" - v2 "github.com/grafana/agent/internal/static/integrations/v2" + v1 "github.com/grafana/alloy/internal/static/integrations" + v2 "github.com/grafana/alloy/internal/static/integrations/v2" "github.com/stretchr/testify/require" ) diff --git a/internal/static/integrations/integration.go b/internal/static/integrations/integration.go index d8ebe03875..c65616ccac 100644 --- a/internal/static/integrations/integration.go +++ b/internal/static/integrations/integration.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) // Config provides the configuration and constructor for an integration. diff --git a/internal/static/integrations/kafka_exporter/kafka_exporter.go b/internal/static/integrations/kafka_exporter/kafka_exporter.go index e0e354f74c..c864212614 100644 --- a/internal/static/integrations/kafka_exporter/kafka_exporter.go +++ b/internal/static/integrations/kafka_exporter/kafka_exporter.go @@ -8,9 +8,9 @@ import ( "github.com/IBM/sarama" kafka_exporter "github.com/davidmparrott/kafka_exporter/v2/exporter" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) // DefaultConfig holds the default settings for the kafka_lag_exporter diff --git a/internal/static/integrations/kafka_exporter/kafka_test.go b/internal/static/integrations/kafka_exporter/kafka_test.go index f8a67d2658..a0f4cdb8cb 100644 --- a/internal/static/integrations/kafka_exporter/kafka_test.go +++ b/internal/static/integrations/kafka_exporter/kafka_test.go @@ -3,7 +3,7 @@ package kafka_exporter //nolint:golint import ( "testing" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/static/config" ) func TestConfig_SecretKafkaPassword(t *testing.T) { diff --git a/internal/static/integrations/manager.go b/internal/static/integrations/manager.go index 59760b9c7f..b43322bffb 100644 --- a/internal/static/integrations/manager.go +++ b/internal/static/integrations/manager.go @@ -6,8 +6,8 @@ import ( config_util "github.com/prometheus/common/config" - "github.com/grafana/agent/internal/static/metrics" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/static/metrics" + "github.com/grafana/alloy/internal/static/server" "github.com/prometheus/common/model" promConfig "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/static/integrations/memcached_exporter/memcached_exporter.go b/internal/static/integrations/memcached_exporter/memcached_exporter.go index 8d8e591568..24b83f7fda 100644 --- a/internal/static/integrations/memcached_exporter/memcached_exporter.go +++ b/internal/static/integrations/memcached_exporter/memcached_exporter.go @@ -10,9 +10,9 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/memcached_exporter/pkg/exporter" ) diff --git a/internal/static/integrations/mongodb_exporter/mongodb_exporter.go b/internal/static/integrations/mongodb_exporter/mongodb_exporter.go index a07c45071d..5f5cf352a6 100644 --- a/internal/static/integrations/mongodb_exporter/mongodb_exporter.go +++ b/internal/static/integrations/mongodb_exporter/mongodb_exporter.go @@ -10,9 +10,9 @@ import ( "github.com/percona/mongodb_exporter/exporter" config_util "github.com/prometheus/common/config" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) var DefaultConfig = Config{ diff --git a/internal/static/integrations/mongodb_exporter/mongodb_test.go b/internal/static/integrations/mongodb_exporter/mongodb_test.go index b1fac94934..cd4e052427 100644 --- a/internal/static/integrations/mongodb_exporter/mongodb_test.go +++ b/internal/static/integrations/mongodb_exporter/mongodb_test.go @@ -3,7 +3,7 @@ package mongodb_exporter //nolint:golint import ( "testing" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/static/config" ) func TestConfig_SecretMongoDB(t *testing.T) { diff --git a/internal/static/integrations/mssql/sql_exporter.go b/internal/static/integrations/mssql/sql_exporter.go index f378b7f90f..6e7cd41402 100644 --- a/internal/static/integrations/mssql/sql_exporter.go +++ b/internal/static/integrations/mssql/sql_exporter.go @@ -13,10 +13,10 @@ import ( "github.com/burningalchemist/sql_exporter" "github.com/burningalchemist/sql_exporter/config" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/common/model" ) diff --git a/internal/static/integrations/mysqld_exporter/mysqld-exporter.go b/internal/static/integrations/mysqld_exporter/mysqld-exporter.go index eae4294fda..eb01ab285c 100644 --- a/internal/static/integrations/mysqld_exporter/mysqld-exporter.go +++ b/internal/static/integrations/mysqld_exporter/mysqld-exporter.go @@ -11,9 +11,9 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/go-sql-driver/mysql" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/mysqld_exporter/collector" ) diff --git a/internal/static/integrations/mysqld_exporter/mysqld_test.go b/internal/static/integrations/mysqld_exporter/mysqld_test.go index 7c620ee409..ade15a3c66 100644 --- a/internal/static/integrations/mysqld_exporter/mysqld_test.go +++ b/internal/static/integrations/mysqld_exporter/mysqld_test.go @@ -3,7 +3,7 @@ package mysqld_exporter //nolint:golint import ( "testing" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/static/config" ) func TestConfig_SecretMysqlD(t *testing.T) { diff --git a/internal/static/integrations/node_exporter/config.go b/internal/static/integrations/node_exporter/config.go index 4dda0d7266..b49f46dcc1 100644 --- a/internal/static/integrations/node_exporter/config.go +++ b/internal/static/integrations/node_exporter/config.go @@ -8,9 +8,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/grafana/dskit/flagext" "github.com/prometheus/node_exporter/collector" "github.com/prometheus/procfs" diff --git a/internal/static/integrations/node_exporter/node_exporter.go b/internal/static/integrations/node_exporter/node_exporter.go index 3833c5103e..92f4cbea3b 100644 --- a/internal/static/integrations/node_exporter/node_exporter.go +++ b/internal/static/integrations/node_exporter/node_exporter.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/static/integrations/config" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/node_exporter/collector" diff --git a/internal/static/integrations/node_exporter/node_exporter_windows.go b/internal/static/integrations/node_exporter/node_exporter_windows.go index 0dfdf44601..be3f5fdfea 100644 --- a/internal/static/integrations/node_exporter/node_exporter_windows.go +++ b/internal/static/integrations/node_exporter/node_exporter_windows.go @@ -6,7 +6,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) // Integration is the node_exporter integration. On Windows platforms, diff --git a/internal/static/integrations/oracledb_exporter/oracledb_exporter.go b/internal/static/integrations/oracledb_exporter/oracledb_exporter.go index c4385e5aa2..8c967d3549 100644 --- a/internal/static/integrations/oracledb_exporter/oracledb_exporter.go +++ b/internal/static/integrations/oracledb_exporter/oracledb_exporter.go @@ -7,14 +7,14 @@ import ( "os" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations" oe "github.com/iamseth/oracledb_exporter/collector" // required driver for integration _ "github.com/sijms/go-ora/v2" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" config_util "github.com/prometheus/common/config" ) diff --git a/internal/static/integrations/postgres_exporter/postgres_exporter.go b/internal/static/integrations/postgres_exporter/postgres_exporter.go index aa375be8c4..44b52405b1 100644 --- a/internal/static/integrations/postgres_exporter/postgres_exporter.go +++ b/internal/static/integrations/postgres_exporter/postgres_exporter.go @@ -9,9 +9,9 @@ import ( config_util "github.com/prometheus/common/config" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/lib/pq" "github.com/prometheus-community/postgres_exporter/exporter" ) diff --git a/internal/static/integrations/postgres_exporter/postgres_test.go b/internal/static/integrations/postgres_exporter/postgres_test.go index cb189ee719..b1112ee27b 100644 --- a/internal/static/integrations/postgres_exporter/postgres_test.go +++ b/internal/static/integrations/postgres_exporter/postgres_test.go @@ -3,7 +3,7 @@ package postgres_exporter //nolint:golint import ( "testing" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/static/config" ) func TestConfig_SecretPostgres(t *testing.T) { diff --git a/internal/static/integrations/process_exporter/config.go b/internal/static/integrations/process_exporter/config.go index a43bb45074..121d8208d4 100644 --- a/internal/static/integrations/process_exporter/config.go +++ b/internal/static/integrations/process_exporter/config.go @@ -3,9 +3,9 @@ package process_exporter //nolint:golint import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" exporter_config "github.com/ncabatoff/process-exporter/config" ) diff --git a/internal/static/integrations/process_exporter/process-exporter.go b/internal/static/integrations/process_exporter/process-exporter.go index 14f9d14db9..9f64560f5d 100644 --- a/internal/static/integrations/process_exporter/process-exporter.go +++ b/internal/static/integrations/process_exporter/process-exporter.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) // Integration is the process_exporter integration. On non-Linux platforms, diff --git a/internal/static/integrations/process_exporter/process-exporter_linux.go b/internal/static/integrations/process_exporter/process-exporter_linux.go index 1194f7e11c..d45d82f7ff 100644 --- a/internal/static/integrations/process_exporter/process-exporter_linux.go +++ b/internal/static/integrations/process_exporter/process-exporter_linux.go @@ -7,8 +7,8 @@ import ( "net/http" "github.com/go-kit/log" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/static/integrations/config" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/internal/static/integrations/redis_exporter/redis_exporter.go b/internal/static/integrations/redis_exporter/redis_exporter.go index 3b34b20079..8335162ab0 100644 --- a/internal/static/integrations/redis_exporter/redis_exporter.go +++ b/internal/static/integrations/redis_exporter/redis_exporter.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/go-kit/log" "github.com/go-kit/log/level" diff --git a/internal/static/integrations/redis_exporter/redis_exporter_test.go b/internal/static/integrations/redis_exporter/redis_exporter_test.go index 6b10be315f..47965e5050 100644 --- a/internal/static/integrations/redis_exporter/redis_exporter_test.go +++ b/internal/static/integrations/redis_exporter/redis_exporter_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/grafana/agent/internal/static/config" + "github.com/grafana/alloy/internal/static/config" "gopkg.in/yaml.v2" "github.com/go-kit/log" diff --git a/internal/static/integrations/register.go b/internal/static/integrations/register.go index 9a5c4734ee..006ca47347 100644 --- a/internal/static/integrations/register.go +++ b/internal/static/integrations/register.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" - "github.com/grafana/agent/internal/static/integrations/config" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/integrations/config" + "github.com/grafana/alloy/internal/util" "gopkg.in/yaml.v2" ) diff --git a/internal/static/integrations/snmp_exporter/snmp_exporter.go b/internal/static/integrations/snmp_exporter/snmp_exporter.go index c03ead4a47..de2246101f 100644 --- a/internal/static/integrations/snmp_exporter/snmp_exporter.go +++ b/internal/static/integrations/snmp_exporter/snmp_exporter.go @@ -8,9 +8,9 @@ import ( "net/url" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/config" - snmp_common "github.com/grafana/agent/internal/static/integrations/snmp_exporter/common" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/config" + snmp_common "github.com/grafana/alloy/internal/static/integrations/snmp_exporter/common" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/snmp_exporter/collector" diff --git a/internal/static/integrations/snowflake_exporter/snowflake_exporter.go b/internal/static/integrations/snowflake_exporter/snowflake_exporter.go index ef01a7cf38..6013e07f4b 100644 --- a/internal/static/integrations/snowflake_exporter/snowflake_exporter.go +++ b/internal/static/integrations/snowflake_exporter/snowflake_exporter.go @@ -2,9 +2,9 @@ package snowflake_exporter import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/grafana/snowflake-prometheus-exporter/collector" config_util "github.com/prometheus/common/config" ) diff --git a/internal/static/integrations/squid_exporter/squid_exporter.go b/internal/static/integrations/squid_exporter/squid_exporter.go index 9ec368f70b..b596ef11f8 100644 --- a/internal/static/integrations/squid_exporter/squid_exporter.go +++ b/internal/static/integrations/squid_exporter/squid_exporter.go @@ -8,11 +8,11 @@ import ( se "github.com/boynux/squid-exporter/collector" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations" config_util "github.com/prometheus/common/config" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) var ( diff --git a/internal/static/integrations/statsd_exporter/statsd_exporter.go b/internal/static/integrations/statsd_exporter/statsd_exporter.go index 6b0f7a8fbe..1ead241def 100644 --- a/internal/static/integrations/statsd_exporter/statsd_exporter.go +++ b/internal/static/integrations/statsd_exporter/statsd_exporter.go @@ -12,11 +12,11 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/build" - "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/config" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/build" + "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/config" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/statsd_exporter/pkg/address" diff --git a/internal/static/integrations/v2/agent/agent.go b/internal/static/integrations/v2/agent/agent.go index deeaa1d8ca..2e669b3c15 100644 --- a/internal/static/integrations/v2/agent/agent.go +++ b/internal/static/integrations/v2/agent/agent.go @@ -5,9 +5,9 @@ package agent import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/internal/static/integrations/v2/apache_http/apache_http.go b/internal/static/integrations/v2/apache_http/apache_http.go index cdffaebab2..69160bb4ca 100644 --- a/internal/static/integrations/v2/apache_http/apache_http.go +++ b/internal/static/integrations/v2/apache_http/apache_http.go @@ -8,9 +8,9 @@ import ( ae "github.com/Lusitaniae/apache_exporter/collector" "github.com/go-kit/log" "github.com/go-kit/log/level" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/internal/static/integrations/v2/apache_http/apache_http_test.go b/internal/static/integrations/v2/apache_http/apache_http_test.go index 8480eb1b56..3e3e1f6306 100644 --- a/internal/static/integrations/v2/apache_http/apache_http_test.go +++ b/internal/static/integrations/v2/apache_http/apache_http_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" "github.com/stretchr/testify/require" ) diff --git a/internal/static/integrations/v2/app_agent_receiver/app_agent_receiver.go b/internal/static/integrations/v2/app_agent_receiver/app_agent_receiver.go index 9145115fd5..83a0bcc958 100644 --- a/internal/static/integrations/v2/app_agent_receiver/app_agent_receiver.go +++ b/internal/static/integrations/v2/app_agent_receiver/app_agent_receiver.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2" ) func init() { diff --git a/internal/static/integrations/v2/app_agent_receiver/config.go b/internal/static/integrations/v2/app_agent_receiver/config.go index 32d1b12389..fd49908ca2 100644 --- a/internal/static/integrations/v2/app_agent_receiver/config.go +++ b/internal/static/integrations/v2/app_agent_receiver/config.go @@ -3,8 +3,8 @@ package app_agent_receiver import ( "time" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" ) const ( diff --git a/internal/static/integrations/v2/blackbox_exporter/blackbox.go b/internal/static/integrations/v2/blackbox_exporter/blackbox.go index e06a20d968..f59e571932 100644 --- a/internal/static/integrations/v2/blackbox_exporter/blackbox.go +++ b/internal/static/integrations/v2/blackbox_exporter/blackbox.go @@ -8,10 +8,10 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" blackbox_config "github.com/prometheus/blackbox_exporter/config" "github.com/prometheus/blackbox_exporter/prober" "github.com/prometheus/common/model" diff --git a/internal/static/integrations/v2/blackbox_exporter/blackbox_exporter.go b/internal/static/integrations/v2/blackbox_exporter/blackbox_exporter.go index 1f4ffdc489..73db0f49f3 100644 --- a/internal/static/integrations/v2/blackbox_exporter/blackbox_exporter.go +++ b/internal/static/integrations/v2/blackbox_exporter/blackbox_exporter.go @@ -2,10 +2,10 @@ package blackbox_exporter_v2 import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/util" blackbox_config "github.com/prometheus/blackbox_exporter/config" "gopkg.in/yaml.v3" ) diff --git a/internal/static/integrations/v2/blackbox_exporter/blackbox_test.go b/internal/static/integrations/v2/blackbox_exporter/blackbox_test.go index 9b798f1ad3..e346bb31bc 100644 --- a/internal/static/integrations/v2/blackbox_exporter/blackbox_test.go +++ b/internal/static/integrations/v2/blackbox_exporter/blackbox_test.go @@ -3,11 +3,11 @@ package blackbox_exporter_v2 import ( "testing" - "github.com/grafana/agent/internal/static/integrations/blackbox_exporter" - "github.com/grafana/agent/internal/static/integrations/v2" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - autoscrape "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" - "github.com/grafana/agent/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/blackbox_exporter" + "github.com/grafana/alloy/internal/static/integrations/v2" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + autoscrape "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/integrations/v2/common" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/stretchr/testify/require" diff --git a/internal/static/integrations/v2/common/metrics.go b/internal/static/integrations/v2/common/metrics.go index 1e83a8bb94..14289acebb 100644 --- a/internal/static/integrations/v2/common/metrics.go +++ b/internal/static/integrations/v2/common/metrics.go @@ -1,7 +1,7 @@ package common import ( - "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" "github.com/prometheus/prometheus/model/labels" ) diff --git a/internal/static/integrations/v2/eventhandler/integration.go b/internal/static/integrations/v2/eventhandler/integration.go index 4453aeefce..78e33e0741 100644 --- a/internal/static/integrations/v2/eventhandler/integration.go +++ b/internal/static/integrations/v2/eventhandler/integration.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2" "github.com/prometheus/prometheus/model/labels" ) diff --git a/internal/static/integrations/v2/integrations.go b/internal/static/integrations/v2/integrations.go index 3c5ba8d3ab..5a5348b233 100644 --- a/internal/static/integrations/v2/integrations.go +++ b/internal/static/integrations/v2/integrations.go @@ -25,8 +25,8 @@ import ( "net/url" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" - "github.com/grafana/agent/internal/static/server" + "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/server" "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery/targetgroup" ) diff --git a/internal/static/integrations/v2/metricsutils/metricshandler_integration.go b/internal/static/integrations/v2/metricsutils/metricshandler_integration.go index 1978619091..fe9cbeba7e 100644 --- a/internal/static/integrations/v2/metricsutils/metricshandler_integration.go +++ b/internal/static/integrations/v2/metricsutils/metricshandler_integration.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/log" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" - "github.com/grafana/agent/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/integrations/v2/common" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" diff --git a/internal/static/integrations/v2/metricsutils/metricshandler_integration_test.go b/internal/static/integrations/v2/metricsutils/metricshandler_integration_test.go index 643b2ff25b..c45d653d52 100644 --- a/internal/static/integrations/v2/metricsutils/metricshandler_integration_test.go +++ b/internal/static/integrations/v2/metricsutils/metricshandler_integration_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/model/labels" diff --git a/internal/static/integrations/v2/metricsutils/versionshim.go b/internal/static/integrations/v2/metricsutils/versionshim.go index 75908ec9ce..230cdbeeca 100644 --- a/internal/static/integrations/v2/metricsutils/versionshim.go +++ b/internal/static/integrations/v2/metricsutils/versionshim.go @@ -9,10 +9,10 @@ import ( "github.com/go-kit/log" "github.com/prometheus/common/model" - v1 "github.com/grafana/agent/internal/static/integrations" - v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" - "github.com/grafana/agent/internal/util" + v1 "github.com/grafana/alloy/internal/static/integrations" + v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/util" ) // NewNamedShim returns a v2.UpgradeFunc which will upgrade a v1.Config to a diff --git a/internal/static/integrations/v2/register.go b/internal/static/integrations/v2/register.go index 30e8064174..5b68b1b3b0 100644 --- a/internal/static/integrations/v2/register.go +++ b/internal/static/integrations/v2/register.go @@ -8,9 +8,9 @@ import ( "gopkg.in/yaml.v2" - v1 "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/v2/common" - "github.com/grafana/agent/internal/util" + v1 "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/util" ) var ( diff --git a/internal/static/integrations/v2/register_test.go b/internal/static/integrations/v2/register_test.go index 5515910229..a3962a2d23 100644 --- a/internal/static/integrations/v2/register_test.go +++ b/internal/static/integrations/v2/register_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/go-kit/log" - v1 "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/v2/common" + v1 "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/v2/common" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/internal/static/integrations/v2/snmp_exporter/snmp.go b/internal/static/integrations/v2/snmp_exporter/snmp.go index dc78dad5ed..df6bee98b9 100644 --- a/internal/static/integrations/v2/snmp_exporter/snmp.go +++ b/internal/static/integrations/v2/snmp_exporter/snmp.go @@ -7,10 +7,10 @@ import ( "path" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/static/integrations/snmp_exporter" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" diff --git a/internal/static/integrations/v2/snmp_exporter/snmp_exporter.go b/internal/static/integrations/v2/snmp_exporter/snmp_exporter.go index bea9d944de..842dfc014b 100644 --- a/internal/static/integrations/v2/snmp_exporter/snmp_exporter.go +++ b/internal/static/integrations/v2/snmp_exporter/snmp_exporter.go @@ -3,9 +3,9 @@ package snmp_exporter_v2 import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/snmp_exporter" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/snmp_exporter" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" snmp_config "github.com/prometheus/snmp_exporter/config" ) diff --git a/internal/static/integrations/v2/subsystem.go b/internal/static/integrations/v2/subsystem.go index ce501b37c6..6f8572ef6a 100644 --- a/internal/static/integrations/v2/subsystem.go +++ b/internal/static/integrations/v2/subsystem.go @@ -1,8 +1,8 @@ package integrations import ( - "github.com/grafana/agent/internal/static/integrations/v2/autoscrape" - "github.com/grafana/agent/internal/static/metrics" + "github.com/grafana/alloy/internal/static/integrations/v2/autoscrape" + "github.com/grafana/alloy/internal/static/metrics" ) const ( diff --git a/internal/static/integrations/v2/subsystem_test.go b/internal/static/integrations/v2/subsystem_test.go index ddc223b736..33c5fc4adf 100644 --- a/internal/static/integrations/v2/subsystem_test.go +++ b/internal/static/integrations/v2/subsystem_test.go @@ -3,8 +3,8 @@ package integrations import ( "testing" - v1 "github.com/grafana/agent/internal/static/integrations" - "github.com/grafana/agent/internal/static/integrations/v2/common" + v1 "github.com/grafana/alloy/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations/v2/common" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/internal/static/integrations/v2/utils.go b/internal/static/integrations/v2/utils.go index 138cf18b0c..7da61b5628 100644 --- a/internal/static/integrations/v2/utils.go +++ b/internal/static/integrations/v2/utils.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" ) // FuncIntegration is a function that implements Integration. diff --git a/internal/static/integrations/v2/vmware_exporter/vmware_exporter.go b/internal/static/integrations/v2/vmware_exporter/vmware_exporter.go index 257ed80812..c4a98614e0 100644 --- a/internal/static/integrations/v2/vmware_exporter/vmware_exporter.go +++ b/internal/static/integrations/v2/vmware_exporter/vmware_exporter.go @@ -6,9 +6,9 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/common" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/common" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" "github.com/grafana/vmware_exporter/vsphere" config_util "github.com/prometheus/common/config" ) diff --git a/internal/static/integrations/vmware_exporter/vmware_exporter.go b/internal/static/integrations/vmware_exporter/vmware_exporter.go index b84e209d97..329c562ea3 100644 --- a/internal/static/integrations/vmware_exporter/vmware_exporter.go +++ b/internal/static/integrations/vmware_exporter/vmware_exporter.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations" "github.com/grafana/vmware_exporter/vsphere" config_util "github.com/prometheus/common/config" ) diff --git a/internal/static/integrations/windows_exporter/config.go b/internal/static/integrations/windows_exporter/config.go index f3c3cadafe..6803c4f986 100644 --- a/internal/static/integrations/windows_exporter/config.go +++ b/internal/static/integrations/windows_exporter/config.go @@ -2,9 +2,9 @@ package windows_exporter //nolint:golint import ( "github.com/go-kit/log" - "github.com/grafana/agent/internal/static/integrations" - integrations_v2 "github.com/grafana/agent/internal/static/integrations/v2" - "github.com/grafana/agent/internal/static/integrations/v2/metricsutils" + "github.com/grafana/alloy/internal/static/integrations" + integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2" + "github.com/grafana/alloy/internal/static/integrations/v2/metricsutils" ) func init() { diff --git a/internal/static/integrations/windows_exporter/windows_exporter.go b/internal/static/integrations/windows_exporter/windows_exporter.go index 55d02ac496..c4b9daaaeb 100644 --- a/internal/static/integrations/windows_exporter/windows_exporter.go +++ b/internal/static/integrations/windows_exporter/windows_exporter.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations/config" + "github.com/grafana/alloy/internal/static/integrations/config" ) // Integration is the windows_exporter integration. On non-Windows platforms, diff --git a/internal/static/integrations/windows_exporter/windows_exporter_windows.go b/internal/static/integrations/windows_exporter/windows_exporter_windows.go index 83faf6c27d..5ca468cf85 100644 --- a/internal/static/integrations/windows_exporter/windows_exporter_windows.go +++ b/internal/static/integrations/windows_exporter/windows_exporter_windows.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/static/integrations" + "github.com/grafana/alloy/internal/static/integrations" "github.com/prometheus-community/windows_exporter/pkg/collector" ) diff --git a/internal/static/logs/logs.go b/internal/static/logs/logs.go index 8dd2035341..a35da83f89 100644 --- a/internal/static/logs/logs.go +++ b/internal/static/logs/logs.go @@ -4,7 +4,7 @@ package logs import ( _ "time/tzdata" // embed timezone data - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/useragent" "github.com/grafana/loki/clients/pkg/promtail/client" "github.com/grafana/loki/clients/pkg/promtail/config" "github.com/grafana/loki/clients/pkg/promtail/server" diff --git a/internal/static/metrics/agent.go b/internal/static/metrics/agent.go index 6ef123c1ec..cb7f610842 100644 --- a/internal/static/metrics/agent.go +++ b/internal/static/metrics/agent.go @@ -9,10 +9,10 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/static/metrics/cluster" - "github.com/grafana/agent/internal/static/metrics/cluster/client" - "github.com/grafana/agent/internal/static/metrics/instance" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/metrics/cluster" + "github.com/grafana/alloy/internal/static/metrics/cluster/client" + "github.com/grafana/alloy/internal/static/metrics/instance" + "github.com/grafana/alloy/internal/util" ) // DefaultConfig is the default settings for the Prometheus-lite client. diff --git a/internal/static/metrics/agent_test.go b/internal/static/metrics/agent_test.go index 2d1d063b20..7669723743 100644 --- a/internal/static/metrics/agent_test.go +++ b/internal/static/metrics/agent_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/grafana/agent/internal/static/metrics/instance" + "github.com/grafana/alloy/internal/static/metrics/instance" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/internal/static/metrics/cluster/client/client.go b/internal/static/metrics/cluster/client/client.go index b4180ab3b0..03cb8de175 100644 --- a/internal/static/metrics/cluster/client/client.go +++ b/internal/static/metrics/cluster/client/client.go @@ -4,7 +4,7 @@ import ( "flag" "reflect" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/grafana/dskit/grpcclient" ) diff --git a/internal/static/metrics/cluster/config.go b/internal/static/metrics/cluster/config.go index f51a529c04..6774ac80a5 100644 --- a/internal/static/metrics/cluster/config.go +++ b/internal/static/metrics/cluster/config.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/grafana/agent/internal/static/metrics/cluster/client" - flagutil "github.com/grafana/agent/internal/util" - util_log "github.com/grafana/agent/internal/util/log" + "github.com/grafana/alloy/internal/static/metrics/cluster/client" + flagutil "github.com/grafana/alloy/internal/util" + util_log "github.com/grafana/alloy/internal/util/log" "github.com/grafana/dskit/kv" "github.com/grafana/dskit/ring" ) diff --git a/internal/static/metrics/instance/instance.go b/internal/static/metrics/instance/instance.go index db8e22109c..59b3380901 100644 --- a/internal/static/metrics/instance/instance.go +++ b/internal/static/metrics/instance/instance.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/useragent" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/model/relabel" "github.com/prometheus/prometheus/scrape" diff --git a/internal/static/metrics/wal/wal_test.go b/internal/static/metrics/wal/wal_test.go index 14bc252ff0..8563b0b400 100644 --- a/internal/static/metrics/wal/wal_test.go +++ b/internal/static/metrics/wal/wal_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/value" diff --git a/internal/static/server/config.go b/internal/static/server/config.go index ce5ffa99e8..5a85a79997 100644 --- a/internal/static/server/config.go +++ b/internal/static/server/config.go @@ -3,7 +3,7 @@ package server import ( "flag" - "github.com/grafana/agent/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging" "github.com/grafana/dskit/log" ) diff --git a/internal/static/server/server.go b/internal/static/server/server.go index adae8c6a30..ffaae930f7 100644 --- a/internal/static/server/server.go +++ b/internal/static/server/server.go @@ -1,7 +1,7 @@ // Package server implements the HTTP and gRPC server used throughout Grafana // Agent. // -// It is a grafana/agent-specific fork of github.com/weaveworks/common/server. +// It is a grafana/alloy-specific fork of github.com/weaveworks/common/server. package server import ( diff --git a/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor.go b/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor.go index 0624e1a54d..303f5d89f8 100644 --- a/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor.go +++ b/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/log" - util_log "github.com/grafana/agent/internal/util/log" + util_log "github.com/grafana/alloy/internal/util/log" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor_test.go b/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor_test.go index b02b7ba7f9..c4dc12ba4c 100644 --- a/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor_test.go +++ b/internal/static/traces/automaticloggingprocessor/automaticloggingprocessor_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/grafana/agent/internal/static/logs" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/logs" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "gopkg.in/yaml.v3" diff --git a/internal/static/traces/automaticloggingprocessor/factory.go b/internal/static/traces/automaticloggingprocessor/factory.go index bab898f972..0e2e753ebe 100644 --- a/internal/static/traces/automaticloggingprocessor/factory.go +++ b/internal/static/traces/automaticloggingprocessor/factory.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/grafana/agent/internal/static/logs" + "github.com/grafana/alloy/internal/static/logs" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/processor" diff --git a/internal/static/traces/config.go b/internal/static/traces/config.go index 12aa4c784e..2c98e7bda0 100644 --- a/internal/static/traces/config.go +++ b/internal/static/traces/config.go @@ -11,7 +11,7 @@ import ( "strings" "time" - promsdconsumer "github.com/grafana/agent/internal/static/traces/promsdprocessor/consumer" + promsdconsumer "github.com/grafana/alloy/internal/static/traces/promsdprocessor/consumer" "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" @@ -40,14 +40,14 @@ import ( "go.uber.org/multierr" "gopkg.in/yaml.v2" - "github.com/grafana/agent/internal/static/logs" - "github.com/grafana/agent/internal/static/traces/automaticloggingprocessor" - "github.com/grafana/agent/internal/static/traces/noopreceiver" - "github.com/grafana/agent/internal/static/traces/promsdprocessor" - "github.com/grafana/agent/internal/static/traces/pushreceiver" - "github.com/grafana/agent/internal/static/traces/remotewriteexporter" - "github.com/grafana/agent/internal/static/traces/servicegraphprocessor" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/static/logs" + "github.com/grafana/alloy/internal/static/traces/automaticloggingprocessor" + "github.com/grafana/alloy/internal/static/traces/noopreceiver" + "github.com/grafana/alloy/internal/static/traces/promsdprocessor" + "github.com/grafana/alloy/internal/static/traces/pushreceiver" + "github.com/grafana/alloy/internal/static/traces/remotewriteexporter" + "github.com/grafana/alloy/internal/static/traces/servicegraphprocessor" + "github.com/grafana/alloy/internal/util" ) const ( diff --git a/internal/static/traces/config_test.go b/internal/static/traces/config_test.go index fb8443abab..eb95372b22 100644 --- a/internal/static/traces/config_test.go +++ b/internal/static/traces/config_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/grafana/agent/internal/static/traces/pushreceiver" + "github.com/grafana/alloy/internal/static/traces/pushreceiver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" diff --git a/internal/static/traces/promsdprocessor/consumer/consumer.go b/internal/static/traces/promsdprocessor/consumer/consumer.go index a5825196d6..d3660558ee 100644 --- a/internal/static/traces/promsdprocessor/consumer/consumer.go +++ b/internal/static/traces/promsdprocessor/consumer/consumer.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" "github.com/prometheus/common/model" "go.opentelemetry.io/collector/client" otelcomponent "go.opentelemetry.io/collector/component" diff --git a/internal/static/traces/promsdprocessor/consumer/consumer_test.go b/internal/static/traces/promsdprocessor/consumer/consumer_test.go index 87730834d7..758b4095e5 100644 --- a/internal/static/traces/promsdprocessor/consumer/consumer_test.go +++ b/internal/static/traces/promsdprocessor/consumer/consumer_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" - "github.com/grafana/agent/internal/component/discovery" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/component/discovery" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/consumer/consumertest" diff --git a/internal/static/traces/promsdprocessor/prom_sd_processor.go b/internal/static/traces/promsdprocessor/prom_sd_processor.go index c88bfbca33..181a8a05e9 100644 --- a/internal/static/traces/promsdprocessor/prom_sd_processor.go +++ b/internal/static/traces/promsdprocessor/prom_sd_processor.go @@ -6,9 +6,9 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/component/discovery" - promsdconsumer "github.com/grafana/agent/internal/static/traces/promsdprocessor/consumer" - util "github.com/grafana/agent/internal/util/log" + "github.com/grafana/alloy/internal/component/discovery" + promsdconsumer "github.com/grafana/alloy/internal/static/traces/promsdprocessor/consumer" + util "github.com/grafana/alloy/internal/util/log" "github.com/prometheus/prometheus/config" promdiscovery "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/internal/static/traces/promsdprocessor/prom_sd_processor_test.go b/internal/static/traces/promsdprocessor/prom_sd_processor_test.go index 1c703a2220..3641168149 100644 --- a/internal/static/traces/promsdprocessor/prom_sd_processor_test.go +++ b/internal/static/traces/promsdprocessor/prom_sd_processor_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-kit/log" - "github.com/grafana/agent/internal/component/discovery" + "github.com/grafana/alloy/internal/component/discovery" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/static/traces/servicegraphprocessor/processor.go b/internal/static/traces/servicegraphprocessor/processor.go index b99648f38e..95c2ff36dd 100644 --- a/internal/static/traces/servicegraphprocessor/processor.go +++ b/internal/static/traces/servicegraphprocessor/processor.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - util "github.com/grafana/agent/internal/util/log" + util "github.com/grafana/alloy/internal/util/log" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/internal/static/traces/servicegraphprocessor/processor_test.go b/internal/static/traces/servicegraphprocessor/processor_test.go index d2ba70f4b0..6337d17053 100644 --- a/internal/static/traces/servicegraphprocessor/processor_test.go +++ b/internal/static/traces/servicegraphprocessor/processor_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/static/traces/traceutils" + "github.com/grafana/alloy/internal/static/traces/traceutils" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" diff --git a/internal/static/traces/traceutils/server.go b/internal/static/traces/traceutils/server.go index f22c445953..9ad1ed2a08 100644 --- a/internal/static/traces/traceutils/server.go +++ b/internal/static/traces/traceutils/server.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/grafana/agent/internal/util" + "github.com/grafana/alloy/internal/util" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" diff --git a/internal/tools/docs_generator/compatible_components_page.go b/internal/tools/docs_generator/compatible_components_page.go index 960294ea4b..35689df5be 100644 --- a/internal/tools/docs_generator/compatible_components_page.go +++ b/internal/tools/docs_generator/compatible_components_page.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/grafana/agent/internal/component/metadata" + "github.com/grafana/alloy/internal/component/metadata" "golang.org/x/exp/maps" ) diff --git a/internal/tools/docs_generator/docs_generator.go b/internal/tools/docs_generator/docs_generator.go index 071f80eb50..9a9f33fddf 100644 --- a/internal/tools/docs_generator/docs_generator.go +++ b/internal/tools/docs_generator/docs_generator.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/metadata" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/component/metadata" ) type DocsGenerator interface { diff --git a/internal/tools/docs_generator/docs_updated_test.go b/internal/tools/docs_generator/docs_updated_test.go index 3c45abe4df..65358f908a 100644 --- a/internal/tools/docs_generator/docs_updated_test.go +++ b/internal/tools/docs_generator/docs_updated_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/grafana/agent/internal/component" - _ "github.com/grafana/agent/internal/component/all" - "github.com/grafana/agent/internal/component/metadata" - generator "github.com/grafana/agent/internal/tools/docs_generator" + "github.com/grafana/alloy/internal/component" + _ "github.com/grafana/alloy/internal/component/all" + "github.com/grafana/alloy/internal/component/metadata" + generator "github.com/grafana/alloy/internal/tools/docs_generator" "github.com/stretchr/testify/require" ) diff --git a/internal/tools/docs_generator/links_to_types.go b/internal/tools/docs_generator/links_to_types.go index e6960fe83b..4a49fd45f7 100644 --- a/internal/tools/docs_generator/links_to_types.go +++ b/internal/tools/docs_generator/links_to_types.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/grafana/agent/internal/component/metadata" + "github.com/grafana/alloy/internal/component/metadata" ) type LinksToTypesGenerator struct { diff --git a/internal/usagestats/reporter.go b/internal/usagestats/reporter.go index a175e154b9..b5d37c55c1 100644 --- a/internal/usagestats/reporter.go +++ b/internal/usagestats/reporter.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/agentseed" + "github.com/grafana/alloy/internal/alloyseed" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/multierror" ) @@ -21,7 +21,7 @@ var ( type Reporter struct { logger log.Logger - agentSeed *agentseed.AgentSeed + seed *alloyseed.Seed lastReport time.Time } @@ -36,14 +36,14 @@ func NewReporter(logger log.Logger) (*Reporter, error) { // Start inits the reporter seed and start sending report for every interval func (rep *Reporter) Start(ctx context.Context, metricsFunc func() map[string]interface{}) error { level.Info(rep.logger).Log("msg", "running usage stats reporter") - rep.agentSeed = agentseed.Get() + rep.seed = alloyseed.Get() // check every minute if we should report. ticker := time.NewTicker(reportCheckInterval) defer ticker.Stop() // find when to send the next report. - next := nextReport(reportInterval, rep.agentSeed.CreatedAt, time.Now()) + next := nextReport(reportInterval, rep.seed.CreatedAt, time.Now()) if rep.lastReport.IsZero() { // if we never reported assumed it was the last interval. rep.lastReport = next.Add(-reportInterval) @@ -77,7 +77,7 @@ func (rep *Reporter) reportUsage(ctx context.Context, interval time.Time, metric }) var errs multierror.MultiError for backoff.Ongoing() { - if err := sendReport(ctx, rep.agentSeed, interval, metrics); err != nil { + if err := sendReport(ctx, rep.seed, interval, metrics); err != nil { level.Info(rep.logger).Log("msg", "failed to send usage report", "retries", backoff.NumRetries(), "err", err) errs.Add(err) backoff.Wait() diff --git a/internal/usagestats/reporter_test.go b/internal/usagestats/reporter_test.go index bbe3c14f8f..54e71aea16 100644 --- a/internal/usagestats/reporter_test.go +++ b/internal/usagestats/reporter_test.go @@ -61,7 +61,7 @@ func Test_ReportLoop(t *testing.T) { for _, uid := range agentIDs { require.Equal(t, first, uid) } - require.Equal(t, first, r.agentSeed.UID) + require.Equal(t, first, r.seed.UID) } func Test_NextReport(t *testing.T) { diff --git a/internal/usagestats/stats.go b/internal/usagestats/stats.go index 33fffd157e..aa73068e2b 100644 --- a/internal/usagestats/stats.go +++ b/internal/usagestats/stats.go @@ -10,8 +10,8 @@ import ( "runtime" "time" - "github.com/grafana/agent/internal/agentseed" - "github.com/grafana/agent/internal/useragent" + "github.com/grafana/alloy/internal/alloyseed" + "github.com/grafana/alloy/internal/useragent" "github.com/prometheus/common/version" ) @@ -32,7 +32,7 @@ type Report struct { DeployMode string `json:"deployMode"` } -func sendReport(ctx context.Context, seed *agentseed.AgentSeed, interval time.Time, metrics map[string]interface{}) error { +func sendReport(ctx context.Context, seed *alloyseed.Seed, interval time.Time, metrics map[string]interface{}) error { report := Report{ UsageStatsID: seed.UID, CreatedAt: seed.CreatedAt, diff --git a/internal/useragent/useragent.go b/internal/useragent/useragent.go index 1c6739fb50..10eb4fce6f 100644 --- a/internal/useragent/useragent.go +++ b/internal/useragent/useragent.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/grafana/agent/internal/build" + "github.com/grafana/alloy/internal/build" ) const ( diff --git a/internal/useragent/useragent_test.go b/internal/useragent/useragent_test.go index 6a94fe0b28..3502ec2137 100644 --- a/internal/useragent/useragent_test.go +++ b/internal/useragent/useragent_test.go @@ -3,7 +3,7 @@ package useragent import ( "testing" - "github.com/grafana/agent/internal/build" + "github.com/grafana/alloy/internal/build" "github.com/stretchr/testify/require" ) diff --git a/internal/util/test_logger.go b/internal/util/test_logger.go index a158953af2..9a9795ee64 100644 --- a/internal/util/test_logger.go +++ b/internal/util/test_logger.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-kit/log" - "github.com/grafana/agent/internal/flow/logging" + "github.com/grafana/alloy/internal/flow/logging" "github.com/stretchr/testify/require" ) diff --git a/internal/util/testappender/testappender.go b/internal/util/testappender/testappender.go index 0417329000..88bd00a70f 100644 --- a/internal/util/testappender/testappender.go +++ b/internal/util/testappender/testappender.go @@ -5,7 +5,7 @@ package testappender import ( "fmt" - "github.com/grafana/agent/internal/util/testappender/internal/dtobuilder" + "github.com/grafana/alloy/internal/util/testappender/internal/dtobuilder" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/exemplar" diff --git a/internal/util/testappender/testappender_test.go b/internal/util/testappender/testappender_test.go index 797f4cfde9..db291fbc56 100644 --- a/internal/util/testappender/testappender_test.go +++ b/internal/util/testappender/testappender_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/grafana/agent/internal/util/testappender" + "github.com/grafana/alloy/internal/util/testappender" "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/metadata" diff --git a/internal/util/wildcard/match_test.go b/internal/util/wildcard/match_test.go index eb0728530b..f99b57e4c9 100644 --- a/internal/util/wildcard/match_test.go +++ b/internal/util/wildcard/match_test.go @@ -19,7 +19,7 @@ package wildcard_test import ( "testing" - "github.com/grafana/agent/internal/util/wildcard" + "github.com/grafana/alloy/internal/util/wildcard" ) // TestMatch - Tests validate the logic of wild card matching. diff --git a/internal/util/zapadapter/zapadapter_test.go b/internal/util/zapadapter/zapadapter_test.go index c0881ed4ba..8b6747740d 100644 --- a/internal/util/zapadapter/zapadapter_test.go +++ b/internal/util/zapadapter/zapadapter_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/agent/internal/util/zapadapter" + "github.com/grafana/alloy/internal/util/zapadapter" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/internal/vcs/git_test.go b/internal/vcs/git_test.go index a7614eb950..6ec47fa6d8 100644 --- a/internal/vcs/git_test.go +++ b/internal/vcs/git_test.go @@ -6,7 +6,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/config" - "github.com/grafana/agent/internal/vcs" + "github.com/grafana/alloy/internal/vcs" "github.com/stretchr/testify/require" ) diff --git a/internal/web/api/api.go b/internal/web/api/api.go index f57806c951..a6e34dc38e 100644 --- a/internal/web/api/api.go +++ b/internal/web/api/api.go @@ -10,9 +10,9 @@ import ( "path" "github.com/gorilla/mux" - "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/service" - "github.com/grafana/agent/internal/service/cluster" + "github.com/grafana/alloy/internal/component" + "github.com/grafana/alloy/internal/service" + "github.com/grafana/alloy/internal/service/cluster" "github.com/prometheus/prometheus/util/httputil" ) diff --git a/internal/web/ui/ui.go b/internal/web/ui/ui.go index 82a910415f..3e7ff81ce0 100644 --- a/internal/web/ui/ui.go +++ b/internal/web/ui/ui.go @@ -31,7 +31,7 @@ import ( // invoked after all other routes have been registered. // // RegisterRoutes is not intended for public use and will only work properly -// when called from github.com/grafana/agent. +// when called from github.com/grafana/alloy. func RegisterRoutes(pathPrefix string, router *mux.Router) { if !strings.HasSuffix(pathPrefix, "/") { pathPrefix = pathPrefix + "/" diff --git a/operations/river-jsonnet/README.md b/operations/river-jsonnet/README.md index aaac13d610..3e5466c3f3 100644 --- a/operations/river-jsonnet/README.md +++ b/operations/river-jsonnet/README.md @@ -34,7 +34,7 @@ the literal River expression `env("HOME")`. ## Example ```jsonnet -local river = import 'github.com/grafana/agent/operations/river-jsonnet/main.libsonnet'; +local river = import 'github.com/grafana/alloy/operations/river-jsonnet/main.libsonnet'; river.manifestRiver({ attr_1: "Hello, world!", diff --git a/tools/gen-crd-docs/config.json b/tools/gen-crd-docs/config.json index 8ae1e273e8..b7791c157c 100644 --- a/tools/gen-crd-docs/config.json +++ b/tools/gen-crd-docs/config.json @@ -32,8 +32,8 @@ "docsURLTemplate": "https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/client#Object" }, { - "typeMatchPrefix": "^github\\.com/grafana/agent/internal/static/operator/assets\\.SecretStore$", - "docsURLTemplate": "https://pkg.go.dev/github.com/grafana/agent/internal/static/operator/assets#SecretStore" + "typeMatchPrefix": "^github\\.com/grafana/alloy/internal/static/operator/assets\\.SecretStore$", + "docsURLTemplate": "https://pkg.go.dev/github.com/grafana/alloy/internal/static/operator/assets#SecretStore" } ], "typeDisplayNamePrefixOverrides": {