Skip to content

Commit

Permalink
Merge pull request #471 from dannyk81/nginx/prometheus-scrape-annotat…
Browse files Browse the repository at this point in the history
…ions

[Nginx] prometheus scrape annotations
  • Loading branch information
aledbf authored Mar 21, 2017
2 parents 62070a1 + 6a38a1a commit 1739327
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions examples/daemonset/nginx/nginx-ingress-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ spec:
metadata:
labels:
name: nginx-ingress-lb
annotations:
prometheus.io/port: '10254'
prometheus.io/scrape: 'true'
spec:
terminationGracePeriodSeconds: 60
containers:
Expand Down
3 changes: 3 additions & 0 deletions examples/deployment/nginx/nginx-ingress-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ spec:
metadata:
labels:
k8s-app: nginx-ingress-controller
annotations:
prometheus.io/port: '10254'
prometheus.io/scrape: 'true'
spec:
# hostNetwork makes it possible to use ipv6 and to preserve the source IP correctly regardless of docker configuration
# however, it is not a hard dependency of the nginx-ingress-controller itself and it may cause issues if port 10254 already is taken on the host
Expand Down

0 comments on commit 1739327

Please sign in to comment.