update for 2.2 release (#3477)

grafana · Mar 11, 2021 · 9c470d4 · 9c470d4
1 parent 612933b
commit 9c470d4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet
@@ -1,5 +1,5 @@
 {
   _images+:: {
-    loki_canary: 'grafana/loki-canary:2.1.0',
+    loki_canary: 'grafana/loki-canary:2.2.0',
   },
 }
diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet
@@ -4,7 +4,7 @@
     memcached: 'memcached:1.5.17-alpine',
     memcachedExporter: 'prom/memcached-exporter:v0.6.0',
 
-    loki: 'grafana/loki:2.1.0',
+    loki: 'grafana/loki:2.2.0',
 
     distributor: self.loki,
     ingester: self.loki,

diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet
@@ -1,6 +1,6 @@
 {
   _images+:: {
-    promtail: 'grafana/promtail:2.1.0',
+    promtail: 'grafana/promtail:2.2.0',
   },
 
   _config+:: {

diff --git a/tools/promtail.sh b/tools/promtail.sh
@@ -6,7 +6,7 @@ INSTANCEURL="${3:-}"
 NAMESPACE="${4:-default}"
 CONTAINERROOT="${5:-/var/lib/docker}"
 PARSER="${6:-- docker:}"
-VERSION="${PROMTAIL_VERSION:-2.1.0}"
+VERSION="${PROMTAIL_VERSION:-2.2.0}"
 
 if [ -z "$INSTANCEID" -o -z "$APIKEY" -o -z "$INSTANCEURL" -o -z "$NAMESPACE" -o -z "$CONTAINERROOT" -o -z "$PARSER" ]; then
     echo "usage: $0 <instanceId> <apiKey> <url> [<namespace>[<container_root_path>[<parser>]]]"