svn commit: r436970 - in head/net-mgmt/netdata: . files
Mahdi Mokhtari
mmokhi at FreeBSD.org
Sun Mar 26 15:39:16 UTC 2017
Author: mmokhi
Date: Sun Mar 26 15:39:14 2017
New Revision: 436970
URL: https://svnweb.freebsd.org/changeset/ports/436970
Log:
net-mgmt/netdata: Update to 1.6.0:
This release merged many parts of our local FreeBSD patches.
Reviewed by: feld, mat (mentors)
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D10093
Deleted:
head/net-mgmt/netdata/files/patch-src_Makefile.am
head/net-mgmt/netdata/files/patch-src_plugin__freebsd.c
head/net-mgmt/netdata/files/patch-src_plugin__freebsd.h
Modified:
head/net-mgmt/netdata/Makefile
head/net-mgmt/netdata/distinfo
head/net-mgmt/netdata/files/patch-configure.ac
head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c
head/net-mgmt/netdata/pkg-plist
Modified: head/net-mgmt/netdata/Makefile
==============================================================================
--- head/net-mgmt/netdata/Makefile Sun Mar 26 15:33:58 2017 (r436969)
+++ head/net-mgmt/netdata/Makefile Sun Mar 26 15:39:14 2017 (r436970)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= netdata
-PORTVERSION= 1.5.0
+PORTVERSION= 1.6.0
CATEGORIES= net-mgmt
MAINTAINER= mmokhi at FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-
USE_GITHUB= yes
GH_ACCOUNT= firehol
-GH_TAGNAME= 3bd41a0
+GH_TAGNAME= f5fa346
NETDATA_CACHE= /var/cache/${PORTNAME}
NETDATA_LOG= /var/log/${PORTNAME}
Modified: head/net-mgmt/netdata/distinfo
==============================================================================
--- head/net-mgmt/netdata/distinfo Sun Mar 26 15:33:58 2017 (r436969)
+++ head/net-mgmt/netdata/distinfo Sun Mar 26 15:39:14 2017 (r436970)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485268722
-SHA256 (firehol-netdata-1.5.0-3bd41a0_GH0.tar.gz) = add4d6dceed43771deccf7388c9ff68fe72ca8f771f79b0a5fb19213d940888d
-SIZE (firehol-netdata-1.5.0-3bd41a0_GH0.tar.gz) = 2257311
+TIMESTAMP = 1490178032
+SHA256 (firehol-netdata-1.6.0-f5fa346_GH0.tar.gz) = e9101bbc2628bedcf7755cde23f33884e8c64cb051b36154996bcd44387dad78
+SIZE (firehol-netdata-1.6.0-f5fa346_GH0.tar.gz) = 2526672
Modified: head/net-mgmt/netdata/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/netdata/files/patch-configure.ac Sun Mar 26 15:33:58 2017 (r436969)
+++ head/net-mgmt/netdata/files/patch-configure.ac Sun Mar 26 15:39:14 2017 (r436970)
@@ -1,14 +1,5 @@
--- configure.ac.orig 2017-01-22 19:49:22 UTC
+++ configure.ac
-@@ -162,7 +162,7 @@ PKG_CHECK_MODULES(
- [UUID],
- [uuid],
- )
--test -z "${UUID_LIBS}" && AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])
-+test -z "${UUID_LIBS}" && AC_MSG_ERROR([libuuid required but not found. Try installing 'misc/e2fsprogs-libuuid'.])
- AC_DEFINE([NETDATA_WITH_UUID], [1], [uuid settings])
- OPTIONAL_UUID_CLFAGS="${UUID_CFLAGS}"
- OPTIONAL_UUID_LIBS="${UUID_LIBS}"
@@ -214,14 +214,14 @@ fi
AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
Modified: head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c
==============================================================================
--- head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c Sun Mar 26 15:33:58 2017 (r436969)
+++ head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c Sun Mar 26 15:39:14 2017 (r436970)
@@ -1,26 +1,11 @@
---- src/freebsd_sysctl.c.orig 2017-01-22 19:49:22 UTC
+--- src/freebsd_sysctl.c.orig 2017-03-20 18:26:59 UTC
+++ src/freebsd_sysctl.c
-@@ -828,7 +828,11 @@ int do_freebsd_sysctl(int update_every,
- if (unlikely(GETSYSCTL("vm.stats.vm.v_active_count", vmmeter_data.v_active_count) ||
- GETSYSCTL("vm.stats.vm.v_inactive_count", vmmeter_data.v_inactive_count) ||
- GETSYSCTL("vm.stats.vm.v_wire_count", vmmeter_data.v_wire_count) ||
-+#if (__FreeBSD__ >= 12) && (__FreeBSD_version >= 1200016)
-+ 0 ||
-+#else
- GETSYSCTL("vm.stats.vm.v_cache_count", vmmeter_data.v_cache_count) ||
+@@ -1,3 +1,8 @@
++#if __FreeBSD__ < 11 || __FreeBSD_version < 1100000
++#define _IFI_OQDROPS
++#define _IN_NET_RTSOCK_C
+#endif
- GETSYSCTL("vfs.bufspace", vfs_bufspace_count) ||
- GETSYSCTL("vm.stats.vm.v_free_count", vmmeter_data.v_free_count))) {
- do_ram = 0;
-@@ -850,7 +854,11 @@ int do_freebsd_sysctl(int update_every,
- rrddim_set(st, "active", vmmeter_data.v_active_count);
- rrddim_set(st, "inactive", vmmeter_data.v_inactive_count);
- rrddim_set(st, "wired", vmmeter_data.v_wire_count);
-+#if (__FreeBSD__ >= 12) && (__FreeBSD_version >= 1200016)
-+ rrddim_set(st, "cache", 0);
-+#else
- rrddim_set(st, "cache", vmmeter_data.v_cache_count);
-+#endif
- rrddim_set(st, "buffers", vfs_bufspace_count);
- rrddim_set(st, "free", vmmeter_data.v_free_count);
- rrdset_done(st);
++
+ #include "common.h"
+
+ #include <sys/vmmeter.h>
Modified: head/net-mgmt/netdata/pkg-plist
==============================================================================
--- head/net-mgmt/netdata/pkg-plist Sun Mar 26 15:33:58 2017 (r436969)
+++ head/net-mgmt/netdata/pkg-plist Sun Mar 26 15:39:14 2017 (r436970)
@@ -26,33 +26,23 @@
%%ETCDIR%%/health.d/apache.conf
%%ETCDIR%%/health.d/backend.conf
%%ETCDIR%%/health.d/bind_rndc.conf
-%%ETCDIR%%/health.d/cpu.conf
-%%ETCDIR%%/health.d/disks.conf
%%ETCDIR%%/health.d/elasticsearch.conf
-%%ETCDIR%%/health.d/entropy.conf
+%%ETCDIR%%/health.d/fping.conf
%%ETCDIR%%/health.d/haproxy.conf
-%%ETCDIR%%/health.d/ipc.conf
%%ETCDIR%%/health.d/ipfs.conf
+%%ETCDIR%%/health.d/ipmi.conf
%%ETCDIR%%/health.d/isc_dhcpd.conf
%%ETCDIR%%/health.d/mdstat.conf
%%ETCDIR%%/health.d/memcached.conf
-%%ETCDIR%%/health.d/memory.conf
%%ETCDIR%%/health.d/mysql.conf
%%ETCDIR%%/health.d/named.conf
-%%ETCDIR%%/health.d/net.conf
-%%ETCDIR%%/health.d/netfilter.conf
%%ETCDIR%%/health.d/nginx.conf
%%ETCDIR%%/health.d/postgres.conf
-%%ETCDIR%%/health.d/qos.conf
-%%ETCDIR%%/health.d/ram.conf
%%ETCDIR%%/health.d/redis.conf
%%ETCDIR%%/health.d/retroshare.conf
-%%ETCDIR%%/health.d/softnet.conf
%%ETCDIR%%/health.d/squid.conf
-%%ETCDIR%%/health.d/swap.conf
-%%ETCDIR%%/health.d/tcp_resets.conf
-%%ETCDIR%%/health.d/udp_errors.conf
%%ETCDIR%%/health.d/varnish.conf
+%%ETCDIR%%/health.d/web_log.conf
%%ETCDIR%%/health_alarm_notify.conf
%%ETCDIR%%/health_email_recipients.conf
%%ETCDIR%%/node.d.conf
@@ -71,16 +61,16 @@
%%ETCDIR%%/python.d/exim.conf
%%ETCDIR%%/python.d/fail2ban.conf
%%ETCDIR%%/python.d/freeradius.conf
-%%ETCDIR%%/python.d/gunicorn_log.conf
%%ETCDIR%%/python.d/haproxy.conf
%%ETCDIR%%/python.d/hddtemp.conf
%%ETCDIR%%/python.d/ipfs.conf
%%ETCDIR%%/python.d/isc_dhcpd.conf
%%ETCDIR%%/python.d/mdstat.conf
%%ETCDIR%%/python.d/memcached.conf
+%%ETCDIR%%/python.d/mongodb.conf
%%ETCDIR%%/python.d/mysql.conf
%%ETCDIR%%/python.d/nginx.conf
-%%ETCDIR%%/python.d/nginx_log.conf
+%%ETCDIR%%/python.d/nsd.conf
%%ETCDIR%%/python.d/ovpn_status_log.conf
%%ETCDIR%%/python.d/phpfpm.conf
%%ETCDIR%%/python.d/postfix.conf
@@ -88,9 +78,12 @@
%%ETCDIR%%/python.d/redis.conf
%%ETCDIR%%/python.d/retroshare.conf
%%ETCDIR%%/python.d/sensors.conf
+%%ETCDIR%%/python.d/smartd_log.conf
%%ETCDIR%%/python.d/squid.conf
%%ETCDIR%%/python.d/tomcat.conf
%%ETCDIR%%/python.d/varnish.conf
+%%ETCDIR%%/python.d/web_log.conf
+%%ETCDIR%%/stream.conf
@mode
@owner
@group
@@ -153,16 +146,16 @@ libexec/netdata/python.d/example.chart.p
libexec/netdata/python.d/exim.chart.py
libexec/netdata/python.d/fail2ban.chart.py
libexec/netdata/python.d/freeradius.chart.py
-libexec/netdata/python.d/gunicorn_log.chart.py
libexec/netdata/python.d/haproxy.chart.py
libexec/netdata/python.d/hddtemp.chart.py
libexec/netdata/python.d/ipfs.chart.py
libexec/netdata/python.d/isc_dhcpd.chart.py
libexec/netdata/python.d/mdstat.chart.py
libexec/netdata/python.d/memcached.chart.py
+libexec/netdata/python.d/mongodb.chart.py
libexec/netdata/python.d/mysql.chart.py
libexec/netdata/python.d/nginx.chart.py
-libexec/netdata/python.d/nginx_log.chart.py
+libexec/netdata/python.d/nsd.chart.py
libexec/netdata/python.d/ovpn_status_log.chart.py
libexec/netdata/python.d/phpfpm.chart.py
libexec/netdata/python.d/postfix.chart.py
@@ -209,9 +202,11 @@ libexec/netdata/python.d/python_modules/
libexec/netdata/python.d/redis.chart.py
libexec/netdata/python.d/retroshare.chart.py
libexec/netdata/python.d/sensors.chart.py
+libexec/netdata/python.d/smartd_log.chart.py
libexec/netdata/python.d/squid.chart.py
libexec/netdata/python.d/tomcat.chart.py
libexec/netdata/python.d/varnish.chart.py
+libexec/netdata/python.d/web_log.chart.py
sbin/netdata
@mode 4640
@owner netdata
@@ -229,6 +224,7 @@ sbin/netdata
%%DATADIR%%/web/dashboard.js
%%DATADIR%%/web/dashboard.slate.css
%%DATADIR%%/web/dashboard_info.js
+%%DATADIR%%/web/dashboard_info_custom_example.js
%%DATADIR%%/web/demo.html
%%DATADIR%%/web/demo2.html
%%DATADIR%%/web/demosites.html
@@ -275,7 +271,7 @@ sbin/netdata
%%DATADIR%%/web/lib/d3-3.5.17.min.js
%%DATADIR%%/web/lib/dygraph-combined-dd74404.js
%%DATADIR%%/web/lib/dygraph-smooth-plotter-dd74404.js
-%%DATADIR%%/web/lib/gauge-d5260c3.min.js
+%%DATADIR%%/web/lib/gauge-1.3.2.min.js
%%DATADIR%%/web/lib/jquery-2.2.4.min.js
%%DATADIR%%/web/lib/jquery.easypiechart-97b5824.min.js
%%DATADIR%%/web/lib/jquery.peity-3.2.0.min.js
More information about the svn-ports-all
mailing list