Enable limited_log_push_errors by default.

grafana · Apr 3, 2024 · 579bc58 · 579bc58
1 parent fbb8686
commit 579bc58
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/pkg/loki/runtime_config.go b/pkg/loki/runtime_config.go
@@ -42,7 +42,11 @@ func (r runtimeConfigValues) validate() error {
 }
 
 func loadRuntimeConfig(r io.Reader) (interface{}, error) {
-	overrides := &runtimeConfigValues{}
+	overrides := &runtimeConfigValues{
+		DefaultConfig: &runtime.Config{
+			LimitedLogPushErrors: true,
+		},
+	}
 
 	decoder := yaml.NewDecoder(r)
 	decoder.SetStrict(true)

diff --git a/pkg/loki/runtime_config_test.go b/pkg/loki/runtime_config_test.go
@@ -84,6 +84,29 @@ overrides:
 	require.Equal(t, "invalid override for tenant 29: retention period must be >= 24h was 5h", err.Error())
 }
 
+func Test_DefaultValuesWithoutDefaultSectionHelp(t *testing.T) {
+	runtimeGetter := newTestRuntimeconfig(t,
+		`
+configs:
+    "1":
+        log_push_request: false
+        limited_log_push_errors: false
+    "2":
+        log_push_request: true
+`)
+
+	user1 := runtimeGetter.TenantConfig("1")
+	user2 := runtimeGetter.TenantConfig("2")
+	user3 := runtimeGetter.TenantConfig("3")
+
+	require.Equal(t, false, user1.LogPushRequest)
+	require.Equal(t, false, user1.LimitedLogPushErrors)
+	require.Equal(t, false, user2.LimitedLogPushErrors)
+	require.Equal(t, true, user2.LogPushRequest)
+	require.Equal(t, true, user3.LimitedLogPushErrors)
+	require.Equal(t, false, user3.LogPushRequest)
+}
+
 func Test_DefaultConfig(t *testing.T) {
 	runtimeGetter := newTestRuntimeconfig(t,
 		`