From d12482fcd6b30f33833f23eb28964726f306e566 Mon Sep 17 00:00:00 2001 From: Juan Ariza Toledano Date: Thu, 8 Aug 2019 16:43:18 +0200 Subject: [PATCH] [stable/rabbitmq] Improve NOTES.txt (#16185) Signed-off-by: juan131 --- stable/rabbitmq/Chart.yaml | 2 +- stable/rabbitmq/README.md | 1 + stable/rabbitmq/templates/NOTES.txt | 11 +++++++++++ stable/rabbitmq/templates/statefulset.yaml | 2 +- stable/rabbitmq/values-production.yaml | 2 ++ stable/rabbitmq/values.yaml | 2 ++ 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml index f2b51663a9..7007bb3c6e 100644 --- a/stable/rabbitmq/Chart.yaml +++ b/stable/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 6.2.4 +version: 6.2.5 appVersion: 3.7.17 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/stable/rabbitmq/README.md b/stable/rabbitmq/README.md index 39acc920a9..105cc74f85 100644 --- a/stable/rabbitmq/README.md +++ b/stable/rabbitmq/README.md @@ -130,6 +130,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `metrics.serviceMonitor.relabellings`| Specify Metric Relabellings to add to the scrape endpoint | `nil` | | `metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels. | `false` | | `metrics.serviceMonitor.additionalLabels`| Used to pass Labels that are required by the Installed Prometheus Operator | `{}` | +| `metrics.port` | Prometheus metrics exporter port | `9090` | | `metrics.env` | Exporter [configuration environment variables](https://github.com/kbudde/rabbitmq_exporter#configuration) | `{}` | | `metrics.resources` | Exporter resource requests/limit | `nil` | | `metrics.capabilities` | Exporter: Comma-separated list of extended [scraping capabilities supported by the target RabbitMQ server](https://github.com/kbudde/rabbitmq_exporter#extended-rabbitmq-capabilities) | `bert,no_sort` | diff --git a/stable/rabbitmq/templates/NOTES.txt b/stable/rabbitmq/templates/NOTES.txt index f879b5e16e..c0981042c6 100644 --- a/stable/rabbitmq/templates/NOTES.txt +++ b/stable/rabbitmq/templates/NOTES.txt @@ -58,6 +58,17 @@ To Access the RabbitMQ Management interface: {{- end }} +{{- if .Values.metrics.enabled }} + +To access the RabbitMQ Prometheus metrics, get the RabbitMQ Prometheus exporter URL by running: + + echo "Prometheus Metrics URL: http://127.0.0.1:{{ .Values.metrics.port }}/metrics" + kubectl port-forward --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }}-0 {{ .Values.metrics.port }}:{{ .Values.metrics.port }} + +Then, open the URL obtained in a browser. + +{{- end }} + {{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment. diff --git a/stable/rabbitmq/templates/statefulset.yaml b/stable/rabbitmq/templates/statefulset.yaml index d6d5a7c018..b95a589367 100644 --- a/stable/rabbitmq/templates/statefulset.yaml +++ b/stable/rabbitmq/templates/statefulset.yaml @@ -256,7 +256,7 @@ spec: {{- end }} ports: - name: metrics - containerPort: 9090 + containerPort: {{ .Values.metrics.port }} livenessProbe: httpGet: path: /metrics diff --git a/stable/rabbitmq/values-production.yaml b/stable/rabbitmq/values-production.yaml index 287b1770a9..d55a38a74a 100644 --- a/stable/rabbitmq/values-production.yaml +++ b/stable/rabbitmq/values-production.yaml @@ -311,6 +311,8 @@ metrics: ## environment variables to configure rabbitmq_exporter ## ref: https://github.com/kbudde/rabbitmq_exporter#configuration env: {} + ## Metrics exporter port + port: 9090 ## Comma-separated list of extended scraping capabilities supported by the target RabbitMQ server ## ref: https://github.com/kbudde/rabbitmq_exporter#extended-rabbitmq-capabilities capabilities: "bert,no_sort" diff --git a/stable/rabbitmq/values.yaml b/stable/rabbitmq/values.yaml index d6fbaa3eda..bd7805301f 100644 --- a/stable/rabbitmq/values.yaml +++ b/stable/rabbitmq/values.yaml @@ -307,6 +307,8 @@ metrics: ## environment variables to configure rabbitmq_exporter ## ref: https://github.com/kbudde/rabbitmq_exporter#configuration env: {} + ## Metrics exporter port + port: 9090 ## Comma-separated list of extended scraping capabilities supported by the target RabbitMQ server ## ref: https://github.com/kbudde/rabbitmq_exporter#extended-rabbitmq-capabilities capabilities: "bert,no_sort"