Skip to content

Prometheus fix standard port in TLS deploy #541

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 3 commits into from
Jan 5, 2021
Merged

Prometheus fix standard port in TLS deploy #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf8bd53
Fix prom standard port
Gsantomaggio Jan 4, 2021
6e3d098
fix standard port for prometheus
Gsantomaggio Jan 4, 2021
db1c792
Add
Gsantomaggio Jan 5, 2021
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
9 changes: 9 additions & 0 deletions internal/resource/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ func (builder *ServerConfigMapBuilder) Update(object runtime.Object) error {
if _, err := defaultSection.NewKey("management.tcp.port", "15672"); err != nil {
return err
}

if _, err := defaultSection.NewKey("prometheus.tcp.port", "15692"); err != nil {
return err
}
}
if builder.Instance.AdditionalPluginEnabled("rabbitmq_mqtt") {
if _, err := defaultSection.NewKey("mqtt.listeners.ssl.default", "8883"); err != nil {
Expand Down Expand Up @@ -138,6 +142,11 @@ func (builder *ServerConfigMapBuilder) Update(object runtime.Object) error {
if _, err := defaultSection.NewKey("management.ssl.cacertfile", caCertPath); err != nil {
return err
}

if _, err := defaultSection.NewKey("prometheus.ssl.cacertfile", caCertPath); err != nil {
return err
}

if builder.Instance.AdditionalPluginEnabled("rabbitmq_web_mqtt") {
if _, err := defaultSection.NewKey("web_mqtt.ssl.port", "15676"); err != nil {
return err
Expand Down
10 changes: 10 additions & 0 deletions internal/resource/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

management.tcp.port = 15672
prometheus.tcp.port = 15692

`)

Expand Down Expand Up @@ -286,6 +287,7 @@ prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
prometheus.ssl.port = 15691

management.tcp.port = 15672
prometheus.tcp.port = 15692

mqtt.listeners.ssl.default = 8883

Expand Down Expand Up @@ -319,9 +321,13 @@ prometheus.ssl.port = 15691

management.tcp.port = 15672

prometheus.tcp.port = 15692

ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
ssl_options.verify = verify_peer
management.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
prometheus.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt

`)

Expect(configMapBuilder.Update(configMap)).To(Succeed())
Expand Down Expand Up @@ -351,10 +357,13 @@ management.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
prometheus.ssl.port = 15691

management.tcp.port = 15672
prometheus.tcp.port = 15692

ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
ssl_options.verify = verify_peer
management.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt

prometheus.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt

web_mqtt.ssl.port = 15676
web_mqtt.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
Expand Down Expand Up @@ -491,6 +500,7 @@ listeners.tcp = none
ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
ssl_options.verify = verify_peer
management.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
prometheus.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt

web_mqtt.ssl.port = 15676
web_mqtt.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
Expand Down