Attachment #212172 for bug #244323




# $FreeBSD$

PORTNAME=	netdata
PORTVERSION=	1.20.0
DISTVERSIONPREFIX=	v
PORTREVISION=	1
CATEGORIES=	net-mgmt

MAINTAINER=	mmokhi@FreeBSD.org

LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid

RUN_DEPENDS=	bash:shells/bash \
		curl:ftp/curl \
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}

USES=		autoreconf cpe pathfix pkgconfig:both python shebangfix ssl


NETDATA_PERST=	/var/db/${PORTNAME}

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-unit-tests
CPPFLAGS+=	-D_WANT_VMMETER
INSTALL_TARGET=	install-strip

SUB_LIST=	NETDATA_CACHE=${NETDATA_CACHE} \

Lines 1-3 Link Here

(-)b/net-mgmt/netdata/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575076612	1	TIMESTAMP = 1583350154
2	SHA256 (netdata-netdata-v1.19.0_GH0.tar.gz) = 007656f639d3544698af503f35550aeb4d4d5a06b81801bf5acf4ac21db68f6e	2	SHA256 (netdata-netdata-v1.20.0_GH0.tar.gz) = c739e0fa8d6d7f433c0c7c8016b763e8f70519d67f0b5e7eca9ee5318f210d90
3	SIZE (netdata-netdata-v1.19.0_GH0.tar.gz) = 3443251	3	SIZE (netdata-netdata-v1.20.0_GH0.tar.gz) = 3598521




--- collectors/python.d.plugin/Makefile.am.orig	2020-02-21 01:50:30 UTC
+++ collectors/python.d.plugin/Makefile.am
@@ -142,109 +142,3 @@ dist_third_party_DATA = \
     python_modules/third_party/boinc_client.py \
     python_modules/third_party/monotonic.py \
     $(NULL)
-
-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
-dist_pythonyaml2_DATA = \
-    python_modules/pyyaml2/__init__.py \
-    python_modules/pyyaml2/composer.py \
-    python_modules/pyyaml2/constructor.py \
-    python_modules/pyyaml2/cyaml.py \
-    python_modules/pyyaml2/dumper.py \
-    python_modules/pyyaml2/emitter.py \
-    python_modules/pyyaml2/error.py \
-    python_modules/pyyaml2/events.py \
-    python_modules/pyyaml2/loader.py \
-    python_modules/pyyaml2/nodes.py \
-    python_modules/pyyaml2/parser.py \
-    python_modules/pyyaml2/reader.py \
-    python_modules/pyyaml2/representer.py \
-    python_modules/pyyaml2/resolver.py \
-    python_modules/pyyaml2/scanner.py \
-    python_modules/pyyaml2/serializer.py \
-    python_modules/pyyaml2/tokens.py \
-    $(NULL)
-
-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
-dist_pythonyaml3_DATA = \
-    python_modules/pyyaml3/__init__.py \
-    python_modules/pyyaml3/composer.py \
-    python_modules/pyyaml3/constructor.py \
-    python_modules/pyyaml3/cyaml.py \
-    python_modules/pyyaml3/dumper.py \
-    python_modules/pyyaml3/emitter.py \
-    python_modules/pyyaml3/error.py \
-    python_modules/pyyaml3/events.py \
-    python_modules/pyyaml3/loader.py \
-    python_modules/pyyaml3/nodes.py \
-    python_modules/pyyaml3/parser.py \
-    python_modules/pyyaml3/reader.py \
-    python_modules/pyyaml3/representer.py \
-    python_modules/pyyaml3/resolver.py \
-    python_modules/pyyaml3/scanner.py \
-    python_modules/pyyaml3/serializer.py \
-    python_modules/pyyaml3/tokens.py \
-    $(NULL)
-
-python_urllib3dir=$(pythonmodulesdir)/urllib3
-dist_python_urllib3_DATA = \
-    python_modules/urllib3/__init__.py \
-    python_modules/urllib3/_collections.py \
-    python_modules/urllib3/connection.py \
-    python_modules/urllib3/connectionpool.py \
-    python_modules/urllib3/exceptions.py \
-    python_modules/urllib3/fields.py \
-    python_modules/urllib3/filepost.py \
-    python_modules/urllib3/response.py \
-    python_modules/urllib3/poolmanager.py \
-    python_modules/urllib3/request.py \
-    $(NULL)
-
-python_urllib3_utildir=$(python_urllib3dir)/util
-dist_python_urllib3_util_DATA = \
-    python_modules/urllib3/util/__init__.py \
-    python_modules/urllib3/util/connection.py \
-    python_modules/urllib3/util/request.py \
-    python_modules/urllib3/util/response.py \
-    python_modules/urllib3/util/retry.py \
-    python_modules/urllib3/util/selectors.py \
-    python_modules/urllib3/util/ssl_.py \
-    python_modules/urllib3/util/timeout.py \
-    python_modules/urllib3/util/url.py \
-    python_modules/urllib3/util/wait.py \
-    $(NULL)
-
-python_urllib3_packagesdir=$(python_urllib3dir)/packages
-dist_python_urllib3_packages_DATA = \
-    python_modules/urllib3/packages/__init__.py \
-    python_modules/urllib3/packages/ordered_dict.py \
-    python_modules/urllib3/packages/six.py \
-    $(NULL)
-
-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
-dist_python_urllib3_backports_DATA = \
-    python_modules/urllib3/packages/backports/__init__.py \
-    python_modules/urllib3/packages/backports/makefile.py \
-    $(NULL)
-
-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
-dist_python_urllib3_ssl_match_hostname_DATA = \
-    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
-    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
-    $(NULL)
-
-python_urllib3_contribdir=$(python_urllib3dir)/contrib
-dist_python_urllib3_contrib_DATA = \
-    python_modules/urllib3/contrib/__init__.py \
-    python_modules/urllib3/contrib/appengine.py \
-    python_modules/urllib3/contrib/ntlmpool.py \
-    python_modules/urllib3/contrib/pyopenssl.py \
-    python_modules/urllib3/contrib/securetransport.py \
-    python_modules/urllib3/contrib/socks.py \
-    $(NULL)
-
-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
-dist_python_urllib3_securetransport_DATA = \
-    python_modules/urllib3/contrib/_securetransport/__init__.py \
-    python_modules/urllib3/contrib/_securetransport/bindings.py \
-    python_modules/urllib3/contrib/_securetransport/low_level.py \
-    $(NULL)




