Attachment #225763 for bug #255980

Lines 2-16 Link Here

(-)b/net-mgmt/netdata/Makefile (-13 / +41 lines)
2		2
3	PORTNAME= netdata	3	PORTNAME= netdata
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.29.2	5	DISTVERSION= 1.31.0
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/	7	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
		8	https://github.com/forkbomb9/netdata/commit/:dashboard
		9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fd15080f65fde1c484a06cbc5a13a2853639a960.patch:dashboard
		10	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
		11
		12	# Backport commit to fix interrupt graph
		13	PATCH_SITES= https://github.com/netdata/netdata/commit/
		14	PATCHFILES= 4b130034f223a5034c241b8a3e905d8f8031747d.patch:-p1
8		15
9	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Scalable distributed realtime performance and health monitoring	17	COMMENT= Scalable distributed realtime performance and health monitoring
11		18
12	LICENSE= GPLv3	19	LICENSE= GPLv3
		20	LICENSE_FILE= ${WRKSRC}/LICENSE
13		21
		22	# Used to patch the custom dashboard
		23	PATCH_DEPENDS= gpatch:devel/patch
14	LIB_DEPENDS= libjson-c.so:devel/json-c \	24	LIB_DEPENDS= libjson-c.so:devel/json-c \
15	libuuid.so:misc/e2fsprogs-libuuid \	25	libuuid.so:misc/e2fsprogs-libuuid \
16	libuv.so:devel/libuv	26	libuv.so:devel/libuv
Lines 53-75 OPTIONS_SUB= YES Link Here
53		63
54	CLOUD_DESC= Enable cloud functionality	64	CLOUD_DESC= Enable cloud functionality
55	CUPS_DESC= Enable support for cups	65	CUPS_DESC= Enable support for cups
56	DBENGINE_DESC= Enable support for database engine	66	DBENGINE_DESC= Enable support for database engine
57	FREEIPMI_DESC= Enable support for freeipmi	67	FREEIPMI_DESC= Enable support for freeipmi
58	GOPLUGIN_DESC= Enable the go collector plugin	68	GOPLUGIN_DESC= Enable the go collector plugin
59		69
60	CLOUD_CONFIGURE_OFF= --disable-cloud	70	CLOUD_CONFIGURE_ON= --with-aclk-ng
61	CLOUD_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-web_gui_index.html \	71	CLOUD_CONFIGURE_OFF= --disable-cloud
62	${FILESDIR}/extra-patch-web_gui_main.js	72	CUPS_LIB_DEPENDS= libcups.so:print/cups
63	CUPS_LIB_DEPENDS= libcups.so:print/cups	73	CUPS_CONFIGURE_ENABLE= plugin-cups
64	CUPS_CONFIGURE_ENABLE= plugin-cups
65	DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \	74	DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \
66	liblz4.so:archivers/liblz4	75	liblz4.so:archivers/liblz4
67	DBENGINE_CONFIGURE_ENABLE= dbengine	76	DBENGINE_CONFIGURE_ENABLE= dbengine
68	FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi	77	FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
69	FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi	78	FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi
70	GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go	79	GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go
71	LTO_USES= compiler:c11	80	LTO_USES= compiler:c11
72	LTO_CONFIGURE_ENABLE= lto	81	LTO_CONFIGURE_ENABLE= lto
73		82
74	.include <bsd.port.options.mk>	83	.include <bsd.port.options.mk>
75	.if ${PORT_OPTIONS:MLTO} && ${OPSYS}_${OSREL:R} == FreeBSD_11	84	.if ${PORT_OPTIONS:MLTO} && ${OPSYS}_${OSREL:R} == FreeBSD_11
Lines 84-90 NETDATA_CACHE= /var/cache/${PORTNAME} Link Here
84	NETDATA_LOG= /var/log/${PORTNAME}	93	NETDATA_LOG= /var/log/${PORTNAME}
85	NETDATA_PERST= /var/db/${PORTNAME}	94	NETDATA_PERST= /var/db/${PORTNAME}
86		95
		96	.if ! ${PORT_OPTIONS:MCLOUD}
87	post-patch:	97	post-patch:
		98	cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/fd15080f65fde1c484a06cbc5a13a2853639a960.patch
		99	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION}\|g' \
		100	${PATCH_WRKSRC}/configure.ac
88	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \	101	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \
89	${PATCH_WRKSRC}/configure.ac	102	${PATCH_WRKSRC}/configure.ac
90	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \	103	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \
Lines 95-100 post-patch: Link Here
95	${PATCH_WRKSRC}/configure.ac	108	${PATCH_WRKSRC}/configure.ac
96	@${REINPLACE_CMD} -e 's\|%%PYTHON%%\|${PYTHON_CMD}\|g' \	109	@${REINPLACE_CMD} -e 's\|%%PYTHON%%\|${PYTHON_CMD}\|g' \
97	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in	110	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
		111	.else
		112	post-patch:
		113	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION}\|g' \
		114	${PATCH_WRKSRC}/configure.ac
		115	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \
		116	${PATCH_WRKSRC}/configure.ac
		117	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \
		118	${PATCH_WRKSRC}/configure.ac
		119	@${REINPLACE_CMD} -e 's\|%%NETDATA_PERST%%\|${NETDATA_PERST}\|g' \
		120	${PATCH_WRKSRC}/configure.ac
		121	@${REINPLACE_CMD} -e 's\|%%ETCDIR%%\|${ETCDIR}\|g' \
		122	${PATCH_WRKSRC}/configure.ac
		123	@${REINPLACE_CMD} -e 's\|%%PYTHON%%\|${PYTHON_CMD}\|g' \
		124	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
		125	.endif
