From da809deab5f8c8a4903d8b2d93955f31c87d4a76 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Sun, 11 Sep 2016 23:27:47 -0400 Subject: [PATCH] collectd: update to 5.6.0. --- srcpkgs/collectd/files/collectd.conf | 1499 -------------------------- srcpkgs/collectd/template | 19 +- 2 files changed, 8 insertions(+), 1510 deletions(-) delete mode 100644 srcpkgs/collectd/files/collectd.conf diff --git a/srcpkgs/collectd/files/collectd.conf b/srcpkgs/collectd/files/collectd.conf deleted file mode 100644 index c0dd0ca9f6..0000000000 --- a/srcpkgs/collectd/files/collectd.conf +++ /dev/null @@ -1,1499 +0,0 @@ -# -# Config file for collectd(1). -# Please read collectd.conf(5) for a list of options. -# http://collectd.org/ -# - -############################################################################## -# Global # -#----------------------------------------------------------------------------# -# Global settings for the daemon. # -############################################################################## - -Hostname "localhost" -FQDNLookup true -#BaseDir "/var/lib/collectd" -#PIDFile "/var/run/collectd.pid" -#PluginDir "/usr/lib/collectd" -#TypesDB "/usr/share/collectd/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 syslog -#LoadPlugin logfile -#LoadPlugin log_logstash - -# -# LogLevel info -# File STDOUT -# Timestamp true -# PrintSeverity false -# - -# -# LogLevel info -# File "/var/log/collectd.json.log" -# - - - LogLevel info - - -############################################################################## -# LoadPlugin section # -#----------------------------------------------------------------------------# -# Lines beginning with a single `#' belong to plugins which have been built # -# but are disabled by default. # -# # -# Lines begnning with `##' belong to plugins which have not been built due # -# to missing dependencies or because they have been deactivated explicitly. # -############################################################################## - -#LoadPlugin aggregation -##LoadPlugin amqp -#LoadPlugin apache -#LoadPlugin apcups -##LoadPlugin apple_sensors -##LoadPlugin aquaero -#LoadPlugin ascent -##LoadPlugin barometer -#LoadPlugin battery -#LoadPlugin bind -#LoadPlugin ceph -#LoadPlugin conntrack -#LoadPlugin contextswitch -#LoadPlugin cgroups -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 iptables -##LoadPlugin ipmi -#LoadPlugin ipvs -#LoadPlugin irq -##LoadPlugin java -LoadPlugin load -##LoadPlugin lpar -##LoadPlugin lvm -#LoadPlugin madwifi -#LoadPlugin mbmon -#LoadPlugin md -##LoadPlugin memcachec -#LoadPlugin memcached -LoadPlugin memory -##LoadPlugin modbus -#LoadPlugin multimeter -##LoadPlugin mysql -##LoadPlugin netapp -##LoadPlugin netlink -LoadPlugin network -#LoadPlugin nfs -#LoadPlugin nginx -#LoadPlugin notify_desktop -#LoadPlugin notify_email -#LoadPlugin ntpd -#LoadPlugin numa -##LoadPlugin nut -#LoadPlugin olsrd -##LoadPlugin onewire -##LoadPlugin openldap -#LoadPlugin openvpn -##LoadPlugin oracle -##LoadPlugin perl -##LoadPlugin pinba -##LoadPlugin ping -##LoadPlugin postgresql -#LoadPlugin powerdns -#LoadPlugin processes -#LoadPlugin protocols -##LoadPlugin python -##LoadPlugin redis -##LoadPlugin routeros -##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 tape -#LoadPlugin tcpconns -#LoadPlugin teamspeak2 -#LoadPlugin ted -#LoadPlugin thermal -##LoadPlugin tokyotyrant -##LoadPlugin turbostat -#LoadPlugin unixsock -#LoadPlugin uptime -#LoadPlugin users -#LoadPlugin uuid -##LoadPlugin varnish -##LoadPlugin mic -#LoadPlugin virt -#LoadPlugin vmem -#LoadPlugin vserver -#LoadPlugin wireless -#LoadPlugin write_graphite -#LoadPlugin write_http -##LoadPlugin write_kafka -#LoadPlugin write_log -##LoadPlugin write_mongodb -##LoadPlugin write_redis -##LoadPlugin write_riemann -#LoadPlugin write_sensu -#LoadPlugin write_tsdb -##LoadPlugin xmms -#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 "unspecified" -# Type "cpu" -# #TypeInstance "unspecified" -# -# 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/status?auto" -# User "www-user" -# Password "secret" -# CACert "/etc/ssl/ca.crt" -# -# - -# -# Host "localhost" -# Port "3551" -# ReportSeconds true -# - -# -# Device "" -# - -# -# URL "http://localhost/ascent/status/" -# User "www-user" -# Password "secret" -# 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 -# - -# -# 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" -# -# -# - -# -# -# Instance "test_http_json" -# -# Type "gauge" -# # Expect: 1 -# -# -# Type "gauge" -# # Expect: 2 -# -# -# Type "gauge" -# # Expect: 3 -# -# -# Type "gauge" -# # Expect: 4 -# -# -# Type "gauge" -# # Expect: 5 -# -# -# Type "gauge" -# # Expect: 6 -# -# -# put this as test.json on your webserver, the above config demonstraces -# how to match them. -# { -# "testArray":[1,2], -# "testArrayInbetween":[{"blarg":3},{"blub":4}], -# "testDirectHit":5, -# "testSubLevelHit":{"oneMoreLevel":6} -# } -## 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" -# -# Type "gauge" -# InstancesFrom "c_key" -# ValuesFrom "c_value" -# -# -# -# Driver "mysql" -# DriverOption "host" "localhost" -# DriverOption "username" "collectd" -# DriverOption "password" "AeXohy0O" -# DriverOption "dbname" "custdb0" -# #SelectDB "custdb0" -# Query "num_of_customers" -# #Query "..." -# #Host "..." -# -# - -# -# Device "/dev/hda1" -# Device "192.168.0.2:/mnt/nfs" -# MountPoint "/home" -# FSType "ext3" -# IgnoreSelected false -# ReportByDevice false -# ReportReserved false -# ReportInodes false -# ValuesAbsolute true -# ValuesPercentage false -# - -# -# Disk "/^[hs]d[a-f][0-9]?$/" -# IgnoreSelected false -# UseBSDName false -# UdevNameAttr "DEVNAME" -# - -# -# Interface "eth0" -# IgnoreSource "192.168.0.1" -# SelectNumericQueryTypes true -# - -# -# 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:group" "/path/to/exec" -# NotificationExec "user:group" "/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 -# - -# -# 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.Foobar" -# -# # To be parsed by the plugin -# -# - -# -# ReportRelative true -# - -# -# CpuPoolStats false -# ReportBySerial false -# - -# -# 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" -# -# -# - -# -# -# 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" -# 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 -# -# - -# -# -# Protocol "https" -# Address "10.0.0.1" -# Port 443 -# User "username" -# Password "aef4Aebe" -# Interval 30 -# -# -# Interval 30 -# GetNameCache true -# GetDirCache true -# GetBufferCache true -# GetInodeCache true -# -# -# -# Interval 30 -# GetBusy true -# -# -# -# Interval 30 -# GetIO "volume0" -# IgnoreSelectedIO false -# GetOps "volume0" -# IgnoreSelectedOps false -# GetLatency "volume0" -# IgnoreSelectedLatency false -# -# -# -# Interval 30 -# GetCapacity "vol0" -# GetCapacity "vol1" -# IgnoreSelectedCapacity false -# GetSnapshot "vol1" -# GetSnapshot "vol3" -# IgnoreSelectedSnapshot false -# -# -# -# Interval 30 -# GetCPULoad true -# GetInterfaces true -# GetDiskOps true -# GetDiskIO 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" -# 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 %s in this string!!! -# Subject "Aaaaaa!! %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" -# - -# -# Device "-s localhost:4304" -# Sensor "F10FCA000800" -# IgnoreSelected false -# - -# -# -# 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 -# - -# -# -# Statement "SELECT category, COUNT(*) AS value FROM products WHERE in_stock = 0 GROUP BY category" -# -# Type "gauge" -# InstancesFrom "category" -# ValuesFrom "value" -# -# -# -# ConnectID "db01" -# Username "oracle" -# Password "secret" -# Query "out_of_stock" -# -# - -# -# 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" -# 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 contrib/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" -# - -# -# 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 -# -# - -# -# -# Host "router.example.com" -# Port "8728" -# User "admin" -# Password "dozaiTh4" -# CollectInterface true -# CollectRegistrationTable true -# CollectCPULoad true -# CollectMemory true -# CollectDF true -# CollectDisk true -# -# - -# -# DaemonAddress "unix:/tmp/rrdcached.sock" -# DataDir "/var/lib/collectd/rrd" -# CreateFiles true -# CreateFilesAsync false -# CollectStatistics true -# - -# -# DataDir "/var/lib/collectd/rrd" -# CreateFilesAsync false -# CacheTimeout 120 -# CacheFlush 900 -# WritesPerSecond 50 -# - -# -# SensorConfigFile "/etc/sensors.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 -# - -# -# -# Type "voltage" -# Table false -# Instance "input_line1" -# Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1" -# -# -# Type "users" -# Table false -# Instance "" -# Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0" -# -# -# Type "if_octets" -# Table true -# Instance "IF-MIB::ifDescr" -# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets" -# -# -# -# Address "192.168.0.2" -# Version 1 -# Community "community_string" -# Collect "std_traffic" -# Interval 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 -# ValuesAbsolute true -# ValuesPercentage false -# - -# -# -# 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 "/usr/var/run/collectd-unixsock" -# SocketGroup "collectd" -# SocketPerms "0660" -# DeleteSocket false -# - -# -# UUIDFile "/etc/uuid" -# - -# -# ShowCPU true -# ShowCPUCores true -# ShowMemory true -# ShowTemperatures true -## Temperature Sensors can be ignored/shown by repeated #Temperature lines, and -## then inverted with a IgnoreSelectedTemperature. -## Known Temperature sensors: die, devmem, fin, fout, vccp, vddg, vddq -# Temperature vddg -# IgnoreSelectedTemperature true -# ShowPower true -## Power Sensors can be ignored/shown by repeated #Power lines, and -## then inverted with a IgnoreSelectedTemperature. -## Known Temperature sensors: total0, total1, inst, imax, pci3, c2x3, c2x4, vccp, vddg, vddq -# Power total1 -# IgnoreSelectedPower true -# - -# -# This tag support an argument if you want to -# monitor the local instance just use -# If you prefer defining another instance you can do -# so by using -# -# 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 -# CollectVCL false -# CollectVSM false # Varnish 4 only -# CollectWorkers false -# -# - -# -# 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 "weCh3ik0" -# 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 "27017" -# Timeout 1000 -# StoreRates false -# Database "auth_db" -# User "auth_user" -# Password "auth_passwd" -# -# - -# -# -# Host "localhost" -# Port "6379" -# Timeout 1000 -# -# - -# -# -# 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 configuration # -#----------------------------------------------------------------------------# -# The following configures collectd's filtering mechanism. Before changing # -# anything in this section, please read the `FILTER CONFIGURATION' section # -# in the collectd.conf(5) manual page. # -############################################################################## - -# Load required matches: -#LoadPlugin match_empty_counter -#LoadPlugin match_hashed -#LoadPlugin match_regex -#LoadPlugin match_value -#LoadPlugin match_timediff - -# Load required targets: -#LoadPlugin target_notification -#LoadPlugin target_replace -#LoadPlugin target_scale -#LoadPlugin target_set -#LoadPlugin target_v5upgrade - -#----------------------------------------------------------------------------# -# The following block demonstrates the default behavior if no filtering is # -# configured at all: All values will be sent to all available write plugins. # -#----------------------------------------------------------------------------# - -# -# Target "write" -# - -############################################################################## -# Threshold configuration # -#----------------------------------------------------------------------------# -# The following outlines how to configure collectd's threshold checking # -# plugin. The plugin and possible configuration options are documented in # -# the collectd-threshold(5) manual page. # -############################################################################## - -#LoadPlugin "threshold" -# -# -# WarningMin 0.00 -# WarningMax 1000.00 -# FailureMin 0.00 -# FailureMax 1200.00 -# Invert false -# Instance "bar" -# -# -# -# Instance "eth0" -# -# FailureMax 10000000 -# DataSource "rx" -# -# -# -# -# -# Instance "idle" -# FailureMin 10 -# -# -# -# -# Instance "cached" -# WarningMin 100000000 -# -# -# -# -# DataSource "midterm" -# FailureMax 4 -# Hits 3 -# Hysteresis 3 -# -# -# diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 7200d2341f..3a329a1049 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,11 +1,12 @@ # Template file for 'collectd' pkgname=collectd -version=5.5.2 -revision=2 +version=5.6.0 +revision=1 build_style=gnu-configure -configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) - --with-libiptc --enable-virt --sysconfdir=/etc --disable-static --with-fp-layout=nothing" -hostmakedepends="autoconf automake pkg-config libtool libltdl-devel glib-devel" +configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) + $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt + --sysconfdir=/etc --disable-static --with-fp-layout=nothing --disable-werror" +hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel" makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel libesmtp-devel zlib-devel yajl-devel python-devel libxml2-devel net-snmp-devel libgcrypt-devel libmysqlclient-devel libvirt-devel @@ -15,8 +16,8 @@ short_desc="Daemon which collects system performance statistics periodically" maintainer="Steve Prybylski " license="GPL-2, MIT" homepage="http://collectd.org" -distfiles="http://collectd.org/files/${pkgname}-${version}.tar.gz" -checksum=8013ae74df2b90ec8a8e7ac5da7638e165199021eca5f423ff8ee19feac649ba +distfiles="http://collectd.org/files/${pkgname}-${version}.tar.bz2" +checksum=f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623 LDFLAGS="-lgcrypt" build_options="rrdtool perl notify" @@ -27,12 +28,10 @@ if [ -z "$CROSS_BUILD" ]; then fi pre_configure() { - sed -i 's/-Werror//g' configure.ac src/Makefile.am autoreconf -fi } post_install() { - vinstall ${FILESDIR}/collectd.conf 640 etc/ vsv collectd vlicense COPYING } @@ -63,5 +62,3 @@ libcollectdclient-devel_package() { vmove usr/lib/*.so } } - -