--- collectors/python.d.plugin/python_modules/bases/loaders.py.orig	2020-02-21 01:50:30 UTC
+++ collectors/python.d.plugin/python_modules/bases/loaders.py
@@ -10,9 +10,9 @@ PY_VERSION = version_info[:2]
 
 try:
     if PY_VERSION > (3, 1):
-        from pyyaml3 import SafeLoader as YamlSafeLoader
+        from yaml import SafeLoader as YamlSafeLoader
     else:
-        from pyyaml2 import SafeLoader as YamlSafeLoader
+        from yaml import SafeLoader as YamlSafeLoader
 except ImportError:
     from yaml import SafeLoader as YamlSafeLoader
 




--- web/gui/index.html.orig	2020-02-21 01:50:30 UTC
+++ web/gui/index.html
@@ -93,10 +93,14 @@
                     <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i>&nbsp;<span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
                     <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
                     <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
+                    <!--
                     <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
+                    -->
+                    <!--
                     <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class=&quot;fas fa-star&quot;></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li>
                     <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li>
                     <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li>
+                    -->
                     <li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Import</span></a></li>
                     <li title="export / save a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="saveButton"><a href="#" class="btn" data-toggle="modal" data-target="#saveSnapshotModal"><i class="fas fa-upload"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Export</span></a></li>
                     <li title="print this dashboard to PDF" data-toggle="tooltip" data-placement="bottom" id="printButton"><a href="#" class="btn" data-toggle="modal" data-target="#printPreflightModal"><i class="fas fa-print"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Print</span></a></li>
@@ -110,6 +114,7 @@
         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
     </div>
 
+<!--
     <div id="sign-in-banner" style="display: none">
         <div class="container">
             Like what you see? 
@@ -120,6 +125,7 @@
             </div>
         </div>
     </div>
+-->
     
     <div id="masthead" style="display: none;">
         <div class="container">




%%ETCDIR%%/charts.d/.keep
%%ETCDIR%%/edit-config
%%ETCDIR%%/health.d/.keep
%%ETCDIR%%/node.d/.keep
%%ETCDIR%%/python.d/.keep
%%ETCDIR%%/statsd.d/.keep
@sample(netdata,netdata,0640) lib/netdata/conf.d/apps_groups.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/aws_kinesis.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d.conf.sample
@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
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/cpu_apps.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/cpufreq.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/example.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/exim.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/hddtemp.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/libreswan.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/load_average.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/mem_apps.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/mysql.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/nginx.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/nut.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/phpfpm.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/postfix.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_process.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
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/am2320.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/cockroachdb.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/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/scaleio.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

@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_orphans.conf.sample
@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/unbound.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/vcsa.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vsphere.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/go_expvar.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/haproxy.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/hddtemp.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/hpssa.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/httpcheck.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/icecast.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ipfs.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/tomcat.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/tor.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/traefik.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/unbound.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/uwsgi.conf.sample
@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/statsd.d/example.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample
libexec/netdata/charts.d/ap.chart.sh
libexec/netdata/charts.d/apache.chart.sh
libexec/netdata/charts.d/apcupsd.chart.sh
libexec/netdata/charts.d/cpu_apps.chart.sh
libexec/netdata/charts.d/cpufreq.chart.sh
libexec/netdata/charts.d/example.chart.sh
libexec/netdata/charts.d/exim.chart.sh
libexec/netdata/charts.d/hddtemp.chart.sh
libexec/netdata/charts.d/libreswan.chart.sh
libexec/netdata/charts.d/load_average.chart.sh
libexec/netdata/charts.d/mem_apps.chart.sh
libexec/netdata/charts.d/mysql.chart.sh
libexec/netdata/charts.d/nginx.chart.sh
libexec/netdata/charts.d/nut.chart.sh
libexec/netdata/charts.d/opensips.chart.sh
libexec/netdata/charts.d/phpfpm.chart.sh
libexec/netdata/charts.d/postfix.chart.sh
libexec/netdata/charts.d/sensors.chart.sh
libexec/netdata/charts.d/squid.chart.sh
libexec/netdata/charts.d/tomcat.chart.sh
libexec/netdata/node.d/fronius.node.js
libexec/netdata/node.d/named.node.js
libexec/netdata/node.d/node_modules/asn1-ber.js

%%CUPS%%libexec/netdata/plugins.d/cups.plugin
libexec/netdata/plugins.d/fping.plugin
%%FREEIPMI%%libexec/netdata/plugins.d/freeipmi.plugin
libexec/netdata/plugins.d/get-kubernetes-labels.sh
libexec/netdata/plugins.d/health-cmdapi-test.sh
libexec/netdata/plugins.d/ioping.plugin
libexec/netdata/plugins.d/loopsleepms.sh.inc

libexec/netdata/python.d/go_expvar.chart.py
libexec/netdata/python.d/haproxy.chart.py
libexec/netdata/python.d/hddtemp.chart.py
libexec/netdata/python.d/hpssa.chart.py
libexec/netdata/python.d/httpcheck.chart.py
libexec/netdata/python.d/icecast.chart.py
libexec/netdata/python.d/ipfs.chart.py

