From 62027099029ab19c3ff37bcd60e4d5c7888c9114 Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Jun 10 2010 18:17:28 +0000 Subject: last release bump and config file addition --- diff --git a/collectd-httpd.conf b/collectd-httpd.conf new file mode 100644 index 0000000..a9fe956 --- /dev/null +++ b/collectd-httpd.conf @@ -0,0 +1,12 @@ +# Configuration for collectd. + +ScriptAlias /collectd/bin/ /usr/share/collectd/collection3/bin/ +Alias /collectd/ /usr/share/collectd/collection3/ + + + AddHandler cgi-script .cgi + DirectoryIndex bin/index.cgi + Order Deny,Allow + Deny from all + Allow from 127.0.0.1 + diff --git a/collectd.conf b/collectd.conf deleted file mode 100644 index 8c39c26..0000000 --- a/collectd.conf +++ /dev/null @@ -1,555 +0,0 @@ -# -# Config file for collectd(1). -# Please read collectd.conf(5) for a list of options. -# http://collectd.org/ -# - -#Hostname "localhost" -FQDNLookup true -#BaseDir "/usr/var/lib/collectd" -#PIDFile "/usr/var/run/collectd.pid" -#PluginDir "/usr/lib/collectd" -#TypesDB "/usr/share/collectd/types.db" -#Interval 10 -#ReadThreads 5 - -LoadPlugin logfile -LoadPlugin syslog - -# -# LogLevel info -# File STDOUT -# Timestamp true -# - -# -# LogLevel info -# - -#LoadPlugin apcups -#LoadPlugin apple_sensors -#LoadPlugin ascent -#LoadPlugin battery -#LoadPlugin bind -LoadPlugin cpu -LoadPlugin cpufreq -LoadPlugin csv -#LoadPlugin curl -#LoadPlugin dbi -LoadPlugin df -LoadPlugin disk -LoadPlugin entropy -LoadPlugin exec -#LoadPlugin filecount -#LoadPlugin hddtemp -LoadPlugin interface -#LoadPlugin iptables -#LoadPlugin ipvs -LoadPlugin irq -LoadPlugin load -#LoadPlugin mbmon -LoadPlugin memcached -LoadPlugin memory -#LoadPlugin multimeter -#LoadPlugin netlink -LoadPlugin network -LoadPlugin nfs -#LoadPlugin notify_desktop -#LoadPlugin notify_email -LoadPlugin ntpd -#LoadPlugin onewire -#LoadPlugin openvpn -#LoadPlugin oracle -#LoadPlugin ping -LoadPlugin powerdns -LoadPlugin processes -#LoadPlugin rrdcached -LoadPlugin serial -LoadPlugin swap -#LoadPlugin tail -#LoadPlugin tape -LoadPlugin tcpconns -#LoadPlugin teamspeak2 -LoadPlugin thermal -LoadPlugin unixsock -LoadPlugin users -#LoadPlugin uuid -LoadPlugin vmem -#LoadPlugin vserver -#LoadPlugin wireless -#LoadPlugin xmms - -# -# URL "http://localhost/status?auto" -# User "www-user" -# Password "secret" -# CACert "/etc/ssl/ca.crt" -# - -# -# Host "localhost" -# Port "3551" -# - -# -# URL "http://localhost/ascent/status/" -# User "www-user" -# Password "secret" -# CACert "/etc/ssl/ca.crt" -# - -# -# URL "http://localhost:8053/" -# OpCodes true -# QTypes true -# -# ServerStats true -# ZoneMaintStats true -# ResolverStats false -# MemoryStats true -# -# -# QTypes true -# ResolverStats true -# CacheRRSets true -# -# Zone "127.in-addr.arpa/IN" -# -# - -# -# DataDir "/usr/var/lib/collectd/csv" -# StoreRates false -# - -# -# -# URL "http://finance.google.com/finance?q=NYSE%3AAMD" -# User "foo" -# Password "bar" -# -# Regex "]*> *([0-9]*\\.[0-9]+) *" -# DSType "GaugeAverage" -# Type "stock_value" -# Instance "AMD" -# -# -# - -# -# -# 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 "..." -# -# - -# -# Device "/dev/hda1" -# Device "192.168.0.2:/mnt/nfs" -# MountPoint "/home" -# FSType "ext3" -# IgnoreSelected false -# - -# -# Disk "/^[hs]d[a-f][0-9]?$/" -# IgnoreSelected false -# - -# -# Interface "eth0" -# IgnoreSource "192.168.0.1" -# - -# -# SocketFile "/usr/var/run/collectd-email" -# SocketGroup "collectd" -# SocketPerms "0770" -# MaxConns 5 -# - -# -# Exec "user:group" "/path/to/exec" -# NotificationExec "user:group" "/path/to/exec" -# - - - Exec "nobody:nobody" "/tmp/test.sh" - - -# -# -# Instance "foodir" -# Name "*.conf" -# MTime "-5m" -# Size "+10k" -# Recursive true -# -# - -# -# Host "127.0.0.1" -# Port "7634" -# TranslateDevicename false -# - -# -# 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 -# - -# -# Connection "xen:///" -# RefreshInterval 60 -# Domain "name" -# BlockDevice "name:device" -# InterfaceDevice "name:device" -# IgnoreSelected false -# HostnameFormat name -# - -# -# Host "127.0.0.1" -# Port "411" -# - -# -# Host "127.0.0.1" -# Port "11211" -# - -# -# Host "database.serv.er" -# User "db_user" -# Password "secret" -# Database "db_name" -# - -# -# Interface "All" -# VerboseInterface "All" -# QDisc "eth0" "pfifo_fast-1:0" -# Class "ppp0" "htb-1:10" -# Filter "ppp0" "u32-1:0" -# IgnoreSelected false -# - -# -# Server "ff18::efc0:4a42" "25826" -# Server "239.192.74.66" "25826" -# Listen "ff18::efc0:4a42" "25826" -# Listen "239.192.74.66" "25826" -# TimeToLive "128" -# Forward false -# 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 -# - -# -# UPS "upsname@hostname:port" -# - -# -# Device "-s localhost:4304" -# Sensor "F10FCA000800" -# IgnoreSelected false -# - -# -# StatusFile "/etc/openvpn/openvpn-status.log" -# - -# -# -# 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::Plugin" -# EnableDebugger "" -# LoadPlugin foo -# -# -# Foo "Bar" -# Qux "Baz" -# -# - -# -# Host "host.foo.bar" -# TTL 255 -# - -# -# -# 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" -# -# -# -# Host "hostname" -# Port "5432" -# User "username" -# Password "secret" -# SSLMode "prefer" -# KRBSrvName "kerberos_service_name" -# Query magic -# -# -# Service "service_name" -# Query backend # predefined -# Query rt36_tickets -# -# - -# -# -# 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" -# - -# -# DaemonAddress "unix:/tmp/rrdcached.sock" -# DataDir "/usr/var/lib/collectd/rrd" -# CreateFiles true -# CollectStatistics true -# - -# -# DataDir "/usr/var/lib/collectd/rrd" -# CacheTimeout 120 -# CacheFlush 900 -# - -# -# Sensor "it8712-isa-0290/temperature-temp1" -# Sensor "it8712-isa-0290/fanspeed-fan3" -# Sensor "it8712-isa-0290/voltage-in8" -# 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" -# 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 -# -# - -# -# -# Instance "exim" -# -# Regex "S=([1-9][0-9]*)" -# DSType "CounterAdd" -# Type "ipt_bytes" -# Instance "total" -# -# -# Regex "\\" -# DSType "CounterInc" -# Type "counter" -# Instance "local_user" -# -# -# - -# -# ListeningPorts false -# LocalPort "25" -# RemotePort "25" -# - -# -# Host "127.0.0.1" -# Port "51234" -# Server "8767" -# - -# -# ForceUseProcfs false -# Device "THRM" -# IgnoreSelected false -# - -# -# SocketFile "/usr/var/run/collectd-unixsock" -# SocketGroup "collectd" -# SocketPerms "0660" -# - -# -# UUIDFile "/etc/uuid" -# - -# -# Verbose false -# - -# * * * * * * * * * * * * * -# * 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_regex -#LoadPlugin match_value -#LoadPlugin match_timediff - -# Load required targets: -#LoadPlugin target_notification -#LoadPlugin target_replace -#LoadPlugin target_set - -# 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" -# - -Include "/etc/collectd.d" diff --git a/collectd.spec b/collectd.spec index 6a5051b..4d941b0 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.10.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -499,7 +499,7 @@ fi %endif %changelog -* Thu Jun 10 2010 Mike McGrath 4.10.0-3 +* Thu Jun 10 2010 Mike McGrath 4.10.0-4 - New upstram version - First EL-5 build