grafana
diff --git a/‎cmd/loki/loki-local-config.yaml
+3 b/‎cmd/loki/loki-local-config.yaml
+3
diff --git a/‎cmd/loki/main.go
+1 b/‎cmd/loki/main.go
+1
diff --git a/‎docs/Makefile
+1 b/‎docs/Makefile
+1
diff --git a/‎docs/sources/get-started/_index.md
+2 b/‎docs/sources/get-started/_index.md
+2
diff --git a/‎docs/sources/get-started/quick-start.md
+12 b/‎docs/sources/get-started/quick-start.md
+12
diff --git a/‎docs/sources/reference/loki-http-api.md
+11 b/‎docs/sources/reference/loki-http-api.md
+11
diff --git a/‎docs/sources/release-notes/_index.md
+1-1 b/‎docs/sources/release-notes/_index.md
+1-1
diff --git a/‎docs/sources/send-data/otel/_index.md
+2-2 b/‎docs/sources/send-data/otel/_index.md
+2-2
diff --git a/‎docs/sources/setup/install/helm/install-monolithic/_index.md
+2-2 b/‎docs/sources/setup/install/helm/install-monolithic/_index.md
+2-2
diff --git a/‎docs/sources/setup/install/helm/reference.md
+39 b/‎docs/sources/setup/install/helm/reference.md
+39
diff --git a/‎docs/sources/shared/configuration.md
+51 b/‎docs/sources/shared/configuration.md
+51
diff --git a/‎pkg/bloombuild/builder/builder.go
+50 b/‎pkg/bloombuild/builder/builder.go
+50
diff --git a/‎pkg/bloombuild/builder/config.go
+21 b/‎pkg/bloombuild/builder/config.go
+21
diff --git a/‎pkg/bloombuild/builder/metrics.go
+26 b/‎pkg/bloombuild/builder/metrics.go
+26
@@ -33,6 +33,9 @@ schema_config:
         prefix: index_
         period: 24h
 
+pattern_ingester:
+  enabled: true
+
 ruler:
   alertmanager_url: http://localhost:9093
 
 
@@ -118,6 +118,7 @@ func main() {
 	}
 
 	level.Info(util_log.Logger).Log("msg", "Starting Loki", "version", version.Info())
+	level.Info(util_log.Logger).Log("msg", "Loading configuration file", "filename", config.ConfigFile)
 
 	err = t.Run(loki.RunOpts{StartTime: startTime})
 	util_log.CheckFatal("running loki", err, util_log.Logger)
 
@@ -10,6 +10,7 @@ include docs.mk
 PODMAN := $(shell if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)
 BUILD_IN_CONTAINER ?= true
 
+.PHONY: sources/setup/install/helm/reference.md
 sources/setup/install/helm/reference.md: ../production/helm/loki/reference.md.gotmpl ../production/helm/loki/values.yaml
 ifeq ($(BUILD_IN_CONTAINER),true)
 	$(PODMAN) run --rm --volume "$(realpath ..):/helm-docs" -u "$$(id -u)" "docker.io/jnorwood/helm-docs:v1.11.0" \
 
@@ -7,6 +7,8 @@ description: Provides an overview of the steps for implementing Grafana Loki to
 
 # Get started with Grafana Loki
 
+{{< youtube id="1uk8LtQqsZQ" >}}
+
 Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. It does not index the contents of the logs, but rather a set of labels for each log stream.
 
 Because all Loki implementations are unique, the installation process is
 
@@ -22,6 +22,18 @@ The Docker Compose configuration instantiates the following components, each in
 
 {{< figure max-width="75%" src="/media/docs/loki/get-started-flog-v3.png" caption="Getting started sample application" alt="Getting started sample application">}}
 
