From owner-svn-src-all@freebsd.org Fri May 5 21:59:35 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6BFAD5FC77; Fri, 5 May 2017 21:59:35 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A20751631; Fri, 5 May 2017 21:59:35 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45LxYxb080383; Fri, 5 May 2017 21:59:34 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45LxYnt080379; Fri, 5 May 2017 21:59:34 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201705052159.v45LxYnt080379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 5 May 2017 21:59:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r317857 - in stable/11: etc/defaults etc/periodic/daily share/man/man5 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2017 21:59:35 -0000 Author: asomers Date: Fri May 5 21:59:34 2017 New Revision: 317857 URL: https://svnweb.freebsd.org/changeset/base/317857 Log: MFC r316945-r316946 r316945: Add 410.status-mfi, a periodic script for mfi(4) arrays PR: 176049 Submitted by: doconnor@gsoft.com.au Reviewed by: scottl, Larry Rosenman Relnotes: yes r316946: Reorder Makefile entries from r316945 PR: 176049 Reported by: Oliver Pinter X-MFC-With: 316945 Added: stable/11/etc/periodic/daily/410.status-mfi - copied unchanged from r316946, head/etc/periodic/daily/410.status-mfi Modified: stable/11/etc/defaults/periodic.conf stable/11/etc/periodic/daily/Makefile stable/11/share/man/man5/periodic.conf.5 Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/defaults/periodic.conf ============================================================================== --- stable/11/etc/defaults/periodic.conf Fri May 5 21:57:26 2017 (r317856) +++ stable/11/etc/defaults/periodic.conf Fri May 5 21:59:34 2017 (r317857) @@ -112,6 +112,9 @@ daily_status_gstripe_enable="NO" # Che # 409.status-gconcat daily_status_gconcat_enable="NO" # Check gconcat(8) +# 410.status-mfi +daily_status_mfi_enable="NO" # Check mfiutil(8) + # 420.status-network daily_status_network_enable="YES" # Check network status daily_status_network_usedns="YES" # DNS lookups are ok Copied: stable/11/etc/periodic/daily/410.status-mfi (from r316946, head/etc/periodic/daily/410.status-mfi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/etc/periodic/daily/410.status-mfi Fri May 5 21:59:34 2017 (r317857, copy of r316946, head/etc/periodic/daily/410.status-mfi) @@ -0,0 +1,33 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$daily_status_mfi_enable" in + [Yy][Ee][Ss]) + echo + echo 'Checking status of mfi(4) devices:' + + if mfiutil show volumes; then + if mfiutil show volumes | grep -q DEGRADED; then + rc=3 + else + rc=0 + fi + else + rc=2 + fi + ;; + + *) rc=0;; +esac + +exit $rc Modified: stable/11/etc/periodic/daily/Makefile ============================================================================== --- stable/11/etc/periodic/daily/Makefile Fri May 5 21:57:26 2017 (r317856) +++ stable/11/etc/periodic/daily/Makefile Fri May 5 21:59:34 2017 (r317857) @@ -16,6 +16,7 @@ FILES= 100.clean-disks \ 407.status-graid3 \ 408.status-gstripe \ 409.status-gconcat \ + 410.status-mfi \ 420.status-network \ 430.status-uptime \ 450.status-security \ Modified: stable/11/share/man/man5/periodic.conf.5 ============================================================================== --- stable/11/share/man/man5/periodic.conf.5 Fri May 5 21:57:26 2017 (r317856) +++ stable/11/share/man/man5/periodic.conf.5 Fri May 5 21:59:34 2017 (r317857) @@ -399,6 +399,15 @@ if you want to run on your .Xr gconcat 8 devices. +.It Va daily_status_mfi_enable +.Pq Vt bool +Set to +.Dq Li YES +if you want to run +.Nm mfiutil Cm status +on your +.Xr mfi 4 +devices. .It Va daily_status_network_enable .Pq Vt bool Set to