summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosta Tsaousis <costa@tsaousis.gr>2018-10-16 15:26:28 +0300
committerGitHub <noreply@github.com>2018-10-16 15:26:28 +0300
commitd802f83e4af868236a4381112b82b7561c8d7f67 (patch)
tree6c80aa37dfc0007404b5e80d9f82ddd464d22174
parent6ea6dcc3640263ce5f07df2bccb025eda4acefe2 (diff)
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
-rw-r--r--.lgtm.yml4
-rw-r--r--Makefile.am15
-rw-r--r--README.md4
-rw-r--r--collectors/charts.d.plugin/Makefile.am102
-rw-r--r--collectors/charts.d.plugin/ap/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/apache/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/apcupsd/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/cpu_apps/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/cpufreq/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/example/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/exim/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/hddtemp/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/libreswan/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/load_average/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/mem_apps/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/mysql/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/nginx/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/nut/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/opensips/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/phpfpm/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/postfix/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/sensors/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/squid/Makefile.inc13
-rw-r--r--collectors/charts.d.plugin/tomcat/Makefile.inc13
-rw-r--r--collectors/node.d.plugin/Makefile.am16
-rw-r--r--collectors/node.d.plugin/fronius/Makefile.inc13
-rw-r--r--collectors/node.d.plugin/named/Makefile.inc13
-rw-r--r--collectors/node.d.plugin/sma_webbox/Makefile.inc13
-rw-r--r--collectors/node.d.plugin/snmp/Makefile.inc13
-rw-r--r--collectors/node.d.plugin/stiebeleltron/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/Makefile.am198
-rw-r--r--collectors/python.d.plugin/apache/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/beanstalk/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/bind_rndc/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/boinc/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/ceph/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/chrony/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/couchdb/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/cpufreq/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/cpuidle/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/dns_query_time/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/dnsdist/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/dockerd/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/dovecot/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/elasticsearch/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/example/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/exim/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/fail2ban/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/freeradius/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/go_expvar/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/haproxy/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/hddtemp/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/httpcheck/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/icecast/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/ipfs/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/isc_dhcpd/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/linux_power_supply/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/litespeed/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/logind/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/mdstat/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/megacli/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/memcached/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/mongodb/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/monit/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/mysql/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/nginx/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/nginx_plus/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/nsd/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/ntpd/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/ovpn_status_log/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/phpfpm/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/portcheck/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/postfix/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/postgres/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/powerdns/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/puppet/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/rabbitmq/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/redis/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/rethinkdbs/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/retroshare/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/samba/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/sensors/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/smartd_log/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/spigotmc/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/springboot/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/squid/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/tomcat/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/traefik/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/unbound/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/varnish/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/w1sensor/Makefile.inc13
-rw-r--r--collectors/python.d.plugin/web_log/Makefile.inc13
-rwxr-xr-xnetdata-installer.sh3
-rwxr-xr-xpackaging/tar-compare1
-rw-r--r--system/Makefile.am2
-rw-r--r--web/gui/images/README.md1
96 files changed, 1240 insertions, 224 deletions
diff --git a/.lgtm.yml b/.lgtm.yml
index 0815aadb53..7b789e7eab 100644
--- a/.lgtm.yml
+++ b/.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/
diff --git a/Makefile.am b/Makefile.am
index c80aa0f5a0..a4865d38c0 100644
--- a/Makefile.am
+++ b/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) \
diff --git a/README.md b/README.md
index 7af8560dbd..1f8321df7f 100644
--- a/README.md
+++ b/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.
diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
index 1d580c947d..685b0c7a85 100644
--- a/collectors/charts.d.plugin/Makefile.am
+++ b/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
diff --git a/collectors/charts.d.plugin/ap/Makefile.inc b/collectors/charts.d.plugin/ap/Makefile.inc
new file mode 100644
index 0000000000..a2dd375ac2
--- /dev/null
+++ b/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
+
diff --git a/collectors/charts.d.plugin/apache/Makefile.inc b/collectors/charts.d.plugin/apache/Makefile.inc
new file mode 100644
index 0000000000..4b360eae05
--- /dev/null
+++ b/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 +=