mirror of
https://github.com/coreos/prometheus-operator.git
synced 2026-02-05 06:45:27 +01:00
Helm chart changes (#1218)
* helm: Added additionalServiceMonitorLabels template
Add additional labels to ServiceMonitors in case of
custom ServiceMonitorSelector values in Prometheus.
* helm: Fixed file permissions
Removed unnecessary executable bit from helm chart files
* helm: Added additionalRulesConfigMapLabels template
Add additional labels to Prometheus Rules configmaps in
case of custom RuleSelector in Prometheus
* Revert "helm: Fixed file permissions"
This reverts commit 4d7d2e0745.
* helm: Bumped Chart Versions
Bumped chart versions as per review comments
This commit is contained in:
committed by
Giancarlo Rubio
parent
9661f06000
commit
83f9ba41ee
@@ -9,4 +9,4 @@ maintainers:
|
||||
name: alertmanager
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.13
|
||||
version: 0.0.14
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "alertmanager.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
alertmanager.rules: |-
|
||||
{{- include "alertmanager.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -9,6 +9,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "alertmanager.fullname" . }}
|
||||
spec:
|
||||
jobLabel: app
|
||||
|
||||
@@ -45,6 +45,14 @@ externalUrl: ""
|
||||
##
|
||||
selfServiceMonitor: true
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
## Alertmanager container image
|
||||
##
|
||||
image:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart for coredns metrics
|
||||
name: exporter-coredns
|
||||
version: 0.0.1
|
||||
version: 0.0.2
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-coredns.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -5,3 +5,7 @@ port: 9153
|
||||
|
||||
# The k8s-app label coredns is deployed with
|
||||
selectorLabel: coredns
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart for Kubernetes
|
||||
name: exporter-kube-controller-manager
|
||||
version: 0.1.7
|
||||
version: 0.1.8
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-controller-manager.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
kube-controller-manager.rules: |-
|
||||
{{- include "kube-controller-manager.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-controller-manager.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -8,3 +8,10 @@ scheme: http
|
||||
serviceSelectorLabelKey: k8s-app
|
||||
# default rules are in templates/kube-controller-manager.rules.yaml
|
||||
# prometheusRules: {}
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart singleton for kube-state-metrics
|
||||
name: exporter-kube-dns
|
||||
version: 0.1.5
|
||||
version: 0.1.6
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-dns.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart for Kubernetes
|
||||
name: exporter-kube-etcd
|
||||
version: 0.1.9
|
||||
version: 0.1.10
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-etcd.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
etcd3.rules: |-
|
||||
{{- include "etcd3.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-etcd.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
@@ -33,4 +36,3 @@ spec:
|
||||
{{- end}}
|
||||
insecureSkipVerify: true
|
||||
{{- end }}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# on what port are the metrics exposed by etcd. Use port 2379 for https
|
||||
etcdPort: 4001
|
||||
# for deployments that have etcd deployed outside of the cluster, list their adresses here
|
||||
endpoints: []
|
||||
endpoints: []
|
||||
# Are we talking http or https?
|
||||
scheme: http
|
||||
# default rules are in templates/etcd3.rules.yaml
|
||||
@@ -11,3 +11,10 @@ scheme: http
|
||||
caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
|
||||
certFile: ""
|
||||
keyFile: ""
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart singleton for kube-state-metrics
|
||||
name: exporter-kube-scheduler
|
||||
version: 0.1.6
|
||||
version: 0.1.7
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-scheduler.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
kube-scheduler.rules: |-
|
||||
{{- include "kube-scheduler.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-scheduler.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -8,3 +8,9 @@ scheme: http
|
||||
serviceSelectorLabelKey: k8s-app
|
||||
# default rules are in templates/kube-scheduler.rules.yaml
|
||||
# prometheusRules: {}
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart singleton for kube-state-metrics
|
||||
name: exporter-kube-state
|
||||
version: 0.1.16
|
||||
version: 0.1.17
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-state.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
kube-state-metrics.rules: |-
|
||||
{{- include "kube-state-metrics.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kube-state.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -46,3 +46,10 @@ tolerations: {}
|
||||
# operator: "Equal"
|
||||
# value: "value"
|
||||
# effect: "NoSchedule"
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart for Kubernetes
|
||||
name: exporter-kubelets
|
||||
version: 0.2.7
|
||||
version: 0.2.8
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kubelets.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
kubelet.rules: |-
|
||||
{{- include "kubelet.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kubelets.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -5,3 +5,10 @@ insecureSkipVerify: true
|
||||
|
||||
# default rules are in templates/kubelet.rules.yaml
|
||||
# prometheusRules: {}
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart for Kubernetes
|
||||
name: exporter-kubernetes
|
||||
version: 0.1.7
|
||||
version: 0.1.8
|
||||
maintainers:
|
||||
- name: Giancarlo Rubio
|
||||
email: gianrubio@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kubernetes.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
kubernetes.rules: |-
|
||||
{{- include "kubernetes.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-kubernetes.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -1,2 +1,9 @@
|
||||
# default rules are in templates/kubernetes.rules.yaml
|
||||
# prometheusRules: {}
|
||||
# prometheusRules: {}
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
description: A Helm chart for Kubernetes
|
||||
name: exporter-node
|
||||
version: 0.2.1
|
||||
version: 0.2.2
|
||||
maintainers:
|
||||
- name: Michael Goodness
|
||||
email: mgoodness@gmail.com
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-node.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
node.rules: |-
|
||||
{{- include "node.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -7,6 +7,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "exporter-node.fullname" . }}
|
||||
spec:
|
||||
jobLabel: component
|
||||
|
||||
@@ -18,7 +18,7 @@ resources:
|
||||
cpu: 100m
|
||||
memory: 30Mi
|
||||
|
||||
container:
|
||||
container:
|
||||
args:
|
||||
- --path.procfs=/host/proc
|
||||
- --path.sysfs=/host/sys
|
||||
@@ -30,7 +30,7 @@ container:
|
||||
- name: sys
|
||||
hostPath:
|
||||
path: /sys
|
||||
|
||||
|
||||
volumeMounts:
|
||||
- name: proc
|
||||
mountPath: /host/proc
|
||||
@@ -38,7 +38,7 @@ container:
|
||||
- name: sys
|
||||
mountPath: /host/sys
|
||||
readOnly: true
|
||||
|
||||
|
||||
## Tolerations for use with node taints
|
||||
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
|
||||
##
|
||||
@@ -49,3 +49,10 @@ tolerations:
|
||||
|
||||
# default rules are in templates/node.rules.yaml
|
||||
# prometheusRules: {}
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
@@ -8,4 +8,4 @@ maintainers:
|
||||
name: grafana
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.25
|
||||
version: 0.0.26
|
||||
@@ -9,6 +9,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "grafana.fullname" . }}
|
||||
spec:
|
||||
jobLabel: {{ template "grafana.fullname" . }}
|
||||
|
||||
@@ -14,6 +14,9 @@ annotations: {}
|
||||
## If true, create a serviceMonitor for grafana
|
||||
##
|
||||
selfServiceMonitor: true
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalServiceMonitorLabels: {}
|
||||
|
||||
## Pass extra environment variables to the Grafana container.
|
||||
##
|
||||
|
||||
@@ -9,4 +9,4 @@ maintainers:
|
||||
name: kube-prometheus
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.48
|
||||
version: 0.0.49
|
||||
|
||||
@@ -1,65 +1,65 @@
|
||||
dependencies:
|
||||
- name: alertmanager
|
||||
version: 0.0.13
|
||||
version: 0.0.14
|
||||
#e2e-repository: file://../alertmanager
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployAlertManager
|
||||
|
||||
- name: prometheus
|
||||
version: 0.0.25
|
||||
version: 0.0.26
|
||||
#e2e-repository: file://../prometheus
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-coredns
|
||||
version: 0.0.1
|
||||
version: 0.0.2
|
||||
#e2e-repository: file://../exporter-coredns
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployCoreDNS
|
||||
|
||||
- name: exporter-kube-controller-manager
|
||||
version: 0.1.7
|
||||
version: 0.1.8
|
||||
#e2e-repository: file://../exporter-kube-controller-manager
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-kube-dns
|
||||
version: 0.1.5
|
||||
version: 0.1.6
|
||||
#e2e-repository: file://../exporter-kube-dns
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployKubeDNS
|
||||
|
||||
- name: exporter-kube-etcd
|
||||
version: 0.1.9
|
||||
version: 0.1.10
|
||||
#e2e-repository: file://../exporter-kube-etcd
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-kube-scheduler
|
||||
version: 0.1.6
|
||||
version: 0.1.7
|
||||
#e2e-repository: file://../exporter-kube-scheduler
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-kube-state
|
||||
version: 0.1.16
|
||||
version: 0.1.17
|
||||
#e2e-repository: file://../exporter-kube-state
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-kubelets
|
||||
version: 0.2.7
|
||||
version: 0.2.8
|
||||
#e2e-repository: file://../exporter-kubelets
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-kubernetes
|
||||
version: 0.1.7
|
||||
version: 0.1.8
|
||||
#e2e-repository: file://../exporter-kubernetes
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-node
|
||||
version: 0.2.1
|
||||
version: 0.2.2
|
||||
#e2e-repository: file://../exporter-node
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployExporterNode
|
||||
|
||||
- name: grafana
|
||||
version: 0.0.25
|
||||
version: 0.0.26
|
||||
#e2e-repository: file://../grafana
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployGrafana
|
||||
|
||||
@@ -7,4 +7,4 @@ maintainers:
|
||||
name: prometheus
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.25
|
||||
version: 0.0.26
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
prometheus: {{ .Release.Name }}
|
||||
release: {{ .Release.Name }}
|
||||
role: alert-rules
|
||||
{{- if .Values.additionalRulesConfigMapLabels }}
|
||||
{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "prometheus.fullname" . }}
|
||||
data:
|
||||
{{- if .Values.prometheusRules }}
|
||||
@@ -19,4 +22,4 @@ data:
|
||||
{{ else }}
|
||||
prometheus.rules: |-
|
||||
{{- include "prometheus.rules.yaml.tpl" . | indent 4}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: "{{ .Release.Name }}"
|
||||
prometheus: {{ .Release.Name }}
|
||||
{{- if .Values.additionalSelfServiceMonitorLabels }}
|
||||
{{ toYaml .Values.additionalSelfServiceMonitorLabels | indent 4 }}
|
||||
{{- end }}
|
||||
name: {{ template "prometheus.fullname" . }}
|
||||
spec:
|
||||
jobLabel: app
|
||||
|
||||
7
helm/prometheus/values.yaml
Executable file → Normal file
7
helm/prometheus/values.yaml
Executable file → Normal file
@@ -27,6 +27,13 @@ externalUrl: ""
|
||||
##
|
||||
selfServiceMonitor: true
|
||||
|
||||
## Custom Labels to be added to ServiceMonitor
|
||||
##
|
||||
additionalSelfServiceMonitorLabels: {}
|
||||
##Custom Labels to be added to Prometheus Rules ConfigMap
|
||||
##
|
||||
additionalRulesConfigMapLabels: {}
|
||||
|
||||
## Prometheus container image
|
||||
##
|
||||
image:
|
||||
|
||||
Reference in New Issue
Block a user