Skip to content

Add support for prometheus TLS #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 28, 2020
Merged

Add support for prometheus TLS #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7803fe7
Add support for prometheus TLS
Gsantomaggio Dec 23, 2020
d153a50
Change prometheus annotation
Gsantomaggio Dec 23, 2020
eebd2ab
Add tests for prometheus TLS
Gsantomaggio Dec 24, 2020
97ce18d
Add space
Gsantomaggio Dec 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/resource/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ listeners.ssl.default = 5671
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691
`
caCertPath = "/etc/rabbitmq-tls/ca.crt"
tlsCertPath = "/etc/rabbitmq-tls/tls.crt"
Expand Down
37 changes: 36 additions & 1 deletion internal/resource/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,13 @@ listeners.ssl.default = 5671
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671
management.tcp.port = 15672

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

management.tcp.port = 15672

`)

Expect(configMapBuilder.Update(configMap)).To(Succeed())
Expand All @@ -274,6 +280,11 @@ listeners.ssl.default = 5671
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

management.tcp.port = 15672

mqtt.listeners.ssl.default = 8883
Expand Down Expand Up @@ -301,6 +312,11 @@ listeners.ssl.default = 5671
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

management.tcp.port = 15672

ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
Expand Down Expand Up @@ -329,6 +345,11 @@ management.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

management.tcp.port = 15672

ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
Expand Down Expand Up @@ -376,6 +397,10 @@ management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

listeners.tcp = none
`)

Expand Down Expand Up @@ -410,6 +435,11 @@ listeners.ssl.default = 5671
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

listeners.tcp = none

mqtt.listeners.ssl.default = 8883
Expand Down Expand Up @@ -451,6 +481,11 @@ listeners.ssl.default = 5671
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
management.ssl.port = 15671

prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

listeners.tcp = none

ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
Expand Down
15 changes: 12 additions & 3 deletions internal/resource/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,14 @@ func sortVolumeMounts(mounts []corev1.VolumeMount) {

func (builder *StatefulSetBuilder) podTemplateSpec(previousPodAnnotations map[string]string) corev1.PodTemplateSpec {
// default pod annotations used for prometheus metrics
prometheusPort := "15692"
if builder.Instance.DisableNonTLSListeners() {
prometheusPort = "15691"
}

defaultPodAnnotations := map[string]string{
"prometheus.io/scrape": "true",
"prometheus.io/port": "15692",
"prometheus.io/port": prometheusPort,
}

//Init Container resources
Expand Down Expand Up @@ -711,6 +716,10 @@ func (builder *StatefulSetBuilder) updateContainerPorts() []corev1.ContainerPort
Name: "management-tls",
ContainerPort: 15671,
},
corev1.ContainerPort{
Name: "prometheus-tls",
ContainerPort: 15691,
},
)

// enable tls ports for plugins
Expand Down Expand Up @@ -763,8 +772,8 @@ func (builder *StatefulSetBuilder) updateContainerPortsOnlyTLSListeners() []core
ContainerPort: 15671,
},
{
Name: "prometheus",
ContainerPort: 15692,
Name: "prometheus-tls",
ContainerPort: 15691,
},
}

Expand Down
8 changes: 4 additions & 4 deletions internal/resource/statefulset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,8 @@ var _ = Describe("StatefulSet", func() {
ContainerPort: 4369,
},
{
Name: "prometheus",
ContainerPort: 15692,
Name: "prometheus-tls",
ContainerPort: 15691,
},
{
Name: "amqps",
Expand All @@ -731,8 +731,8 @@ var _ = Describe("StatefulSet", func() {
ContainerPort: 4369,
},
{
Name: "prometheus",
ContainerPort: 15692,
Name: "prometheus-tls",
ContainerPort: 15691,
},
{
Name: "amqps",
Expand Down