Merge pull request grafana#109 from grafana/main

Update from upstream repository

.drone/drone.jsonnet

@@ -137,14 +137,14 @@ local promtail_win() = pipeline('promtail-windows') {
   steps: [
     {
       name: 'identify-runner',
-      image: 'golang:windowsservercore-1809',
+      image: 'golang:1.19-windowsservercore-1809',
       commands: [
         'Write-Output $env:DRONE_RUNNER_NAME',
       ],
     },
     {
       name: 'test',
-      image: 'golang:windowsservercore-1809',
+      image: 'golang:1.19-windowsservercore-1809',
       commands: [
         'go test .\\clients\\pkg\\promtail\\targets\\windows\\... -v',
       ],

.drone/drone.yml

@@ -1279,11 +1279,11 @@ platform:
 steps:
 - commands:
   - Write-Output $env:DRONE_RUNNER_NAME
-  image: golang:windowsservercore-1809
+  image: golang:1.19-windowsservercore-1809
   name: identify-runner
 - commands:
   - go test .\clients\pkg\promtail\targets\windows\... -v
-  image: golang:windowsservercore-1809
+  image: golang:1.19-windowsservercore-1809
   name: test
 trigger:
   ref:
@@ -1675,6 +1675,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: fbc93106cac3a989c4b910682f2e08eadc21786d8502f3270bc2f4a5b1996b21
+hmac: c1930caa8e7ffedf82b641cc1204d87319cddf576efa787d2ef1a86d16c2b9cf
 
 ...

.github/workflows/doc-validator.yml

@@ -17,5 +17,6 @@ jobs:
         run: >
           doc-validator
           --include=$(git config --global --add safe.directory $(realpath .); printf '^docs/sources/(%s)$' "$(git --no-pager diff --name-only --diff-filter=ACMRT origin/${{ github.event.pull_request.base.ref }}...${{ github.event.pull_request.head.sha }} -- docs/sources | sed 's/^docs\/sources\///' | awk -F'\n' '{if(NR == 1) {printf $0} else {printf "|"$0}}')")
+          --skip-image-validation
           ./docs/sources
           /docs/loki/latest

.github/workflows/operator-images.yaml

@@ -47,7 +47,7 @@ jobs:
          ( IFS=$','; echo "${TAGS[*]}" )
 
      - name: Build and publish image on quay.io
-       uses: docker/build-push-action@v2
+       uses: docker/build-push-action@v4
        with:
          context: ./operator
          push: true
@@ -85,7 +85,7 @@ jobs:
          ( IFS=$','; echo "${TAGS[*]}" )
 
      - name: Build and publish image on quay.io
-       uses: docker/build-push-action@v2
+       uses: docker/build-push-action@v4
        with:
          context: ./operator
          file: ./operator/bundle.Dockerfile
@@ -124,7 +124,7 @@ jobs:
          ( IFS=$','; echo "${TAGS[*]}" )
 
      - name: Build and publish image on quay.io
-       uses: docker/build-push-action@v2
+       uses: docker/build-push-action@v4
        with:
          context: ./operator
          file: ./operator/calculator.Dockerfile

.github/workflows/snyk.yml

@@ -0,0 +1,15 @@
+name: Snyk Monitor Scanning
+on:
+ release:
+   types: [published] 
+ push:
+    branches:
+      - 'main' 
+      - 'master'
+ workflow_dispatch:
+
+jobs:
+  snyk-scan-ci:
+    uses: 'grafana/security-github-actions/.github/workflows/snyk_monitor.yml@main'
+    secrets:
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

CHANGELOG.md

@@ -40,7 +40,6 @@
 * [7925](https://github.com/grafana/loki/pull/7925) **sandeepsukhani**: Fix bugs in logs results caching causing query-frontend to return logs outside of query window.
 * [8120](https://github.com/grafana/loki/pull/8120) **ashwanthgoli** fix panic on hitting /scheduler/ring when ring is disabled.
 * [8251](https://github.com/grafana/loki/pull/8251) **sandeepsukhani** index-store: fix indexing of chunks overlapping multiple schemas.
-* [8120](https://github.com/grafana/loki/pull/8232) **TaehyunHwang** Fix version info issue that shows wrong version.
 * [8151](https://github.com/grafana/loki/pull/8151) **sandeepsukhani** fix log deletion with line filters.
 
 ##### Changes
@@ -66,6 +65,12 @@
 
 ##### Changes
 
+#### LogCLI
+
+##### Enhancement
+
+* [8413](https://github.com/grafana/loki/pull/8413) **chaudum**: Try to load tenant-specific `schemaconfig-{orgID}.yaml` when using `--remote-schema` argument and fallback to global `schemaconfig.yaml`.
+
 #### Fluent Bit
 
 #### Loki Canary
@@ -77,6 +82,10 @@
 #### Jsonnet
 * [7923](https://github.com/grafana/loki/pull/7923) **manohar-koukuntla**: Add zone aware ingesters in jsonnet deployment
 
+##### Fixes
+
+* [8247](https://github.com/grafana/loki/pull/8247) **Whyeasy** fix usage of cluster label within Mixin.
+
 #### Build
 
 * [7938](https://github.com/grafana/loki/pull/7938) **ssncferreira**: Add DroneCI pipeline step to validate configuration flags documentation generation.
@@ -85,6 +94,18 @@
 
 ### Dependencies
 
+## 2.7.3 (2023-02-01)
+
+#### Loki
+
+##### Fixes
+
+* [8340](https://github.com/grafana/loki/pull/8340) **MasslessParticle** Fix bug in compactor that caused panics when `startTime` and `endTime` of a delete request are equal.
+
+#### Build
+
+* [8232](https://github.com/grafana/loki/pull/8232) **TaehyunHwang** Fix build issue that caused `--version` to show wrong version for Loki and Promtail binaries.
+
 ## 2.7.2 (2023-01-25)
 
 #### Loki
@@ -185,6 +206,7 @@ Check the history of the branch `release-2.7.x`.
 * [5400](https://github.com/grafana/loki/pull/5400) **BenoitKnecht**: promtail/server: Disable profiling by default
 
 #### Promtail
+* [7470](https://github.com/grafana/loki/pull/7470) **Jack-King**: Add configuration for adding custom HTTP headers to push requests
 
 ##### Enhancements
 * [7593](https://github.com/grafana/loki/pull/7593) **chodges15**: Promtail: Add tenant label to client drop metrics and logs
@@ -285,6 +307,7 @@ Here is the list with the changes that were produced since the previous release.
 ##### Fixes
 * [6034](https://github.com/grafana/loki/pull/6034) **DylanGuedes**: Promtail: Fix symlink tailing behavior.
 ##### Changes
+* [6371](https://github.com/grafana/loki/pull/6371) **witalisoft**: BREAKING: Support more complex match based on multiple extracted data fields in drop stage
 * [5686](https://github.com/grafana/loki/pull/5686) **ssncferreira**: Move promtail StreamLagLabels config to upper level config.Config
 * [5839](https://github.com/grafana/loki/pull/5839) **marctc**: Add ActiveTargets method to promtail
 * [5661](https://github.com/grafana/loki/pull/5661) **masslessparticle**: Invalidate caches on deletes

clients/cmd/docker-driver/config_test.go

@@ -81,7 +81,7 @@ var pipeline = PipelineConfig{
 }
 
 func Test_parsePipeline(t *testing.T) {
-	f, err := os.CreateTemp("/tmp", "Test_parsePipeline")
+	f, err := os.CreateTemp("", "Test_parsePipeline")
 	if err != nil {
 		t.Fatal(err)
 	}

clients/cmd/fluent-bit/dque.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"sync"
 	"time"
 
@@ -25,7 +26,7 @@ type dqueConfig struct {
 }
 
 var defaultDqueConfig = dqueConfig{
-	queueDir:         "/tmp/flb-storage/loki",
+	queueDir:         filepath.Join(os.TempDir(), "flb-storage/loki"),
 	queueSegmentSize: 500,
 	queueSync:        false,
 	queueName:        "dque",

clients/cmd/fluentd/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.5 as build
+FROM ruby:3.2.0 as build
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -9,7 +9,7 @@ COPY . /src/loki
 WORKDIR /src/loki
 RUN make BUILD_IN_CONTAINER=false fluentd-plugin
 
-FROM fluent/fluentd:v1.9.2-debian-1.0
+FROM fluent/fluentd:v1.14.0-debian-1.0
 ENV LOKI_URL "https://logs-prod-us-central1.grafana.net"
 
 COPY --from=build /src/loki/clients/cmd/fluentd/lib/fluent/plugin/out_loki.rb /fluentd/plugins/out_loki.rb

clients/cmd/fluentd/fluent-plugin-grafana-loki.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/grafana/loki/'
   spec.license       = 'Apache-2.0'
 
-  spec.required_ruby_version = '~> 2.7'
+  spec.required_ruby_version = '>= 2.7'
 
   # test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
   #   f.match(%r{^(test|spec|features)/})

clients/cmd/promtail/main.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"reflect"
 	"sync"
+
 	// embed time zone data
 	_ "time/tzdata"