libexec/netdata/python.d/python_modules/bases/collection.py
libexec/netdata/python.d/python_modules/bases/loaders.py
libexec/netdata/python.d/python_modules/bases/loggers.py
libexec/netdata/python.d/python_modules/pyyaml2/__init__.py
libexec/netdata/python.d/python_modules/pyyaml2/composer.py
libexec/netdata/python.d/python_modules/pyyaml2/constructor.py
libexec/netdata/python.d/python_modules/pyyaml2/cyaml.py
libexec/netdata/python.d/python_modules/pyyaml2/dumper.py
libexec/netdata/python.d/python_modules/pyyaml2/emitter.py
libexec/netdata/python.d/python_modules/pyyaml2/error.py
libexec/netdata/python.d/python_modules/pyyaml2/events.py
libexec/netdata/python.d/python_modules/pyyaml2/loader.py
libexec/netdata/python.d/python_modules/pyyaml2/nodes.py
libexec/netdata/python.d/python_modules/pyyaml2/parser.py
libexec/netdata/python.d/python_modules/pyyaml2/reader.py
libexec/netdata/python.d/python_modules/pyyaml2/representer.py
libexec/netdata/python.d/python_modules/pyyaml2/resolver.py
libexec/netdata/python.d/python_modules/pyyaml2/scanner.py
libexec/netdata/python.d/python_modules/pyyaml2/serializer.py
libexec/netdata/python.d/python_modules/pyyaml2/tokens.py
libexec/netdata/python.d/python_modules/pyyaml3/__init__.py
libexec/netdata/python.d/python_modules/pyyaml3/composer.py
libexec/netdata/python.d/python_modules/pyyaml3/constructor.py
libexec/netdata/python.d/python_modules/pyyaml3/cyaml.py
libexec/netdata/python.d/python_modules/pyyaml3/dumper.py
libexec/netdata/python.d/python_modules/pyyaml3/emitter.py
libexec/netdata/python.d/python_modules/pyyaml3/error.py
libexec/netdata/python.d/python_modules/pyyaml3/events.py
libexec/netdata/python.d/python_modules/pyyaml3/loader.py
libexec/netdata/python.d/python_modules/pyyaml3/nodes.py
libexec/netdata/python.d/python_modules/pyyaml3/parser.py
libexec/netdata/python.d/python_modules/pyyaml3/reader.py
libexec/netdata/python.d/python_modules/pyyaml3/representer.py
libexec/netdata/python.d/python_modules/pyyaml3/resolver.py
libexec/netdata/python.d/python_modules/pyyaml3/scanner.py
libexec/netdata/python.d/python_modules/pyyaml3/serializer.py
libexec/netdata/python.d/python_modules/pyyaml3/tokens.py
libexec/netdata/python.d/python_modules/third_party/__init__.py
libexec/netdata/python.d/python_modules/third_party/boinc_client.py
libexec/netdata/python.d/python_modules/third_party/lm_sensors.py
libexec/netdata/python.d/python_modules/third_party/mcrcon.py
libexec/netdata/python.d/python_modules/third_party/monotonic.py
libexec/netdata/python.d/python_modules/third_party/ordereddict.py
libexec/netdata/python.d/python_modules/urllib3/__init__.py
libexec/netdata/python.d/python_modules/urllib3/_collections.py
libexec/netdata/python.d/python_modules/urllib3/connection.py
libexec/netdata/python.d/python_modules/urllib3/connectionpool.py
libexec/netdata/python.d/python_modules/urllib3/contrib/__init__.py
libexec/netdata/python.d/python_modules/urllib3/contrib/_securetransport/__init__.py
libexec/netdata/python.d/python_modules/urllib3/contrib/_securetransport/bindings.py
libexec/netdata/python.d/python_modules/urllib3/contrib/_securetransport/low_level.py
libexec/netdata/python.d/python_modules/urllib3/contrib/appengine.py
libexec/netdata/python.d/python_modules/urllib3/contrib/ntlmpool.py
libexec/netdata/python.d/python_modules/urllib3/contrib/pyopenssl.py
libexec/netdata/python.d/python_modules/urllib3/contrib/securetransport.py
libexec/netdata/python.d/python_modules/urllib3/contrib/socks.py
libexec/netdata/python.d/python_modules/urllib3/exceptions.py
libexec/netdata/python.d/python_modules/urllib3/fields.py
libexec/netdata/python.d/python_modules/urllib3/filepost.py
libexec/netdata/python.d/python_modules/urllib3/packages/__init__.py
libexec/netdata/python.d/python_modules/urllib3/packages/backports/__init__.py
libexec/netdata/python.d/python_modules/urllib3/packages/backports/makefile.py
libexec/netdata/python.d/python_modules/urllib3/packages/ordered_dict.py
libexec/netdata/python.d/python_modules/urllib3/packages/six.py
libexec/netdata/python.d/python_modules/urllib3/packages/ssl_match_hostname/__init__.py
libexec/netdata/python.d/python_modules/urllib3/packages/ssl_match_hostname/_implementation.py
libexec/netdata/python.d/python_modules/urllib3/poolmanager.py
libexec/netdata/python.d/python_modules/urllib3/request.py
libexec/netdata/python.d/python_modules/urllib3/response.py
libexec/netdata/python.d/python_modules/urllib3/util/__init__.py
libexec/netdata/python.d/python_modules/urllib3/util/connection.py
libexec/netdata/python.d/python_modules/urllib3/util/request.py
libexec/netdata/python.d/python_modules/urllib3/util/response.py
libexec/netdata/python.d/python_modules/urllib3/util/retry.py
libexec/netdata/python.d/python_modules/urllib3/util/selectors.py
libexec/netdata/python.d/python_modules/urllib3/util/ssl_.py
libexec/netdata/python.d/python_modules/urllib3/util/timeout.py
libexec/netdata/python.d/python_modules/urllib3/util/url.py
libexec/netdata/python.d/python_modules/urllib3/util/wait.py
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/tomcat.chart.py
libexec/netdata/python.d/tor.chart.py
libexec/netdata/python.d/traefik.chart.py
libexec/netdata/python.d/unbound.chart.py
libexec/netdata/python.d/uwsgi.chart.py
libexec/netdata/python.d/varnish.chart.py
libexec/netdata/python.d/w1sensor.chart.py
libexec/netdata/python.d/web_log.chart.py
sbin/netdata-claim.sh
sbin/netdata
sbin/netdatacli
@mode 4640
@owner netdata
@group netdata

%%DATADIR%%/web/static/img/netdata-logomark.svg
%%DATADIR%%/web/tv.html
%%DATADIR%%/web/version.txt
%%NETDATA_CACHE%%/.keep
%%NETDATA_PERST%%/.keep
%%NETDATA_PERST%%/registry/.keep
%%NETDATA_LOG%%/.keep
@mode
@owner
@group
@sample(netdata,netdata,0640) %%ETCDIR%%/netdata.conf.sample
@dir(netdata,netdata,0750) %%ETCDIR%%
@dir(netdata,netdata,0750) %%ETCDIR%%/charts.d
@dir(netdata,netdata,0750) %%ETCDIR%%/custom-plugins.d
@dir(netdata,netdata,0750) %%ETCDIR%%/go.d
@dir(netdata,netdata,0750) %%ETCDIR%%/health.d
@dir(netdata,netdata,0750) %%ETCDIR%%/node.d
@dir(netdata,netdata,0750) %%ETCDIR%%/python.d
@dir(netdata,netdata,0750) %%ETCDIR%%/ssl
@dir(netdata,netdata,0750) %%ETCDIR%%/statsd.d
@dir(netdata,netdata,0750) %%DATADIR%%
@dir(netdata,netdata,0750) %%DATADIR%%/web
@dir(netdata,netdata,0750) %%NETDATA_CACHE%%
@dir(netdata,netdata,0750) %%NETDATA_PERST%%
@dir(netdata,netdata,0750) %%NETDATA_PERST%%/registry
@dir(netdata,netdata,0750) %%NETDATA_LOG%%
- 

Return to bug 244323

Lines 2-10 Link Here

(-)b/net-mgmt/netdata/Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= netdata	4	PORTNAME= netdata
5	PORTVERSION= 1.19.0	5	PORTVERSION= 1.20.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1
8	CATEGORIES= net-mgmt	7	CATEGORIES= net-mgmt
9		8
10	MAINTAINER= mmokhi@FreeBSD.org	9	MAINTAINER= mmokhi@FreeBSD.org
Lines 15-21 LICENSE= GPLv3 Link Here
15	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid	14	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
16		15
17	RUN_DEPENDS= bash:shells/bash \	16	RUN_DEPENDS= bash:shells/bash \
18	curl:ftp/curl	17	curl:ftp/curl \
		18	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
		19	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
19		20
20	USES= autoreconf cpe pathfix pkgconfig:both python shebangfix ssl	21	USES= autoreconf cpe pathfix pkgconfig:both python shebangfix ssl
21		22
Lines 28-35 NETDATA_LOG= /var/log/${PORTNAME} Link Here
28	NETDATA_PERST= /var/db/${PORTNAME}	29	NETDATA_PERST= /var/db/${PORTNAME}
29		30
30	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
31	CPPFLAGS+= -D_WANT_VMMETER -I${LOCALBASE}/include	32	CONFIGURE_ARGS= --disable-unit-tests
32	LIBS+= -L${LOCALBASE}/lib	33	CPPFLAGS+= -D_WANT_VMMETER
33	INSTALL_TARGET= install-strip	34	INSTALL_TARGET= install-strip
34		35
35	SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \	36	SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \

