Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CHANGELOG
=====================================

| March 31, 2021 : feat: add chart support to prometheus servicemonitor `#535 <https://github.com/mergeability/mergeable/pull/535>`_
| March 30, 2021 : fix: codeowners team
| March 25, 2021 : feat: Add rate limit related metrics/endpoint `#526 <https://github.com/mergeability/mergeable/pull/526>`_
| February 25, 2021 : feat: add feature to limit approval to a list of users `#509 <https://github.com/mergeability/mergeable/issues/509>`_
Expand Down
23 changes: 23 additions & 0 deletions helm/mergeable/templates/prometheus-servicemonitor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{{- if and .Values.prometheus.enabled }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
{{- include "mergeable.labels" $ | nindent 4 }}
prometheus: kube-prometheus
name: {{ include "mergeable.fullname" . }}
spec:
endpoints:
- interval: {{ .Values.prometheus.service.metricInterval | default "30s" }}
path: {{ .Values.prometheus.service.metricPath | default "/metrics" }}
port: {{ .Values.prometheus.service.metricPortName | default "http" }}
jobLabel: {{ include "mergeable.fullname" . }}
namespaceSelector:
matchNames:
- "{{ $.Release.Namespace }}"
selector:
matchLabels:
app: {{ include "mergeable.fullname" . }}
sampleLimit: {{ .Values.prometheus.service.sampleLimit | default 5000}}
{{- end }}
1 change: 1 addition & 0 deletions helm/mergeable/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: {{ include "mergeable.fullname" . }}
labels:
{{- include "mergeable.labels" . | nindent 4 }}
app: {{ include "mergeable.fullname" . }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
5 changes: 5 additions & 0 deletions helm/mergeable/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ affinity: {}

prometheus:
enabled: false
service: {}
# metricInterval: 30s
# metricPath: /metrics
# metricPortName: http
# sampleLimit: 5000
rules: {}
# - name: mergeable
# rules:
Expand Down