dannykopping/autodeploy key

.circleci/config.yml

@@ -40,7 +40,7 @@ workflows:
 # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
 .defaults: &defaults
   docker:
-    - image: grafana/loki-build-image:0.13.0
+    - image: grafana/loki-build-image:0.19.0
   working_directory: /src/loki
 
 jobs:

.drone/drone.jsonnet

@@ -14,6 +14,11 @@ local condition(verb) = {
         ],
     },
   },
+  path(path): {
+    paths: {
+      [verb]: [path],
+    },
+  },
 };
 
 local pipeline(name) = {
@@ -39,7 +44,7 @@ local pull_secret = secret('dockerconfigjson', 'secret/data/common/gcr', '.docke
 local github_secret = secret('github_token', 'infra/data/ci/github/grafanabot', 'pat');
 
 // Injected in a secret because this is a public repository and having the config here would leak our environment names
-local deploy_configuration = secret('deploy_config', 'infra/data/ci/loki/deploy', 'config.json');
+local deploy_configuration = secret('deploy_config', 'common/loki/ci/autodeploy', 'config.json');
 
 
 local run(name, commands) = {
@@ -310,12 +315,35 @@ local manifest(apps) = pipeline('manifest') {
 };
 
 [
+  pipeline('loki-build-image') {
+    workspace: {
+      base: '/src',
+      path: 'loki',
+    },
+    steps: [
+      {
+        name: 'push-image',
+        image: 'plugins/docker',
+        when: condition('include').tagMain + condition('include').path('loki-build-image/**'),
+        settings: {
+          repo: 'grafana/loki-build-image',
+          context: 'loki-build-image',
+          dockerfile: 'loki-build-image/Dockerfile',
+          username: { from_secret: docker_username_secret.name },
+          password: { from_secret: docker_password_secret.name },
+          tags: ['0.20.0'],
+          dry_run: false,
+        },
+      },
+    ],
+  },
   pipeline('check') {
     workspace: {
       base: '/src',
       path: 'loki',
     },
     steps: [
+      make('check-drone-drift', container=false) { depends_on: ['clone'] },
       make('check-generated-files', container=false) { depends_on: ['clone'] },
       make('test', container=false) { depends_on: ['clone', 'check-generated-files'] },
       make('lint', container=false) { depends_on: ['clone', 'check-generated-files'] },
@@ -325,7 +353,7 @@ local manifest(apps) = pipeline('manifest') {
         image: 'koalaman/shellcheck-alpine:stable',
         commands: ['apk add make bash && make lint-scripts'],
       },
-      make('loki', container=false) { depends_on: ['clone'] },
+      make('loki', container=false) { depends_on: ['clone', 'check-generated-files'] },
       make('validate-example-configs', container=false) { depends_on: ['loki'] },
       make('check-example-config-doc', container=false) { depends_on: ['clone'] },
     ],

.drone/drone.yml

@@ -1,34 +1,73 @@
 ---
 kind: pipeline
+name: loki-build-image
+steps:
+- image: plugins/docker
+  name: push-image
+  settings:
+    context: loki-build-image
+    dockerfile: loki-build-image/Dockerfile
+    dry_run: false
+    password:
+      from_secret: docker_password
+    repo: grafana/loki-build-image
+    tags:
+    - 0.20.0
+    username:
+      from_secret: docker_username
+  when:
+    paths:
+      include:
+      - loki-build-image/**
+    ref:
+      include:
+      - refs/heads/main
+      - refs/heads/k??
+      - refs/tags/v*
+trigger:
+  event:
+  - push
+  - pull_request
+workspace:
+  base: /src
+  path: loki
+---
+kind: pipeline
 name: check
 steps:
+- commands:
+  - make BUILD_IN_CONTAINER=false check-drone-drift
+  depends_on:
+  - clone
+  image: grafana/loki-build-image:0.20.0
+  name: check-drone-drift
 - commands:
   - make BUILD_IN_CONTAINER=false check-generated-files
   depends_on:
   - clone
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: check-generated-files
 - commands:
   - make BUILD_IN_CONTAINER=false test
   depends_on:
   - clone
   - check-generated-files
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: test
 - commands:
   - make BUILD_IN_CONTAINER=false lint
   depends_on:
   - clone
   - check-generated-files
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: lint
 - commands:
   - make BUILD_IN_CONTAINER=false check-mod
   depends_on:
   - clone
   - test
   - lint
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: check-mod
 - commands:
   - apk add make bash && make lint-scripts
@@ -38,19 +77,20 @@ steps:
   - make BUILD_IN_CONTAINER=false loki
   depends_on:
   - clone
-  image: grafana/loki-build-image:0.18.0
+  - check-generated-files
+  image: grafana/loki-build-image:0.20.0
   name: loki
 - commands:
   - make BUILD_IN_CONTAINER=false validate-example-configs
   depends_on:
   - loki
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: validate-example-configs
 - commands:
   - make BUILD_IN_CONTAINER=false check-example-config-doc
   depends_on:
   - clone
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: check-example-config-doc
 trigger:
   event:
@@ -84,7 +124,7 @@ node:
 steps:
 - commands:
   - go test -mod=vendor -bench=Benchmark -benchtime 20x -timeout 120m ./pkg/...
-  image: grafana/loki-build-image:0.18.0
+  image: grafana/loki-build-image:0.20.0
   name: All
 trigger:
   cron:
@@ -1025,6 +1065,6 @@ kind: secret
 name: deploy_config
 ---
 kind: signature
-hmac: 615276ab546179d2261b1af22830b968afe2e437463f22ac86a349fca3c86428
+hmac: 6d010031b5c18947ac4710106d06f119e77d715ddc687983227700254b27e6d8
 
 ...

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Main
 
+
+* [5356](https://github.com/grafana/loki/pull/5356) **jbschami**: Enhance lambda-promtail to support adding extra labels from an environment variable value
+* [5392](https://github.com/grafana/loki/pull/5392) **MichelHollands**: Etcd credentials are parsed as secrets instead of plain text now.
+* [5361](https://github.com/grafana/loki/pull/5361) **ctovena**: Add usage report to grafana.com.
 * [5289](https://github.com/grafana/loki/pull/5289) **ctovena**: Fix deduplication bug in queries when mutating labels.
 * [5302](https://github.com/grafana/loki/pull/5302) **MasslessParticle** Update azure blobstore client to use new sdk.
 * [5243](https://github.com/grafana/loki/pull/5290) **ssncferreira**: Update Promtail to support duration string formats.
@@ -20,7 +24,7 @@
 * [5081](https://github.com/grafana/loki/pull/5081) **SasSwart**: Add the option to configure memory ballast for Loki
 * [5085](https://github.com/grafana/loki/pull/5085) **aknuds1**: Upgrade Cortex to [e0807c4eb487](https://github.com/cortexproject/cortex/compare/4e9fc3a2b5ab..e0807c4eb487) and Prometheus to [692a54649ed7](https://github.com/prometheus/prometheus/compare/2a3d62ac8456..692a54649ed7)
 * [5067](https://github.com/grafana/loki/pull/5057) **cstyan**: Add a metric to Azure Blob Storage client to track total egress bytes
-* [5056](https://github.com/grafana/loki/pull/5056) **AndreZiviani**: lambda-promtail: Add ability to ingest logs from S3
+* [5065](https://github.com/grafana/loki/pull/5065) **AndreZiviani**: lambda-promtail: Add ability to ingest logs from S3
 * [4950](https://github.com/grafana/loki/pull/4950) **DylanGuedes**: Implement common instance addr/net interface
 * [4949](https://github.com/grafana/loki/pull/4949) **ssncferreira**: Add query `queueTime` metric to statistics and metrics.go
 * [4938](https://github.com/grafana/loki/pull/4938) **DylanGuedes**: Implement ring status page for the distributor
@@ -54,6 +58,9 @@
 * [5204](https://github.com/grafana/loki/pull/5204) **trevorwhitney**: Default `max_outstanding_per_tenant` to `2048`
 * [5253](https://github.com/grafana/loki/pull/5253) **Juneezee**: refactor: use `T.TempDir` to create temporary test directory
 * [5315](https://github.com/grafana/loki/pull/5315) **bboreham**: filters: use faster regexp package
+* [5393](https://github.com/grafana/loki/pull/5393) **sandeepsukhani**: jsonnet: move boltdb-shipper configs set as compactor args to yaml config
+* [5450](https://github.com/grafana/loki/pull/5450) **BenoitKnecht**: pkg/ruler/base: Add external_labels option
+* [5484](https://github.com/grafana/loki/pull/5450) **sandeepsukhani**: Add support for per user index query readiness with limits overrides
 
 # 2.4.1 (2021/11/07)