dist: drop collectd support from package

Since scyllatop no longer needs collectd, now we are able to drop collectd.

resolves #3490

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <1528961612-8528-1-git-send-email-syuu@scylladb.com>

dist/common/collectd.d/scylla.conf

@@ -1,16 +0,0 @@
-LoadPlugin network
-LoadPlugin unixsock
-
-# dummy write_graphite to silent noisy warning
-LoadPlugin network
-<Plugin "network">
-        Server "127.0.0.1 65534"
-</Plugin>
-
-<Plugin network>
-	Listen "127.0.0.1" "25826"
-</Plugin>
-<Plugin unixsock>
-	SocketFile "/var/run/collectd-unixsock"
-	SocketPerms "0666"
-</Plugin>

dist/common/scripts/scylla_setup

@@ -295,11 +295,9 @@ fi
 if [ $ENABLE_SERVICE -eq 1 ]; then
     if is_systemd; then
         systemctl enable scylla-server.service
-        systemctl enable collectd.service
         systemctl unmask scylla-fstrim.timer
     elif is_gentoo_variant; then
         rc-update add scylla-server default
-        rc-update add collectd default
     fi
     if [ $INTERACTIVE -eq 1 ] && [ ! -f /etc/scylla.d/housekeeping.cfg ]; then
         interactive_ask_service "Do you want to enable Scylla to check if there is a newer version of Scylla available?" "Yes - start the Scylla-housekeeping service to check for a newer version. This check runs periodically. No - skips this step." "yes" &&:

dist/common/sysconfig/scylla-server

@@ -35,10 +35,10 @@ SCYLLA_HOME=/var/lib/scylla
 SCYLLA_CONF=/etc/scylla
 
 # scylla arguments (for posix mode)
-SCYLLA_ARGS="--log-to-syslog 1 --log-to-stdout 0 --default-log-level info --collectd-address=127.0.0.1:25826 --collectd=1 --collectd-poll-period 3000 --network-stack posix"
+SCYLLA_ARGS="--log-to-syslog 1 --log-to-stdout 0 --default-log-level info --network-stack posix"
 
 ## scylla arguments (for dpdk mode)
-#SCYLLA_ARGS="--log-to-syslog 1 --log-to-stdout 0 --default-log-level info --collectd-address=127.0.0.1:25826 --collectd=1 --collectd-poll-period 3000 --network-stack native --dpdk-pmd"
+#SCYLLA_ARGS="--log-to-syslog 1 --log-to-stdout 0 --default-log-level info --network-stack native --dpdk-pmd"
 
 # setup as AMI instance
 AMI=no

dist/debian/control.mustache

