Add liveness and readiness probes to Grafana

* https://github.com/grafana/grafana/issues/3302
This commit is contained in:
Dalton Hubble 2019-03-23 17:54:16 -07:00
parent 619a0370dc
commit 36e31fc9fa
3 changed files with 17 additions and 6 deletions

View File

@ -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) * 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)) * Refresh rules based on upstreams ([#426](https://github.com/poseidon/typhoon/pull/426))
* Update Grafana from v6.0.0 to v6.0.2 * 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)) * 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)) * 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. * Heapster addon powers `kubectl top` (in early Kubernetes, running the addon was expected). Today, there are better monitoring options.

View File

@ -30,6 +30,16 @@ spec:
ports: ports:
- name: http - name: http
containerPort: 8080 containerPort: 8080
livenessProbe:
httpGet:
path: /metrics
port: 8080
initialDelaySeconds: 10
readinessProbe:
httpGet:
path: /api/health
port: 8080
initialDelaySeconds: 10
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

View File

@ -39,18 +39,18 @@ spec:
mountPath: /etc/prometheus/rules mountPath: /etc/prometheus/rules
- name: data - name: data
mountPath: /var/lib/prometheus mountPath: /var/lib/prometheus
readinessProbe:
httpGet:
path: /-/ready
port: 9090
initialDelaySeconds: 10
timeoutSeconds: 10
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /-/healthy path: /-/healthy
port: 9090 port: 9090
initialDelaySeconds: 10 initialDelaySeconds: 10
timeoutSeconds: 10 timeoutSeconds: 10
readinessProbe:
httpGet:
path: /-/ready
port: 9090
initialDelaySeconds: 10
timeoutSeconds: 10
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
volumes: volumes:
- name: config - name: config