diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e7e70e30b106..8a3ad3c91c089 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ * [10733](https://github.com/grafana/loki/pull/10733) **shantanualsi** Add support for case-insensitive logql funtions * [10727](https://github.com/grafana/loki/pull/10727) **sandeepsukhani** Native otlp ingestion support * [11051](https://github.com/grafana/loki/pull/11051) Refactor to not use global logger in modules +* [11146](https://github.com/grafana/loki/pull/11146) **hainenber** Embed LogCLI binary into Loki's CLI for better DevExp. + ##### Fixes * [11074](https://github.com/grafana/loki/pull/11074) **hainenber** Fix panic in lambda-promtail due to mishandling of empty DROP_LABELS env var. diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile index a398eba1682f3..1242bcb4b35e2 100644 --- a/cmd/loki/Dockerfile +++ b/cmd/loki/Dockerfile @@ -2,13 +2,14 @@ FROM golang:1.21.3 as build COPY . /src/loki WORKDIR /src/loki -RUN make clean && make BUILD_IN_CONTAINER=false loki +RUN make clean && make BUILD_IN_CONTAINER=false loki logcli FROM alpine:3.18.3 RUN apk add --no-cache ca-certificates libcap COPY --from=build /src/loki/cmd/loki/loki /usr/bin/loki +COPY --from=build /src/loki/cmd/logcli/logcli /usr/bin/logcli COPY cmd/loki/loki-docker-config.yaml /etc/loki/local-config.yaml RUN addgroup -g 10001 -S loki && \ diff --git a/docs/sources/query/logcli.md b/docs/sources/query/logcli.md index 25f5f26062a7e..920249e986859 100644 --- a/docs/sources/query/logcli.md +++ b/docs/sources/query/logcli.md @@ -14,6 +14,9 @@ LogCLI is the command-line interface to Grafana Loki. It facilitates running [LogQL]({{< relref "../query/_index.md" >}}) queries against a Loki instance. +LogCLI is also installed in Loki's Docker image for quick interaction +in containerized environment. + ## Installation ### Binary (Recommended)