Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable Prometheus scraping for components without /metrics #339

Merged
merged 4 commits into from
Jan 4, 2019
Merged

Disable Prometheus scraping for components without /metrics #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00e1b27
Disable Prometheus scraping for components without /metrics
stefanprodan Dec 23, 2018
75e7530
Fix faas-idler node selector and toleration indentation
stefanprodan Dec 23, 2018
9ec4ad5
Fix worker basic auth env var
stefanprodan Dec 23, 2018
ed31dd7
Add NATS address env var to worker
stefanprodan Dec 23, 2018
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
6 changes: 4 additions & 2 deletions chart/openfaas/templates/faas-idler-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ spec:
replicas: {{ .Values.faasIdler.replicas }}
template:
metadata:
annotations:
prometheus.io.scrape: "false"
labels:
app: faas-idler
spec:
Expand Down Expand Up @@ -43,14 +45,14 @@ spec:

{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
2 changes: 2 additions & 0 deletions chart/openfaas/templates/nats-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
replicas: 1
template:
metadata:
annotations:
prometheus.io.scrape: "false"
labels:
app: nats
spec:
Expand Down
6 changes: 5 additions & 1 deletion chart/openfaas/templates/queueworker-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
replicas: {{ .Values.queueWorker.replicas }}
template:
metadata:
annotations:
prometheus.io.scrape: "false"
labels:
app: queue-worker
spec:
Expand All @@ -38,7 +40,9 @@ spec:
- name: secret_mount_path
value: "/var/secrets"
- name: basic_auth
value: "true"
value: "{{ .Values.basic_auth }}"
- name: faas_nats_address
value: "nats.{{ .Release.Namespace }}.svc.{{ .Values.kubernetesDNSDomain }}"
volumeMounts:
- name: auth
readOnly: true
Expand Down