+## Interactive Learning Environment
+
+{{< admonition type="note" >}}
+The Interactive Learning Environment is currently in trial. Please provide feedback, report bugs, and raise issues in the [Grafana Killercoda Repository](https://github.com/grafana/killercoda).
+{{< /admonition >}}
+
+Try out this demo within our interactive learning environment: [Loki Quickstart Sandbox](https://killercoda.com/grafana-labs/course/loki/loki-quickstart) 
+
+- A free Killercoda account is required to verify you are not a bot.
+- Tutorial instructions are located on the left-hand side of the screen. Click to move on to the next section.
+- All commands run inside the interactive terminal. Grafana can also be accessed via the URL links provided within the sandbox.  
+
 ## Installing Loki and collecting sample logs
 
 Prerequisites
 
@@ -24,6 +24,7 @@ Authorization needs to be done separately, for example, using an open-source loa
 These endpoints are exposed by the `distributor`, `write`, and `all` components:
 
 - [`POST /loki/api/v1/push`](#ingest-logs)
+- [`POST /otlp/v1/logs`](#ingest-logs-using-otlp)
 
 A [list of clients]({{< relref "../send-data" >}}) can be found in the clients documentation.
 
@@ -260,6 +261,16 @@ curl -H "Content-Type: application/json" \
   --data-raw '{"streams": [{ "stream": { "foo": "bar2" }, "values": [ [ "1570818238000000000", "fizzbuzz" ] ] }]}'
 ```
 
+## Ingest logs using OTLP
+
+```bash
+POST /otlp/v1/logs
+```
+
+`/otlp/v1/logs` lets the OpenTelemetry Collector send logs to Loki using `otlphttp` procotol.
+
+For information on how to configure Loki, refer to the [OTel Collector topic](https://grafana.com/docs/loki/<LOKI_VERSION>/send-data/otel/).
+
 ## Query logs at a single point in time
 
 ```bash
 
@@ -8,7 +8,7 @@ weight: 100
 Release notes for Loki are in the CHANGELOG for the release and
 listed here by version number.
 
-- [V3.0 release notes](https://grafana.com/docs/loki/<LOKI_VERSION>/release-notes/v3.0/)
+- [V3.0 release notes](https://grafana.com/docs/loki/<LOKI_VERSION>/release-notes/v3-0/)
 - [V2.9 release notes](https://grafana.com/docs/loki/<LOKI_VERSION>/release-notes/v2-9/)
 - [V2.8 release notes](https://grafana.com/docs/loki/<LOKI_VERSION>/release-notes/v2-8/)
 - [V2.7 release notes](https://grafana.com/docs/loki/<LOKI_VERSION>/release-notes/v2-7/)
 
@@ -30,7 +30,7 @@ You need to make the following changes to the [OpenTelemetry Collector config](h
 ```yaml
 exporters:
   otlphttp:
-    endpoint: http://<loki-addr>:3100/otlp
+    endpoint: http://<loki-addr>:3100/otlp/v1/logs
 ```
 
 And enable it in `service.pipelines`:
@@ -57,7 +57,7 @@ exporters:
   otlphttp:
     auth:
       authenticator: basicauth/otlp
-    endpoint: http://<loki-addr>:3100/otlp
+    endpoint: http://<loki-addr>:3100/otlp/v1/logs
 
 service:
   extensions: [basicauth/otlp]
 
@@ -47,7 +47,7 @@ If you set the `singleBinary.replicas` value to 2 or more, this chart configures
           type: 'filesystem'
         schemaConfig:
           configs:
-          - from: 2024-01-01
+          - from: "2024-01-01"
             store: tsdb
             index:
               prefix: loki_index_
@@ -72,7 +72,7 @@ If you set the `singleBinary.replicas` value to 2 or more, this chart configures
           replication_factor: 3
         schemaConfig:
           configs:
-          - from: 2024-01-01
+          - from: "2024-01-01"
             store: tsdb
             index:
               prefix: loki_index_
 
@@ -315,6 +315,7 @@ This is the generated reference for the Loki Helm Chart values.
   "initContainers": [],
   "nodeSelector": {},
   "persistence": {
+    "annotations": {},
     "dataVolumeParameters": {
       "emptyDir": {}
     },
@@ -512,6 +513,15 @@ null
 			<td><pre lang="json">
 {}
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>backend.persistence.annotations</td>
+			<td>object</td>
+			<td>Annotations for volume claim</td>
+			<td><pre lang="json">
+{}
+</pre>
 </td>
 		</tr>
 		<tr>
@@ -6226,6 +6236,7 @@ false
   "drivesPerNode": 2,
   "enabled": false,
   "persistence": {
+    "annotations": {},
     "size": "5Gi"
   },
   "replicas": 1,
@@ -8442,6 +8453,7 @@ false
   "lifecycle": {},
   "nodeSelector": {},
   "persistence": {
+    "annotations": {},
     "enableStatefulSetAutoDeletePVC": true,
     "selector": null,
     "size": "10Gi",
@@ -8653,6 +8665,15 @@ false
 			<td><pre lang="json">
 {}
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>read.persistence.annotations</td>
+			<td>object</td>
+			<td>Annotations for volume claim</td>
+			<td><pre lang="json">
+{}
+</pre>
 </td>
 		</tr>
 		<tr>
@@ -9893,6 +9914,15 @@ null
 			<td><pre lang="json">
 {}
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>singleBinary.persistence.annotations</td>
+			<td>object</td>
+			<td>Annotations for volume claim</td>
+			<td><pre lang="json">
+{}
+</pre>
 </td>
 		</tr>
 		<tr>
@@ -10677,6 +10707,15 @@ null
 			<td><pre lang="json">
 {}
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>write.persistence.annotations</td>
+			<td>object</td>
+			<td>Annotations for volume claim</td>
+			<td><pre lang="json">
+{}
+</pre>
 </td>
 		</tr>
 		<tr>
 
@@ -326,6 +326,37 @@ pattern_ingester:
 # merging them as bloom blocks.
 [bloom_compactor: <bloom_compactor>]
 
+bloom_build:
+  # Flag to enable or disable the usage of the bloom-planner and bloom-builder
+  # components.
+  # CLI flag: -bloom-build.enabled
+  [enabled: <boolean> | default = false]
+
+  planner:
+    # Interval at which to re-run the bloom creation planning.
+    # CLI flag: -bloom-build.planner.interval
+    [planning_interval: <duration> | default = 8h]
+
+    # Newest day-table offset (from today, inclusive) to build blooms for.
+    # Increase to lower cost by not re-writing data to object storage too
+    # frequently since recent data changes more often at the cost of not having
+    # blooms available as quickly.
+    # CLI flag: -bloom-build.planner.min-table-offset
+    [min_table_offset: <int> | default = 1]
+
+    # Oldest day-table offset (from today, inclusive) to compact. This can be
+    # used to lower cost by not trying to compact older data which doesn't
+    # change. This can be optimized by aligning it with the maximum
+    # `reject_old_samples_max_age` setting of any tenant.
+    # CLI flag: -bloom-build.planner.max-table-offset
+    [max_table_offset: <int> | default = 2]
+
+    # Maximum number of tasks to queue per tenant.
+    # CLI flag: -bloom-build.planner.max-tasks-per-tenant
+    [max_queued_tasks_per_tenant: <int> | default = 30000]
+
+  builder:
+
 # Experimental: The bloom_gateway block configures the Loki bloom gateway
 # server, responsible for serving queries for filtering chunks based on filter
 # expressions.
@@ -2947,6 +2978,11 @@ The `limits_config` block configures global and per-tenant limits in Loki. The v
 # CLI flag: -validation.discover-log-levels
 [discover_log_levels: <boolean> | default = true]
 
+# When true an ingester takes into account only the streams that it owns
+# according to the ring while applying the stream limit.
+# CLI flag: -ingester.use-owned-stream-count
+[use_owned_stream_count: <boolean> | default = false]
+
 # Maximum number of active streams per user, per ingester. 0 to disable.
 # CLI flag: -ingester.max-streams-per-user
 [max_streams_per_user: <int> | default = 0]
@@ -3372,6 +3408,21 @@ shard_streams:
 # CLI flag: -bloom-compactor.max-bloom-size
 [bloom_compactor_max_bloom_size: <int> | default = 128MB]
 
+# Experimental. Whether to create blooms for the tenant.
+# CLI flag: -bloom-build.enable
+[bloom_creation_enabled: <boolean> | default = false]
+
+# Experimental. Number of splits to create for the series keyspace when building
+# blooms. The series keyspace is split into this many parts to parallelize bloom
+# creation.
+# CLI flag: -bloom-build.split-keyspace-by
+[bloom_split_series_keyspace_by: <int> | default = 256]
+
+# Experimental. Maximum number of builders to use when building blooms. 0 allows
+# unlimited builders.
+# CLI flag: -bloom-build.max-builders
+[bloom_build_max_builders: <int> | default = 0]
+
 # Experimental. Length of the n-grams created when computing blooms from log
 # lines.
 # CLI flag: -bloom-compactor.ngram-length
 
@@ -0,0 +1,50 @@
+package builder
+
+import (
+	"context"
+
+	"github.com/go-kit/log"
+	"github.com/grafana/dskit/services"
+	"github.com/prometheus/client_golang/prometheus"
+
+	utillog "github.com/grafana/loki/v3/pkg/util/log"
+)
+
+type Worker struct {
+	services.Service
+
+	cfg     Config
+	metrics *Metrics
+	logger  log.Logger
+}
+
+func New(
+	cfg Config,
+	logger log.Logger,
+	r prometheus.Registerer,
+) (*Worker, error) {
+	utillog.WarnExperimentalUse("Bloom Builder", logger)
+
+	w := &Worker{
+		cfg:     cfg,
+		metrics: NewMetrics(r),
+		logger:  logger,
+	}
+
+	w.Service = services.NewBasicService(w.starting, w.running, w.stopping)
+	return w, nil
+}
+
+func (w *Worker) starting(_ context.Context) (err error) {
+	w.metrics.running.Set(1)
+	return err
+}
+
+func (w *Worker) stopping(_ error) error {
+	w.metrics.running.Set(0)
+	return nil
+}
+
+func (w *Worker) running(_ context.Context) error {
+	return nil
+}
@@ -0,0 +1,21 @@
+package builder
+
+import "flag"
+
+// Config configures the bloom-builder component.
+type Config struct {
+	// TODO: Add config
+}
+
+// RegisterFlagsWithPrefix registers flags for the bloom-planner configuration.
+func (cfg *Config) RegisterFlagsWithPrefix(_ string, _ *flag.FlagSet) {
+	// TODO: Register flags with flagsPrefix
+}
+
+func (cfg *Config) Validate() error {
+	return nil
+}
+
+type Limits interface {
+	// TODO: Add limits
+}
@@ -0,0 +1,26 @@
+package builder
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+const (
+	metricsNamespace = "loki"
+	metricsSubsystem = "bloombuilder"
+)
+
+type Metrics struct {
+	running prometheus.Gauge
+}
+
+func NewMetrics(r prometheus.Registerer) *Metrics {
+	return &Metrics{
+		running: promauto.With(r).NewGauge(prometheus.GaugeOpts{
+			Namespace: metricsNamespace,
+			Subsystem: metricsSubsystem,
+			Name:      "running",
+			Help:      "Value will be 1 if the bloom builder is currently running on this instance",
+		}),
+	}
+}
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ func main() {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`level.Info(util_log.Logger).Log("msg", "Starting Loki", "version", version.Info())`
	`121`	`+ level.Info(util_log.Logger).Log("msg", "Loading configuration file", "filename", config.ConfigFile)`
`121`	`122`
`122`	`123`	`err = t.Run(loki.RunOpts{StartTime: startTime})`
`123`	`124`	`util_log.CheckFatal("running loki", err, util_log.Logger)`