Added Link Here

(-)b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_Makefile.am (+112 lines)
1	--- collectors/python.d.plugin/Makefile.am.orig 2020-02-21 01:50:30 UTC
2	+++ collectors/python.d.plugin/Makefile.am
3	@@ -142,109 +142,3 @@ dist_third_party_DATA = \
4	python_modules/third_party/boinc_client.py \
5	python_modules/third_party/monotonic.py \
6	$(NULL)
7	-
8	-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
9	-dist_pythonyaml2_DATA = \
10	- python_modules/pyyaml2/__init__.py \
11	- python_modules/pyyaml2/composer.py \
12	- python_modules/pyyaml2/constructor.py \
13	- python_modules/pyyaml2/cyaml.py \
14	- python_modules/pyyaml2/dumper.py \
15	- python_modules/pyyaml2/emitter.py \
16	- python_modules/pyyaml2/error.py \
17	- python_modules/pyyaml2/events.py \
18	- python_modules/pyyaml2/loader.py \
19	- python_modules/pyyaml2/nodes.py \
20	- python_modules/pyyaml2/parser.py \
21	- python_modules/pyyaml2/reader.py \
22	- python_modules/pyyaml2/representer.py \
23	- python_modules/pyyaml2/resolver.py \
24	- python_modules/pyyaml2/scanner.py \
25	- python_modules/pyyaml2/serializer.py \
26	- python_modules/pyyaml2/tokens.py \
27	- $(NULL)
28	-
29	-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
30	-dist_pythonyaml3_DATA = \
31	- python_modules/pyyaml3/__init__.py \
32	- python_modules/pyyaml3/composer.py \
33	- python_modules/pyyaml3/constructor.py \
34	- python_modules/pyyaml3/cyaml.py \
35	- python_modules/pyyaml3/dumper.py \
36	- python_modules/pyyaml3/emitter.py \
37	- python_modules/pyyaml3/error.py \
38	- python_modules/pyyaml3/events.py \
39	- python_modules/pyyaml3/loader.py \
40	- python_modules/pyyaml3/nodes.py \
41	- python_modules/pyyaml3/parser.py \
42	- python_modules/pyyaml3/reader.py \
43	- python_modules/pyyaml3/representer.py \
44	- python_modules/pyyaml3/resolver.py \
45	- python_modules/pyyaml3/scanner.py \
46	- python_modules/pyyaml3/serializer.py \
47	- python_modules/pyyaml3/tokens.py \
48	- $(NULL)
49	-
50	-python_urllib3dir=$(pythonmodulesdir)/urllib3
51	-dist_python_urllib3_DATA = \
52	- python_modules/urllib3/__init__.py \
53	- python_modules/urllib3/_collections.py \
54	- python_modules/urllib3/connection.py \
55	- python_modules/urllib3/connectionpool.py \
56	- python_modules/urllib3/exceptions.py \
57	- python_modules/urllib3/fields.py \
58	- python_modules/urllib3/filepost.py \
59	- python_modules/urllib3/response.py \
60	- python_modules/urllib3/poolmanager.py \
61	- python_modules/urllib3/request.py \
62	- $(NULL)
63	-
64	-python_urllib3_utildir=$(python_urllib3dir)/util
65	-dist_python_urllib3_util_DATA = \
66	- python_modules/urllib3/util/__init__.py \
67	- python_modules/urllib3/util/connection.py \
68	- python_modules/urllib3/util/request.py \
69	- python_modules/urllib3/util/response.py \
70	- python_modules/urllib3/util/retry.py \
71	- python_modules/urllib3/util/selectors.py \
72	- python_modules/urllib3/util/ssl_.py \
73	- python_modules/urllib3/util/timeout.py \
74	- python_modules/urllib3/util/url.py \
75	- python_modules/urllib3/util/wait.py \
76	- $(NULL)
77	-
78	-python_urllib3_packagesdir=$(python_urllib3dir)/packages
79	-dist_python_urllib3_packages_DATA = \
80	- python_modules/urllib3/packages/__init__.py \
81	- python_modules/urllib3/packages/ordered_dict.py \
82	- python_modules/urllib3/packages/six.py \
83	- $(NULL)
84	-
85	-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
86	-dist_python_urllib3_backports_DATA = \
87	- python_modules/urllib3/packages/backports/__init__.py \
88	- python_modules/urllib3/packages/backports/makefile.py \
89	- $(NULL)
90	-
91	-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
92	-dist_python_urllib3_ssl_match_hostname_DATA = \
93	- python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
94	- python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
95	- $(NULL)
96	-
97	-python_urllib3_contribdir=$(python_urllib3dir)/contrib
98	-dist_python_urllib3_contrib_DATA = \
99	- python_modules/urllib3/contrib/__init__.py \
100	- python_modules/urllib3/contrib/appengine.py \
101	- python_modules/urllib3/contrib/ntlmpool.py \
102	- python_modules/urllib3/contrib/pyopenssl.py \
103	- python_modules/urllib3/contrib/securetransport.py \
104	- python_modules/urllib3/contrib/socks.py \
105	- $(NULL)
106	-
107	-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
108	-dist_python_urllib3_securetransport_DATA = \
109	- python_modules/urllib3/contrib/_securetransport/__init__.py \
110	- python_modules/urllib3/contrib/_securetransport/bindings.py \
111	- python_modules/urllib3/contrib/_securetransport/low_level.py \
112	- $(NULL)

