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

[bitnami/*] Fix service monitors selectors (#7720)

Browse Source 
* [bitnami/cassandra] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/elasticsearch] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/external-dns] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/fluentd] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/grafana-tempo] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/grafana] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/influxdb] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/kafka] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/kiam] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/kibana] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/kong] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/kube-state-metrics] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/logstash] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/mariadb-galera] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/memcached] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/nats] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/nginx] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/postgresql-ha] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>

* [bitnami/zookeeper] Fix serviceMonitor selectors

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2021-10-07 11:35:35 +02:00
committed by GitHub
parent ae086acff0
commit 1279593765
43 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/cassandra/Chart.yaml
+1 -1
View File
@@ -23,4 +23,4 @@ name: cassandra
sources:
- https://github.com/bitnami/bitnami-docker-cassandra
- http://cassandra.apache.org
version: 8.0.4
version: 8.0.5
bitnami/cassandra/templates/servicemonitor.yaml
+3 -3
View File
@@ -9,9 +9,6 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -21,6 +18,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: metrics
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/elasticsearch/Chart.yaml
+1 -1
View File
@@ -25,4 +25,4 @@ name: elasticsearch
sources:
- https://github.com/bitnami/bitnami-docker-elasticsearch
- https://www.elastic.co/products/elasticsearch
version: 17.1.0
version: 17.1.1
bitnami/elasticsearch/templates/servicemonitor.yaml
+3 -3
View File
@@ -8,12 +8,12 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: metrics
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: metrics
endpoints:
- port: http-metrics
bitnami/external-dns/Chart.yaml
+1 -1
View File
@@ -24,4 +24,4 @@ sources:
- https://github.com/kubernetes-sigs/external-dns
- https://github.com/bitnami/bitnami-docker-external-dns
- https://github.com/kubernetes-sigs/external-dns
version: 5.4.9
version: 5.4.10
bitnami/external-dns/templates/servicemonitor.yaml
+3 -3
View File
@@ -7,9 +7,6 @@ metadata:
namespace: {{ . }}
{{- end }}
labels: {{ include "external-dns.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.selector }}
{{ toYaml . | nindent 4 }}
{{- end }}
spec:
endpoints:
- port: http
@@ -25,4 +22,7 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels: {{ include "external-dns.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
{{- end }}
bitnami/fluentd/Chart.yaml
+1 -1
View File
@@ -25,4 +25,4 @@ name: fluentd
sources:
- https://github.com/bitnami/bitnami-docker-fluentd
- https://www.fluentd.org/
version: 4.2.2
version: 4.2.3
bitnami/fluentd/templates/servicemonitor.yaml
+3 -3
View File
@@ -7,9 +7,6 @@ metadata:
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.labels }}
{{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
{{- end }}
@@ -19,6 +16,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: tcp-metrics
path: "/metrics"
bitnami/grafana-tempo/Chart.yaml
+1 -1
View File
@@ -27,4 +27,4 @@ name: grafana-tempo
sources:
- https://github.com/bitnami/bitnami-docker-grafana-tempo
- https://github.com/grafana/tempo/
version: 0.2.6
version: 0.2.7
bitnami/grafana-tempo/templates/compactor/servicemonitor.yaml
+4 -4
View File
@@ -10,9 +10,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: compactor
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,7 +19,10 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: compactor
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: compactor
endpoints:
- port: http
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/grafana-tempo/templates/distributor/servicemonitor.yaml
+5 -5
View File
@@ -9,10 +9,7 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: distributor
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
app.kubernetes.io/component: distributor
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,7 +19,10 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: distributor
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: distributor
endpoints:
- port: http
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/grafana-tempo/templates/ingester/servicemonitor.yaml
+5 -5
View File
@@ -9,10 +9,7 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: ingester
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
app.kubernetes.io/component: ingester
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,7 +19,10 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: ingester
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: ingester
endpoints:
- port: http
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/grafana-tempo/templates/querier/servicemonitor.yaml
+5 -5
View File
@@ -9,10 +9,7 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: querier
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
app.kubernetes.io/component: querier
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,7 +19,10 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: querier
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: querier
endpoints:
- port: http
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/grafana-tempo/templates/query-frontend/servicemonitor.yaml
+5 -5
View File
@@ -9,10 +9,7 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: query-frontend
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
app.kubernetes.io/component: query-frontend
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,7 +19,10 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: query-frontend
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: query-frontend
endpoints:
- port: http
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/grafana-tempo/templates/vulture/servicemonitor.yaml
+5 -5
View File
@@ -9,10 +9,7 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: vulture
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
app.kubernetes.io/component: vulture
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,7 +19,10 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: vulture
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: vulture
endpoints:
- port: http
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/grafana/templates/image-renderer-servicemonitor.yaml
+3 -3
View File
@@ -10,12 +10,12 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: image-renderer
{{- range $key, $value := .Values.imageRenderer.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.imageRenderer.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.imageRenderer.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: image-renderer
endpoints:
- port: http
bitnami/grafana/templates/servicemonitor.yaml
+3 -3
View File
@@ -10,12 +10,12 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: grafana
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: grafana
endpoints:
- port: http
bitnami/influxdb/Chart.yaml
+1 -1
View File
@@ -24,4 +24,4 @@ name: influxdb
sources:
- https://github.com/bitnami/bitnami-docker-influxdb
- https://www.influxdata.com/products/influxdb-overview/
version: 2.3.14
version: 2.3.15
bitnami/influxdb/templates/influxdb/servicemonitor.yaml
+3 -3
View File
@@ -9,9 +9,6 @@ metadata:
labels:
{{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: influxdb
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -21,6 +18,9 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: influxdb
endpoints:
- port: http
bitnami/kafka/Chart.yaml
+1 -1
View File
@@ -29,4 +29,4 @@ name: kafka
sources:
- https://github.com/bitnami/bitnami-docker-kafka
- https://kafka.apache.org/
version: 14.2.0
version: 14.2.1
bitnami/kafka/templates/servicemonitor-jmx-metrics.yaml
+3 -3
View File
@@ -8,9 +8,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: kafka
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -20,6 +17,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: kafka
endpoints:
- port: http-metrics
bitnami/kafka/templates/servicemonitor-metrics.yaml
+3 -3
View File
@@ -8,9 +8,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: metrics
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -20,6 +17,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: metrics
endpoints:
- port: http-metrics
bitnami/kiam/Chart.yaml
+1 -1
View File
@@ -23,4 +23,4 @@ name: kiam
sources:
- https://github.com/bitnami/bitnami-docker-kiam
- https://github.com/uswitch/kiam
version: 0.3.14
version: 0.3.15
bitnami/kiam/templates/agent/agent-servicemonitor.yaml
+3 -3
View File
@@ -8,9 +8,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: agent
{{- range $key, $value := .Values.agent.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -20,6 +17,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: agent
endpoints:
- port: metrics
bitnami/kiam/templates/server/server-servicemonitor.yaml
+3 -3
View File
@@ -8,9 +8,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: server
{{- range $key, $value := .Values.server.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -20,6 +17,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.server.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: server
endpoints:
- port: metrics
bitnami/kibana/Chart.yaml
+1 -1
View File
@@ -25,4 +25,4 @@ name: kibana
sources:
- https://github.com/bitnami/bitnami-docker-kibana
- https://www.elastic.co/products/kibana
version: 9.0.5
version: 9.0.6
bitnami/kibana/templates/servicemonitor.yaml
+3 -3
View File
@@ -7,12 +7,12 @@ metadata:
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: http
path: "/_prometheus/metrics"
bitnami/kong/Chart.yaml
+1 -1
View File
@@ -34,4 +34,4 @@ name: kong
sources:
- https://github.com/bitnami/bitnami-docker-kong
- https://konghq.com/
version: 4.1.3
version: 4.1.4
bitnami/kong/templates/servicemonitor.yaml
+3 -3
View File
@@ -10,9 +10,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: server
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,6 +19,9 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: metrics
path: "/metrics"
bitnami/kube-state-metrics/Chart.yaml
+1 -1
View File
@@ -23,4 +23,4 @@ name: kube-state-metrics
sources:
- https://github.com/bitnami/bitnami-docker-kube-state-metrics
- https://github.com/kubernetes/kube-state-metrics
version: 2.1.10
version: 2.1.11
bitnami/kube-state-metrics/templates/servicemonitor.yaml
+3 -3
View File
@@ -12,9 +12,6 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- range $key, $value := .Values.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
@@ -24,6 +21,9 @@ spec:
{{- end }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: http
{{- if .Values.serviceMonitor.interval }}
bitnami/logstash/Chart.yaml
+1 -1
View File
@@ -23,4 +23,4 @@ name: logstash
sources:
- https://github.com/bitnami/bitnami-docker-logstash
- https://www.elastic.co/products/logstash
version: 3.6.8
version: 3.6.10
bitnami/logstash/templates/servicemonitor.yaml
+3 -3
View File
@@ -7,12 +7,12 @@ metadata:
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: metrics
path: "/metrics"
bitnami/mariadb-galera/Chart.yaml
+1 -1
View File
@@ -27,4 +27,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-mariadb-galera
- https://github.com/prometheus/mysqld_exporter
- https://mariadb.org
version: 6.0.0
version: 6.0.1
bitnami/mariadb-galera/templates/servicemonitor.yaml
+3 -3
View File
@@ -7,12 +7,12 @@ metadata:
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: metrics
{{- if .Values.metrics.serviceMonitor.interval }}
bitnami/memcached/templates/servicemonitor.yaml
+3 -3
View File
@@ -9,9 +9,6 @@ metadata:
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -21,6 +18,9 @@ metadata:
spec:
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: metrics
endpoints:
- port: {{ .Values.metrics.portName }}
bitnami/nats/Chart.yaml
+1 -1
View File
@@ -24,4 +24,4 @@ name: nats
sources:
- https://github.com/bitnami/bitnami-docker-nats
- https://nats.io/
version: 6.4.9
version: 6.4.10
bitnami/nats/templates/servicemonitor.yaml
+3 -3
View File
@@ -12,9 +12,6 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.selector "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
@@ -26,6 +23,9 @@ spec:
{{- end }}
selector:
matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: metrics
namespaceSelector:
matchNames:
bitnami/nginx/Chart.yaml
+1 -1
View File
@@ -25,4 +25,4 @@ name: nginx
sources:
- https://github.com/bitnami/bitnami-docker-nginx
- http://www.nginx.org
version: 9.5.5
version: 9.5.6
bitnami/nginx/templates/servicemonitor.yaml
+3 -3
View File
@@ -7,12 +7,12 @@ metadata:
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
endpoints:
- port: metrics
path: /metrics
bitnami/postgresql-ha/templates/postgresql/servicemonitor.yaml
+3 -3
View File
@@ -8,9 +8,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: postgresql
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -20,6 +17,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: postgresql
endpoints:
- port: metrics
bitnami/zookeeper/Chart.yaml
+1 -1
View File
@@ -21,4 +21,4 @@ name: zookeeper
sources:
- https://github.com/bitnami/bitnami-docker-zookeeper
- https://zookeeper.apache.org/
version: 7.4.5
version: 7.4.6
bitnami/zookeeper/templates/servicemonitor.yaml
+3 -3
View File
@@ -10,9 +10,6 @@ metadata:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: zookeeper
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@@ -22,6 +19,9 @@ metadata:
spec:
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: zookeeper
endpoints:
- port: tcp-metrics