From nobody Thu Sep 01 01:04:05 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MJ2qn2JmQz4brmb; Thu, 1 Sep 2022 01:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MJ2qn1k7Fz3yXQ; Thu, 1 Sep 2022 01:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661994245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cy6foaQaIDVrZNYJolpkFLKkvW5IoJVShDE7jqp/rWU=; b=Q7gTT7zE5OUbeY16kUyx994Izd3D5X3yV56KuiKLvom+BaRPMsyvYvooFYGG7ULJ1LW7Wy okeqSqOPnaeEJDoI8c3xjTQBWASQOXQQ5xW7/0wLwn6tb2DYlC0uN8tkBSeS4g+nECzGwC n2ptzQwV9LSOSRUkumYaK15MB0PhLEwfy/mKoJOwzXVGuCb4GNGc5sKfRoPsVIkleVBp5N OW3FKMtDuww2UilNFhFQDG5M89jDQraG9a4ZmpeGDUN33LU9+XE+C7n/e1CgKiNLQb9bxS yyRhPHHP+LwH9/oayhK2cMJbWoJ5C3ZgIX79oW4LWJbtZeLyFyUn3Udz7LHu8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MJ2qn0nf6zJSY; Thu, 1 Sep 2022 01:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 281145kn002991; Thu, 1 Sep 2022 01:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 281145kY002990; Thu, 1 Sep 2022 01:04:05 GMT (envelope-from git) Date: Thu, 1 Sep 2022 01:04:05 GMT Message-Id: <202209010104.281145kY002990@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Devin Teske Subject: git: 542fb2297a9e - main - sysutils/dwatch-json: update to 1.2, restore maintainership List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dteske X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 542fb2297a9ed95d6dc9b1359f6fc09ebfdaed4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661994245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cy6foaQaIDVrZNYJolpkFLKkvW5IoJVShDE7jqp/rWU=; b=xL+EAdkZNyLboZw3OPK4sw0pxkLheppnGYN0i9djZEZKn3tgCxNoqLoTb3cDkGyP0MX4Wk VPsNHEdGJba8/WWX/hUlIkoaImrl5voqrIpEsJq8PiHGCOTUJXvwuFetZXllX7Eq7U3Vfj /fMKcQA7USc30tsc0iC7Lp95K7i75/fOySfZ9TouqBvXjdrkeRo5kX0P6+anLIFjcVdbz2 t1JffWpOvRQJy79hJy6wVZXIP9S/DYpRePlgUyPYG0x2IJb9jsH1sTH775p7zPlU6ZUr8X /SELe1DaxAWUOPWfAYyDG7xV7Jb5v4yPHjmXm2hOROmDke7yqAnQqBg4oWf6mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661994245; a=rsa-sha256; cv=none; b=cfw6asIGM3uemBB2Mn7AYF2ovqhTJcAfiIoa3FyKwdgdsdD+H3uwW6wNMZ/q9zq9da0eJl zPGpEihCJ4RrKxjUNpVtLC0iGlmb36lhf0103DRs62ZYFp6Kz1MCPS2xtSB7bY3Hl3ryAQ kgX+iHiV+KLlLMB8jkT3FAx4eDvIkpZBdG3tZ93RMH8lSPuRxYjG782nv5OQ3tc+40e/GQ i7h9yqQA7WJUj6U3frQpnzhWX6V2yq17YiIwUI+ZYE5bdDaaLU5N7H7SRRNfSez6FItfWn sFI1e/U23lGK5RmtKhPxFrfmSmYqsuYL67FMILOXPf4BnuhBTecvJDVW2NrUCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dteske (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=542fb2297a9ed95d6dc9b1359f6fc09ebfdaed4e commit 542fb2297a9ed95d6dc9b1359f6fc09ebfdaed4e Author: Devin Teske AuthorDate: 2022-09-01 00:57:59 +0000 Commit: Devin Teske CommitDate: 2022-09-01 01:04:02 +0000 sysutils/dwatch-json: update to 1.2, restore maintainership dwatch itself is a powerful modular abstraction layer atop dtrace in FreeBSD base. This package installs modules that produce JSON instead of human readable text. This version update adds abstraction services atop those modules. Approved by: ler Reviewed by: ler, woodsb02 (previous revision) Differential revision: https://reviews.freebsd.org/D36051 --- sysutils/dwatch-json/Makefile | 31 ++++++++++++++++++++++++++++--- sysutils/dwatch-json/distinfo | 6 +++--- sysutils/dwatch-json/pkg-descr | 18 ++++++++++++++---- sysutils/dwatch-json/pkg-plist | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 79 insertions(+), 11 deletions(-) diff --git a/sysutils/dwatch-json/Makefile b/sysutils/dwatch-json/Makefile index b27c7da0440b..0915fdfa168c 100644 --- a/sysutils/dwatch-json/Makefile +++ b/sysutils/dwatch-json/Makefile @@ -1,9 +1,9 @@ PORTNAME= dwatch-json -DISTVERSION= 0.6.3 +DISTVERSION= 1.2 CATEGORIES= sysutils -MAINTAINER= ports@FreeBSD.org -COMMENT= FreeBSD dwatch profiles to produce JSON logs +MAINTAINER= dteske@FreeBSD.org +COMMENT= FreeBSD dwatch suite to produce JSON stats LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE @@ -21,7 +21,32 @@ OPTIONS_DEFINE= DOCS do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch ${INSTALL_DATA} ${WRKSRC}/json-* ${STAGEDIR}${PREFIX}/libexec/dwatch + ${INSTALL_DATA} ${WRKSRC}/dwatch-json-io.conf ${STAGEDIR}${PREFIX}/etc/dwatch-json-io.conf.sample ${INSTALL_DATA} ${WRKSRC}/dwatch-json-net.conf ${STAGEDIR}${PREFIX}/etc/dwatch-json-net.conf.sample + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/cron.d + ${INSTALL_DATA} ${WRKSRC}/grafio/cron.d/* ${STAGEDIR}${PREFIX}/etc/cron.d + ${INSTALL_DATA} ${WRKSRC}/grafnet/cron.d/* ${STAGEDIR}${PREFIX}/etc/cron.d + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/grafio + ${INSTALL_DATA} ${WRKSRC}/grafio/etc/* ${STAGEDIR}${PREFIX}/etc/grafio + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/grafnet + ${INSTALL_DATA} ${WRKSRC}/grafnet/etc/* ${STAGEDIR}${PREFIX}/etc/grafnet + @${MKDIR} ${STAGEDIR}${PREFIX}/sbin + @${LN} -s grafio ${STAGEDIR}${PREFIX}/sbin/gio + @${LN} -s grafnet ${STAGEDIR}${PREFIX}/sbin/gn + ${INSTALL_SCRIPT} ${WRKSRC}/graf/logs ${STAGEDIR}${PREFIX}/sbin/grafio-logs + ${INSTALL_SCRIPT} ${WRKSRC}/graf/logs ${STAGEDIR}${PREFIX}/sbin/grafnet-logs + ${INSTALL_SCRIPT} ${WRKSRC}/graf/rotate ${STAGEDIR}${PREFIX}/sbin/grafio-rotate + ${INSTALL_SCRIPT} ${WRKSRC}/graf/rotate ${STAGEDIR}${PREFIX}/sbin/grafnet-rotate + ${INSTALL_SCRIPT} ${WRKSRC}/graf/stats ${STAGEDIR}${PREFIX}/sbin/grafio_stats + ${INSTALL_SCRIPT} ${WRKSRC}/graf/stats ${STAGEDIR}${PREFIX}/sbin/grafnet_stats + ${INSTALL_SCRIPT} ${WRKSRC}/grafio/grafio ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/grafio/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKSRC}/grafnet/grafnet ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/grafnet/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d + @${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/grafio/dashboards + ${INSTALL_DATA} ${WRKSRC}/grafio/dashboards/* ${STAGEDIR}${PREFIX}/share/examples/grafio/dashboards + @${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/grafnet/dashboards + ${INSTALL_DATA} ${WRKSRC}/grafnet/dashboards/* ${STAGEDIR}${PREFIX}/share/examples/grafnet/dashboards do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/dwatch-json/distinfo b/sysutils/dwatch-json/distinfo index 7d63968351c6..615fe50a420a 100644 --- a/sysutils/dwatch-json/distinfo +++ b/sysutils/dwatch-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660285058 -SHA256 (FrauBSD-dwatch-json-0.6.3_GH0.tar.gz) = cb9edb9954f25acdbcf0788cb30b8cc32068e524b2dc5a1da29b4c9545938e3c -SIZE (FrauBSD-dwatch-json-0.6.3_GH0.tar.gz) = 40586 +TIMESTAMP = 1661565853 +SHA256 (FrauBSD-dwatch-json-1.2_GH0.tar.gz) = 14f55d822fa2bad4e42c93717230035561f6361b962e1c67c022e147033a5914 +SIZE (FrauBSD-dwatch-json-1.2_GH0.tar.gz) = 75379 diff --git a/sysutils/dwatch-json/pkg-descr b/sysutils/dwatch-json/pkg-descr index c2c698898757..81ad3a7c9fbd 100644 --- a/sysutils/dwatch-json/pkg-descr +++ b/sysutils/dwatch-json/pkg-descr @@ -1,6 +1,16 @@ -DTrace module for FreeBSD dwatch(1) to produce JSON logs. JSON (JavaScript -Object Notation) is easily consumed by log aggregators such as Kafka and -Telegraf and visualizers like Vizceral. With these modules you can get -data out of the kernel/userland for use in such aggregators/visualizers. +DTrace suite for FreeBSD dwatch(1) to produce JSON stats. +JSON (JavaScript Object Notation) is easily consumed by log aggregators such as +Kafka and Telegraf and visualizers like Grafana and Vizceral. It is also easily +parsed, filtered, and transformed with jq. + +With this package you can get data out of the kernel for use in such tools, +aggregators, and visualizers. + +Included in this package are service suites which help automate the collection +of statistics for time-series graphing (with Grafana for example). The suites +consist of general daemons, sample configs, statistics-gathering daemons +(utilizing telegraf), log-rotation tools, default cron.d entries for calling +said tools, and many convenience features including full service(8) integration +and rc.conf(5) support. WWW: https://fraubsd.org/dwatch-json/ diff --git a/sysutils/dwatch-json/pkg-plist b/sysutils/dwatch-json/pkg-plist index 7469f2283ffa..24e67e8e6b3f 100644 --- a/sysutils/dwatch-json/pkg-plist +++ b/sysutils/dwatch-json/pkg-plist @@ -1,7 +1,40 @@ -etc/dwatch-json-net.conf.sample +etc/cron.d/grafio +etc/cron.d/grafnet +@sample etc/dwatch-json-io.conf.sample +@sample etc/dwatch-json-net.conf.sample +@sample etc/grafio/grafio.conf.sample +@sample etc/grafio/grafio.subr.sample +@sample etc/grafio/stats.conf.sample +@sample etc/grafnet/grafnet.conf.sample +@sample etc/grafnet/grafnet.subr.sample +@sample etc/grafnet/stats.conf.sample +etc/rc.d/grafio +etc/rc.d/grafio_stats +etc/rc.d/grafnet +etc/rc.d/grafnet_stats +libexec/dwatch/json-io +libexec/dwatch/json-io-config +libexec/dwatch/json-io-config-raw +libexec/dwatch/json-io-raw +libexec/dwatch/json-io-top +libexec/dwatch/json-io-top-raw libexec/dwatch/json-net libexec/dwatch/json-net-config libexec/dwatch/json-net-config-raw libexec/dwatch/json-net-raw libexec/dwatch/json-net-top libexec/dwatch/json-net-top-raw +sbin/gio +sbin/gn +sbin/grafio +sbin/grafio-logs +sbin/grafio-rotate +sbin/grafio_stats +sbin/grafnet +sbin/grafnet-logs +sbin/grafnet-rotate +sbin/grafnet_stats +share/examples/grafio/dashboards/block-i-o.json +share/examples/grafnet/dashboards/device-i-o-rates-b-s.json +share/examples/grafnet/dashboards/device-i-o-rates-bps.json +share/examples/grafnet/dashboards/device-i-o.json