diff --git a/dist/common/collectd.d/scylla.conf b/dist/common/collectd.d/scylla.conf deleted file mode 100644 index 72abaf39b8..0000000000 --- a/dist/common/collectd.d/scylla.conf +++ /dev/null @@ -1,16 +0,0 @@ -LoadPlugin network -LoadPlugin unixsock - -# dummy write_graphite to silent noisy warning -LoadPlugin network - - Server "127.0.0.1 65534" - - - - Listen "127.0.0.1" "25826" - - - SocketFile "/var/run/collectd-unixsock" - SocketPerms "0666" - diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup index 3c515dc623..6553047a0e 100755 --- a/dist/common/scripts/scylla_setup +++ b/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" &&: diff --git a/dist/common/sysconfig/scylla-server b/dist/common/sysconfig/scylla-server index bb296766a1..ba7c6a101c 100644 --- a/dist/common/sysconfig/scylla-server +++ b/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 diff --git a/dist/debian/collectd/collectd.conf.example b/dist/debian/collectd/collectd.conf.example deleted file mode 100644 index cea1e59202..0000000000 --- a/dist/debian/collectd/collectd.conf.example +++ /dev/null @@ -1,1315 +0,0 @@ -# Config file for collectd(1). -# -# Some plugins need additional configuration and are disabled by default. -# Please read collectd.conf(5) for details. -# -# You should also read /usr/share/doc/collectd-core/README.Debian.plugins -# before enabling any more plugins. - -############################################################################## -# Global # -#----------------------------------------------------------------------------# -# Global settings for the daemon. # -############################################################################## - -#Hostname "localhost" -FQDNLookup true -#BaseDir "/var/lib/collectd" -#PluginDir "/usr/lib/collectd" -#TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db" - -#----------------------------------------------------------------------------# -# When enabled, plugins are loaded automatically with the default options # -# when an appropriate block is encountered. # -# Disabled by default. # -#----------------------------------------------------------------------------# -#AutoLoadPlugin false - -#----------------------------------------------------------------------------# -# When enabled, internal statistics are collected, using "collectd" as the # -# plugin name. # -# Disabled by default. # -#----------------------------------------------------------------------------# -#CollectInternalStats false - -#----------------------------------------------------------------------------# -# Interval at which to query values. This may be overwritten on a per-plugin # -# base by using the 'Interval' option of the LoadPlugin block: # -# # -# Interval 60 # -# # -#----------------------------------------------------------------------------# -#Interval 10 - -#MaxReadInterval 86400 -#Timeout 2 -#ReadThreads 5 -#WriteThreads 5 - -# Limit the size of the write queue. Default is no limit. Setting up a limit -# is recommended for servers handling a high volume of traffic. -#WriteQueueLimitHigh 1000000 -#WriteQueueLimitLow 800000 - -############################################################################## -# Logging # -#----------------------------------------------------------------------------# -# Plugins which provide logging functions should be loaded first, so log # -# messages generated when loading or configuring other plugins can be # -# accessed. # -############################################################################## - -#LoadPlugin logfile -LoadPlugin syslog -#LoadPlugin log_logstash - -# -# LogLevel "info" -# File STDOUT -# Timestamp true -# PrintSeverity false -# - - - LogLevel info - - -# -# LogLevel info -# File "/var/log/collectd.json.log" -# - -############################################################################## -# LoadPlugin section # -#----------------------------------------------------------------------------# -# Specify what features to activate. # -############################################################################## - -#LoadPlugin aggregation -#LoadPlugin amqp -#LoadPlugin apache -#LoadPlugin apcups -#LoadPlugin ascent -#LoadPlugin barometer -LoadPlugin battery -#LoadPlugin bind -#LoadPlugin ceph -#LoadPlugin cgroups -#LoadPlugin conntrack -#LoadPlugin contextswitch -LoadPlugin cpu -#LoadPlugin cpufreq -#LoadPlugin csv -#LoadPlugin curl -#LoadPlugin curl_json -#LoadPlugin curl_xml -#LoadPlugin dbi -LoadPlugin df -LoadPlugin disk -#LoadPlugin dns -#LoadPlugin drbd -#LoadPlugin email -LoadPlugin entropy -#LoadPlugin ethstat -#LoadPlugin exec -#LoadPlugin fhcount -#LoadPlugin filecount -#LoadPlugin fscache -#LoadPlugin gmond -#LoadPlugin hddtemp -LoadPlugin interface -#LoadPlugin ipc -#LoadPlugin ipmi -#LoadPlugin iptables -#LoadPlugin ipvs -LoadPlugin irq -#LoadPlugin java -LoadPlugin load -#LoadPlugin lvm -#LoadPlugin madwifi -#LoadPlugin mbmon -#LoadPlugin md -#LoadPlugin memcachec -#LoadPlugin memcached -LoadPlugin memory -#LoadPlugin modbus -#LoadPlugin multimeter -#LoadPlugin mysql -#LoadPlugin netlink -#LoadPlugin network -#LoadPlugin nfs -#LoadPlugin nginx -#LoadPlugin notify_desktop -#LoadPlugin notify_email -#LoadPlugin ntpd -#LoadPlugin numa -#LoadPlugin nut -#LoadPlugin olsrd -#LoadPlugin openldap -#LoadPlugin openvpn -#LoadPlugin perl -#LoadPlugin pinba -#LoadPlugin ping -#LoadPlugin postgresql -#LoadPlugin powerdns -LoadPlugin processes -#LoadPlugin protocols -#LoadPlugin python -#LoadPlugin redis -#LoadPlugin rrdcached -LoadPlugin rrdtool -#LoadPlugin sensors -#LoadPlugin serial -#LoadPlugin sigrok -#LoadPlugin smart -#LoadPlugin snmp -#LoadPlugin statsd -LoadPlugin swap -#LoadPlugin table -#LoadPlugin tail -#LoadPlugin tail_csv -#LoadPlugin tcpconns -#LoadPlugin teamspeak2 -#LoadPlugin ted -#LoadPlugin thermal -#LoadPlugin tokyotyrant -#LoadPlugin turbostat -#LoadPlugin unixsock -#LoadPlugin uptime -LoadPlugin users -#LoadPlugin uuid -#LoadPlugin varnish -#LoadPlugin virt -#LoadPlugin vmem -#LoadPlugin vserver -#LoadPlugin wireless -#LoadPlugin write_graphite -#LoadPlugin write_http -#LoadPlugin write_kafka -#LoadPlugin write_log -#LoadPlugin write_redis -#LoadPlugin write_riemann -#LoadPlugin write_sensu -#LoadPlugin write_tsdb -#LoadPlugin zfs_arc -#LoadPlugin zookeeper - -############################################################################## -# Plugin configuration # -#----------------------------------------------------------------------------# -# In this section configuration stubs for each plugin are provided. A desc- # -# ription of those options is available in the collectd.conf(5) manual page. # -############################################################################## - -# -# -# #Host "unspecified" -# Plugin "cpu" -# PluginInstance "/[0,2,4,6,8]$/" -# Type "cpu" -# #TypeInstance "unspecified" -# -# SetPlugin "cpu" -# SetPluginInstance "even-%{aggregation}" -# -# GroupBy "Host" -# GroupBy "TypeInstance" -# -# CalculateNum false -# CalculateSum false -# CalculateAverage true -# CalculateMinimum false -# CalculateMaximum false -# CalculateStddev false -# -# - -# -# -# Host "localhost" -# Port "5672" -# VHost "/" -# User "guest" -# Password "guest" -# Exchange "amq.fanout" -# RoutingKey "collectd" -# Persistent false -# StoreRates false -# ConnectionRetryDelay 0 -# -# - -# -# -# URL "http://localhost/server-status?auto" -# User "www-user" -# Password "secret" -# VerifyPeer false -# VerifyHost false -# CACert "/etc/ssl/ca.crt" -# Server "apache" -# -# -# -# URL "http://some.domain.tld/status?auto" -# Host "some.domain.tld" -# Server "lighttpd" -# -# - -# -# Host "localhost" -# Port "3551" -# ReportSeconds true -# - -# -# URL "http://localhost/ascent/status/" -# User "www-user" -# Password "secret" -# VerifyPeer false -# VerifyHost false -# CACert "/etc/ssl/ca.crt" -# - -# -# Device "/dev/i2c-0"; -# Oversampling 512 -# PressureOffset 0.0 -# TemperatureOffset 0.0 -# Normalization 2 -# Altitude 238.0 -# TemperatureSensor "myserver/onewire-F10FCA000800/temperature" -# - -# -# ValuesPercentage false -# ReportDegraded false -# - -# -# URL "http://localhost:8053/" -# -# ParseTime false -# -# OpCodes true -# QTypes true -# ServerStats true -# ZoneMaintStats true -# ResolverStats false -# MemoryStats true -# -# -# QTypes true -# ResolverStats true -# CacheRRSets true -# -# Zone "127.in-addr.arpa/IN" -# -# - -# -# LongRunAvgLatency false -# ConvertSpecialMetricTypes true -# -# SocketPath "/var/run/ceph/ceph-osd.0.asok" -# -# -# SocketPath "/var/run/ceph/ceph-osd.1.asok" -# -# -# SocketPath "/var/run/ceph/ceph-mon.ceph1.asok" -# -# -# SocketPath "/var/run/ceph/ceph-mds.ceph1.asok" -# -# - -# -# CGroup "libvirt" -# IgnoreSelected false -# - -# -# ReportByCpu true -# ReportByState true -# ValuesPercentage false -# - -# -# DataDir "/var/lib/collectd/csv" -# StoreRates false -# - -# -# -# URL "http://finance.google.com/finance?q=NYSE%3AAMD" -# User "foo" -# Password "bar" -# Digest false -# VerifyPeer true -# VerifyHost true -# CACert "/path/to/ca.crt" -# Header "X-Custom-Header: foobar" -# Post "foo=bar" -# -# MeasureResponseTime false -# MeasureResponseCode false -# -# Regex "]*> *([0-9]*\\.[0-9]+) *" -# DSType "GaugeAverage" -# Type "stock_value" -# Instance "AMD" -# -# -# - -# -## See: http://wiki.apache.org/couchdb/Runtime_Statistics -# -# Instance "httpd" -# -# Type "http_requests" -# -# -# -# Type "http_request_methods" -# -# -# -# Type "http_response_codes" -# -# -## Database status metrics: -# -# Instance "dbs" -# -# Type "gauge" -# -# -# Type "counter" -# -# -# Type "bytes" -# -# -# - -# -# -# Host "my_host" -# Instance "some_instance" -# User "collectd" -# Password "thaiNg0I" -# Digest false -# VerifyPeer true -# VerifyHost true -# CACert "/path/to/ca.crt" -# Header "X-Custom-Header: foobar" -# Post "foo=bar" -# -# -# Type "magic_level" -# InstancePrefix "prefix-" -# InstanceFrom "td[1]" -# ValuesFrom "td[2]/span[@class=\"level\"]" -# -# -# - -# -# -# Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \ -# FROM customers_tbl" -# MinVersion 40102 -# MaxVersion 50042 -# -# Type "gauge" -# InstancePrefix "customer" -# InstancesFrom "c_key" -# ValuesFrom "c_value" -# -# -# -# -# Driver "mysql" -# DriverOption "host" "localhost" -# DriverOption "username" "collectd" -# DriverOption "password" "secret" -# DriverOption "dbname" "custdb0" -# SelectDB "custdb0" -# Query "num_of_customers" -# Query "..." -# Host "..." -# -# - - -# Device "/dev/sda1" -# Device "192.168.0.2:/mnt/nfs" -# MountPoint "/home" -# FSType "ext3" - - # ignore rootfs; else, the root file-system would appear twice, causing - # one of the updates to fail and spam the log - FSType rootfs - # ignore the usual virtual / temporary file-systems - FSType sysfs - FSType proc - FSType devtmpfs - FSType devpts - FSType tmpfs - FSType fusectl - FSType cgroup - IgnoreSelected true - -# ReportByDevice false -# ReportInodes false - -# ValuesAbsolute true -# ValuesPercentage false - - -# -# Disk "hda" -# Disk "/sda[23]/" -# IgnoreSelected false -# UseBSDName false -# UdevNameAttr "DEVNAME" -# - -# -# Interface "eth0" -# IgnoreSource "192.168.0.1" -# SelectNumericQueryTypes false -# - -# -# SocketFile "/var/run/collectd-email" -# SocketGroup "collectd" -# SocketPerms "0770" -# MaxConns 5 -# - -# -# Interface "eth0" -# Map "rx_csum_offload_errors" "if_rx_errors" "checksum_offload" -# Map "multicast" "if_multicast" -# MappedOnly false -# - -# -# Exec user "/path/to/exec" -# Exec "user:group" "/path/to/exec" -# NotificationExec user "/path/to/exec" -# - -# -# ValuesAbsolute true -# ValuesPercentage false -# - -# -# -# Instance "foodir" -# Name "*.conf" -# MTime "-5m" -# Size "+10k" -# Recursive true -# IncludeHidden false -# -# - -# -# MCReceiveFrom "239.2.11.71" "8649" -# -# -# Type "swap" -# TypeInstance "total" -# DataSource "value" -# -# -# -# Type "swap" -# TypeInstance "free" -# DataSource "value" -# -# - -# -# Host "127.0.0.1" -# Port 7634 -# - -# -# Interface "eth0" -# IgnoreSelected false -# - -# -# Sensor "some_sensor" -# Sensor "another_one" -# IgnoreSelected false -# NotifySensorAdd false -# NotifySensorRemove true -# NotifySensorNotPresent false -# - -# -# Chain "table" "chain" -# Chain6 "table" "chain" -# - -# -# Irq 7 -# Irq 8 -# Irq 9 -# IgnoreSelected true -# - -# -# JVMArg "-verbose:jni" -# JVMArg "-Djava.class.path=/usr/share/collectd/java/collectd-api.jar" -# -# LoadPlugin "org.collectd.java.GenericJMX" -# -# # See /usr/share/doc/collectd/examples/GenericJMX.conf -# # for an example config. -# -# - -# -# ReportRelative true -# - -# -# Interface "wlan0" -# IgnoreSelected false -# Source "SysFS" -# WatchSet "None" -# WatchAdd "node_octets" -# WatchAdd "node_rssi" -# WatchAdd "is_rx_acl" -# WatchAdd "is_scan_active" -# - -# -# Host "127.0.0.1" -# Port 411 -# - -# -# Device "/dev/md0" -# IgnoreSelected false -# - -# -# -# Server "localhost" -# Key "page_key" -# -# Regex "(\\d+) bytes sent" -# ExcludeRegex "" -# DSType CounterAdd -# Type "ipt_octets" -# Instance "type_instance" -# -# -# - -# -# -# Socket "/var/run/memcached.sock" -# or: -# Host "127.0.0.1" -# Port "11211" -# -# - -# -# ValuesAbsolute true -# ValuesPercentage false -# - -# -# -# RegisterBase 1234 -# RegisterCmd ReadHolding -# RegisterType float -# Type gauge -# Instance "..." -# -# -# -# Address "addr" -# Port "1234" -# Interval 60 -# -# -# Instance "foobar" # optional -# Collect "data_name" -# -# -# - -# -# -# Host "database.serv.er" -# Port "3306" -# User "db_user" -# Password "secret" -# Database "db_name" -# MasterStats true -# ConnectTimeout 10 -# InnodbStats true -# -# -# -# Alias "squeeze" -# Host "localhost" -# Socket "/var/run/mysql/mysqld.sock" -# SlaveStats true -# SlaveNotifications true -# -# - -# -# Interface "All" -# VerboseInterface "All" -# QDisc "eth0" "pfifo_fast-1:0" -# Class "ppp0" "htb-1:10" -# Filter "ppp0" "u32-1:0" -# IgnoreSelected false -# - -# -# # client setup: -# Server "ff18::efc0:4a42" "25826" -# -# SecurityLevel Encrypt -# Username "user" -# Password "secret" -# Interface "eth0" -# ResolveInterval 14400 -# -# TimeToLive 128 -# -# # server setup: -# Listen "ff18::efc0:4a42" "25826" -# -# SecurityLevel Sign -# AuthFile "/etc/collectd/passwd" -# Interface "eth0" -# -# MaxPacketSize 1452 -# -# # proxy setup (client and server as above): -# Forward true -# -# # statistics about the network plugin itself -# ReportStats false -# -# # "garbage collection" -# CacheFlush 1800 -# - -# -# URL "http://localhost/status?auto" -# User "www-user" -# Password "secret" -# VerifyPeer false -# VerifyHost false -# CACert "/etc/ssl/ca.crt" -# - -# -# OkayTimeout 1000 -# WarningTimeout 5000 -# FailureTimeout 0 -# - -# -# SMTPServer "localhost" -# SMTPPort 25 -# SMTPUser "my-username" -# SMTPPassword "my-password" -# From "collectd@main0server.com" -# # on . -# # Beware! Do not use not more than two placeholders (%)! -# Subject "[collectd] %s on %s!" -# Recipient "email1@domain1.net" -# Recipient "email2@domain2.com" -# - -# -# Host "localhost" -# Port 123 -# ReverseLookups false -# IncludeUnitID true -# - -# -# UPS "upsname@hostname:port" -# - -# -# Host "127.0.0.1" -# Port "2006" -# CollectLinks "Summary" -# CollectRoutes "Summary" -# CollectTopology "Summary" -# - -# -# -# URL "ldap://localhost:389" -# StartTLS false -# VerifyHost true -# CACert "/path/to/ca.crt" -# Timeout -1 -# Version 3 -# -# - -# -# StatusFile "/etc/openvpn/openvpn-status.log" -# ImprovedNamingSchema false -# CollectCompression true -# CollectIndividualUsers true -# CollectUserCount false -# - -# -# IncludeDir "/my/include/path" -# BaseName "Collectd::Plugins" -# EnableDebugger "" -# LoadPlugin Monitorus -# LoadPlugin OpenVZ -# -# -# Foo "Bar" -# Qux "Baz" -# -# - -# -# Address "::0" -# Port "30002" -# -# Host "host name" -# Server "server name" -# Script "script name" -# -# - -# -# Host "host.foo.bar" -# Host "host.baz.qux" -# Interval 1.0 -# Timeout 0.9 -# TTL 255 -# SourceAddress "1.2.3.4" -# Device "eth0" -# MaxMissed -1 -# - -# -# -# Statement "SELECT magic FROM wizard WHERE host = $1;" -# Param hostname -# -# -# Type gauge -# InstancePrefix "magic" -# ValuesFrom "magic" -# -# -# -# -# Statement "SELECT COUNT(type) AS count, type \ -# FROM (SELECT CASE \ -# WHEN resolved = 'epoch' THEN 'open' \ -# ELSE 'resolved' END AS type \ -# FROM tickets) type \ -# GROUP BY type;" -# -# -# Type counter -# InstancePrefix "rt36_tickets" -# InstancesFrom "type" -# ValuesFrom "count" -# -# -# -# -# # See /usr/share/doc/collectd-core/examples/postgresql/collectd_insert.sql for details -# Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);" -# StoreRates true -# -# -# -# Host "hostname" -# Port 5432 -# User "username" -# Password "secret" -# -# SSLMode "prefer" -# KRBSrvName "kerberos_service_name" -# -# Query magic -# -# -# -# Interval 60 -# Service "service_name" -# -# Query backend # predefined -# Query rt36_tickets -# -# -# -# Service "collectd_store" -# Writer sqlstore -# # see collectd.conf(5) for details -# CommitInterval 30 -# -# - -# -# -# Collect "latency" -# Collect "udp-answers" "udp-queries" -# Socket "/var/run/pdns.controlsocket" -# -# -# Collect "questions" -# Collect "cache-hits" "cache-misses" -# Socket "/var/run/pdns_recursor.controlsocket" -# -# LocalSocket "/opt/collectd/var/run/collectd-powerdns" -# - -# -# Process "name" -# ProcessMatch "foobar" "/usr/bin/perl foobar\\.pl.*" -# - -# -# Value "/^Tcp:/" -# IgnoreSelected false -# - -# -# ModulePath "/path/to/your/python/modules" -# LogTraces true -# Interactive true -# Import "spam" -# -# -# spam "wonderful" "lovely" -# -# - -# -# -# Host "redis.example.com" -# Port "6379" -# Timeout 2000 -# -# - -# -# DaemonAddress "unix:/var/run/rrdcached.sock" -# DataDir "/var/lib/rrdcached/db/collectd" -# CreateFiles true -# CreateFilesAsync false -# CollectStatistics true -# -# The following settings are rather advanced -# and should usually not be touched: -# StepSize 10 -# HeartBeat 20 -# RRARows 1200 -# RRATimespan 158112000 -# XFF 0.1 -# - - - DataDir "/var/lib/collectd/rrd" -# CacheTimeout 120 -# CacheFlush 900 -# WritesPerSecond 30 -# CreateFilesAsync false -# RandomTimeout 0 -# -# The following settings are rather advanced -# and should usually not be touched: -# StepSize 10 -# HeartBeat 20 -# RRARows 1200 -# RRATimespan 158112000 -# XFF 0.1 - - -# -# SensorConfigFile "/etc/sensors3.conf" -# Sensor "it8712-isa-0290/temperature-temp1" -# Sensor "it8712-isa-0290/fanspeed-fan3" -# Sensor "it8712-isa-0290/voltage-in8" -# IgnoreSelected false -# - -# -# LogLevel 3 -# -# Driver "fluke-dmm" -# MinimumInterval 10 -# Conn "/dev/ttyUSB2" -# -# -# Driver "cem-dt-885x" -# Conn "/dev/ttyUSB1" -# -# - -# -# Disk "/^[hs]d[a-f][0-9]?$/" -# IgnoreSelected false -# - -# See /usr/share/doc/collectd/examples/snmp-data.conf.gz for a -# comprehensive sample configuration. -# -# -# Type "voltage" -# Table false -# Instance "input_line1" -# Scale 0.1 -# Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1" -# -# -# Type "users" -# Table false -# Instance "" -# Shift -1 -# Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0" -# -# -# Type "if_octets" -# Table true -# InstancePrefix "traffic" -# Instance "IF-MIB::ifDescr" -# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets" -# -# -# -# Address "192.168.0.2" -# Version 1 -# Community "community_string" -# Collect "std_traffic" -# Inverval 120 -# -# -# Address "192.168.0.42" -# Version 2 -# Community "another_string" -# Collect "std_traffic" "hr_users" -# -# -# Address "192.168.0.3" -# Version 1 -# Community "more_communities" -# Collect "powerplus_voltge_input" -# Interval 300 -# -# - -# -# Host "::" -# Port "8125" -# DeleteCounters false -# DeleteTimers false -# DeleteGauges false -# DeleteSets false -# TimerPercentile 90.0 -# TimerPercentile 95.0 -# TimerPercentile 99.0 -# TimerLower false -# TimerUpper false -# TimerSum false -# TimerCount false -# - -# -# ReportByDevice false -# ReportBytes true -# - -# -# -# Instance "slabinfo" -# Separator " " -# -# Type gauge -# InstancePrefix "active_objs" -# InstancesFrom 0 -# ValuesFrom 1 -# -# -# Type gauge -# InstancePrefix "objperslab" -# InstancesFrom 0 -# ValuesFrom 4 -# -#
-# - -# -# -# Instance "exim" -# Interval 60 -# -# Regex "S=([1-9][0-9]*)" -# DSType "CounterAdd" -# Type "ipt_bytes" -# Instance "total" -# -# -# Regex "\\" -# ExcludeRegex "\\.*mail_spool defer" -# DSType "CounterInc" -# Type "counter" -# Instance "local_user" -# -# -# - -# -# -# Type "percent" -# Instance "dropped" -# ValueFrom 1 -# -# -# Type "bytes" -# Instance "wire-realtime" -# ValueFrom 2 -# -# -# Type "alerts_per_second" -# ValueFrom 3 -# -# -# Type "kpackets_wire_per_sec.realtime" -# ValueFrom 4 -# -# -# Instance "snort-eth0" -# Interval 600 -# Collect "dropped" "mbps" "alerts" "kpps" -# TimeFrom 0 -# -# - -# -# ListeningPorts false -# AllPortsSummary false -# LocalPort "25" -# RemotePort "25" -# - -# -# Host "127.0.0.1" -# Port "51234" -# Server "8767" -# - -# -# Device "/dev/ttyUSB0" -# Retries 0 -# - -# -# ForceUseProcfs false -# Device "THRM" -# IgnoreSelected false -# - -# -# Host "localhost" -# Port "1978" -# - -# -## None of the following option should be set manually -## This plugin automatically detect most optimal options -## Only set values here if: -## - The module ask you to -## - You want to disable the collection of some data -## - Your (intel) CPU is not supported (yet) by the module -## - The module generate a lot of errors 'MSR offset 0x... read failed' -## In the last two cases, please open a bug request -# -# TCCActivationTemp "100" -# CoreCstates "392" -# PackageCstates "396" -# SystemManagementInterrupt true -# DigitalTemperatureSensor true -# PackageThermalManagement true -# RunningAveragePowerLimit "7" -# - -# -# SocketFile "/var/run/collectd-unixsock" -# SocketGroup "collectd" -# SocketPerms "0660" -# DeleteSocket false -# - -# -# UUIDFile "/etc/uuid" -# - -# -# -# CollectBackend true -# CollectBan false # Varnish 3 and above -# CollectCache true -# CollectConnections true -# CollectDirectorDNS false # Varnish 3 only -# CollectESI false -# CollectFetch false -# CollectHCB false -# CollectObjects false -# CollectPurge false # Varnish 2 only -# CollectSession false -# CollectSHM true -# CollectSMA false # Varnish 2 only -# CollectSMS false -# CollectSM false # Varnish 2 only -# CollectStruct false -# CollectTotals false -# CollectUptime false # Varnish 3 and above -# CollectdVCL false -# CollectVSM false # Varnish 4 only -# CollectWorkers false -# -# -# -# CollectCache true -# -# - -# -# Connection "xen:///" -# RefreshInterval 60 -# Domain "name" -# BlockDevice "name:device" -# InterfaceDevice "name:device" -# IgnoreSelected false -# HostnameFormat name -# InterfaceFormat name -# PluginInstanceFormat name -# - -# -# Verbose false -# - -# -# -# Host "localhost" -# Port "2003" -# Protocol "tcp" -# LogSendErrors true -# Prefix "collectd" -# Postfix "collectd" -# StoreRates true -# AlwaysAppendDS false -# EscapeCharacter "_" -# -# - -# -# -# URL "http://example.com/collectd-post" -# User "collectd" -# Password "secret" -# VerifyPeer true -# VerifyHost true -# CACert "/etc/ssl/ca.crt" -# CAPath "/etc/ssl/certs/" -# ClientKey "/etc/ssl/client.pem" -# ClientCert "/etc/ssl/client.crt" -# ClientKeyPass "secret" -# SSLVersion "TLSv1" -# Format "Command" -# StoreRates false -# BufferSize 4096 -# LowSpeedLimit 0 -# Timeout 0 -# -# - -# -# Property "metadata.broker.list" "localhost:9092" -# -# Format JSON -# -# - -# -# -# Host "localhost" -# Port 5555 -# Protocol TCP -# Batch true -# BatchMaxSize 8192 -# StoreRates true -# AlwaysAppendDS false -# TTLFactor 2.0 -# Notifications true -# CheckThresholds false -# EventServicePrefix "" -# -# Tag "foobar" -# Attribute "foo" "bar" -# - -# -# -# Host "localhost" -# Port 3030 -# StoreRates true -# AlwaysAppendDS false -# Notifications true -# Metrics true -# EventServicePrefix "" -# MetricHandler "influx" -# MetricHandler "default" -# NotificationHandler "flapjack" -# NotificationHandler "howling_monkey" -# -# Tag "foobar" -# Attribute "foo" "bar" -# - -# -# -# Host "localhost" -# Port "4242" -# HostTags "status=production" -# StoreRates false -# AlwaysAppendDS false -# -# - -# -# Host "localhost" -# Port "2181" -# - - - Filter "*.conf" - - diff --git a/dist/debian/control.mustache b/dist/debian/control.mustache index 14b8c5cb26..3c264f562f 100644 --- a/dist/debian/control.mustache +++ b/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}} diff --git a/dist/debian/debian/scylla-server.docs b/dist/debian/debian/scylla-server.docs index 0d5587306f..a539e2c020 100644 --- a/dist/debian/debian/scylla-server.docs +++ b/dist/debian/debian/scylla-server.docs @@ -2,4 +2,3 @@ NOTICE.txt ORIGIN licenses -dist/debian/collectd/collectd.conf.example diff --git a/dist/debian/debian/scylla-server.postinst b/dist/debian/debian/scylla-server.postinst index bd16b7d454..01da3d2f60 100644 --- a/dist/debian/debian/scylla-server.postinst +++ b/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# diff --git a/dist/debian/scylla-server.install.mustache b/dist/debian/scylla-server.install.mustache index 821f4e39aa..74476798ef 100644 --- a/dist/debian/scylla-server.install.mustache +++ b/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 diff --git a/dist/docker/redhat/etc/sysconfig/scylla-server b/dist/docker/redhat/etc/sysconfig/scylla-server index bda23df9a3..24105b0504 100644 --- a/dist/docker/redhat/etc/sysconfig/scylla-server +++ b/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 diff --git a/dist/redhat/scylla.spec.mustache b/dist/redhat/scylla.spec.mustache index 7d99281950..4500111dd7 100644 --- a/dist/redhat/scylla.spec.mustache +++ b/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 diff --git a/install.sh b/install.sh index 7903108df2..b54868f716 100755 --- a/install.sh +++ b/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