Date: Fri, 20 Sep 2019 13:45:33 +0000 (UTC) From: Mahdi Mokhtari <mmokhi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512413 - in head/net-mgmt/netdata: . files Message-ID: <201909201345.x8KDjXAo037120@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmokhi Date: Fri Sep 20 13:45:33 2019 New Revision: 512413 URL: https://svnweb.freebsd.org/changeset/ports/512413 Log: net-mgmt/netdata: Update to the latest upstream release 1.17.1 Update the patches to latest upstream changes Add dbengine and json support options Add cpe awareness Reported by: Daniel Engberg <daniel.engberg.lists@pyret.net> Event: EuroBSDCon 2019 Hackathon Sponsored by: EuroBSDCon 2019 Differential Revision: https://reviews.freebsd.org/D21395 Modified: head/net-mgmt/netdata/Makefile head/net-mgmt/netdata/distinfo head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in head/net-mgmt/netdata/pkg-plist Modified: head/net-mgmt/netdata/Makefile ============================================================================== --- head/net-mgmt/netdata/Makefile Fri Sep 20 13:34:52 2019 (r512412) +++ head/net-mgmt/netdata/Makefile Fri Sep 20 13:45:33 2019 (r512413) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= netdata -PORTVERSION= 1.15.0 +PORTVERSION= 1.17.1 DISTVERSIONPREFIX=v CATEGORIES= net-mgmt @@ -11,14 +11,12 @@ COMMENT= Scalable distributed realtime performance and LICENSE= GPLv3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ - libuv.so:devel/libuv \ - liblz4.so:archivers/liblz4 +LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= bash:shells/bash \ curl:ftp/curl -USES= autoreconf pathfix pkgconfig:both python shebangfix ssl +USES= autoreconf cpe pathfix pkgconfig:both python shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= firehol @@ -49,16 +47,27 @@ SUB_FILES= ${PORTNAME}.conf.sample USERS= netdata GROUPS= netdata -OPTIONS_DEFINE= CUPS FREEIPMI +OPTIONS_DEFINE= CUPS DBENGINE FREEIPMI JSON OPTIONS_SUB= YES +OPTIONS_DEFAULT= DBENGINE JSON CUPS_DESC= Enable support for cups CUPS_CONFIGURE_ENABLE= plugin-cups CUPS_LIB_DEPENDS= libcups.so:print/cups +DBENGINE_DESC= Enable support for database engine +DBENGINE_CONFIGURE_ENABLE= dbengine +DBENGINE_LIB_DEPENDS= libuv.so:devel/libuv \ + liblz4.so:archivers/liblz4 \ + libJudy.so:devel/judy + FREEIPMI_DESC= Enable support for freeipmi FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi + +JSON_DESC= Enable support for json +JSON_CONFIGURE_ENABLE= jsonc +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c post-patch: @${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \ Modified: head/net-mgmt/netdata/distinfo ============================================================================== --- head/net-mgmt/netdata/distinfo Fri Sep 20 13:34:52 2019 (r512412) +++ head/net-mgmt/netdata/distinfo Fri Sep 20 13:45:33 2019 (r512413) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558992903 -SHA256 (firehol-netdata-v1.15.0_GH0.tar.gz) = 60cf4a15c25c828e25ae1218a485c21ef23423f7b6a9a1148ce9eea9c9726a39 -SIZE (firehol-netdata-v1.15.0_GH0.tar.gz) = 3178633 +TIMESTAMP = 1568896571 +SHA256 (firehol-netdata-v1.17.1_GH0.tar.gz) = 032f9001e2b7f774989a200519feeafa3a4d9b7c9e8fb0cfa43e68a8da6ad1bf +SIZE (firehol-netdata-v1.17.1_GH0.tar.gz) = 3332115 Modified: head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in ============================================================================== --- head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in Fri Sep 20 13:34:52 2019 (r512412) +++ head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in Fri Sep 20 13:45:33 2019 (r512413) @@ -1,11 +1,9 @@ --- collectors/python.d.plugin/python.d.plugin.in.orig 2019-05-27 21:36:18 UTC +++ collectors/python.d.plugin/python.d.plugin.in -@@ -3,7 +3,7 @@ - if [[ "$OSTYPE" == "darwin"* ]]; then - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - fi +@@ -1,5 +1,5 @@ + #!/usr/local/bin/bash + '''':; -exec "$(command -v python || command -v python3 || command -v python2 || +exec "$(command -v python || command -v python3.6 || command -v python2.7 || echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # ''' - # -*- coding: utf-8 -*- Modified: head/net-mgmt/netdata/pkg-plist ============================================================================== --- head/net-mgmt/netdata/pkg-plist Fri Sep 20 13:34:52 2019 (r512412) +++ head/net-mgmt/netdata/pkg-plist Fri Sep 20 13:45:33 2019 (r512413) @@ -41,7 +41,9 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cgroups.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/couchdb.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cpu.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dbengine.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/disks.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dnsmasq_dhcp.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dockerd.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/elasticsearch.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/entropy.conf.sample @@ -70,12 +72,15 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/nginx.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/nginx_plus.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/phpfpm.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/pihole.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/portcheck.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/postgres.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/processes.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/qos.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ram.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/redis.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/retroshare.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/riakkv.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/softnet.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/squid.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/stiebeleltron.conf.sample @@ -87,12 +92,15 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_resets.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/udp_errors.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/varnish.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vsphere.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/web_log.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/wmi.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/x509check.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/zfs.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health_alarm_notify.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health_email_recipients.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/ioping.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/mongodb.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/node.d.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/adaptec_raid.conf.sample @@ -146,6 +154,7 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/redis.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/rethinkdbs.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/retroshare.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/riakkv.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/samba.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/sensors.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/smartd_log.conf.sample @@ -197,9 +206,11 @@ libexec/netdata/node.d/node_modules/pixl-xml.js libexec/netdata/node.d/sma_webbox.node.js libexec/netdata/node.d/snmp.node.js libexec/netdata/node.d/stiebeleltron.node.js +libexec/netdata/plugins.d/acl.sh libexec/netdata/plugins.d/alarm-email.sh libexec/netdata/plugins.d/alarm-notify.sh libexec/netdata/plugins.d/alarm-test.sh +libexec/netdata/plugins.d/alarm.sh libexec/netdata/plugins.d/anonymous-statistics.sh libexec/netdata/plugins.d/apps.plugin libexec/netdata/plugins.d/cgroup-name.sh @@ -214,6 +225,7 @@ libexec/netdata/plugins.d/ioping.plugin libexec/netdata/plugins.d/loopsleepms.sh.inc libexec/netdata/plugins.d/node.d.plugin libexec/netdata/plugins.d/python.d.plugin +libexec/netdata/plugins.d/request.sh libexec/netdata/plugins.d/system-info.sh libexec/netdata/plugins.d/tc-qos-helper.sh libexec/netdata/python.d/adaptec_raid.chart.py @@ -356,6 +368,7 @@ libexec/netdata/python.d/rabbitmq.chart.py libexec/netdata/python.d/redis.chart.py libexec/netdata/python.d/rethinkdbs.chart.py libexec/netdata/python.d/retroshare.chart.py +libexec/netdata/python.d/riakkv.chart.py libexec/netdata/python.d/samba.chart.py libexec/netdata/python.d/sensors.chart.py libexec/netdata/python.d/smartd_log.chart.py @@ -375,7 +388,7 @@ sbin/netdata @owner netdata @group netdata %%DATADIR%%/web/.well-known/dnt/cookies -%%DATADIR%%/web/console/index.html +%%DATADIR%%/web/console.html %%DATADIR%%/web/css/bootstrap-3.3.7.css %%DATADIR%%/web/css/bootstrap-slate-flat-3.3.7.css %%DATADIR%%/web/css/bootstrap-slider-10.0.0.min.css @@ -383,6 +396,7 @@ sbin/netdata %%DATADIR%%/web/css/bootstrap-toggle-2.2.2.min.css %%DATADIR%%/web/css/c3-0.4.18.min.css %%DATADIR%%/web/css/morris-0.5.1.css +%%DATADIR%%/web/dash-example.html %%DATADIR%%/web/dashboard.css %%DATADIR%%/web/dashboard.html %%DATADIR%%/web/dashboard.js
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909201345.x8KDjXAo037120>