fix(operator): Use correct field name for remote write client timeout (…

…#11928)
grafana · Aug 29, 2024 · 08870cf · 08870cf
1 parent b40e063
commit 08870cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Main
 
+- [11928](https://github.com/grafana/loki/pull/11928) **periklis**: Fix remote write client timeout config rename
 - [12097](https://github.com/grafana/loki/pull/12097) **btaani**: Fix encoding of blocked query pattern in configuration
 - [12106](https://github.com/grafana/loki/pull/12106) **xperimental**: Allow setting explicit CredentialMode in LokiStack storage spec
 - [11968](https://github.com/grafana/loki/pull/11968) **xperimental**: Extend status to show difference between running and ready

diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go
@@ -857,7 +857,7 @@ ruler:
     client:
       name: remote-write-me
       url: http://remote.write.me
-      timeout: 10s
+      remote_timeout: 10s
       proxy_url: http://proxy.through.me
       follow_redirects: true
       headers:
@@ -1215,7 +1215,7 @@ ruler:
     client:
       name: remote-write-me
       url: http://remote.write.me
-      timeout: 10s
+      remote_timeout: 10s
       proxy_url: http://proxy.through.me
       follow_redirects: true
       headers:
@@ -1574,7 +1574,7 @@ ruler:
     client:
       name: remote-write-me
       url: http://remote.write.me
-      timeout: 10s
+      remote_timeout: 10s
       proxy_url: http://proxy.through.me
       follow_redirects: true
       headers:
@@ -2314,7 +2314,7 @@ ruler:
     client:
       name: remote-write-me
       url: http://remote.write.me
-      timeout: 10s
+      remote_timeout: 10s
       proxy_url: http://proxy.through.me
       follow_redirects: true
       headers:
@@ -3079,7 +3079,7 @@ ruler:
     client:
       name: remote-write-me
       url: http://remote.write.me
-      timeout: 10s
+      remote_timeout: 10s
       proxy_url: http://proxy.through.me
       follow_redirects: true
       headers:

diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml
@@ -356,7 +356,7 @@ ruler:
       {{- with .Client }}
       name: {{ .Name }}
       url: {{ .URL }}
-      timeout: {{ .RemoteTimeout }}
+      remote_timeout: {{ .RemoteTimeout }}
       proxy_url: {{ .ProxyURL }}
       follow_redirects: {{ .FollowRedirects }}
       headers: