diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml index 9356625f8..e1a7151ee 100644 --- a/rabbitmq/Chart.yaml +++ b/rabbitmq/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v3.9.0 description: OpenStack-Helm RabbitMQ name: rabbitmq -version: 0.1.31 +version: 0.1.32 home: https://github.com/rabbitmq/rabbitmq-server ... diff --git a/rabbitmq/templates/configmap-etc.yaml b/rabbitmq/templates/configmap-etc.yaml index cfa3171ce..7544a1c04 100644 --- a/rabbitmq/templates/configmap-etc.yaml +++ b/rabbitmq/templates/configmap-etc.yaml @@ -65,6 +65,16 @@ data: {{ include "rabbitmq.utils.to_rabbit_config" $envAll.Values.conf.rabbit_additonal_conf | indent 4 }} {{- end }} +{{- if .Values.conf.rabbit_advanced_config.enabled }} + advanced.config: | + [ + {rabbit, [ + {default_consumer_prefetch, {false,{{ .Values.conf.rabbit_advanced_config.default_consumer_prefetch }}}} + ] + } + ]. +{{- end }} + {{- $erlvm_scheduler_num := include "get_erlvm_scheduler_num" .Values.pod.resources.server.limits.cpu }} {{- $erlvm_scheduler_conf := printf "+S %s:%s" $erlvm_scheduler_num $erlvm_scheduler_num }} {{- if .Values.manifests.config_ipv6 }} diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml index e2c7ab5e1..a931750a1 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -280,6 +280,12 @@ spec: mountPath: /etc/rabbitmq/rabbitmq.conf subPath: rabbitmq.conf readOnly: true +{{- if .Values.conf.rabbit_advanced_config.enabled }} + - name: rabbitmq-etc + mountPath: /etc/rabbitmq/advanced.config + subPath: advanced.config + readOnly: true +{{- end }} - name: rabbitmq-etc mountPath: /etc/rabbitmq/rabbitmq-env.conf subPath: rabbitmq-env.conf diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 097e555aa..e427b2654 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -212,6 +212,9 @@ conf: # This confinguration is used for non TLS deployments management.listener.ip: "::" management.listener.port: null + rabbit_advanced_config: + enabled: false + default_consumer_prefetch: 250 rabbitmq_exporter: rabbit_timeout: 30 # Feature Flags is introduced in RabbitMQ 3.8.0 diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml index 350bad637..468556e19 100644 --- a/releasenotes/notes/rabbitmq.yaml +++ b/releasenotes/notes/rabbitmq.yaml @@ -31,4 +31,5 @@ rabbitmq: - 0.1.29 Add build-in prometheus plugin and disable external exporter - 0.1.30 Add labels to rabbitmq service - 0.1.31 Support management api metrics collection + - 0.1.32 Enable addition of default consumer prefetch count ...