Skip to content

Commit

Permalink
Add liveness and readiness probes to Grafana
Browse files Browse the repository at this point in the history
  • Loading branch information
dghubble committed Mar 24, 2019
1 parent 619a037 commit 36e31fc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Notable changes between versions.
* Update Prometheus from v2.7.1 to [v2.8.0](https://github.com/prometheus/prometheus/releases/tag/v2.8.0)
* Refresh rules based on upstreams ([#426](https://github.com/poseidon/typhoon/pull/426))
* Update Grafana from v6.0.0 to v6.0.2
* Add liveness and readiness probes
* Refresh dashboards and organize to stay below ConfigMap size limit ([#426](https://github.com/poseidon/typhoon/pull/426))
* Remove heapster manifests from addons ([#427](https://github.com/poseidon/typhoon/pull/427))
* Heapster addon powers `kubectl top` (in early Kubernetes, running the addon was expected). Today, there are better monitoring options.
Expand Down
10 changes: 10 additions & 0 deletions addons/grafana/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ spec:
ports:
- name: http
containerPort: 8080
livenessProbe:
httpGet:
path: /metrics
port: 8080
initialDelaySeconds: 10
readinessProbe:
httpGet:
path: /api/health
port: 8080
initialDelaySeconds: 10
resources:
requests:
cpu: 100m
Expand Down
8 changes: 4 additions & 4 deletions addons/prometheus/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ spec:
mountPath: /etc/prometheus/rules
- name: data
mountPath: /var/lib/prometheus
readinessProbe:
livenessProbe:
httpGet:
path: /-/ready
path: /-/healthy
port: 9090
initialDelaySeconds: 10
timeoutSeconds: 10
livenessProbe:
readinessProbe:
httpGet:
path: /-/healthy
path: /-/ready
port: 9090
initialDelaySeconds: 10
timeoutSeconds: 10
Expand Down

0 comments on commit 36e31fc

Please sign in to comment.