diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-01-01 16:05:42 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-01-27 20:49:02 +0000 |
commit | 9defc7d3bebf04db61dcdcbaca9fe9be79432a46 (patch) | |
tree | 48a43ce97bb0cf13c1a40c7fe38cc525a631d2e3 | |
parent | Moving architecture-independent plugins to interpreter specific netdata-plugi... (diff) | |
download | netdata-9defc7d3bebf04db61dcdcbaca9fe9be79432a46.tar.xz netdata-9defc7d3bebf04db61dcdcbaca9fe9be79432a46.zip |
Renaming netdata to netdata-core, making netdata a meta package depending on the (typical) netdata components that it contained before the package reshuffeling.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r-- | debian/control | 53 | ||||
-rw-r--r-- | debian/netdata-core.dirs (renamed from debian/netdata.dirs) | 1 | ||||
-rw-r--r-- | debian/netdata-core.docs (renamed from debian/netdata.docs) | 0 | ||||
-rw-r--r-- | debian/netdata-core.install (renamed from debian/netdata.install) | 0 | ||||
-rw-r--r-- | debian/netdata-core.lintian-overrides | 6 | ||||
-rw-r--r-- | debian/netdata-core.maintscript (renamed from debian/netdata.maintscript) | 0 | ||||
-rw-r--r-- | debian/netdata-core.manpages (renamed from debian/netdata.manpages) | 0 | ||||
-rw-r--r-- | debian/netdata-core.netdata.init (renamed from debian/netdata.init) | 0 | ||||
-rw-r--r-- | debian/netdata-core.netdata.logrotate (renamed from debian/netdata.logrotate) | 0 | ||||
-rw-r--r-- | debian/netdata-core.netdata.service (renamed from debian/netdata.service) | 0 | ||||
-rwxr-xr-x | debian/netdata-core.postinst (renamed from debian/netdata.postinst) | 0 | ||||
-rwxr-xr-x | debian/netdata-core.postrm (renamed from debian/netdata.postrm) | 0 | ||||
-rw-r--r-- | debian/netdata.lintian-overrides | 6 | ||||
-rwxr-xr-x | debian/rules | 20 |
14 files changed, 60 insertions, 26 deletions
diff --git a/debian/control b/debian/control index 77c36f84d..fa759f168 100644 --- a/debian/control +++ b/debian/control @@ -19,40 +19,59 @@ Vcs-Git: https://salsa.debian.org/debian/netdata.git Package: netdata Section: net +Architecture: all +Depends: + netdata-core (=${source:Version}), + netdata-plugins-bash (=${source:Version}), + netdata-web (=${source:Version}), + ${misc:Depends}, +Recommends: + netdata-plugins-nodejs (=${source:Version}), + netdata-plugins-python (=${source:Version}), +Description: real-time performance monitoring (metapackage) + Netdata is distributed, real-time, performance and health monitoring for + systems and applications. It provides insights of everything happening on the + systems it runs using interactive web dashboards. + . + It can run autonomously without any third party components or it can be + integrated to existing monitoring tool chains (Prometheus, Graphite, + OpenTSDB, Kafka, Grafana, etc). + . + This package is a metapackage depending on the typical netdata components. + +Package: netdata-core +Section: net Architecture: linux-any Pre-Depends: ${misc:Pre-Depends}, Depends: libcap2-bin, lsb-base, - netdata-plugins-bash (=${source:Version}), - netdata-plugins-nodejs (=${source:Version}), - netdata-plugins-python (=${source:Version}), - netdata-web (=${source:Version}), ${misc:Depends}, ${shlibs:Depends}, Recommends: curl, -Description: real-time performance monitoring +Breaks: + netdata (<< 1.11.1+dfsg-3~), +Description: real-time performance monitoring (core) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the systems it runs using interactive web dashboards. . - It can run autonomously without any third party components or it can be - integrated to existing monitoring tool chains (Prometheus, Graphite, - OpenTSDB, Kafka, Grafana, etc). + This package contains the minimal core. Package: netdata-plugins-bash +Section: net Architecture: all Multi-Arch: foreign Depends: bash, - netdata (=${source:Version}), + netdata-core (=${source:Version}), ${misc:Depends}, Suggests: fping, Enhances: - netdata, + netdata-core, Description: real-time performance monitoring (bash plugins) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the @@ -61,14 +80,15 @@ Description: real-time performance monitoring (bash plugins) This package contains the plugins using bash. Package: netdata-plugins-nodejs +Section: net Architecture: all Multi-Arch: foreign Depends: - netdata (=${source:Version}), + netdata-core (=${source:Version}), nodejs, ${misc:Depends}, Enhances: - netdata, + netdata-core, Description: real-time performance monitoring (nodejs plugins) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the @@ -77,17 +97,18 @@ Description: real-time performance monitoring (nodejs plugins) This package contains the plugins using nodejs. Package: netdata-plugins-python +Section: net Architecture: all Multi-Arch: foreign Depends: - netdata (=${source:Version}), + netdata-core (=${source:Version}), python3, python3-six, python3-urllib3 (>= 1.22), python3-yaml, ${misc:Depends}, Enhances: - netdata, + netdata-core, Description: real-time performance monitoring (python plugins) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the @@ -101,14 +122,14 @@ Architecture: all Depends: fonts-font-awesome, libjs-bootstrap, - netdata (=${source:Version}), + netdata-core (=${source:Version}), ${misc:Depends}, Conflicts: netdata-data, Replaces: netdata-data, Enhances: - netdata, + netdata-core, Description: real-time performance monitoring (web) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the diff --git a/debian/netdata.dirs b/debian/netdata-core.dirs index 0c4eb7c5e..6cda555ff 100644 --- a/debian/netdata.dirs +++ b/debian/netdata-core.dirs @@ -1,4 +1,5 @@ etc/netdata +usr/share/netdata/web var/cache/netdata var/lib/netdata var/log/netdata diff --git a/debian/netdata.docs b/debian/netdata-core.docs index b43bf86b5..b43bf86b5 100644 --- a/debian/netdata.docs +++ b/debian/netdata-core.docs diff --git a/debian/netdata.install b/debian/netdata-core.install index 9c682310d..9c682310d 100644 --- a/debian/netdata.install +++ b/debian/netdata-core.install diff --git a/debian/netdata-core.lintian-overrides b/debian/netdata-core.lintian-overrides new file mode 100644 index 000000000..13c47ca46 --- /dev/null +++ b/debian/netdata-core.lintian-overrides @@ -0,0 +1,6 @@ +# See Debian policy 10.9. apps.plugin has extra capabilities, so don't let +# normal users run it. +netdata-core: non-standard-executable-perm usr/lib/*/netdata/plugins.d/apps.plugin 0754 != 0755 + +# freeipmi plugin +netdata-core: setuid-binary usr/lib/x86_64-linux-gnu/netdata/plugins.d/freeipmi.plugin 4754 root/root diff --git a/debian/netdata.maintscript b/debian/netdata-core.maintscript index ba48e62e5..ba48e62e5 100644 --- a/debian/netdata.maintscript +++ b/debian/netdata-core.maintscript diff --git a/debian/netdata.manpages b/debian/netdata-core.manpages index 421a3ab88..421a3ab88 100644 --- a/debian/netdata.manpages +++ b/debian/netdata-core.manpages diff --git a/debian/netdata.init b/debian/netdata-core.netdata.init index 42e291751..42e291751 100644 --- a/debian/netdata.init +++ b/debian/netdata-core.netdata.init diff --git a/debian/netdata.logrotate b/debian/netdata-core.netdata.logrotate index 7ede4fcb0..7ede4fcb0 100644 --- a/debian/netdata.logrotate +++ b/debian/netdata-core.netdata.logrotate diff --git a/debian/netdata.service b/debian/netdata-core.netdata.service index 54f4d03e7..54f4d03e7 100644 --- a/debian/netdata.service +++ b/debian/netdata-core.netdata.service diff --git a/debian/netdata.postinst b/debian/netdata-core.postinst index c99048900..c99048900 100755 --- a/debian/netdata.postinst +++ b/debian/netdata-core.postinst diff --git a/debian/netdata.postrm b/debian/netdata-core.postrm index 1ac2941ae..1ac2941ae 100755 --- a/debian/netdata.postrm +++ b/debian/netdata-core.postrm diff --git a/debian/netdata.lintian-overrides b/debian/netdata.lintian-overrides deleted file mode 100644 index 188dc18bc..000000000 --- a/debian/netdata.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -# See Debian policy 10.9. apps.plugin has extra capabilities, so don't let -# normal users run it. -netdata: non-standard-executable-perm usr/lib/*/netdata/plugins.d/apps.plugin 0754 != 0755 - -# freeipmi plugin -netdata: setuid-binary usr/lib/x86_64-linux-gnu/netdata/plugins.d/freeipmi.plugin 4754 root/root diff --git a/debian/rules b/debian/rules index 44ae64bd2..f30e70131 100755 --- a/debian/rules +++ b/debian/rules @@ -48,11 +48,11 @@ override_dh_install: dh_install # Move architecture dependent plugins - mkdir -p $(TOP)/usr/lib/netdata/plugins.d + mkdir -p $(TOP)-core/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin freeipmi.plugin; \ do \ mv $(TOP)-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \ - $(TOP)/usr/lib/netdata/plugins.d; \ + $(TOP)-core/usr/lib/netdata/plugins.d; \ done mkdir -p $(TOP)-plugins-nodejs/usr/lib/netdata/plugins.d @@ -74,6 +74,18 @@ override_dh_install-indep: # Setting package version (update check) echo $(VERSION) > $(TOP)-web/usr/share/netdata/web/version.txt +override_dh_installinit: + dh_installinit -p netdata-core --name=netdata + dh_installinit --remaining-packages + +override_dh_installsystemd: + dh_installsystemd -p netdata-core --name=netdata + dh_installsystemd --remaining-packages + +override_dh_installlogrotate: + dh_installlogrotate -p netdata-core --name=netdata + dh_installlogrotate --remaining-packages + override_dh_missing: dh_missing --fail-missing @@ -82,8 +94,8 @@ override_dh_fixperms-arch: # apps.plugin should only be runnable by the netdata user. It will be # given extra capabilities in the postinst script. - chmod 0754 $(TOP)/usr/lib/netdata/plugins.d/apps.plugin - chmod 4754 $(TOP)/usr/lib/netdata/plugins.d/freeipmi.plugin + chmod 0754 $(TOP)-core/usr/lib/netdata/plugins.d/apps.plugin + chmod 4754 $(TOP)-core/usr/lib/netdata/plugins.d/freeipmi.plugin chmod 0644 $(TOP)-plugins-bash/usr/lib/netdata/charts.d/*.sh chmod 0644 $(TOP)-plugins-bash/usr/lib/netdata/plugins.d/*.sh.inc chmod 0644 $(TOP)-plugins-python/usr/lib/netdata/python.d/*.py |