diff options
| -rw-r--r-- | sysutils/dwatch-json/Makefile | 31 | ||||
| -rw-r--r-- | sysutils/dwatch-json/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/dwatch-json/pkg-descr | 18 | ||||
| -rw-r--r-- | 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 |