Make sure the default for EnforceMetricName is ✅ (grafana#518)

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
udyvish · Apr 26, 2019 · 199746a · 199746a
1 parent b85609e
commit 199746a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/cmd/loki/loki-local-config.yaml b/cmd/loki/loki-local-config.yaml
@@ -27,6 +27,3 @@ storage_config:
 
   filesystem:
     directory: /tmp/loki/chunks
-
-limits_config:
-  enforce_metric_name: false
diff --git a/cmd/loki/main.go b/cmd/loki/main.go
@@ -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 != "" {

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -32,8 +32,6 @@ config:
       #     prefix: ""
       #     httpclienttimeout: "20s"
       #     consistentreads: true
-  limits_config:
-    enforce_metric_name: false
   schema_config:
     configs:
     - from: 0

diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet
@@ -29,10 +29,6 @@
         grpc_server_max_recv_msg_size: 1024 * 1024 * 64,
       },
 
-      limits_config: {
-        enforce_metric_name: false,
-      },
-
       ingester: {
         chunk_idle_period: '15m',