98		126
99	post-install:	127	post-install:
100	${MKDIR} ${STAGEDIR}${ETCDIR}	128	${MKDIR} ${STAGEDIR}${ETCDIR}
Lines 105-111 post-install: Link Here
105	${MKDIR} ${STAGEDIR}${NETDATA_PERST}	133	${MKDIR} ${STAGEDIR}${NETDATA_PERST}
106	(for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \	134	(for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \
107	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.conf \	135	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.conf \
108	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.txt ; do \	136	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.txt ; do \
109	${MV} $$fi $$fi".sample"; \	137	${MV} $$fi $$fi".sample"; \
110	done)	138	done)
111		139

Lines 1-3 Link Here

(-)b/net-mgmt/netdata/distinfo (-3 / +7 lines)
1	TIMESTAMP = 1613694033	1	TIMESTAMP = 1621898113
2	SHA256 (netdata-v1.29.2.tar.gz) = 3419a2b54cd29946900e88fa96f8235b6db50bafa615a35c0035887e8a3f5074	2	SHA256 (netdata-v1.31.0.tar.gz) = ca68f725224e8bbec041b493891376fbf41aedb47c4ac06161c2eda990089c9f
3	SIZE (netdata-v1.29.2.tar.gz) = 6736119	3	SIZE (netdata-v1.31.0.tar.gz) = 12528280
		4	SHA256 (4b130034f223a5034c241b8a3e905d8f8031747d.patch) = 9a5be823ba673d2490ec7140cc3726569253e5114157c730d7533916194720d7
		5	SIZE (4b130034f223a5034c241b8a3e905d8f8031747d.patch) = 5207
		6	SHA256 (fd15080f65fde1c484a06cbc5a13a2853639a960.patch) = b1ed548a1f41984f40d36162dc2325e54381d829210d117dfcba3521e2b9c7ea
		7	SIZE (fd15080f65fde1c484a06cbc5a13a2853639a960.patch) = 32024618




--- web/gui/index.html.orig	2020-04-13 16:02:25 UTC
+++ web/gui/index.html
@@ -90,7 +90,9 @@
             </div>
             <nav class="collapse navbar-collapse navbar-right" role="navigation">
                 <ul class="nav navbar-nav">
+                    <!--
                     <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>
                     <!--
@@ -114,6 +116,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? 
@@ -124,6 +127,7 @@
             </div>
         </div>
     </div>
+-->
     
     <div id="masthead" style="display: none;">
         <div class="container">




