Fix make dist (#4401)

* fix make dist; fixes #4400

* added daemon dir

* fix edit-config in dist

* removed config.h from file dependencies

* do not attempt to detect stock files on vanilla installations

* add missing files to dist

* another fix for missing dist files

* modular plugins are now self-configured for automake

* updated lgtm

* fix cncf urls

.lgtm.yml

@@ -17,7 +17,7 @@ path_classifiers:
     - collectors/node.d.plugin/node_modules/extend.js
     - collectors/node.d.plugin/node_modules/net-snmp.js
     - collectors/node.d.plugin/node_modules/pixl-xml.js
-    - web/lib/
-    - web/css/
+    - web/gui/lib/
+    - web/gui/css/
   test:
     - tests/

Makefile.am

@@ -24,8 +24,9 @@ EXTRA_DIST = \
 	.eslintrc \
 	.lgtm.yml \
 	.travis \
-	build/build.sh
-	build/Dockerfile
+	.github/CODEOWNERS \
+	build/build.sh \
+	build/Dockerfile \
 	build/m4/jemalloc.m4 \
 	build/m4/ax_c___atomic.m4 \
 	build/m4/ax_check_enable_debug.m4 \
@@ -40,6 +41,7 @@ EXTRA_DIST = \
 	build/m4/ax_c__generic.m4 \
 	README.md \
 	CONTRIBUTORS.md \
+	CODE_OF_CONDUCT.md \
 	LICENSE \
 	REDISTRIBUTED.md \
 	$(NULL)
@@ -77,6 +79,7 @@ dist_noinst_SCRIPTS= \
 SUBDIRS += \
     backends \
     collectors \
+    daemon \
     database \
     health \
     libnetdata \
@@ -405,7 +408,7 @@ NETDATA_COMMON_LIBS = \
 
 
 sbin_PROGRAMS += netdata
-netdata_SOURCES = ../config.h $(NETDATA_FILES)
+netdata_SOURCES = $(NETDATA_FILES)
 netdata_LDADD = \
 	$(NETDATA_COMMON_LIBS) \
 	$(OPTIONAL_NFACCT_LIBS) \
@@ -413,7 +416,7 @@ netdata_LDADD = \
 
 if ENABLE_PLUGIN_APPS
     plugins_PROGRAMS += apps.plugin
-    apps_plugin_SOURCES = ../config.h $(APPS_PLUGIN_FILES)
+    apps_plugin_SOURCES = $(APPS_PLUGIN_FILES)
     apps_plugin_LDADD = \
     	$(NETDATA_COMMON_LIBS) \
         $(OPTIONAL_LIBCAP_LIBS) \
@@ -422,7 +425,7 @@ endif
 
 if ENABLE_PLUGIN_CGROUP_NETWORK
     plugins_PROGRAMS += cgroup-network
-    cgroup_network_SOURCES = ../config.h $(CGROUP_NETWORK_FILES)
+    cgroup_network_SOURCES = $(CGROUP_NETWORK_FILES)
     cgroup_network_LDADD = \
     	$(NETDATA_COMMON_LIBS) \
         $(NULL)
@@ -430,7 +433,7 @@ endif
 
 if ENABLE_PLUGIN_FREEIPMI
     plugins_PROGRAMS += freeipmi.plugin
-    freeipmi_plugin_SOURCES = ../config.h $(FREEIPMI_PLUGIN_FILES)
+    freeipmi_plugin_SOURCES = $(FREEIPMI_PLUGIN_FILES)
     freeipmi_plugin_LDADD = \
     	$(NETDATA_COMMON_LIBS) \
         $(OPTIONAL_IPMIMONITORING_LIBS) \

README.md

@@ -72,11 +72,11 @@ Netdata now has its own github organization `netdata`, so all github URLs are no
 
 ---
 
-<img src="https://www.cncf.io/wp-content/uploads/2016/09/logo_cncf.png">
+![cncf](https://www.cncf.io/wp-content/uploads/2016/09/logo_cncf.png)
 
 `Jun 16, 2018` - **netdata in CNCF**
 
-Netdata is now at the [Cloud Native Computing Foundation (CNCF) landscape](https://deploy-preview-842--landscape.netlify.com/grouping=no&sort=stars).
+Netdata is now at the [Cloud Native Computing Foundation (CNCF) landscape](https://landscape.cncf.io/grouping=no&sort=stars).
 
 Read the [netdata presentation](https://docs.google.com/presentation/d/18C8bCTbtgKDWqPa57GXIjB2PbjjpjsUNkLtZEz6YK8s/edit?usp=sharing) we gave at CNCF TOC on Sep 18, 2018.
 

collectors/charts.d.plugin/Makefile.am

@@ -3,8 +3,8 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 CLEANFILES = \
-	charts.d.plugin \
-	$(NULL)
+    charts.d.plugin \
+    $(NULL)
 
 include $(top_srcdir)/build/subst.inc
 SUFFIXES = .in
@@ -14,81 +14,43 @@ dist_libconfig_DATA = \
     $(NULL)
 
 dist_plugins_SCRIPTS = \
-	charts.d.dryrun-helper.sh \
-	charts.d.plugin \
-	loopsleepms.sh.inc \
-	$(NULL)
+    charts.d.dryrun-helper.sh \
+    charts.d.plugin \
+    loopsleepms.sh.inc \
+    $(NULL)
 
 dist_noinst_DATA = \
-	charts.d.plugin.in \
-	ap/README.md \
-    apache/README.md \
-    apcupsd/README.md \
-    cpu_apps/README.md \
-    cpufreq/README.md \
-    example/README.md \
-    exim/README.md \
-    hddtemp/README.md \
-    libreswan/README.md \
-    load_average/README.md \
-    mem_apps/README.md \
-    mysql/README.md \
-    nginx/README.md \
-    nut/README.md \
-    opensips/README.md \
-    phpfpm/README.md \
-    postfix/README.md \
-    sensors/README.md \
-    squid/README.md \
-    tomcat/README.md \
-	$(NULL)
+    charts.d.plugin.in \
+    README.md \
+    $(NULL)
 
 dist_charts_SCRIPTS = \
-	$(NULL)
+    $(NULL)
 
 dist_charts_DATA = \
-	ap/ap.chart.sh \
-	apcupsd/apcupsd.chart.sh \
-	apache/apache.chart.sh \
-	cpu_apps/cpu_apps.chart.sh \
-	cpufreq/cpufreq.chart.sh \
-	example/example.chart.sh \
-	exim/exim.chart.sh \
-	hddtemp/hddtemp.chart.sh \
-	libreswan/libreswan.chart.sh \
-	load_average/load_average.chart.sh \
-	mem_apps/mem_apps.chart.sh \
-	mysql/mysql.chart.sh \
-	nginx/nginx.chart.sh \
-	nut/nut.chart.sh \
-	opensips/opensips.chart.sh \
-	phpfpm/phpfpm.chart.sh \
-	postfix/postfix.chart.sh \
-	sensors/sensors.chart.sh \
-	squid/squid.chart.sh \
-	tomcat/tomcat.chart.sh \
-	$(NULL)
+    $(NULL)
 
 chartsconfigdir=$(libconfigdir)/charts.d
 dist_chartsconfig_DATA = \
-    ap/ap.conf \
-    apache/apache.conf \
-    apcupsd/apcupsd.conf \
-    cpu_apps/cpu_apps.conf \
-    cpufreq/cpufreq.conf \
-    example/example.conf \
-    exim/exim.conf \
-    hddtemp/hddtemp.conf \
-    libreswan/libreswan.conf \
-    load_average/load_average.conf \
-    mem_apps/mem_apps.conf \
-    mysql/mysql.conf \
-    nginx/nginx.conf \
-    nut/nut.conf \
-    opensips/opensips.conf \
-    phpfpm/phpfpm.conf \
-    postfix/postfix.conf \
-    sensors/sensors.conf \
-    squid/squid.conf \
-    tomcat/tomcat.conf \
     $(NULL)
+
+include ap/Makefile.inc
+include apache/Makefile.inc
+include apcupsd/Makefile.inc
+include cpu_apps/Makefile.inc
+include cpufreq/Makefile.inc
+include example/Makefile.inc
+include exim/Makefile.inc
+include hddtemp/Makefile.inc
+include libreswan/Makefile.inc
+include load_average/Makefile.inc
+include mem_apps/Makefile.inc
+include mysql/Makefile.inc
+include nginx/Makefile.inc
+include nut/Makefile.inc
+include opensips/Makefile.inc
+include phpfpm/Makefile.inc
+include postfix/Makefile.inc
+include sensors/Makefile.inc
+include squid/Makefile.inc
+include tomcat/Makefile.inc

collectors/charts.d.plugin/ap/Makefile.inc

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_charts_DATA       += ap/ap.chart.sh
+dist_chartsconfig_DATA += ap/ap.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += ap/README.md ap/Makefile.inc
+

collectors/charts.d.plugin/apache/Makefile.inc

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_charts_DATA       += apache/apache.chart.sh
+dist_chartsconfig_DATA += apache/apache.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += apache/README.md apache/Makefile.inc
+

collectors/charts.d.plugin/apcupsd/Makefile.inc

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_charts_DATA       += apcupsd/apcupsd.chart.sh
+dist_chartsconfig_DATA += apcupsd/apcupsd.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += apcupsd/README.md apcupsd/Makefile.inc
+

collectors/charts.d.plugin/cpu_apps/Makefile.inc

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_charts_DATA       += cpu_apps/cpu_apps.chart.sh
+dist_chartsconfig_DATA += cpu_apps/cpu_apps.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += cpu_apps/README.md cpu_apps/Makefile.inc
+

collectors/charts.d.plugin/cpufreq/Makefile.inc

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_charts_DATA       += cpufreq/cpufreq.chart.sh
+dist_chartsconfig_DATA += cpufreq/cpufreq.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += cpufreq/README.md cpufreq/Makefile.inc
+

collectors/charts.d.plugin/example/Makefile.inc

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# THIS IS NOT A COMPLETE Makefile
+# IT IS INCLUDED BY ITS PARENT'S Makefile.am
+# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
+
+# install these files
+dist_charts_DATA       += example/example.chart.sh
+dist_chartsconfig_DATA += example/example.conf
+
+# do not install these files, but include them in the distribution
+dist_noinst_DATA       += example/README.md example/Makefile.inc
+