Page MenuHomeFreeBSD
Files F174361415

D22045.id63326.diff
No OneTemporary
Actions

D22045.id63326.diff
View Options

Index: /root/ports-svn/net-mgmt/netdata/Makefile
===================================================================
--- /root/ports-svn/net-mgmt/netdata/Makefile
+++ /root/ports-svn/net-mgmt/netdata/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= netdata
-PORTVERSION= 1.17.1
+PORTVERSION= 1.18.0
DISTVERSIONPREFIX=v
CATEGORIES= net-mgmt
@@ -19,7 +19,7 @@
USES= autoreconf cpe pathfix pkgconfig:both python shebangfix ssl
USE_GITHUB= yes
-GH_ACCOUNT= firehol
+GH_ACCOUNT= netdata
SHEBANG_GLOB= *
Index: /root/ports-svn/net-mgmt/netdata/distinfo
===================================================================
--- /root/ports-svn/net-mgmt/netdata/distinfo
+++ /root/ports-svn/net-mgmt/netdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568896571
-SHA256 (firehol-netdata-v1.17.1_GH0.tar.gz) = 032f9001e2b7f774989a200519feeafa3a4d9b7c9e8fb0cfa43e68a8da6ad1bf
-SIZE (firehol-netdata-v1.17.1_GH0.tar.gz) = 3332115
+TIMESTAMP = 1571176525
+SHA256 (netdata-netdata-v1.18.0_GH0.tar.gz) = 8396e818f8fe5c1ce345e99a74da8204970810095047dcf5feffee28d35cc937
+SIZE (netdata-netdata-v1.18.0_GH0.tar.gz) = 3401415
Index: /root/ports-svn/net-mgmt/netdata/files/patch-collectors_python.d.plugin_megacli_megacli.chart.py
===================================================================
--- /root/ports-svn/net-mgmt/netdata/files/patch-collectors_python.d.plugin_megacli_megacli.chart.py
+++ /root/ports-svn/net-mgmt/netdata/files/patch-collectors_python.d.plugin_megacli_megacli.chart.py
@@ -0,0 +1,13 @@
+--- collectors/python.d.plugin/megacli/megacli.chart.py.orig 2019-10-15 22:45:31 UTC
++++ collectors/python.d.plugin/megacli/megacli.chart.py
+@@ -163,8 +163,8 @@ class Battery:
+ class Megacli:
+ def __init__(self):
+ self.s = find_binary('sudo')
+- self.m = find_binary('megacli')
+- self.sudo_check = [self.s, '-n', '-v']
++ self.m = find_binary('megacli') or find_binary('MegaCli') # Binary on FreeBSD is MegaCli
++ self.sudo_check = [self.s, '-n', '-l']
+ self.disk_info = [self.s, '-n', self.m, '-LDPDInfo', '-aAll', '-NoLog']
+ self.battery_info = [self.s, '-n', self.m, '-AdpBbuCmd', '-a0', '-NoLog']
+
Index: /root/ports-svn/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
===================================================================
--- /root/ports-svn/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
+++ /root/ports-svn/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
@@ -1,9 +1,10 @@
---- collectors/python.d.plugin/python.d.plugin.in.orig 2019-05-27 21:36:18 UTC
+--- collectors/python.d.plugin/python.d.plugin.in.orig 2019-10-15 22:38:23 UTC
+++ collectors/python.d.plugin/python.d.plugin.in
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
#!/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" "$@" # '''
-
+-pybinary=$(which python || which python3 || which python2)
++pybinary=$(which python || which python3 || which python2 || which python2.7 || which python 3.6)
+ filtered=()
+ for arg in "$@"
+ do
Index: /root/ports-svn/net-mgmt/netdata/files/patch-configure.ac
===================================================================
--- /root/ports-svn/net-mgmt/netdata/files/patch-configure.ac
+++ /root/ports-svn/net-mgmt/netdata/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2018-11-02 14:04:52 UTC
+--- configure.ac.orig 2019-10-15 22:38:23 UTC
+++ configure.ac
-@@ -497,15 +497,15 @@ AC_MSG_RESULT([${enable_lto}])
+@@ -1060,15 +1060,15 @@ AM_CONDITIONAL([ENABLE_CXX_LINKER], [test "${enable_ba
AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
@@ -7,17 +7,17 @@
-varlibdir="${localstatedir}/lib/netdata"
-registrydir="${localstatedir}/lib/netdata/registry"
-cachedir="${localstatedir}/cache/netdata"
-+varlibdir="%%NETDATA_PERST%%"
-+registrydir="%%NETDATA_PERST%%/registry"
-+cachedir="%%NETDATA_CACHE%%"
++varlibdir="/var/db/netdata"
++registrydir="/var/db/netdata/registry"
++cachedir="/var/cache/netdata"
chartsdir="${libexecdir}/netdata/charts.d"
nodedir="${libexecdir}/netdata/node.d"
pythondir="${libexecdir}/netdata/python.d"
-configdir="${sysconfdir}/netdata"
-+configdir="%%ETCDIR%%"
++configdir="/usr/local/etc/netdata"
libconfigdir="${libdir}/netdata/conf.d"
-logdir="${localstatedir}/log/netdata"
-+logdir="%%NETDATA_LOG%%"
++logdir="/var/log/netdata"
pluginsdir="${libexecdir}/netdata/plugins.d"
AC_SUBST([build_target])
Index: /root/ports-svn/net-mgmt/netdata/pkg-descr
===================================================================
--- /root/ports-svn/net-mgmt/netdata/pkg-descr
+++ /root/ports-svn/net-mgmt/netdata/pkg-descr
@@ -7,4 +7,4 @@
It will use some spare CPU cycles, usually just 1-3% of a single core,
the RAM you want it have, and no disk I/O at all, apart its logging.
-WWW: https://github.com/firehol/netdata
+WWW: https://github.com/netdata/netdata
Index: /root/ports-svn/net-mgmt/netdata/pkg-plist
===================================================================
--- /root/ports-svn/net-mgmt/netdata/pkg-plist
+++ /root/ports-svn/net-mgmt/netdata/pkg-plist
@@ -171,6 +171,13 @@
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/gearman.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/hdfs.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vcsa.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/zookeeper.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/gearman.conf.sample
+libexec/netdata/plugins.d/template_dim.sh
+libexec/netdata/python.d/gearman.chart.py
libexec/netdata/charts.d/ap.chart.sh
libexec/netdata/charts.d/apache.chart.sh
libexec/netdata/charts.d/apcupsd.chart.sh

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 4:40 PM (14 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40138979
Default Alt Text
D22045.id63326.diff (6 KB)

Event Timeline