]> Frank Brehm's Git Trees - config/samara/etc.git/commitdiff
committing changes in /etc after emerge run
authorFrank Brehm <frank.brehm@profitbricks.com>
Wed, 4 May 2016 16:32:50 +0000 (18:32 +0200)
committerroot Samara <root@samara.pb.local>
Wed, 4 May 2016 16:32:50 +0000 (18:32 +0200)
Package changes:

collectd.conf [deleted file]
conf.d/collectd [deleted file]
init.d/collectd [deleted file]
logrotate.d/collectd [deleted file]

diff --git a/collectd.conf b/collectd.conf
deleted file mode 100644 (file)
index 34c45f2..0000000
+++ /dev/null
@@ -1,1268 +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/collectd.pid"
-#PluginDir   "/usr/lib64/collectd"
-#TypesDB     "/usr/share/collectd/types.db"
-
-#----------------------------------------------------------------------------#
-# When enabled, plugins are loaded automatically with the default options    #
-# when an appropriate <Plugin ...> block is encountered.                     #
-# Disabled by default.                                                       #
-#----------------------------------------------------------------------------#
-#AutoLoadPlugin 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:               #
-#   <LoadPlugin foo>                                                         #
-#       Interval 60                                                          #
-#   </LoadPlugin>                                                            #
-#----------------------------------------------------------------------------#
-#Interval     10
-
-#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
-
-#<Plugin logfile>
-#      LogLevel info
-#      File STDOUT
-#      Timestamp true
-#      PrintSeverity false
-#</Plugin>
-
-#<Plugin syslog>
-#      LogLevel info
-#</Plugin>
-
-##############################################################################
-# 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 battery
-##LoadPlugin bind
-##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 email
-##LoadPlugin entropy
-##LoadPlugin ethstat
-##LoadPlugin exec
-##LoadPlugin filecount
-##LoadPlugin fscache
-##LoadPlugin gmond
-##LoadPlugin hddtemp
-LoadPlugin interface
-##LoadPlugin iptables
-##LoadPlugin ipmi
-##LoadPlugin ipvs
-#LoadPlugin irq
-##LoadPlugin java
-##LoadPlugin libvirt
-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 openvpn
-##LoadPlugin oracle
-##<LoadPlugin perl>
-##  Globals true
-##</LoadPlugin>
-##LoadPlugin pinba
-##LoadPlugin ping
-##LoadPlugin postgresql
-##LoadPlugin powerdns
-##LoadPlugin processes
-##LoadPlugin protocols
-##<LoadPlugin python>
-##  Globals true
-##</LoadPlugin>
-##LoadPlugin redis
-##LoadPlugin routeros
-##LoadPlugin rrdcached
-LoadPlugin rrdtool
-##LoadPlugin sensors
-##LoadPlugin serial
-##LoadPlugin sigrok
-##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 unixsock
-##LoadPlugin uptime
-##LoadPlugin users
-##LoadPlugin uuid
-##LoadPlugin varnish
-##LoadPlugin mic
-##LoadPlugin vmem
-##LoadPlugin vserver
-##LoadPlugin wireless
-##LoadPlugin write_graphite
-##LoadPlugin write_http
-##LoadPlugin write_mongodb
-##LoadPlugin write_redis
-#LoadPlugin write_riemann
-##LoadPlugin xmms
-##LoadPlugin zfs_arc
-
-##############################################################################
-# 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. #
-##############################################################################
-
-#<Plugin "aggregation">
-#  <Aggregation>
-#    #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
-#  </Aggregation>
-#</Plugin>
-
-#<Plugin "amqp">
-#  <Publish "name">
-#    Host "localhost"
-#    Port "5672"
-#    VHost "/"
-#    User "guest"
-#    Password "guest"
-#    Exchange "amq.fanout"
-#    RoutingKey "collectd"
-#    Persistent false
-#    StoreRates false
-#  </Publish>
-#</Plugin>
-
-#<Plugin apache>
-#  <Instance "local">
-#    URL "http://localhost/status?auto"
-#    User "www-user"
-#    Password "secret"
-#    CACert "/etc/ssl/ca.crt"
-#  </Instance>
-#</Plugin>
-
-#<Plugin apcups>
-#      Host "localhost"
-#      Port "3551"
-#      ReportSeconds true
-#</Plugin>
-
-#<Plugin aquaero>
-#      Device ""
-#</Plugin>
-
-#<Plugin ascent>
-#      URL "http://localhost/ascent/status/"
-#      User "www-user"
-#      Password "secret"
-#      CACert "/etc/ssl/ca.crt"
-#</Plugin>
-
-#<Plugin "bind">
-#  URL "http://localhost:8053/"
-#  ParseTime       false
-#  OpCodes         true
-#  QTypes          true
-#
-#  ServerStats     true
-#  ZoneMaintStats  true
-#  ResolverStats   false
-#  MemoryStats     true
-#
-#  <View "_default">
-#    QTypes        true
-#    ResolverStats true
-#    CacheRRSets   true
-#
-#    Zone "127.in-addr.arpa/IN"
-#  </View>
-#</Plugin>
-
-#<Plugin cgroups>
-#  CGroup "libvirt"
-#  IgnoreSelected false
-#</Plugin>
-
-#<Plugin csv>
-#      DataDir "/var/lib/collectd/csv"
-#      StoreRates false
-#</Plugin>
-
-#<Plugin curl>
-#  <Page "stock_quotes">
-#    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
-#    User "foo"
-#    Password "bar"
-#    MeasureResponseTime false
-#    <Match>
-#      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
-#      DSType "GaugeAverage"
-#      Type "stock_value"
-#      Instance "AMD"
-#    </Match>
-#  </Page>
-#</Plugin>
-
-#<Plugin curl_json>
-## See: http://wiki.apache.org/couchdb/Runtime_Statistics
-#  <URL "http://localhost:5984/_stats">
-#    Instance "httpd"
-#    <Key "httpd/requests/count">
-#      Type "http_requests"
-#    </Key>
-#
-#    <Key "httpd_request_methods/*/count">
-#      Type "http_request_methods"
-#    </Key>
-#
-#    <Key "httpd_status_codes/*/count">
-#      Type "http_response_codes"
-#    </Key>
-#  </URL>
-## Database status metrics:
-#  <URL "http://localhost:5984/_all_dbs">
-#    Instance "dbs"
-#    <Key "*/doc_count">
-#      Type "gauge"
-#    </Key>
-#    <Key "*/doc_del_count">
-#      Type "counter"
-#    </Key>
-#    <Key "*/disk_size">
-#      Type "bytes"
-#    </Key>
-#  </URL>
-#</Plugin>
-
-#<Plugin "curl_xml">
-#  <URL "http://localhost/stats.xml">
-#    Host "my_host"
-#    Instance "some_instance"
-#    User "collectd"
-#    Password "thaiNg0I"
-#    VerifyPeer true
-#    VerifyHost true
-#    CACert "/path/to/ca.crt"
-#
-#    <XPath "table[@id=\"magic_level\"]/tr">
-#      Type "magic_level"
-#      #InstancePrefix "prefix-"
-#      InstanceFrom "td[1]"
-#      ValuesFrom "td[2]/span[@class=\"level\"]"
-#    </XPath>
-#  </URL>
-#</Plugin>
-
-#<Plugin dbi>
-#      <Query "num_of_customers">
-#              Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value FROM customers_tbl"
-#              <Result>
-#                      Type "gauge"
-#                      InstancesFrom "c_key"
-#                      ValuesFrom "c_value"
-#              </Result>
-#      </Query>
-#      <Database "customers_db">
-#              Driver "mysql"
-#              DriverOption "host" "localhost"
-#              DriverOption "username" "collectd"
-#              DriverOption "password" "AeXohy0O"
-#              DriverOption "dbname" "custdb0"
-#              #SelectDB "custdb0"
-#              Query "num_of_customers"
-#              #Query "..."
-#              #Host "..."
-#      </Database>
-#</Plugin>
-
-#<Plugin df>
-#      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
-#</Plugin>
-
-#<Plugin disk>
-#      Disk "/^[hs]d[a-f][0-9]?$/"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin dns>
-#      Interface "eth0"
-#      IgnoreSource "192.168.0.1"
-#      SelectNumericQueryTypes true
-#</Plugin>
-
-#<Plugin email>
-#      SocketFile "/var/run/collectd-email"
-#      SocketGroup "collectd"
-#      SocketPerms "0770"
-#      MaxConns 5
-#</Plugin>
-
-#<Plugin ethstat>
-#      Interface "eth0"
-#      Map "rx_csum_offload_errors" "if_rx_errors" "checksum_offload"
-#      Map "multicast" "if_multicast"
-#      MappedOnly false
-#</Plugin>
-
-#<Plugin exec>
-#      Exec "user:group" "/path/to/exec"
-#      NotificationExec "user:group" "/path/to/exec"
-#</Plugin>
-
-#<Plugin filecount>
-#      <Directory "/path/to/dir">
-#              Instance "foodir"
-#              Name "*.conf"
-#              MTime "-5m"
-#              Size "+10k"
-#              Recursive true
-#              IncludeHidden false
-#      </Directory>
-#</Plugin>
-
-#<Plugin "gmond">
-#  MCReceiveFrom "239.2.11.71" "8649"
-#  <Metric "swap_total">
-#    Type "swap"
-#    TypeInstance "total"
-#    DataSource "value"
-#  </Metric>
-#  <Metric "swap_free">
-#    Type "swap"
-#    TypeInstance "free"
-#    DataSource "value"
-#  </Metric>
-#</Plugin>
-
-#<Plugin hddtemp>
-#  Host "127.0.0.1"
-#  Port "7634"
-#</Plugin>
-
-#<Plugin interface>
-#      Interface "eth0"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin ipmi>
-#      Sensor "some_sensor"
-#      Sensor "another_one"
-#      IgnoreSelected false
-#      NotifySensorAdd false
-#      NotifySensorRemove true
-#      NotifySensorNotPresent false
-#</Plugin>
-
-#<Plugin iptables>
-#      Chain table chain
-#</Plugin>
-
-#<Plugin irq>
-#      Irq 7
-#      Irq 8
-#      Irq 9
-#      IgnoreSelected true
-#</Plugin>
-
-#<Plugin "java">
-#      JVMArg "-verbose:jni"
-#      JVMArg "-Djava.class.path=/usr/share/collectd/java/collectd-api.jar"
-#
-#      LoadPlugin "org.collectd.java.Foobar"
-#      <Plugin "org.collectd.java.Foobar">
-#        # To be parsed by the plugin
-#      </Plugin>
-#</Plugin>
-
-#<Plugin libvirt>
-#      Connection "xen:///"
-#      RefreshInterval 60
-#      Domain "name"
-#      BlockDevice "name:device"
-#      InterfaceDevice "name:device"
-#      IgnoreSelected false
-#      HostnameFormat name
-#      InterfaceFormat name
-#</Plugin>
-
-#<Plugin lpar>
-#      CpuPoolStats   false
-#      ReportBySerial false
-#</Plugin>
-
-#<Plugin madwifi>
-#      Interface "wlan0"
-#      IgnoreSelected false
-#      Source "SysFS"
-#      WatchSet "None"
-#      WatchAdd "node_octets"
-#      WatchAdd "node_rssi"
-#      WatchAdd "is_rx_acl"
-#      WatchAdd "is_scan_active"
-#</Plugin>
-
-#<Plugin mbmon>
-#      Host "127.0.0.1"
-#      Port "411"
-#</Plugin>
-
-#<Plugin md>
-#      Device "/dev/md0"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin memcachec>
-#      <Page "plugin_instance">
-#              Server "localhost"
-#              Key "page_key"
-#              <Match>
-#                      Regex "(\\d+) bytes sent"
-#                      ExcludeRegex "<lines to be excluded>"
-#                      DSType CounterAdd
-#                      Type "ipt_octets"
-#                      Instance "type_instance"
-#              </Match>
-#      </Page>
-#</Plugin>
-
-#<Plugin memcached>
-#      <Instance "local">
-#              Host "127.0.0.1"
-#              Port "11211"
-#      </Instance>
-#</Plugin>
-
-#<Plugin modbus>
-#      <Data "data_name">
-#              RegisterBase 1234
-#              RegisterType float
-#              Type gauge
-#              Instance "..."
-#      </Data>
-#
-#      <Host "name">
-#              Address "addr"
-#              Port "1234"
-#              Interval 60
-#
-#              <Slave 1>
-#                      Instance "foobar" # optional
-#                      Collect "data_name"
-#              </Slave>
-#      </Host>
-#</Plugin>
-
-#<Plugin mysql>
-#      <Database db_name>
-#              Host "database.serv.er"
-#              User "db_user"
-#              Password "secret"
-#              Database "db_name"
-#              MasterStats true
-#      </Database>
-#
-#      <Database db_name2>
-#              Host "localhost"
-#              Socket "/var/run/mysql/mysqld.sock"
-#              SlaveStats true
-#              SlaveNotifications true
-#      </Database>
-#</Plugin>
-
-#<Plugin netapp>
-#      <Host "netapp1.example.com">
-#              Protocol      "https"
-#              Address       "10.0.0.1"
-#              Port          443
-#              User          "username"
-#              Password      "aef4Aebe"
-#              Interval      30
-#
-#              <WAFL>
-#                      Interval 30
-#                      GetNameCache   true
-#                      GetDirCache    true
-#                      GetBufferCache true
-#                      GetInodeCache  true
-#              </WAFL>
-#
-#              <Disks>
-#                      Interval 30
-#                      GetBusy true
-#              </Disks>
-#
-#              <VolumePerf>
-#                      Interval 30
-#                      GetIO      "volume0"
-#                      IgnoreSelectedIO      false
-#                      GetOps     "volume0"
-#                      IgnoreSelectedOps     false
-#                      GetLatency "volume0"
-#                      IgnoreSelectedLatency false
-#              </VolumePerf>
-#
-#              <VolumeUsage>
-#                      Interval 30
-#                      GetCapacity "vol0"
-#                      GetCapacity "vol1"
-#                      IgnoreSelectedCapacity false
-#                      GetSnapshot "vol1"
-#                      GetSnapshot "vol3"
-#                      IgnoreSelectedSnapshot false
-#              </VolumeUsage>
-#
-#              <System>
-#                      Interval 30
-#                      GetCPULoad     true
-#                      GetInterfaces  true
-#                      GetDiskOps     true
-#                      GetDiskIO      true
-#              </System>
-#      </Host>
-#</Plugin>
-
-#<Plugin netlink>
-#      Interface "All"
-#      VerboseInterface "All"
-#      QDisc "eth0" "pfifo_fast-1:0"
-#      Class "ppp0" "htb-1:10"
-#      Filter "ppp0" "u32-1:0"
-#      IgnoreSelected false
-#</Plugin>
-
-##<Plugin network>
-#      # client setup:
-##     Server "ff18::efc0:4a42" "25826"
-##     <Server "239.192.74.66" "25826">
-#              SecurityLevel Encrypt
-#              Username "user"
-#              Password "secret"
-#              Interface "eth0"
-##     </Server>
-#      TimeToLive "128"
-#
-#      # server setup:
-#      Listen "ff18::efc0:4a42" "25826"
-#      <Listen "239.192.74.66" "25826">
-#              SecurityLevel Sign
-#              AuthFile "/etc/collectd/passwd"
-#              Interface "eth0"
-#      </Listen>
-#      MaxPacketSize 1024
-#
-#      # proxy setup (client and server as above):
-#      Forward true
-#
-#      # statistics about the network plugin itself
-#      ReportStats false
-#
-#      # "garbage collection"
-#      CacheFlush 1800
-##</Plugin>
-
-#<Plugin nginx>
-#      URL "http://localhost/status?auto"
-#      User "www-user"
-#      Password "secret"
-#      CACert "/etc/ssl/ca.crt"
-#</Plugin>
-
-#<Plugin notify_desktop>
-#      OkayTimeout 1000
-#      WarningTimeout 5000
-#      FailureTimeout 0
-#</Plugin>
-
-#<Plugin notify_email>
-#       SMTPServer "localhost"
-#      SMTPPort 25
-#      SMTPUser "my-username"
-#      SMTPPassword "my-password"
-#      From "collectd@main0server.com"
-#      # <WARNING/FAILURE/OK> on <hostname>. 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"
-#</Plugin>
-
-#<Plugin ntpd>
-#      Host "localhost"
-#      Port 123
-#      ReverseLookups false
-#      IncludeUnitID true
-#</Plugin>
-
-#<Plugin nut>
-#      UPS "upsname@hostname:port"
-#</Plugin>
-
-#<Plugin olsrd>
-#      Host "127.0.0.1"
-#      Port "2006"
-#      CollectLinks "Summary"
-#      CollectRoutes "Summary"
-#      CollectTopology "Summary"
-#</Plugin>
-
-#<Plugin onewire>
-#      Device "-s localhost:4304"
-#      Sensor "F10FCA000800"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin openvpn>
-#      StatusFile "/etc/openvpn/openvpn-status.log"
-#      ImprovedNamingSchema false
-#      CollectCompression true
-#      CollectIndividualUsers true
-#      CollectUserCount false
-#</Plugin>
-
-#<Plugin oracle>
-#  <Query "out_of_stock">
-#    Statement "SELECT category, COUNT(*) AS value FROM products WHERE in_stock = 0 GROUP BY category"
-#    <Result>
-#      Type "gauge"
-#      InstancesFrom "category"
-#      ValuesFrom "value"
-#    </Result>
-#  </Query>
-#  <Database "product_information">
-#    ConnectID "db01"
-#    Username "oracle"
-#    Password "secret"
-#    Query "out_of_stock"
-#  </Database>
-#</Plugin>
-
-#<Plugin perl>
-#      IncludeDir "/my/include/path"
-#      BaseName "Collectd::Plugins"
-#      EnableDebugger ""
-#      LoadPlugin Monitorus
-#      LoadPlugin OpenVZ
-#
-#      <Plugin foo>
-#              Foo "Bar"
-#              Qux "Baz"
-#      </Plugin>
-#</Plugin>
-
-#<Plugin pinba>
-#      Address "::0"
-#      Port "30002"
-#      <View "name">
-#              Host "host name"
-#              Server "server name"
-#              Script "script name"
-#      </View>
-#</Plugin>
-
-#<Plugin ping>
-#      Host "host.foo.bar"
-#      Interval 1.0
-#      Timeout 0.9
-#      TTL 255
-#      SourceAddress "1.2.3.4"
-#      Device "eth0"
-#      MaxMissed -1
-#</Plugin>
-
-#<Plugin postgresql>
-#      <Query magic>
-#              Statement "SELECT magic FROM wizard WHERE host = $1;"
-#              Param hostname
-#              <Result>
-#                      Type gauge
-#                      InstancePrefix "magic"
-#                      ValuesFrom magic
-#              </Result>
-#      </Query>
-#      <Query rt36_tickets>
-#              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;"
-#              <Result>
-#                      Type counter
-#                      InstancePrefix "rt36_tickets"
-#                      InstancesFrom "type"
-#                      ValuesFrom "count"
-#              </Result>
-#      </Query>
-#      <Writer sqlstore>
-#              # See contrib/postgresql/collectd_insert.sql for details
-#              Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);"
-#              StoreRates true
-#      </Writer>
-#      <Database foo>
-#              Host "hostname"
-#              Port "5432"
-#              User "username"
-#              Password "secret"
-#              SSLMode "prefer"
-#              KRBSrvName "kerberos_service_name"
-#              Query magic
-#      </Database>
-#      <Database bar>
-#              Interval 60
-#              Service "service_name"
-#              Query backend # predefined
-#              Query rt36_tickets
-#      </Database>
-#      <Database qux>
-#              Service "collectd_store"
-#              Writer sqlstore
-#              # see collectd.conf(5) for details
-#              CommitInterval 30
-#      </Database>
-#</Plugin>
-
-#<Plugin powerdns>
-#  <Server "server_name">
-#    Collect "latency"
-#    Collect "udp-answers" "udp-queries"
-#    Socket "/var/run/pdns.controlsocket"
-#  </Server>
-#  <Recursor "recursor_name">
-#    Collect "questions"
-#    Collect "cache-hits" "cache-misses"
-#    Socket "/var/run/pdns_recursor.controlsocket"
-#  </Recursor>
-#  LocalSocket "/opt/collectd/var/run/collectd-powerdns"
-#</Plugin>
-
-#<Plugin processes>
-#      Process "name"
-#</Plugin>
-
-#<Plugin protocols>
-#      Value "/^Tcp:/"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin python>
-#      ModulePath "/path/to/your/python/modules"
-#      LogTraces true
-#      Interactive true
-#      Import "spam"
-#
-#      <Module spam>
-#              spam "wonderful" "lovely"
-#      </Module>
-#</Plugin>
-
-#<Plugin redis>
-#   <Node example>
-#      Host "redis.example.com"
-#      Port "6379"
-#      Timeout 2000
-#   </Node>
-#</Plugin>
-
-#<Plugin routeros>
-#      <Router>
-#              Host "router.example.com"
-#              Port "8728"
-#              User "admin"
-#              Password "dozaiTh4"
-#              CollectInterface true
-#              CollectRegistrationTable true
-#              CollectCPULoad true
-#              CollectMemory true
-#              CollectDF true
-#              CollectDisk true
-#      </Router>
-#</Plugin>
-
-#<Plugin rrdcached>
-#      DaemonAddress "unix:/tmp/rrdcached.sock"
-#      DataDir "/var/lib/collectd/rrd"
-#      CreateFiles true
-#      CreateFilesAsync false
-#      CollectStatistics true
-#</Plugin>
-
-#<Plugin rrdtool>
-#      DataDir "/var/lib/collectd/rrd"
-#      CreateFilesAsync false
-#      CacheTimeout 120
-#      CacheFlush   900
-#      WritesPerSecond 50
-#</Plugin>
-
-#<Plugin sensors>
-#      SensorConfigFile "/etc/sensors.conf"
-#      Sensor "it8712-isa-0290/temperature-temp1"
-#      Sensor "it8712-isa-0290/fanspeed-fan3"
-#      Sensor "it8712-isa-0290/voltage-in8"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin sigrok>
-#  LogLevel 3
-#  <Device "AC Voltage">
-#    Driver "fluke-dmm"
-#    MinimumInterval 10
-#    Conn "/dev/ttyUSB2"
-#  </Device>
-#  <Device "Sound Level">
-#    Driver "cem-dt-885x"
-#    Conn "/dev/ttyUSB1"
-#  </Device>
-#</Plugin>
-
-#<Plugin snmp>
-#   <Data "powerplus_voltge_input">
-#       Type "voltage"
-#       Table false
-#       Instance "input_line1"
-#       Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
-#   </Data>
-#   <Data "hr_users">
-#       Type "users"
-#       Table false
-#       Instance ""
-#       Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
-#   </Data>
-#   <Data "std_traffic">
-#       Type "if_octets"
-#       Table true
-#       Instance "IF-MIB::ifDescr"
-#       Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
-#   </Data>
-#
-#   <Host "some.switch.mydomain.org">
-#       Address "192.168.0.2"
-#       Version 1
-#       Community "community_string"
-#       Collect "std_traffic"
-#       Interval 120
-#   </Host>
-#   <Host "some.server.mydomain.org">
-#       Address "192.168.0.42"
-#       Version 2
-#       Community "another_string"
-#       Collect "std_traffic" "hr_users"
-#   </Host>
-#   <Host "some.ups.mydomain.org">
-#       Address "192.168.0.3"
-#       Version 1
-#       Community "more_communities"
-#       Collect "powerplus_voltge_input"
-#       Interval 300
-#   </Host>
-#</Plugin>
-
-#<Plugin statsd>
-#  Host "::"
-#  Port "8125"
-#  DeleteCounters false
-#  DeleteTimers   false
-#  DeleteGauges   false
-#  DeleteSets     false
-#  TimerPercentile 90.0
-#</Plugin>
-
-#<Plugin "swap">
-#      ReportByDevice false
-#      ReportBytes true
-#</Plugin>
-
-#<Plugin "table">
-#      <Table "/proc/slabinfo">
-#              Instance "slabinfo"
-#              Separator " "
-#              <Result>
-#                      Type gauge
-#                      InstancePrefix "active_objs"
-#                      InstancesFrom 0
-#                      ValuesFrom 1
-#              </Result>
-#              <Result>
-#                      Type gauge
-#                      InstancePrefix "objperslab"
-#                      InstancesFrom 0
-#                      ValuesFrom 4
-#              </Result>
-#      </Table>
-#</Plugin>
-
-#<Plugin "tail">
-#  <File "/var/log/exim4/mainlog">
-#    Instance "exim"
-#    <Match>
-#      Regex "S=([1-9][0-9]*)"
-#      DSType "CounterAdd"
-#      Type "ipt_bytes"
-#      Instance "total"
-#    </Match>
-#    <Match>
-#      Regex "\\<R=local_user\\>"
-#      ExcludeRegex "\\<R=local_user\\>.*mail_spool defer"
-#      DSType "CounterInc"
-#      Type "counter"
-#      Instance "local_user"
-#    </Match>
-#  </File>
-#</Plugin>
-
-#<Plugin "tail_csv">
-#   <Metric "dropped">
-#       Type "percent"
-#       Instance "dropped"
-#       ValueFrom 1
-#   </Metric>
-#   <Metric "mbps">
-#       Type "bytes"
-#       Instance "wire-realtime"
-#       ValueFrom 2
-#   </Metric>
-#   <Metric "alerts">
-#       Type "alerts_per_second"
-#       ValueFrom 3
-#   </Metric>
-#   <Metric "kpps">
-#       Type "kpackets_wire_per_sec.realtime"
-#       ValueFrom 4
-#   </Metric>
-#   <File "/var/log/snort/snort.stats">
-#       Instance "snort-eth0"
-#       Interval 600
-#       Collect "dropped" "mbps" "alerts" "kpps"
-#       TimeFrom 0
-#   </File>
-#</Plugin>
-
-#<Plugin tcpconns>
-#      ListeningPorts false
-#      LocalPort "25"
-#      RemotePort "25"
-#</Plugin>
-
-#<Plugin teamspeak2>
-#      Host "127.0.0.1"
-#      Port "51234"
-#      Server "8767"
-#</Plugin>
-
-#<Plugin ted>
-#      Device "/dev/ttyUSB0"
-#      Retries 0
-#</Plugin>
-
-#<Plugin thermal>
-#      ForceUseProcfs false
-#      Device "THRM"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin tokyotyrant>
-#      Host "localhost"
-#      Port "1978"
-#</Plugin>
-
-#<Plugin unixsock>
-#      SocketFile "/var/run/collectd/collectd-unixsock"
-#      SocketGroup "collectd"
-#      SocketPerms "0660"
-#      DeleteSocket false
-#</Plugin>
-
-#<Plugin uuid>
-#      UUIDFile "/etc/uuid"
-#</Plugin>
-
-#<Plugin mic>
-#   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
-#</Plugin>
-
-#<Plugin varnish>
-#   This tag support an argument if you want to
-#   monitor the local instance just use </Instance>
-#   If you prefer defining another instance you can do
-#   so by using <Instance "myinstance">
-#   <Instance>
-#      CollectCache true
-#      CollectBackend true
-#      CollectBan false           # Varnish 3 only
-#      CollectConnections true
-#      CollectDirectorDNS false   # Varnish 3 only
-#      CollectSHM true
-#      CollectESI false
-#      CollectFetch false
-#      CollectHCB false
-#      CollectObjects false
-#      CollectPurge false         # Varnish 2 only
-#      CollectSession false
-#      CollectSMA false           # Varnish 2 only
-#      CollectSMS false
-#      CollectSM false            # Varnish 2 only
-#      CollectStruct false
-#      CollectTotals false
-#      CollectUptime false
-#      CollectVCL false
-#      CollectWorkers false
-#   </Instance>
-#</Plugin>
-
-#<Plugin vmem>
-#      Verbose false
-#</Plugin>
-
-#<Plugin write_graphite>
-#  <Node "example">
-#    Host "localhost"
-#    Port "2003"
-#    Protocol "tcp"
-#    LogSendErrors true
-#    Prefix "collectd"
-#    Postfix "collectd"
-#    StoreRates true
-#    AlwaysAppendDS false
-#    EscapeCharacter "_"
-#  </Node>
-#</Plugin>
-
-#<Plugin write_http>
-#      <URL "http://example.com/collectd-post">
-#              User "collectd"
-#              Password "weCh3ik0"
-#              VerifyPeer true
-#              VerifyHost true
-#              CACert "/etc/ssl/ca.crt"
-#              Format "Command"
-#              StoreRates false
-#      </URL>
-#</Plugin>
-
-#<Plugin write_mongodb>
-#      <Node "example">
-#              Host "localhost"
-#              Port "27017"
-#              Timeout 1000
-#              StoreRates false
-#              Database "auth_db"
-#              User "auth_user"
-#              Password "auth_passwd"
-#      </Node>
-#</Plugin>
-
-#<Plugin write_redis>
-#      <Node "example">
-#              Host "localhost"
-#              Port "6379"
-#              Timeout 1000
-#      </Node>
-#</Plugin>
-
-#<Plugin write_riemann>
-#      <Node "example">
-#              Host "localhost"
-#              Port 5555
-#              Protocol UDP
-#              StoreRates true
-#              AlwaysAppendDS false
-#              TTLFactor 2.0
-#      </Node>
-#      Tag "foobar"
-#</Plugin>
-
-##############################################################################
-# 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. #
-#----------------------------------------------------------------------------#
-
-#<Chain "PostCache">
-#  Target "write"
-#</Chain>
-
-##############################################################################
-# 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"
-#<Plugin "threshold">
-#  <Type "foo">
-#    WarningMin    0.00
-#    WarningMax 1000.00
-#    FailureMin    0.00
-#    FailureMax 1200.00
-#    Invert false
-#    Instance "bar"
-#  </Type>
-#
-#  <Plugin "interface">
-#    Instance "eth0"
-#    <Type "if_octets">
-#      FailureMax 10000000
-#      DataSource "rx"
-#    </Type>
-#  </Plugin>
-#
-#  <Host "hostname">
-#    <Type "cpu">
-#      Instance "idle"
-#      FailureMin 10
-#    </Type>
-#
-#    <Plugin "memory">
-#      <Type "memory">
-#        Instance "cached"
-#        WarningMin 100000000
-#      </Type>
-#    </Plugin>
-#
-#    <Type "load">
-#      DataSource "midterm"
-#      FailureMax 4
-#      Hits 3
-#      Hysteresis 3
-#    </Type>
-#  </Host>
-#</Plugin>
diff --git a/conf.d/collectd b/conf.d/collectd
deleted file mode 100644 (file)
index d579439..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.confd,v 1.2 2011/04/24 17:10:05 dilfridge Exp $
-
-# Nice value used to launch collectd, to change priority of the process. As
-# you usually will want to run it in background, a default of 5 is used.
-#
-#COLLECTD_NICELVL='5'
-
-# Location of configuration file. Modify if you don't like the standard one.
-#
-#COLLECTD_CFGFILE='/etc/collectd.conf'
-
-# File used to store the PID file. Usually you won't need to touch it.
-#
-#COLLECTD_PIDFILE='/var/run/collectd/collectd.pid'
-
-# User to run collectd as (default is collectd, change to root or give
-# collectd user appropriate privileges if you use one of the plugins that 
-# require it, as e.g. ping or iptables plugins)
-#
-#COLLECTD_USER='collectd'
diff --git a/init.d/collectd b/init.d/collectd
deleted file mode 100755 (executable)
index 0799552..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.7 2013/09/08 14:33:06 hwoarang Exp $
-
-: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'}
-: ${COLLECTD_CFGFILE:='/etc/collectd.conf'}
-: ${COLLECTD_NICELVL:='5'}
-: ${COLLECTD_USER:='collectd'}
-
-extra_commands="configtest"
-
-depend() {
-       use net
-}
-
-configtest() {
-       ebegin "Checking ${SVCNAME} configuration"
-       checkconfig
-       eend $?
-}
-
-checkconfig() {
-       if [ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ] ; then
-               if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
-                       . /etc/env.d/50oracle-instantclient-basic
-                       export ORACLE_HOME
-                       export TNS_ADMIN
-               else
-                       ewarn "Unable to set Oracle environment, Oracle plugin wont work"
-               fi
-       fi
-
-       /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1
-       ret=$?
-       if [ $ret -ne 0 ]; then
-               eerror "${SVCNAME} has detected an error in your setup:"
-               /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}"
-       fi
-
-       return $ret
-}
-
-start() {
-       checkconfig || return 1
-       [ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd
-
-       ebegin "Starting collectd"
-       start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \
-               --nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
-                       -P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
-       eend $? "Failed to start collectd"
-}
-
-stop() {
-       ebegin "Stopping collectd"
-       start-stop-daemon --stop \
-               --pidfile "${COLLECTD_PIDFILE}"
-       eend $? "Failed to stop collectd"
-}
diff --git a/logrotate.d/collectd b/logrotate.d/collectd
deleted file mode 100644 (file)
index 5d344f6..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#      /etc/logrotate.d/collectd
-#
-/var/log/collectd.log {
-    daily
-    rotate 5
-    notifempty
-    missingok
-}