Skip to content

Commit

Permalink
Make sure the default for EnforceMetricName is ✅ (grafana#518)
Browse files Browse the repository at this point in the history
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
  • Loading branch information
gouthamve authored Apr 26, 2019
1 parent b85609e commit 199746a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
3 changes: 0 additions & 3 deletions cmd/loki/loki-local-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,3 @@ storage_config:

filesystem:
directory: /tmp/loki/chunks

limits_config:
enforce_metric_name: false
3 changes: 3 additions & 0 deletions cmd/loki/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ func main() {
flagext.RegisterFlags(&cfg)
flag.Parse()

// The flags set the EnforceMetricName to be true, but in loki it _should_ be false.
cfg.LimitsConfig.EnforceMetricName = false

util.InitLogger(&cfg.Server)

if configFile != "" {
Expand Down
2 changes: 0 additions & 2 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ config:
# prefix: ""
# httpclienttimeout: "20s"
# consistentreads: true
limits_config:
enforce_metric_name: false
schema_config:
configs:
- from: 0
Expand Down
4 changes: 0 additions & 4 deletions production/ksonnet/loki/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
grpc_server_max_recv_msg_size: 1024 * 1024 * 64,
},

limits_config: {
enforce_metric_name: false,
},

ingester: {
chunk_idle_period: '15m',

Expand Down

0 comments on commit 199746a

Please sign in to comment.