From 50b30be50c804607a7965cbe38dce6486d98a1a6 Mon Sep 17 00:00:00 2001 From: Aleksandr Mogylchenko Date: Mon, 17 Oct 2016 12:20:24 +0200 Subject: [PATCH] Migrate liveness check to new format Change-Id: Ic8f7b67cc7188fd4a2898dd5c58789132d41afa0 Depends-On: I920029d4cb14981427e7f978778506fb0b69c435 --- service/cron.yaml | 4 +++- service/elasticsearch.yaml | 8 ++++++-- service/grafana.yaml | 4 +++- service/heka.yaml | 4 +++- service/influxdb.yaml | 4 +++- service/kibana.yaml | 4 +++- service/stacklight-collector.yaml | 12 +++++++++--- 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/service/cron.yaml b/service/cron.yaml index 763ca87..081e43c 100644 --- a/service/cron.yaml +++ b/service/cron.yaml @@ -6,7 +6,9 @@ service: image: cron probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" volumes: - name: mysql-logs path: "/var/log/ccp/mysql" diff --git a/service/elasticsearch.yaml b/service/elasticsearch.yaml index 53472a6..74b0b8f 100644 --- a/service/elasticsearch.yaml +++ b/service/elasticsearch.yaml @@ -8,7 +8,9 @@ service: image: elasticsearch probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" daemon: command: /usr/share/elasticsearch/bin/elasticsearch files: @@ -17,7 +19,9 @@ service: image: cron probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" daemon: command: cron -f files: diff --git a/service/grafana.yaml b/service/grafana.yaml index 52e1c7d..761111c 100644 --- a/service/grafana.yaml +++ b/service/grafana.yaml @@ -7,7 +7,9 @@ service: image: grafana probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" daemon: command: /usr/sbin/grafana-server --homepath=/usr/share/grafana --config=/etc/grafana/grafana.ini cfg:default.paths.data=/var/lib/grafana diff --git a/service/heka.yaml b/service/heka.yaml index b9651fd..dd87eca 100644 --- a/service/heka.yaml +++ b/service/heka.yaml @@ -6,7 +6,9 @@ service: image: heka probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" volumes: - name: docker-sock type: host diff --git a/service/influxdb.yaml b/service/influxdb.yaml index 39af715..7429a83 100644 --- a/service/influxdb.yaml +++ b/service/influxdb.yaml @@ -7,7 +7,9 @@ service: image: influxdb probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" daemon: command: influxd -config /etc/influxdb/influxdb.conf files: diff --git a/service/kibana.yaml b/service/kibana.yaml index 872a2ce..9982c31 100644 --- a/service/kibana.yaml +++ b/service/kibana.yaml @@ -7,7 +7,9 @@ service: image: kibana probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" daemon: command: /opt/kibana/bin/kibana dependencies: diff --git a/service/stacklight-collector.yaml b/service/stacklight-collector.yaml index 13762df..79de058 100644 --- a/service/stacklight-collector.yaml +++ b/service/stacklight-collector.yaml @@ -6,7 +6,9 @@ service: image: hindsight probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" pre: - name: service-bootstrap type: local @@ -30,7 +32,9 @@ service: image: snap probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" privileged: true daemon: command: snapd --config /etc/snap/snap.conf @@ -50,7 +54,9 @@ service: image: alarm-manager probes: readiness: "true" - liveness: "true" + liveness: + command: "true" + type: "exec" daemon: command: /opt/ccp/bin/alarm-manager.py -w /etc/alarm-manager files: