Merge ~hloeung/ubuntu-mirror-charm:master into ubuntu-mirror-charm:master
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Haw Loeung | ||||
Approved revision: | c70b734b407d9a56f5d2232b50cbd15e050c3fd0 | ||||
Merged at revision: | 40061ba8802d06153191ab6d3a7b65d267f8408d | ||||
Proposed branch: | ~hloeung/ubuntu-mirror-charm:master | ||||
Merge into: | ubuntu-mirror-charm:master | ||||
Diff against target: |
7 lines (+1/-1) 1 file modified
templates/nagios-check_rsync.tmpl (+1/-1) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Gomes | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email: mp+389762@code.launchpad.net |
Commit message
Update nagios rsync check to only check daemon processes - LP:1891833
Description of the change
$ /usr/lib/
CMD: /bin/ps axwwo 'stat uid pid ppid vsz rss pcpu etime comm args'
Matched: uid=997 vsz=41208 rss=17692 pid=54157 ppid=54153 pcpu=2.60 stat=S etime=03:50 prog=rsync args=rsync --verbose --recursive --times --links --hard-links --stats --exclude Packages* --exclude Sources* --exclude Release* --exclude InRelease --exclude Translation* --exclude Index --exclude /srv2/ftp.
Matched: uid=997 vsz=64160 rss=25932 pid=54161 ppid=54157 pcpu=1.00 stat=S etime=03:50 prog=rsync args=rsync --verbose --recursive --times --links --hard-links --stats --exclude Packages* --exclude Sources* --exclude Release* --exclude InRelease --exclude Translation* --exclude Index --exclude /srv2/ftp.
Matched: uid=65534 vsz=82224 rss=20356 pid=55802 ppid=1 pcpu=16.60 stat=Ss etime=02:21 prog=rsync args=/usr/bin/rsync --daemon
Matched: uid=65534 vsz=38192 rss=9256 pid=60661 ppid=1 pcpu=9.70 stat=Ss etime=01:58 prog=rsync args=/usr/bin/rsync --daemon
Matched: uid=65534 vsz=128796 rss=99656 pid=63661 ppid=1 pcpu=23.20 stat=Ss etime=00:29 prog=rsync args=/usr/bin/rsync --daemon
PROCS OK: 5 processes with command name 'rsync' | procs=5;
vs.
$ /usr/lib/
CMD: /bin/ps axwwo 'stat uid pid ppid vsz rss pcpu etime comm args'
Matched: uid=65534 vsz=82224 rss=20576 pid=55802 ppid=1 pcpu=16.30 stat=Ss etime=02:24 prog=rsync args=/usr/bin/rsync --daemon
Matched: uid=65534 vsz=38192 rss=9256 pid=60661 ppid=1 pcpu=10.10 stat=Ss etime=02:01 prog=rsync args=/usr/bin/rsync --daemon
Matched: uid=65534 vsz=128796 rss=99656 pid=63661 ppid=1 pcpu=21.00 stat=Ss etime=00:32 prog=rsync args=/usr/bin/rsync --daemon
PROCS OK: 3 processes with command name 'rsync', args 'daemon' | procs=3;
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.