Skip to content
Snippets Groups Projects
Commit 5f74726b authored by Will Chandler's avatar Will Chandler Committed by DJ Mountney
Browse files

Move TLS below Prometheus in Praefect config

When both TLS and Prometheus are enabled in Praefect, the
'prometheus_listen_addr' setting is placed in the '[tls]' block.
This stops prometheus from being enabled.

This change move prometheus above the so this cannot occur.
parent c343526e
No related branches found
No related tags found
No related merge requests found
---
title: Move TLS below Prometheus in Praefect config
merge_request: 4575
author:
type: fixed
Loading
Loading
@@ -9,14 +9,6 @@
listen_addr = '<%= @listen_addr %>'
<% end %>
 
<% if @tls_listen_addr %>
# Optional: listen on a secure TCP socket
tls_listen_addr = '<%= @tls_listen_addr %>'
[tls]
certificate_path = '<%= @certificate_path %>'
key_path = '<%= @key_path %>'
<% end %>
<% if @socket_path %>
# # Praefect can listen on a socket when placed on the same machine as all clients
socket_path = '<%= @socket_path %>'
Loading
Loading
@@ -27,6 +19,14 @@ socket_path = '<%= @socket_path %>'
prometheus_listen_addr = '<%= @prometheus_listen_addr %>'
<% end %>
 
<% if @tls_listen_addr %>
# Optional: listen on a secure TCP socket
tls_listen_addr = '<%= @tls_listen_addr %>'
[tls]
certificate_path = '<%= @certificate_path %>'
key_path = '<%= @key_path %>'
<% end %>
[reconciliation]
<%= "scheduling_interval = '#{@reconciliation_scheduling_interval}'" if @reconciliation_scheduling_interval %>
<%= "histogram_buckets = #{@reconciliation_histogram_buckets}" if @reconciliation_histogram_buckets %>
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment