summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/control7
-rw-r--r--contrib/debian/control.buster7
-rw-r--r--contrib/debian/control.jessie7
-rw-r--r--contrib/debian/control.trusty7
-rw-r--r--contrib/debian/control.wheezy6
-rw-r--r--contrib/debian/control.xenial7
-rwxr-xr-xcontrib/debian/rules39
7 files changed, 73 insertions, 7 deletions
diff --git a/contrib/debian/control b/contrib/debian/control
index ed5bd94b83..be9a778606 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -43,7 +43,6 @@ Depends: adduser,
openssl,
libmnl0,
libjson-c3,
- cups,
freeipmi,
libnetfilter-acct1,
libprotobuf-c1,
@@ -56,3 +55,9 @@ Description: real-time charts for system monitoring
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
+
+Package: netdata-plugin-cups
+Architecture: any
+Depends: cups,
+ netdata (>= ${source:Version})
+Description: The Common Unix Printing System plugin for metrics collection from cupds
diff --git a/contrib/debian/control.buster b/contrib/debian/control.buster
index 56c59ae880..1166883be3 100644
--- a/contrib/debian/control.buster
+++ b/contrib/debian/control.buster
@@ -43,7 +43,6 @@ Depends: adduser,
openssl,
libmnl0,
libjson-c3,
- cups,
freeipmi,
libnetfilter-acct1,
libprotobuf-c1,
@@ -56,3 +55,9 @@ Description: real-time charts for system monitoring
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
+
+Package: netdata-plugin-cups
+Architecture: any
+Depends: cups,
+ netdata (>= ${source:Version})
+Description: The Common Unix Printing System plugin for metrics collection from cupds
diff --git a/contrib/debian/control.jessie b/contrib/debian/control.jessie
index ced85d20e8..79db7839c8 100644
--- a/contrib/debian/control.jessie
+++ b/contrib/debian/control.jessie
@@ -41,7 +41,6 @@ Depends: adduser,
openssl,
libmnl0,
libjson-c3,
- cups,
freeipmi,
libnetfilter-acct1,
libprotobuf-c1,
@@ -54,3 +53,9 @@ Description: real-time charts for system monitoring
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
+
+Package: netdata-plugin-cups
+Architecture: any
+Depends: cups,
+ netdata (>= ${source:Version})
+Description: The Common Unix Printing System plugin for metrics collection from cupds
diff --git a/contrib/debian/control.trusty b/contrib/debian/control.trusty
index cb8a52e018..918d2ad35f 100644
--- a/contrib/debian/control.trusty
+++ b/contrib/debian/control.trusty
@@ -41,7 +41,6 @@ Depends: adduser,
openssl,
libmnl0,
libjson-c2,
- cups,
freeipmi,
libnetfilter-acct1,
libprotobuf-c0,
@@ -54,3 +53,9 @@ Description: real-time charts for system monitoring
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
+
+Package: netdata-plugin-cups
+Architecture: any
+Depends: cups,
+ netdata (>= ${source:Version})
+Description: The Common Unix Printing System plugin for metrics collection from cupds
diff --git a/contrib/debian/control.wheezy b/contrib/debian/control.wheezy
index cde1d560c6..dc23b788e1 100644
--- a/contrib/debian/control.wheezy
+++ b/contrib/debian/control.wheezy
@@ -23,3 +23,9 @@ Description: real-time charts for system monitoring
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
+
+Package: netdata-plugin-cups
+Architecture: any
+Depends: cups,
+ netdata (>= ${source:Version})
+Description: The Common Unix Printing System plugin for metrics collection from cupds
diff --git a/contrib/debian/control.xenial b/contrib/debian/control.xenial
index 08a6df43c7..412b389e8d 100644
--- a/contrib/debian/control.xenial
+++ b/contrib/debian/control.xenial
@@ -43,7 +43,6 @@ Depends: adduser,
openssl,
libmnl0,
libjson-c2,
- cups,
freeipmi,
libnetfilter-acct1,
libprotobuf-c1,
@@ -56,3 +55,9 @@ Description: real-time charts for system monitoring
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
+
+Package: netdata-plugin-cups
+Architecture: any
+Depends: cups,
+ netdata (>= ${source:Version})
+Description: The Common Unix Printing System plugin for metrics collection from cupds
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 036e0108e6..35cae45bdb 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -4,6 +4,7 @@
# the location of plugins in /usr/lib
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
TOP = $(CURDIR)/debian/netdata
+TEMPTOP = $(CURDIR)/debian/tmp
%:
# For jessie and beyond
@@ -31,9 +32,36 @@ override_dh_install: debian/netdata.postinst
#
find "$(TOP)" -name .keep -exec rm '{}' ';'
+ # Set the CUPS plugin install rule
+ #
+ mkdir -p $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d
+ mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/cups.plugin \
+ $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin
+
+ # Set the rest of the software in the main package
+ #
+ cp -rp $(TEMPTOP)/usr $(TOP)/usr
+ cp -rp $(TEMPTOP)/var $(TOP)/var
+ #cp -rp $(TEMPTOP)/etc $(TOP)/etc
+
+ # Copy sample netdata.conf
+ cp -p $(CURDIR)/system/edit-config $(TOP)/etc/netdata/
+
+ # Create placeholder dirs in netdata configuration directory
+ #
+ mkdir -p $(TOP)/etc/netdata/health.d
+ mkdir -p $(TOP)/etc/netdata/python.d
+ mkdir -p $(TOP)/etc/netdata/charts.d
+ mkdir -p $(TOP)/etc/netdata/cystonm-plugins.d
+ mkdir -p $(TOP)/etc/netdata/go.d
+ mkdir -p $(TOP)/etc/netdata/ssl
+ mkdir -p $(TOP)/etc/netdata/node.d
+ mkdir -p $(TOP)/etc/netdata/statsd.d
+
+
# Move files that local user shouldn't be editing to /usr/share/netdata
#
- mkdir -p "$(TOP)/usr/share/netdata"
+ mkdir -p "$(TOP)/usr/share/netdata/www"
for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type d -printf '%f '); do \
echo Relocating $$D; \
mv "$(TOP)/var/lib/netdata/www/$$D" "$(TOP)/usr/share/netdata/www/$$D"; \
@@ -55,7 +83,7 @@ override_dh_install: debian/netdata.postinst
# Install go
#
- debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata
+ debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/netdata $(TOP)/usr/libexec/netdata
override_dh_installdocs:
dh_installdocs
@@ -81,6 +109,13 @@ override_dh_fixperms:
chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/perf.plugin
chmod 0750 $(TOP)/usr/libexec/netdata/plugins.d/go.d.plugin
+ # Support script for configuration file management
+ #
+ chmod 0750 $(TOP)/etc/netdata/edit-config
+
+ # CUPS plugin package
+ chmod 0750 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin
+
override_dh_installlogrotate:
cp system/netdata.logrotate debian/netdata.logrotate
dh_installlogrotate
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 23:18:55 +0000