Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-04-02 15:27:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/rabbitmq] feat: servicemonitor and ingress configuration (#6260)

Browse Source 
* feat(rabbitmq): servicemonitor endpoint path configuration

* feat(rabbitmq): use tpl for ingress definition (host & tls)

* style(rabbitmq): remove blank line on ingress annotations

* chore(rabbitmq): bump chart to 8.14.0
This commit is contained in:
AlexisMtr
2021-05-11 11:47:22 +02:00
committed by GitHub
parent 18d525a64b
commit 07ab097836
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/rabbitmq/Chart.yaml
View File

@@ -23,4 +23,4 @@ name: rabbitmq
sources:
- https://github.com/bitnami/bitnami-docker-rabbitmq
- https://www.rabbitmq.com
version: 8.13.1
version: 8.14.0

1
bitnami/rabbitmq/README.md
View File

@@ -252,6 +252,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and
| `metrics.serviceMonitor.namespace` | Namespace which Prometheus is running in | `monitoring` |
| `metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` |
| `metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `nil` |
| `metrics.serviceMonitor.path` | define the path used by ServiceMonitor to scrap metrics | `nil` |
| `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.targetLabels` | Used to keep given service's labels in target | `[]` |

8
bitnami/rabbitmq/templates/ingress.yaml
View File

@@ -10,12 +10,12 @@ metadata:
kubernetes.io/tls-acme: "true"
{{- end }}
{{- if .Values.ingress.annotations }}
{{ include "common.tplvalues.render" (dict "value" .Values.ingress.annotations "context" $) | nindent 4 }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.annotations "context" $) | nindent 4 }}
{{- end }}
spec:
rules:
{{- if .Values.ingress.hostname }}
- host: {{ .Values.ingress.hostname | quote }}
- host: {{ include "common.tplvalues.render" ( dict "value" .Values.ingress.hostname "context" $ ) }}
http:
paths:
{{- if .Values.ingress.extraPaths }}
@@ -28,7 +28,7 @@ spec:
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" .Values.service.managerPortName "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.ingress.extraHosts }}
- host: {{ .name }}
- host: {{ include "common.tplvalues.render" ( dict "value" .name "context" $ ) }}
http:
paths:
- path: {{ default "/" .path }}
@@ -45,7 +45,7 @@ spec:
secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
{{- end }}
{{- if .Values.ingress.extraTls }}
{{- toYaml .Values.ingress.extraTls | nindent 4 }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}

3
bitnami/rabbitmq/templates/servicemonitor.yaml
View File

@@ -27,6 +27,9 @@ spec:
{{- if .Values.metrics.serviceMonitor.relabellings }}
metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.relabellings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.path }}
path: {{ .Values.metrics.serviceMonitor.path }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}

3
bitnami/rabbitmq/values.yaml
View File

@@ -863,6 +863,9 @@ metrics:
## Used to keep given service's labels in target
podTargetLabels:
# - app.kubernetes.io/name
## define the path used by ServiceMonitor to scrap metrics
## could be /metrics for aggragated metrics or /metrics/per-object for more details
# path: /metrics
## Custom PrometheusRule to be defined
## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart