Skip to content

Commit

Permalink
Added optional servicemonitors to chart.
Browse files Browse the repository at this point in the history
  • Loading branch information
Whyeasy committed Apr 7, 2020
1 parent 6c736f1 commit 6aef5b3
Show file tree
Hide file tree
Showing 12 changed files with 278 additions and 1 deletion.
2 changes: 1 addition & 1 deletion charts/distributed-loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: loki-distributed
description: A Helm chart for Kubernetes
type: application

version: 0.0.10
version: 0.0.11
appVersion: 1.4.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.consul" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: consul
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: consul
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: statsd-exporter-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
- port: consul-exporter-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.distributor" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: distributor
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: distributor
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: distributor-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.ingester" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: ingester
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: ingester
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: ingester-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.memcached-frontend" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: memcached-frontend
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: memcached-frontend
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: exporter-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.memcached-index-queries" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: memcached-index-queries
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: memcached-index-queries
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: exporter-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.memcached-index-writes" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: memcached-index-writes
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: memcached-index-writes
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: exporter-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.memcached" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: memcached
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: memcached
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: exporter-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.querier-frontend" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: querier-frontend
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: querier-frontend
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: querier-frontend-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.querier" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: querier
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: querier
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: querier-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "loki-helm.table-manager" . }}
labels: {{- include "loki-helm.labels" . | nindent 4 }}
app.kubernetes.io/component: table-manager
{{- if .Values.serviceMonitor.additionalLabels }}
{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels: {{- include "loki-helm.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: table-manager
namespaceSelector:
matchNames:
- {{ .Release.Namespace | quote }}
endpoints:
- port: table-manager-http-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- end }}
10 changes: 10 additions & 0 deletions charts/distributed-loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,13 @@ storage:
storeUrl: loki-cassandra.monitoring.svc
# storage.config.bucketName -- Name of your gcs bucket.
bucketName: loki_distributed

serviceMonitor:
# serviceMonitor.enabled -- Enable service monitors for Loki deployment.
enabled: false
# serviceMonitor.interval -- Set interval scraping the targets.
interval: ""
# serviceMonitor.additionalLabels -- Set additional labels for the service monitor.
additionalLabels: {}
# serviceMonitor.scrapeTimeout -- Set time out for scraping.
# scrapeTimeout: 10s

0 comments on commit 6aef5b3

Please sign in to comment.