From owner-svn-ports-head@freebsd.org Thu Aug 4 14:26:57 2016 Return-Path: Delivered-To: svn-ports-head@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 9DCE6BAF276; Thu, 4 Aug 2016 14:26:57 +0000 (UTC) (envelope-from mat@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 7B8FA1D6E; Thu, 4 Aug 2016 14:26:57 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u74EQu1W059623; Thu, 4 Aug 2016 14:26:56 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74EQuNv059617; Thu, 4 Aug 2016 14:26:56 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608041426.u74EQuNv059617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 4 Aug 2016 14:26:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419615 - in head/sysutils: munin-common/files munin-node munin-node/plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2016 14:26:57 -0000 Author: mat Date: Thu Aug 4 14:26:56 2016 New Revision: 419615 URL: https://svnweb.freebsd.org/changeset/ports/419615 Log: Fix swap accounting if there are multiple devices [1] Add a few zfs related plugins [2] PR: 210494 [1] Submitted by: bcr [2] Reported by: Fabian Keil [1] Sponsored by: Absolight Added: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in (contents, props changed) head/sysutils/munin-node/plugins/ head/sysutils/munin-node/plugins/zfs_compress (contents, props changed) head/sysutils/munin-node/plugins/zpool_chksum (contents, props changed) head/sysutils/munin-node/plugins/zpool_dedup (contents, props changed) Modified: head/sysutils/munin-node/Makefile (contents, props changed) Added: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in Thu Aug 4 14:26:56 2016 (r419615) @@ -0,0 +1,8 @@ +--- plugins/node.d.freebsd/memory.in.orig 2014-11-24 21:46:24 UTC ++++ plugins/node.d.freebsd/memory.in +@@ -74,4 +74,4 @@ echo wired.value $(($WIRED_COUNT*$PAGESI + echo buffers.value $(($BUFFERS_COUNT)) + echo cached.value $(($CACHE_COUNT*$PAGESIZE)) + echo free.value $(($FREE_COUNT*$PAGESIZE)) +-echo swap.value $(swapinfo -k | awk '{sum += $3}; END {print sum * 1024}') ++echo swap.value $(swapinfo -k | awk '!/^Total/ && !/^Device/ {sum += $3}; END {print sum * 1024}') Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Thu Aug 4 14:18:33 2016 (r419614) +++ head/sysutils/munin-node/Makefile Thu Aug 4 14:26:56 2016 (r419615) @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node Added: head/sysutils/munin-node/plugins/zfs_compress ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/munin-node/plugins/zfs_compress Thu Aug 4 14:26:56 2016 (r419615) @@ -0,0 +1,27 @@ +#!/bin/sh +# +# $FreeBSD$ + +set -e +set -u + +cat <<'EOM' +graph_title ZFS dataset compression ratio +graph_vlabel ratio +graph_category ZFS +graph_info This graph shows the ZFS dataset compression ratio +EOM + +listing=$(zfs get -t filesystem -H compressratio) + +while read -r label _ ratio _; do + clean_label=$(echo "${label}" | sed -e 's|/|__|g') + echo "${clean_label}.label ${label}" + echo "${clean_label}.value ${ratio%x}" +done <