diff options
| -rw-r--r-- | net-mgmt/netdata/Makefile | 14 | ||||
| -rw-r--r-- | net-mgmt/netdata/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/netdata/files/netdata.in | 4 | ||||
| -rw-r--r-- | net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in | 9 | ||||
| -rw-r--r-- | net-mgmt/netdata/pkg-descr | 2 | ||||
| -rw-r--r-- | net-mgmt/netdata/pkg-plist | 16 |
6 files changed, 33 insertions, 18 deletions
diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index 8fd697286029..a26e3884b0b8 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= netdata -PORTVERSION= 1.11.1 +PORTVERSION= 1.13.0 DISTVERSIONPREFIX=v -PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= mmokhi@FreeBSD.org @@ -22,6 +21,8 @@ USES= autoreconf pathfix pkgconfig:both python shebangfix USE_GITHUB= yes GH_ACCOUNT= firehol +SHEBANG_GLOB= * + NETDATA_CACHE= /var/cache/${PORTNAME} NETDATA_LOG= /var/log/${PORTNAME} NETDATA_PERST= /var/db/${PORTNAME} @@ -46,10 +47,15 @@ SUB_FILES= ${PORTNAME}.conf.sample USERS= netdata GROUPS= netdata -OPTIONS_DEFINE= FREEIPMI +OPTIONS_DEFINE= CUPS FREEIPMI OPTIONS_SUB= YES -FREEIPMI_DESC= Enable support for freeipmi +CUPS_DESC= Enable support for cups +CUPS_CONFIGURE_ENABLE= plugin-cups +CUPS_LIB_DEPENDS= libcups.so:print/cups + +FREEIPMI_DESC= Enable support for freeipmi +FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi post-patch: diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo index fcc446f6956b..13c148548b7f 100644 --- a/net-mgmt/netdata/distinfo +++ b/net-mgmt/netdata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545574796 -SHA256 (firehol-netdata-v1.11.1_GH0.tar.gz) = 909388511729d1e3b064d33fcf7ba65e27439787b449303ba8458c300ec46500 -SIZE (firehol-netdata-v1.11.1_GH0.tar.gz) = 3050309 +TIMESTAMP = 1553178227 +SHA256 (firehol-netdata-v1.13.0_GH0.tar.gz) = 45d972c11954af08aaf4c888ffb32453dd2e1fda0c7dbb355afdb9d4b1ab930e +SIZE (firehol-netdata-v1.13.0_GH0.tar.gz) = 3095581 diff --git a/net-mgmt/netdata/files/netdata.in b/net-mgmt/netdata/files/netdata.in index 6a3ee49b9755..bfbdbe04c2a0 100644 --- a/net-mgmt/netdata/files/netdata.in +++ b/net-mgmt/netdata/files/netdata.in @@ -24,11 +24,11 @@ load_rc_config $name : ${netdata_enable="NO"} : ${netdata_user="netdata"} +: ${netdata_pid="%%NETDATA_PERST%%/${name}.pid"} -pidfile="%%NETDATA_PERST%%/${name}.pid" procname="%%PREFIX%%/sbin/${name}" command="/usr/sbin/daemon" -command_args="-c -f ${procname} -u ${netdata_user} -P ${pidfile} ${netdata_args}" +command_args="-c -f ${procname} -u ${netdata_user} -P ${netdata_pid} ${netdata_args}" required_files="%%ETCDIR%%/${name}.conf" diff --git a/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in new file mode 100644 index 000000000000..b3d045d10915 --- /dev/null +++ b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in @@ -0,0 +1,9 @@ +--- collectors/python.d.plugin/python.d.plugin.in.orig 2019-02-03 14:09:41 UTC ++++ collectors/python.d.plugin/python.d.plugin.in +@@ -1,5 +1,5 @@ + #!/usr/bin/env 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 -*- diff --git a/net-mgmt/netdata/pkg-descr b/net-mgmt/netdata/pkg-descr index a11534cf5c33..03005448f7c7 100644 --- a/net-mgmt/netdata/pkg-descr +++ b/net-mgmt/netdata/pkg-descr @@ -5,6 +5,6 @@ Out of the box, it comes with plugins that collect hundreds of system metrics and metrics of popular applications. Netdata is very resource efficient and you can control its resource consumption. 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. +the RAM you want it have, and no disk I/O at all, apart its logging. WWW: https://github.com/firehol/netdata diff --git a/net-mgmt/netdata/pkg-plist b/net-mgmt/netdata/pkg-plist index 6891dad2858a..5c693a40bb63 100644 --- a/net-mgmt/netdata/pkg-plist +++ b/net-mgmt/netdata/pkg-plist @@ -6,7 +6,6 @@ %%ETCDIR%%/statsd.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/apps_groups.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d.conf.sample -lib/netdata/conf.d/charts.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/ap.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/apache.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/apcupsd.conf.sample @@ -28,7 +27,6 @@ lib/netdata/conf.d/charts.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/squid.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/tomcat.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample -lib/netdata/conf.d/health.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apache.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample @@ -39,6 +37,7 @@ lib/netdata/conf.d/health.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/boinc.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/btrfs.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ceph.conf.sample +@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/disks.conf.sample @@ -75,6 +74,7 @@ lib/netdata/conf.d/health.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/retroshare.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/sslcheck.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/stiebeleltron.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/swap.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_conn.conf.sample @@ -89,9 +89,7 @@ lib/netdata/conf.d/health.d/.keep @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/node.d.conf.sample -lib/netdata/conf.d/node.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d.conf.sample -lib/netdata/conf.d/python.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/adaptec_raid.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/apache.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/beanstalk.conf.sample @@ -133,6 +131,7 @@ lib/netdata/conf.d/python.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ntpd.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/nvidia_smi.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/openldap.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/oracledb.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ovpn_status_log.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/phpfpm.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/portcheck.conf.sample @@ -159,7 +158,6 @@ lib/netdata/conf.d/python.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/varnish.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/w1sensor.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample -lib/netdata/conf.d/statsd.d/.keep @sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample libexec/netdata/charts.d/ap.chart.sh @@ -200,13 +198,16 @@ libexec/netdata/node.d/stiebeleltron.node.js 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/anonymous-statistics.sh libexec/netdata/plugins.d/apps.plugin libexec/netdata/plugins.d/cgroup-name.sh libexec/netdata/plugins.d/cgroup-network-helper.sh libexec/netdata/plugins.d/charts.d.dryrun-helper.sh libexec/netdata/plugins.d/charts.d.plugin +%%CUPS%%libexec/netdata/plugins.d/cups.plugin libexec/netdata/plugins.d/fping.plugin %%FREEIPMI%%libexec/netdata/plugins.d/freeipmi.plugin +libexec/netdata/plugins.d/health-cmdapi-test.sh libexec/netdata/plugins.d/loopsleepms.sh.inc libexec/netdata/plugins.d/node.d.plugin libexec/netdata/plugins.d/python.d.plugin @@ -252,6 +253,7 @@ libexec/netdata/python.d/nsd.chart.py libexec/netdata/python.d/ntpd.chart.py libexec/netdata/python.d/nvidia_smi.chart.py libexec/netdata/python.d/openldap.chart.py +libexec/netdata/python.d/oracledb.chart.py libexec/netdata/python.d/ovpn_status_log.chart.py libexec/netdata/python.d/phpfpm.chart.py libexec/netdata/python.d/portcheck.chart.py @@ -429,6 +431,7 @@ sbin/netdata %%DATADIR%%/web/images/ms-icon-150x150.png %%DATADIR%%/web/images/ms-icon-310x310.png %%DATADIR%%/web/images/ms-icon-70x70.png +%%DATADIR%%/web/images/netdata-logomark.svg %%DATADIR%%/web/images/netdata.svg %%DATADIR%%/web/images/post.png %%DATADIR%%/web/index.html @@ -438,7 +441,6 @@ sbin/netdata %%DATADIR%%/web/lib/bootstrap-table-1.11.0.min.js %%DATADIR%%/web/lib/bootstrap-table-export-1.11.0.min.js %%DATADIR%%/web/lib/bootstrap-toggle-2.2.2.min.js -%%DATADIR%%/web/lib/c3-0.4.18.min.js %%DATADIR%%/web/lib/clipboard-polyfill-be05dad.js %%DATADIR%%/web/lib/d3-4.12.2.min.js %%DATADIR%%/web/lib/d3pie-0.2.1-netdata-3.js @@ -451,10 +453,8 @@ sbin/netdata %%DATADIR%%/web/lib/jquery.peity-3.2.0.min.js %%DATADIR%%/web/lib/jquery.sparkline-2.1.2.min.js %%DATADIR%%/web/lib/lz-string-1.4.4.min.js -%%DATADIR%%/web/lib/morris-0.5.1.min.js %%DATADIR%%/web/lib/pako-1.0.6.min.js %%DATADIR%%/web/lib/perfect-scrollbar-0.6.15.min.js -%%DATADIR%%/web/lib/raphael-2.2.4-min.js %%DATADIR%%/web/lib/tableExport-1.6.0.min.js %%DATADIR%%/web/main.css %%DATADIR%%/web/main.js |