Update Cortex to latest master (grafana#1869)

* Update Cortex to master Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Fix compilation errors after Cortex update. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Update to Cortex v1.0.0-rc.0 Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Added missing vendored file. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Vendor Cortex 1.0.0 Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Configuration changes. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Mention Cortex 1.0 changes and link to docs. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com> * Fix jsonnet files, and mention fields that were removed. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
mraboosk · Apr 14, 2020 · 136a909 · 136a909
1 parent e28c319
commit 136a909
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -63,8 +63,8 @@ config:
       #   consul:
       #     host: "consul:8500"
       #     prefix: ""
-      #     httpclienttimeout: "20s"
-      #     consistentreads: true
+      #     http_client_timeout: "20s"
+      #     consistent_reads: true
   limits_config:
     enforce_metric_name: false
     reject_old_samples: true

diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
@@ -127,11 +127,11 @@ config:
 
     backoff_config:
       # Initial backoff time between retries
-      minbackoff: 100ms
+      min_period: 100ms
       # Maximum backoff time between retries
-      maxbackoff: 5s
+      max_period: 5s
       # Maximum number of retries when sending batches, 0 means infinite retries
-      maxretries: 20
+      max_retries: 20
 
     # The labels to add to any time series or alerts when communicating with loki
     external_labels: {}