diff options
author | Costa Tsaousis <costa@tsaousis.gr> | 2018-10-16 15:26:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-16 15:26:28 +0300 |
commit | d802f83e4af868236a4381112b82b7561c8d7f67 (patch) | |
tree | 6c80aa37dfc0007404b5e80d9f82ddd464d22174 /collectors | |
parent | 6ea6dcc3640263ce5f07df2bccb025eda4acefe2 (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
Diffstat (limited to 'collectors')
89 files changed, 1225 insertions, 209 deletions
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 += apache/apache.conf + +# do not install these files, but include them in the distribution +dist_noinst_DATA += apache/README.md apache/Makefile.inc + diff --git a/collectors/charts.d.plugin/apcupsd/Makefile.inc b/collectors/charts.d.plugin/apcupsd/Makefile.inc new file mode 100644 index 0000000000..19cb9cad79 --- /dev/null +++ b/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 + diff --git a/collectors/charts.d.plugin/cpu_apps/Makefile.inc b/collectors/charts.d.plugin/cpu_apps/Makefile.inc new file mode 100644 index 0000000000..a35f828374 --- /dev/null +++ b/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 + diff --git a/collectors/charts.d.plugin/cpufreq/Makefile.inc b/collectors/charts.d.plugin/cpufreq/Makefile.inc new file mode 100644 index 0000000000..6823791333 --- /dev/null +++ b/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 + diff --git a/collectors/charts.d.plugin/example/Makefile.inc b/collectors/charts.d.plugin/example/Makefile.inc new file mode 100644 index 0000000000..e6838fbbe7 --- /dev/null +++ b/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 + diff --git a/collectors/charts.d.plugin/exim/Makefile.inc b/collectors/charts.d.plugin/exim/Makefile.inc new file mode 100644 index 0000000000..ca2112a808 --- /dev/null +++ b/collectors/charts.d.plugin/exim/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 += exim/exim.chart.sh +dist_chartsconfig_DATA += exim/exim.conf + +# do not install these files, but include them in the distribution +dist_noinst_DATA += exim/README.md exim/Makefile.inc + < |