diff --git a/cluster/saltbase/salt/monit/init.sls b/cluster/saltbase/salt/monit/init.sls index 9ca86844be8..26d8cd09538 100644 --- a/cluster/saltbase/salt/monit/init.sls +++ b/cluster/saltbase/salt/monit/init.sls @@ -28,6 +28,17 @@ monit: - group: root - mode: 644 +/etc/monit/monit_watcher.sh: + file.managed: + - source: salt://monit/monit_watcher.sh + - user: root + - group: root + - mode: 755 + +crontab -l | { cat; echo "* * * * * /etc/monit/monit_watcher.sh 2>&1 | logger"; } | crontab -: + cmd.run: + - unless: crontab -l | grep "* * * * * /etc/monit/monit_watcher.sh 2>&1 | logger" + monit-service: service: - running diff --git a/cluster/saltbase/salt/monit/monit_watcher.sh b/cluster/saltbase/salt/monit/monit_watcher.sh new file mode 100644 index 00000000000..417f2f844e6 --- /dev/null +++ b/cluster/saltbase/salt/monit/monit_watcher.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# Copyright 2015 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script is invoked by crond every minute to check if monit is +# up and oom protected. If down it restarts monit; otherwise, it exits +# after applying oom_score_adj + +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + +PROGNAME=monit +FULLPATH=/usr/bin/$PROGNAME + +pids=$(pidof $FULLPATH) +if [[ "${pids}" == "" ]]; then + service $PROGNAME start + sleep 10 +fi + +# Apply oom_score_adj: -901 to processes +pids=$(pidof $FULLPATH) +for pid in "${pids}"; do + echo -901 > /proc/$pid/oom_score_adj +done + +