Added Link Here

(-)b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python__modules_bases_loaders.py (+14 lines)
1	--- collectors/python.d.plugin/python_modules/bases/loaders.py.orig 2020-02-21 01:50:30 UTC
2	+++ collectors/python.d.plugin/python_modules/bases/loaders.py
3	@@ -10,9 +10,9 @@ PY_VERSION = version_info[:2]
4
5	try:
6	if PY_VERSION > (3, 1):
7	- from pyyaml3 import SafeLoader as YamlSafeLoader
8	+ from yaml import SafeLoader as YamlSafeLoader
9	else:
10	- from pyyaml2 import SafeLoader as YamlSafeLoader
11	+ from yaml import SafeLoader as YamlSafeLoader
12	except ImportError:
13	from yaml import SafeLoader as YamlSafeLoader
14

Added Link Here

(-)b/net-mgmt/netdata/files/patch-web_gui_index.html (+33 lines)
1	--- web/gui/index.html.orig 2020-02-21 01:50:30 UTC
2	+++ web/gui/index.html
3	@@ -93,10 +93,14 @@
4	<li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i> <span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
5	<li id="alarmsButton" title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i> <span class="hidden-sm hidden-md">Alarms </span><span id="alarms_count_badge" class="badge"></span></a></li>
6	<li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i> <span class="hidden-sm hidden-md">Settings</span></a></li>
7	+ <!--
8	<li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
9	+ -->
10	+ <!--
11	<li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li>
12	<li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li>
13	<li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li>
14	+ -->
15	<li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i> <span class="hidden-sm hidden-md hidden-lg">Import</span></a></li>
16	<li title="export / save a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="saveButton"><a href="#" class="btn" data-toggle="modal" data-target="#saveSnapshotModal"><i class="fas fa-upload"></i> <span class="hidden-sm hidden-md hidden-lg">Export</span></a></li>
17	<li title="print this dashboard to PDF" data-toggle="tooltip" data-placement="bottom" id="printButton"><a href="#" class="btn" data-toggle="modal" data-target="#printPreflightModal"><i class="fas fa-print"></i> <span class="hidden-sm hidden-md hidden-lg">Print</span></a></li>
18	@@ -110,6 +114,7 @@
19	<div id="navbar-highlight-content" class="navbar-highlight-content"></div>
20	</div>
21
22	+<!--
23	<div id="sign-in-banner" style="display: none">
24	<div class="container">
25	Like what you see?
26	@@ -120,6 +125,7 @@
27	</div>
28	</div>
29	</div>
30	+-->
31
32	<div id="masthead" style="display: none;">
33	<div class="container">