diff --git a/Makefile b/Makefile index 0164d968d5..f681ca3ae3 100644 --- a/Makefile +++ b/Makefile @@ -350,7 +350,7 @@ $(BIN)/mockery: Makefile go.mod $(BIN)/updater: Makefile @mkdir -p $(@D) - GOBIN=$(abspath $(@D)) GOPRIVATE=github.com/grafana/deployment_tools $(GO) install github.com/grafana/deployment_tools/drone/plugins/cmd/updater@d64d509 + GOBIN=$(abspath $(@D)) GOPRIVATE=github.com/grafana/deployment_tools $(GO) install github.com/grafana/deployment_tools/docker/updater/cmd/updater@bd5794b4e488 # Note: When updating the goreleaser version also update .github/workflow/release.yml and .git/workflow/weekly-release.yaml $(BIN)/goreleaser: Makefile go.mod diff --git a/cmd/profilecli/main.go b/cmd/profilecli/main.go index d0fe5d3e5a..82155ee023 100644 --- a/cmd/profilecli/main.go +++ b/cmd/profilecli/main.go @@ -59,6 +59,7 @@ func main() { blocksQueryCmd := blocksCmd.Command("query", "Query on local/remote blocks.") blocksQuerySeriesCmd := blocksQueryCmd.Command("series", "Request series labels on local/remote blocks.") blocksQuerySeriesParams := addBlocksQuerySeriesParams(blocksQuerySeriesCmd) + blocksQueryProfileCmd := blocksQueryCmd.Command("profile", "Request merged profile on local/remote block.").Alias("merge") blocksQueryProfileParams := addBlocksQueryProfileParams(blocksQueryProfileCmd) diff --git a/cmd/profilecli/query-blocks.go b/cmd/profilecli/query-blocks.go index 982478cf2e..bd5fe755d8 100644 --- a/cmd/profilecli/query-blocks.go +++ b/cmd/profilecli/query-blocks.go @@ -49,6 +49,7 @@ func addBlocksQueryParams(queryCmd commander) *blocksQueryParams { return params } + func addBlocksQueryProfileParams(queryCmd commander) *blocksQueryProfileParams { params := new(blocksQueryProfileParams) params.blocksQueryParams = addBlocksQueryParams(queryCmd) @@ -65,6 +66,7 @@ func addBlocksQuerySeriesParams(queryCmd commander) *blocksQuerySeriesParams { return params } + func blocksQueryProfile(ctx context.Context, params *blocksQueryProfileParams) error { level.Info(logger).Log("msg", "blocks query profile", "blockIds", fmt.Sprintf("%v", params.BlockIds), "path", cfg.blocks.path, "bucketName", params.BucketName, "tenantId", params.TenantID, "query", params.Query, "type", params.ProfileType)