@@ -32,7 +32,7 @@ Conflicts: scylla-server (<< 1.1)
 
 Package: scylla-server
 Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, hwloc-nox, collectd-core, scylla-conf, python-yaml, python-urwid, python-requests, curl, util-linux, python3-yaml, python3, uuid-runtime, pciutils, python3-pyudev, gzip,
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, hwloc-nox, scylla-conf, python-yaml, python-urwid, python-requests, curl, util-linux, python3-yaml, python3, uuid-runtime, pciutils, python3-pyudev, gzip,
 {{#jessie}}
  realpath
 {{/jessie}}

dist/debian/debian/scylla-server.docs

@@ -2,4 +2,3 @@
 NOTICE.txt
 ORIGIN
 licenses
-dist/debian/collectd/collectd.conf.example

dist/debian/debian/scylla-server.postinst

@@ -30,8 +30,4 @@ echo "api_ui_dir: /usr/lib/scylla/swagger-ui/dist/" >> /tmp/scylla.yaml
 echo "api_doc_dir: /usr/lib/scylla/api/api-doc/" >> /tmp/scylla.yaml
 mv /tmp/scylla.yaml /etc/scylla/scylla.yaml
 
-if [ -d /etc/collectd/ ] && [ ! -e /etc/collectd/collectd.conf ]; then
-    zcat /usr/share/doc/scylla-server/collectd.conf.example.gz > /etc/collectd/collectd.conf
-fi
-
 #DEBHELPER#

dist/debian/scylla-server.install.mustache

@@ -1,5 +1,4 @@
 dist/common/limits.d/scylla.conf etc/security/limits.d
-dist/common/collectd.d/scylla.conf etc/collectd/collectd.conf.d
 dist/common/scylla.d/*.conf etc/scylla.d
 seastar/dpdk/usertools/dpdk-devbind.py usr/lib/scylla
 seastar/scripts/posix_net_conf.sh usr/lib/scylla

dist/docker/redhat/etc/sysconfig/scylla-server

@@ -35,7 +35,7 @@ SCYLLA_HOME=/var/lib/scylla
 SCYLLA_CONF=/etc/scylla
 
 # scylla arguments
-SCYLLA_ARGS="--log-to-syslog 0 --log-to-stdout 1 --default-log-level info --collectd-address=127.0.0.1:25826 --collectd=1 --collectd-poll-period 3000 --network-stack posix"
+SCYLLA_ARGS="--log-to-syslog 0 --log-to-stdout 1 --default-log-level info --network-stack posix"
 
 # setup as AMI instance
 AMI=no

dist/redhat/scylla.spec.mustache

@@ -57,7 +57,7 @@ URL:            http://www.scylladb.com/
 BuildRequires:  libaio-devel libstdc++-devel cryptopp-devel hwloc-devel numactl-devel libpciaccess-devel libxml2-devel zlib-devel thrift-devel yaml-cpp-devel lz4-devel snappy-devel jsoncpp-devel systemd-devel xz-devel pcre-devel elfutils-libelf-devel bzip2-devel keyutils-libs-devel xfsprogs-devel make gnutls-devel systemd-devel lksctp-tools-devel protobuf-devel protobuf-compiler systemtap-sdt-devel ninja-build cmake python ragel grep kernel-headers
 %{?fedora:BuildRequires: boost-devel antlr3-tool antlr3-C++-devel python3 gcc-c++ libasan libubsan python3-pyparsing dnf-yum python2-pystache}
 %{?rhel:BuildRequires: scylla-libstdc++73-static scylla-boost163-devel scylla-boost163-static scylla-antlr35-tool scylla-antlr35-C++-devel python34 scylla-gcc73-c++, scylla-python34-pyparsing20 yaml-cpp-static pystache python-setuptools}
-Requires:       scylla-conf systemd-libs hwloc collectd PyYAML python-urwid pciutils pyparsing python-requests curl util-linux python-setuptools pciutils python3-pyudev mdadm xfsprogs
+Requires:       scylla-conf systemd-libs hwloc PyYAML python-urwid pciutils pyparsing python-requests curl util-linux python-setuptools pciutils python3-pyudev mdadm xfsprogs
 %{?rhel:Requires: python34 python34-PyYAML kernel >= 3.10.0-514}
 %{?fedora:Requires: python3 python3-PyYAML}
 Conflicts:      abrt
@@ -147,7 +147,6 @@ if  [ -d /tmp/%{name}-%{version}-%{release} ]; then
     rm -rf /tmp/%{name}-%{version}-%{release}/
 fi
 ln -sfT /etc/scylla /var/lib/scylla/conf
-systemctl restart collectd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -157,7 +156,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %config(noreplace) %{_sysconfdir}/sysconfig/scylla-server
 %{_sysconfdir}/security/limits.d/scylla.conf
-%config(noreplace) %{_sysconfdir}/collectd.d/scylla.conf
 %attr(0755,root,root) %dir %{_sysconfdir}/scylla.d
 %config(noreplace) %{_sysconfdir}/scylla.d/*.conf
 %{_docdir}/scylla/README.md

install.sh

@@ -75,11 +75,10 @@ pystache dist/common/systemd/scylla-housekeeping-daily.service.mustache "{ $MUST
 pystache dist/common/systemd/scylla-housekeeping-restart.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-housekeeping-restart.service
 
 
-install -m755 -d "$retc/sysconfig" "$retc/security/limits.d" "$retc/collectd.d"
+install -m755 -d "$retc/sysconfig" "$retc/security/limits.d"
 install -m755 -d "$retc/scylla.d" "$rprefix/lib/sysctl.d"
 install -m644 dist/common/sysconfig/scylla-server -Dt "$retc"/sysconfig
 install -m644 dist/common/limits.d/scylla.conf -Dt "$retc"/security/limits.d
-install -m644 dist/common/collectd.d/scylla.conf -Dt "$retc"/collectd.d
 install -m644 dist/common/scylla.d/*.conf -Dt "$retc"/scylla.d
 install -m644 dist/common/sysctl.d/*.conf -Dt "$rprefix"/lib/sysctl.d