--- web/gui/main.js.orig	2020-05-13 18:08:21 UTC
+++ web/gui/main.js
@@ -745,11 +745,7 @@ function renderMyNetdataMenu(machinesArray) {
     if (!isSignedIn()) {
         if (!NETDATA.registry.isRegistryEnabled()) {
             html += (
-                `<div class="info-item" style="white-space: nowrap">
-                    <span>Please <a href="#" onclick="signInDidClick(event); return false">sign in to netdata.cloud</a> to view your nodes!</span>
-                    <div></div>
-                </div>
-                <hr />`
+                ``
             );
         }
     }




diff --git a/mqtt_websockets/Makefile b/mqtt_websockets/Makefile
index 8eb5e56..c8216bc 100644
--- mqtt_websockets/Makefile
+++ mqtt_websockets/Makefile
@@ -12,7 +12,7 @@
 # If not, see <https://www.gnu.org/licenses/>.
 
 CC = gcc -std=gnu99
-CFLAGS = -Wextra -Wall `pkg-config --cflags openssl`
+CFLAGS = -Wextra -Wall `pkg-config --cflags openssl` `pkg-config --cflags libcrypto`
 BUILD_DIR = build
 
 # dir having our version of mqtt_pal.h must preceede dir of MQTT-C to override this hdr
diff --git a/mqtt_websockets/src/include/common_internal.h b/mqtt_websockets/src/include/common_internal.h
index 066e85a..54024d5 100644
--- mqtt_websockets/src/include/common_internal.h
+++ mqtt_websockets/src/include/common_internal.h
@@ -18,4 +18,6 @@
 #define OPENSSL_VERSION_110 0x10100000L
 #define OPENSSL_VERSION_111 0x10101000L
 
+#include "endian_compat.h"
+
 #endif /* COMMON_INTERNAL_H */
diff --git a/mqtt_websockets/src/include/endian_compat.h b/mqtt_websockets/src/include/endian_compat.h
new file mode 100644
index 0000000..076ccbe
--- /dev/null
+++ mqtt_websockets/src/include/endian_compat.h
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-3.0-only
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program.
+// If not, see <https://www.gnu.org/licenses/>.
+
+#ifndef MQTT_WSS_ENDIAN_COMPAT_H
+#define MQTT_WSS_ENDIAN_COMPAT_H
+
+#ifdef __APPLE__
+    #include <libkern/OSByteOrder.h>
+
+    #define htobe16(x) OSSwapHostToBigInt16(x)
+    #define htole16(x) OSSwapHostToLittleInt16(x)
+    #define be16toh(x) OSSwapBigToHostInt16(x)
+    #define le16toh(x) OSSwapLittleToHostInt16(x)
+
+    #define htobe32(x) OSSwapHostToBigInt32(x)
+    #define htole32(x) OSSwapHostToLittleInt32(x)
+    #define be32toh(x) OSSwapBigToHostInt32(x)
+    #define le32toh(x) OSSwapLittleToHostInt32(x)
+
+    #define htobe64(x) OSSwapHostToBigInt64(x)
+    #define htole64(x) OSSwapHostToLittleInt64(x)
+    #define be64toh(x) OSSwapBigToHostInt64(x)
+    #define le64toh(x) OSSwapLittleToHostInt64(x)
+#else
+#ifdef __FreeBSD__
+    #include <sys/endian.h>
+#else
+    #include <endian.h>
+#endif
+#endif
+
+#endif /* MQTT_WSS_ENDIAN_COMPAT_H */
diff --git a/mqtt_websockets/src/mqtt_wss_client.c b/mqtt_websockets/src/mqtt_wss_client.c
index 8b7261b..25f99c0 100644
--- mqtt_websockets/src/mqtt_wss_client.c
+++ mqtt_websockets/src/mqtt_wss_client.c
@@ -196,7 +196,11 @@ mqtt_wss_client mqtt_wss_new(const char *log_prefix,
 
     client->log = log;
 
+#ifdef __APPLE__
+    if (pipe(client->write_notif_pipe)) {
+#else
     if (pipe2(client->write_notif_pipe, O_CLOEXEC /*| O_DIRECT*/)) {
+#endif
         mws_error(log, "Couldn't create pipe");
         goto fail_2;
     }
@@ -640,7 +644,11 @@ int mqtt_wss_connect(mqtt_wss_client client, char *host, int port, struct mqtt_c
 
 static inline uint64_t boottime_usec(mqtt_wss_client client) {
     struct timespec ts;
-    if(clock_gettime(CLOCK_BOOTTIME, &ts) == -1) {
+#if defined(__APPLE__) || defined(__FreeBSD__)
+    if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) {
+#else
+    if (clock_gettime(CLOCK_BOOTTIME, &ts) == -1) {
+#endif
         mws_error(client->log, "clock_gettimte failed");
         return 0;
     }
diff --git a/mqtt_websockets/src/ws_client.c b/mqtt_websockets/src/ws_client.c
index 3e71d9a..43c2ced 100644
--- mqtt_websockets/src/ws_client.c
+++ mqtt_websockets/src/ws_client.c
@@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-#include <endian.h>
 #include <errno.h>
 #include <ctype.h>
 




--- configure.ac.orig	2021-05-19 11:38:53 UTC
+++ configure.ac
@@ -5,11 +5,11 @@
 AC_PREREQ(2.60)
 
 # We do not use m4_esyscmd_s to support older autoconf.
-define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n']))
-define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n']))
-m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
+# define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n']))
+# define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n']))
+# m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
 
-AC_INIT([netdata], VERSION_STRING[])
+AC_INIT([netdata], v%%DISTVERSION%%)
 
 AM_MAINTAINER_MODE([disable])
 if test x"$USE_MAINTAINER_MODE" = xyes; then
@@ -1449,15 +1449,15 @@ AM_CONDITIONAL([ENABLE_CXX_LINKER], [test "${enable_ba
 
 AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
 




--- web/gui/index.html.orig	2020-04-06 01:28:55 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>

Lines 11-18 Link Here

(-)b/net-mgmt/netdata/pkg-plist (-3 / +116 lines)
11	@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/nut.conf.sample	11	@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/nut.conf.sample
12	@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample	12	@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample
13	@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample	13	@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample
14	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.conf.sample	14	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d.conf.sample
15	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_kernel_reject_list.txt.sample	15	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/cachestat.conf.sample
		16	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/dcstat.conf.sample
		17	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/ebpf_kernel_reject_list.txt.sample
		18	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/network.conf.sample
		19	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/process.conf.sample
		20	@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/sync.conf.sample
16	@sample(netdata,netdata,0640) lib/netdata/conf.d/exporting.conf.sample	21	@sample(netdata,netdata,0640) lib/netdata/conf.d/exporting.conf.sample
17	@sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample	22	@sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample
18	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample	23	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample
Lines 20-26 Link Here
20	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/anomalies.conf.sample	25	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/anomalies.conf.sample
21	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apache.conf.sample	26	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apache.conf.sample
22	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample	27	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample
23	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apps_plugin.conf.sample
24	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/backend.conf.sample	28	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/backend.conf.sample
25	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/bcache.conf.sample	29	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/bcache.conf.sample
26	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/beanstalkd.conf.sample	30	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/beanstalkd.conf.sample
Lines 82-87 Link Here
82	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/squid.conf.sample	86	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/squid.conf.sample
83	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/stiebeleltron.conf.sample	87	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/stiebeleltron.conf.sample
84	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/swap.conf.sample	88	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/swap.conf.sample
		89	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/synchronization.conf.sample
		90	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/systemdunits.conf.sample
85	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_conn.conf.sample	91	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_conn.conf.sample
86	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_listen.conf.sample	92	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_listen.conf.sample
87	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_mem.conf.sample	93	@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_mem.conf.sample
Lines 113-118 Link Here
113	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/bind_rndc.conf.sample	119	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/bind_rndc.conf.sample
114	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/boinc.conf.sample	120	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/boinc.conf.sample
115	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ceph.conf.sample	121	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ceph.conf.sample
		122	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/changefinder.conf.sample
116	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/chrony.conf.sample	123	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/chrony.conf.sample
117	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/couchdb.conf.sample	124	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/couchdb.conf.sample
118	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dns_query_time.conf.sample	125	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dns_query_time.conf.sample
Lines 174-180 Link Here
174	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/varnish.conf.sample	181	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/varnish.conf.sample
175	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/w1sensor.conf.sample	182	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/w1sensor.conf.sample
176	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample	183	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample
		184	@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/zscores.conf.sample
177	@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample	185	@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample
		186	@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/k6.conf.sample
178	@sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample	187	@sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample
179	libexec/netdata/charts.d/ap.chart.sh	188	libexec/netdata/charts.d/ap.chart.sh
180	libexec/netdata/charts.d/apcupsd.chart.sh	189	libexec/netdata/charts.d/apcupsd.chart.sh
Lines 232-237 libexec/netdata/python.d/beanstalk.chart.py Link Here
232	libexec/netdata/python.d/bind_rndc.chart.py	241	libexec/netdata/python.d/bind_rndc.chart.py
233	libexec/netdata/python.d/boinc.chart.py	242	libexec/netdata/python.d/boinc.chart.py
234	libexec/netdata/python.d/ceph.chart.py	243	libexec/netdata/python.d/ceph.chart.py
		244	libexec/netdata/python.d/changefinder.chart.py
235	libexec/netdata/python.d/chrony.chart.py	245	libexec/netdata/python.d/chrony.chart.py
236	libexec/netdata/python.d/couchdb.chart.py	246	libexec/netdata/python.d/couchdb.chart.py
237	libexec/netdata/python.d/dns_query_time.chart.py	247	libexec/netdata/python.d/dns_query_time.chart.py
Lines 313-318 libexec/netdata/python.d/uwsgi.chart.py Link Here
313	libexec/netdata/python.d/varnish.chart.py	323	libexec/netdata/python.d/varnish.chart.py
314	libexec/netdata/python.d/w1sensor.chart.py	324	libexec/netdata/python.d/w1sensor.chart.py
315	libexec/netdata/python.d/web_log.chart.py	325	libexec/netdata/python.d/web_log.chart.py
		326	libexec/netdata/python.d/zscores.chart.py
316	sbin/netdata	327	sbin/netdata
317	sbin/netdata-claim.sh	328	sbin/netdata-claim.sh
318	sbin/netdatacli	329	sbin/netdatacli
Lines 320-325 sbin/netdatacli Link Here
320	@owner netdata	331	@owner netdata
321	@group netdata	332	@group netdata
322	%%DATADIR%%/web/.well-known/dnt/cookies	333	%%DATADIR%%/web/.well-known/dnt/cookies
		334	%%DATADIR%%/web/asset-manifest.json
323	%%DATADIR%%/web/console.html	335	%%DATADIR%%/web/console.html
324	%%DATADIR%%/web/css/bootstrap-3.3.7.css	336	%%DATADIR%%/web/css/bootstrap-3.3.7.css
325	%%DATADIR%%/web/css/bootstrap-slate-flat-3.3.7.css	337	%%DATADIR%%/web/css/bootstrap-slate-flat-3.3.7.css
Lines 327-334 sbin/netdatacli Link Here
327	%%DATADIR%%/web/css/bootstrap-theme-3.3.7.min.css	339	%%DATADIR%%/web/css/bootstrap-theme-3.3.7.min.css
328	%%DATADIR%%/web/css/bootstrap-toggle-2.2.2.min.css	340	%%DATADIR%%/web/css/bootstrap-toggle-2.2.2.min.css
329	%%DATADIR%%/web/css/c3-0.4.18.min.css	341	%%DATADIR%%/web/css/c3-0.4.18.min.css
		342	%%DATADIR%%/web/css/dashboard.css
		343	%%DATADIR%%/web/css/dashboard.slate.css
330	%%DATADIR%%/web/css/morris-0.5.1.css	344	%%DATADIR%%/web/css/morris-0.5.1.css
331	%%DATADIR%%/web/dash-example.html	345	%%DATADIR%%/web/dash-example.html
		346	%%DATADIR%%/web/dashboard-react.js
332	%%DATADIR%%/web/dashboard.css	347	%%DATADIR%%/web/dashboard.css
333	%%DATADIR%%/web/dashboard.html	348	%%DATADIR%%/web/dashboard.html
334	%%DATADIR%%/web/dashboard.js	349	%%DATADIR%%/web/dashboard.js
Lines 371-387 sbin/netdatacli Link Here
371	%%DATADIR%%/web/images/banner-icon-144x144.png	386	%%DATADIR%%/web/images/banner-icon-144x144.png
372	%%DATADIR%%/web/images/check-mark-2-128-green.png	387	%%DATADIR%%/web/images/check-mark-2-128-green.png
373	%%DATADIR%%/web/images/check-mark-2-multi-size-green.ico	388	%%DATADIR%%/web/images/check-mark-2-multi-size-green.ico
		389	%%DATADIR%%/web/images/favicon-128.png
374	%%DATADIR%%/web/images/favicon-16x16.png	390	%%DATADIR%%/web/images/favicon-16x16.png
		391	%%DATADIR%%/web/images/favicon-196x196.png
375	%%DATADIR%%/web/images/favicon-32x32.png	392	%%DATADIR%%/web/images/favicon-32x32.png
376	%%DATADIR%%/web/images/favicon-96x96.png	393	%%DATADIR%%/web/images/favicon-96x96.png
377	%%DATADIR%%/web/images/favicon.ico	394	%%DATADIR%%/web/images/favicon.ico
378	%%DATADIR%%/web/images/ms-icon-144x144.png	395	%%DATADIR%%/web/images/ms-icon-144x144.png
379	%%DATADIR%%/web/images/ms-icon-150x150.png	396	%%DATADIR%%/web/images/ms-icon-150x150.png
		397	%%DATADIR%%/web/images/ms-icon-310x150.png
380	%%DATADIR%%/web/images/ms-icon-310x310.png	398	%%DATADIR%%/web/images/ms-icon-310x310.png
		399	%%DATADIR%%/web/images/ms-icon-36x36.png
381	%%DATADIR%%/web/images/ms-icon-70x70.png	400	%%DATADIR%%/web/images/ms-icon-70x70.png
382	%%DATADIR%%/web/images/netdata-logomark.svg	401	%%DATADIR%%/web/images/netdata-logomark.svg
383	%%DATADIR%%/web/images/netdata.svg	402	%%DATADIR%%/web/images/netdata.svg
		403	%%DATADIR%%/web/images/packaging-beta-tag.svg
384	%%DATADIR%%/web/images/post.png	404	%%DATADIR%%/web/images/post.png
		405	%%DATADIR%%/web/images/seo-performance-128.png
		406	%%DATADIR%%/web/index-node-view.html
385	%%DATADIR%%/web/index.html	407	%%DATADIR%%/web/index.html
386	%%DATADIR%%/web/infographic.html	408	%%DATADIR%%/web/infographic.html
387	%%DATADIR%%/web/lib/bootstrap-3.3.7.min.js	409	%%DATADIR%%/web/lib/bootstrap-3.3.7.min.js
Lines 406-418 sbin/netdatacli Link Here
406	%%DATADIR%%/web/lib/tableExport-1.6.0.min.js	428	%%DATADIR%%/web/lib/tableExport-1.6.0.min.js
407	%%DATADIR%%/web/main.css	429	%%DATADIR%%/web/main.css
408	%%DATADIR%%/web/main.js	430	%%DATADIR%%/web/main.js
		431	%%DATADIR%%/web/manifest.json
409	%%DATADIR%%/web/netdata-swagger.json	432	%%DATADIR%%/web/netdata-swagger.json
410	%%DATADIR%%/web/netdata-swagger.yaml	433	%%DATADIR%%/web/netdata-swagger.yaml
411	%%DATADIR%%/web/old/index.html	434	%%DATADIR%%/web/old/index.html
		435	%%NO_CLOUD%%%%DATADIR%%/web/precache-manifest.0ba08ca00eb913966c9d8338a6b2793e.js
		436	%%CLOUD%%%%DATADIR%%/web/precache-manifest.1a96c027aec7f2d07341fa69aa6b82fa.js
412	%%DATADIR%%/web/refresh-badges.js	437	%%DATADIR%%/web/refresh-badges.js
413	%%DATADIR%%/web/robots.txt	438	%%DATADIR%%/web/robots.txt
		439	%%DATADIR%%/web/service-worker.js
414	%%DATADIR%%/web/sitemap.xml	440	%%DATADIR%%/web/sitemap.xml
		441	%%DATADIR%%/web/static/css/2.6b842ba1.chunk.css
		442	%%DATADIR%%/web/static/css/2.6b842ba1.chunk.css.map
		443	%%DATADIR%%/web/static/css/4.a36e3b73.chunk.css
		444	%%DATADIR%%/web/static/css/4.a36e3b73.chunk.css.map
		445	%%DATADIR%%/web/static/css/main.d931154a.chunk.css
		446	%%DATADIR%%/web/static/css/main.d931154a.chunk.css.map
415	%%DATADIR%%/web/static/img/netdata-logomark.svg	447	%%DATADIR%%/web/static/img/netdata-logomark.svg
		448	%%NO_CLOUD%%%%DATADIR%%/web/static/js/10.0d9f9d3b.chunk.js
		449	%%NO_CLOUD%%%%DATADIR%%/web/static/js/10.0d9f9d3b.chunk.js.map
		450	%%CLOUD%%%%DATADIR%%/web/static/js/10.db7e8e19.chunk.js
		451	%%CLOUD%%%%DATADIR%%/web/static/js/10.db7e8e19.chunk.js.map
		452	%%NO_CLOUD%%%%DATADIR%%/web/static/js/2.11500c94.chunk.js
		453	%%NO_CLOUD%%%%DATADIR%%/web/static/js/2.11500c94.chunk.js.LICENSE
		454	%%NO_CLOUD%%%%DATADIR%%/web/static/js/2.11500c94.chunk.js.map
		455	%%CLOUD%%%%DATADIR%%/web/static/js/2.252b3a57.chunk.js
		456	%%CLOUD%%%%DATADIR%%/web/static/js/2.252b3a57.chunk.js.LICENSE
		457	%%CLOUD%%%%DATADIR%%/web/static/js/2.252b3a57.chunk.js.map
		458	%%CLOUD%%%%DATADIR%%/web/static/js/3.99238dcb.chunk.js
		459	%%CLOUD%%%%DATADIR%%/web/static/js/3.99238dcb.chunk.js.map
		460	%%NO_CLOUD%%%%DATADIR%%/web/static/js/3.abbffb94.chunk.js
		461	%%NO_CLOUD%%%%DATADIR%%/web/static/js/3.abbffb94.chunk.js.map
		462	%%CLOUD%%%%DATADIR%%/web/static/js/4.6ef9bdcb.chunk.js
		463	%%CLOUD%%%%DATADIR%%/web/static/js/4.6ef9bdcb.chunk.js.map
		464	%%NO_CLOUD%%%%DATADIR%%/web/static/js/4.ffbaf2f6.chunk.js
		465	%%NO_CLOUD%%%%DATADIR%%/web/static/js/4.ffbaf2f6.chunk.js.map
		466	%%CLOUD%%%%DATADIR%%/web/static/js/5.96a698ab.chunk.js
		467	%%CLOUD%%%%DATADIR%%/web/static/js/5.96a698ab.chunk.js.LICENSE
		468	%%CLOUD%%%%DATADIR%%/web/static/js/5.96a698ab.chunk.js.map
		469	%%NO_CLOUD%%%%DATADIR%%/web/static/js/5.c3d5572b.chunk.js
		470	%%NO_CLOUD%%%%DATADIR%%/web/static/js/5.c3d5572b.chunk.js.LICENSE
		471	%%NO_CLOUD%%%%DATADIR%%/web/static/js/5.c3d5572b.chunk.js.map
		472	%%NO_CLOUD%%%%DATADIR%%/web/static/js/6.c3d81a93.chunk.js
		473	%%NO_CLOUD%%%%DATADIR%%/web/static/js/6.c3d81a93.chunk.js.map
		474	%%CLOUD%%%%DATADIR%%/web/static/js/6.d9713eb9.chunk.js
		475	%%CLOUD%%%%DATADIR%%/web/static/js/6.d9713eb9.chunk.js.map
		476	%%CLOUD%%%%DATADIR%%/web/static/js/7.12e939e5.chunk.js
		477	%%CLOUD%%%%DATADIR%%/web/static/js/7.12e939e5.chunk.js.map
		478	%%NO_CLOUD%%%%DATADIR%%/web/static/js/7.2db7502f.chunk.js
		479	%%NO_CLOUD%%%%DATADIR%%/web/static/js/7.2db7502f.chunk.js.map
		480	%%NO_CLOUD%%%%DATADIR%%/web/static/js/8.3e19cdc5.chunk.js
		481	%%NO_CLOUD%%%%DATADIR%%/web/static/js/8.3e19cdc5.chunk.js.map
		482	%%CLOUD%%%%DATADIR%%/web/static/js/8.91852cf4.chunk.js
		483	%%CLOUD%%%%DATADIR%%/web/static/js/8.91852cf4.chunk.js.map
		484	%%CLOUD%%%%DATADIR%%/web/static/js/9.e3a9ce26.chunk.js
		485	%%CLOUD%%%%DATADIR%%/web/static/js/9.e3a9ce26.chunk.js.map
		486	%%NO_CLOUD%%%%DATADIR%%/web/static/js/9.e808f67e.chunk.js
		487	%%NO_CLOUD%%%%DATADIR%%/web/static/js/9.e808f67e.chunk.js.map
		488	%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.18a52ff6.chunk.js
		489	%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.18a52ff6.chunk.js.LICENSE
		490	%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.18a52ff6.chunk.js.map
		491	%%CLOUD%%%%DATADIR%%/web/static/js/main.8aa70c75.chunk.js
		492	%%CLOUD%%%%DATADIR%%/web/static/js/main.8aa70c75.chunk.js.LICENSE
		493	%%CLOUD%%%%DATADIR%%/web/static/js/main.8aa70c75.chunk.js.map
		494	%%NO_CLOUD%%%%DATADIR%%/web/static/js/runtime-main.164db7ab.js
		495	%%NO_CLOUD%%%%DATADIR%%/web/static/js/runtime-main.164db7ab.js.map
		496	%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.6c7b39cd.js
		497	%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.6c7b39cd.js.map
		498	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.245539db.woff2
		499	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.9a582f3a.woff
		500	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff
		501	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2
		502	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200.67524c36.woff
		503	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200.bf72c841.woff2
		504	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200italic.52df2560.woff
		505	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2
		506	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300.10bb6a0a.woff
		507	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300.9e1c48af.woff2
		508	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2
		509	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff
		510	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400.263d6267.woff2
		511	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400.a2c56f94.woff
512	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400italic.272f8611.woff
513	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2
514	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500.0866c244.woff2
515	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff
516	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff
517	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2
518	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600.337b1651.woff
519	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600.7852d4dc.woff2
520	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2
521	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff
522	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700.b8809d61.woff
523	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700.c9983d3d.woff2
524	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700italic.02954bee.woff2
525	%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700italic.72e9af40.woff
526	%%DATADIR%%/web/static/media/material-icons.0509ab09.woff2
527	%%DATADIR%%/web/tv-react.html
416	%%DATADIR%%/web/tv.html	528	%%DATADIR%%/web/tv.html
417	%%DATADIR%%/web/version.txt	529	%%DATADIR%%/web/version.txt
418	@mode	530	@mode
Lines 420-425 sbin/netdatacli Link Here
420	@group	532	@group
421	@dir(netdata,netdata,0750) %%ETCDIR%%/charts.d	533	@dir(netdata,netdata,0750) %%ETCDIR%%/charts.d
422	@dir(netdata,netdata,0750) %%ETCDIR%%/custom-plugins.d	534	@dir(netdata,netdata,0750) %%ETCDIR%%/custom-plugins.d
		535	@dir(netdata,netdata,0750) %%ETCDIR%%/ebpf.d
423	@dir(netdata,netdata,0750) %%ETCDIR%%/go.d	536	@dir(netdata,netdata,0750) %%ETCDIR%%/go.d
424	@dir(netdata,netdata,0750) %%ETCDIR%%/health.d	537	@dir(netdata,netdata,0750) %%ETCDIR%%/health.d
425	@dir(netdata,netdata,0750) %%ETCDIR%%/node.d	538	@dir(netdata,netdata,0750) %%ETCDIR%%/node.d

Return to bug 255980

Removed Link Here

(-)a/net-mgmt/netdata/files/extra-patch-web_gui_index.html (-28 lines)
1	--- web/gui/index.html.orig 2020-04-13 16:02:25 UTC
2	+++ web/gui/index.html
3	@@ -90,7 +90,9 @@
4	</div>
5	<nav class="collapse navbar-collapse navbar-right" role="navigation">
6	<ul class="nav navbar-nav">
7	+ <!--
8	<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>
9	+ -->
10	<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>
11	<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>
12	<!--
13	@@ -114,6 +116,7 @@
14	<div id="navbar-highlight-content" class="navbar-highlight-content"></div>
15	</div>
16
17	+<!--
18	<div id="sign-in-banner" style="display: none">
19	<div class="container">
20	Like what you see?
21	@@ -124,6 +127,7 @@
22	</div>
23	</div>
24	</div>
25	+-->
26
27	<div id="masthead" style="display: none;">
28	<div class="container">

Removed Link Here

(-)a/net-mgmt/netdata/files/extra-patch-web_gui_main.js (-15 lines)
1	--- web/gui/main.js.orig 2020-05-13 18:08:21 UTC
2	+++ web/gui/main.js
3	@@ -745,11 +745,7 @@ function renderMyNetdataMenu(machinesArray) {
4	if (!isSignedIn()) {
5	if (!NETDATA.registry.isRegistryEnabled()) {
6	html += (
7	- `<div class="info-item" style="white-space: nowrap">
8	- <span>Please <a href="#" onclick="signInDidClick(event); return false">sign in to netdata.cloud</a> to view your nodes!</span>
9	- <div></div>
10	- </div>
11	- <hr />`
12	+ ``
13	);
14	}
15	}

Added Link Here

(-)b/net-mgmt/netdata/files/patch-bump-mqtt_websockets-to-commit-6a4fba1 (+112 lines)
1	diff --git a/mqtt_websockets/Makefile b/mqtt_websockets/Makefile
2	index 8eb5e56..c8216bc 100644
3	--- mqtt_websockets/Makefile
4	+++ mqtt_websockets/Makefile
5	@@ -12,7 +12,7 @@
6	# If not, see <https://www.gnu.org/licenses/>.
7
8	CC = gcc -std=gnu99
9	-CFLAGS = -Wextra -Wall `pkg-config --cflags openssl`
10	+CFLAGS = -Wextra -Wall `pkg-config --cflags openssl` `pkg-config --cflags libcrypto`
11	BUILD_DIR = build
12
13	# dir having our version of mqtt_pal.h must preceede dir of MQTT-C to override this hdr
14	diff --git a/mqtt_websockets/src/include/common_internal.h b/mqtt_websockets/src/include/common_internal.h
15	index 066e85a..54024d5 100644
16	--- mqtt_websockets/src/include/common_internal.h
17	+++ mqtt_websockets/src/include/common_internal.h
18	@@ -18,4 +18,6 @@
19	#define OPENSSL_VERSION_110 0x10100000L
20	#define OPENSSL_VERSION_111 0x10101000L
21
22	+#include "endian_compat.h"
23	+
24	#endif /* COMMON_INTERNAL_H */
25	diff --git a/mqtt_websockets/src/include/endian_compat.h b/mqtt_websockets/src/include/endian_compat.h
26	new file mode 100644
27	index 0000000..076ccbe
28	--- /dev/null
29	+++ mqtt_websockets/src/include/endian_compat.h
30	@@ -0,0 +1,41 @@
31	+// SPDX-License-Identifier: GPL-3.0-only
32	+//
33	+// This program is free software: you can redistribute it and/or modify it
34	+// under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.
35	+//
36	+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
37	+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
38	+// See the GNU General Public License for more details.
39	+//
40	+// You should have received a copy of the GNU General Public License along with this program.
41	+// If not, see <https://www.gnu.org/licenses/>.
42	+
43	+#ifndef MQTT_WSS_ENDIAN_COMPAT_H
44	+#define MQTT_WSS_ENDIAN_COMPAT_H
45	+
46	+#ifdef __APPLE__
47	+ #include <libkern/OSByteOrder.h>
48	+
49	+ #define htobe16(x) OSSwapHostToBigInt16(x)
50	+ #define htole16(x) OSSwapHostToLittleInt16(x)
51	+ #define be16toh(x) OSSwapBigToHostInt16(x)
52	+ #define le16toh(x) OSSwapLittleToHostInt16(x)
53	+
54	+ #define htobe32(x) OSSwapHostToBigInt32(x)
55	+ #define htole32(x) OSSwapHostToLittleInt32(x)
56	+ #define be32toh(x) OSSwapBigToHostInt32(x)
57	+ #define le32toh(x) OSSwapLittleToHostInt32(x)
58	+
59	+ #define htobe64(x) OSSwapHostToBigInt64(x)
60	+ #define htole64(x) OSSwapHostToLittleInt64(x)
61	+ #define be64toh(x) OSSwapBigToHostInt64(x)
62	+ #define le64toh(x) OSSwapLittleToHostInt64(x)
63	+#else
64	+#ifdef __FreeBSD__
65	+ #include <sys/endian.h>
66	+#else
67	+ #include <endian.h>
68	+#endif
69	+#endif
70	+
71	+#endif /* MQTT_WSS_ENDIAN_COMPAT_H */
72	diff --git a/mqtt_websockets/src/mqtt_wss_client.c b/mqtt_websockets/src/mqtt_wss_client.c
73	index 8b7261b..25f99c0 100644
74	--- mqtt_websockets/src/mqtt_wss_client.c
75	+++ mqtt_websockets/src/mqtt_wss_client.c
76	@@ -196,7 +196,11 @@ mqtt_wss_client mqtt_wss_new(const char *log_prefix,
77
78	client->log = log;
79
80	+#ifdef __APPLE__
81	+ if (pipe(client->write_notif_pipe)) {
82	+#else
83	if (pipe2(client->write_notif_pipe, O_CLOEXEC /\| O_DIRECT/)) {
84	+#endif
85	mws_error(log, "Couldn't create pipe");
86	goto fail_2;
87	}
88	@@ -640,7 +644,11 @@ int mqtt_wss_connect(mqtt_wss_client client, char *host, int port, struct mqtt_c
89
90	static inline uint64_t boottime_usec(mqtt_wss_client client) {
91	struct timespec ts;
92	- if(clock_gettime(CLOCK_BOOTTIME, &ts) == -1) {
93	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
94	+ if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) {
95	+#else
96	+ if (clock_gettime(CLOCK_BOOTTIME, &ts) == -1) {
97	+#endif
98	mws_error(client->log, "clock_gettimte failed");
99	return 0;
100	}
101	diff --git a/mqtt_websockets/src/ws_client.c b/mqtt_websockets/src/ws_client.c
102	index 3e71d9a..43c2ced 100644
103	--- mqtt_websockets/src/ws_client.c
104	+++ mqtt_websockets/src/ws_client.c
105	@@ -14,7 +14,6 @@
106	#include <fcntl.h>
107	#include <unistd.h>
108	#include <string.h>
109	-#include <endian.h>
110	#include <errno.h>
111	#include <ctype.h>
112

Lines 1-6 Link Here

(-)b/net-mgmt/netdata/files/patch-configure.ac (-2 / +18 lines)
1	--- configure.ac.orig 2018-11-02 14:04:52 UTC	1	--- configure.ac.orig 2021-05-19 11:38:53 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -497,15 +497,15 @@ AC_MSG_RESULT([${enable_lto}])	3	@@ -5,11 +5,11 @@
		4	AC_PREREQ(2.60)
		5
		6	# We do not use m4_esyscmd_s to support older autoconf.
		7	-define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null \| tr -d '\n']))
		8	-define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version \| tr -d '\n']))
		9	-m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
		10	+# define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null \| tr -d '\n']))
		11	+# define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version \| tr -d '\n']))
		12	+# m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
		13
		14	-AC_INIT([netdata], VERSION_STRING[])
		15	+AC_INIT([netdata], v%%DISTVERSION%%)
		16
		17	AM_MAINTAINER_MODE([disable])
		18	if test x"$USE_MAINTAINER_MODE" = xyes; then
		19	@@ -1449,15 +1449,15 @@ AM_CONDITIONAL([ENABLE_CXX_LINKER], [test "${enable_ba
4		20
5	AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])	21	AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
6		22

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-web_gui_index.html (-17 lines)
1	--- web/gui/index.html.orig 2020-04-06 01:28:55 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>