From: Florian Forster Date: Sat, 19 Jun 2010 07:17:14 +0000 (+0200) Subject: Build system: Install the config file. X-Git-Tag: v4.0.0~234 X-Git-Url: https://git.octo.it/?p=collection4.git;a=commitdiff_plain;h=119de663a2fc33ea2f9303e0cbe59ab32460520b Build system: Install the config file. --- diff --git a/Makefile.am b/Makefile.am index af437a6..1f529a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = src +SUBDIRS = share src diff --git a/collection.conf b/collection.conf deleted file mode 100644 index eb33fe0..0000000 --- a/collection.conf +++ /dev/null @@ -1,391 +0,0 @@ - - Host "/any/" - Plugin "cpu" - PluginInstance "/any/" - Type "cpu" - TypeInstance "/all/" - - Title "CPU utilization" - VerticalLabel "Jiffies" - - - TypeInstance "idle" - DSName "value" - Legend "Idle " - Color "e8e8e8" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "nice" - DSName "value" - Legend "Nice " - Color "00e000" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "user" - DSName "value" - Legend "User " - Color "0000ff" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "wait" - DSName "value" - Legend "Wait-IO" - Color "ffb000" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "system" - DSName "value" - Legend "System " - Color "ff0000" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "softirq" - DSName "value" - Legend "SoftIRQ" - Color "ff00ff" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "interrupt" - DSName "value" - Legend "IRQ " - Color "a000a0" - Area true - Stack true - Format "%6.2lf" - - - TypeInstance "steal" - DSName "value" - Legend "Steal " - Color "000000" - Area true - Stack true - Format "%6.2lf" - - - - - Host "/any/" - Plugin "df" - PluginInstance "/any/" - Type "df_complex" - TypeInstance "/all/" - - Title "Diskspace" - VerticalLabel "Bytes" - ShowZero true - - - TypeInstance "used" - DSName "value" - Legend "Used " - Color "ff0000" - Area true - #Stack true - Format "%5.1lf%s" - - - TypeInstance "reserved" - DSName "value" - Legend "Reserved" - Color "ffb000" - Area true - Stack true - Format "%5.1lf%s" - - - TypeInstance "free" - DSName "value" - Legend "Free " - Color "00bf00" - Area true - Stack true - Format "%5.1lf%s" - - - - - Host "/any/" - Plugin "df" - PluginInstance "/any/" - Type "df_inodes" - TypeInstance "/all/" - - Title "Diskspace (Inodes)" - VerticalLabel "Inodes" - ShowZero true - - - TypeInstance "used" - DSName "value" - Legend "Used " - Color "ff0000" - Area true - #Stack true - - - TypeInstance "reserved" - DSName "value" - Legend "Reserved" - Color "ffb000" - Area true - Stack true - - - TypeInstance "free" - DSName "value" - Legend "Free " - Color "00bf00" - Area true - Stack true - - - - - Host "/any/" - Plugin "df" - PluginInstance "" - Type "df" - TypeInstance "/any/" - - Title "Diskspace (legacy)" - VerticalLabel "Bytes" - ShowZero true - - - DSName "used" - Legend "Used" - Color "ff0000" - Area true - #Stack true - Format "%5.1lf%s" - - - DSName "free" - Legend "Free" - Color "00bf00" - Area true - Stack true - Format "%5.1lf%s" - - - - - Host "/any/" - Plugin "disk" - PluginInstance "/any/" - Type "disk_merged" - TypeInstance "" - - Title "Disk merged operations" - - - DSName "read" - Legend "Read " - Color "0000ff" - - - DSName "write" - Legend "Write" - Color "00bf00" - - - - - Host "/any/" - Plugin "disk" - PluginInstance "/any/" - Type "disk_octets" - TypeInstance "" - - Title "Disk octets" - - - DSName "read" - Legend "Read " - Color "0000ff" - - - DSName "write" - Legend "Write" - Color "00bf00" - - - - - Host "/any/" - Plugin "disk" - PluginInstance "/any/" - Type "disk_ops" - TypeInstance "" - - Title "Disk operations" - - - DSName "read" - Legend "Read " - Color "0000ff" - - - DSName "write" - Legend "Write" - Color "00bf00" - - - - - Host "/any/" - Plugin "disk" - PluginInstance "/any/" - Type "disk_time" - TypeInstance "" - - Title "Disk time per op" - - - DSName "read" - Legend "Read " - Color "0000ff" - - - DSName "write" - Legend "Write" - Color "00bf00" - - - - - Host "/any/" - Plugin "memory" - PluginInstance "" - Type "memory" - TypeInstance "/all/" - - Title "Memory utilization" - VerticalLabel "Bytes" - ShowZero true - - - TypeInstance "free" - DSName "value" - Legend "Free " - Color "00e000" - Area true - Stack true - Format "%5.1lf%s" - - - TypeInstance "cached" - DSName "value" - Legend "Cached " - Color "0000ff" - Area true - Stack true - Format "%5.1lf%s" - - - TypeInstance "buffered" - DSName "value" - Legend "Buffered" - Color "ffb000" - Area true - Stack true - Format "%5.1lf%s" - - - TypeInstance "locked" - DSName "value" - Legend "Locked " - Color "ff00ff" - Area true - Stack true - Format "%5.1lf%s" - - - TypeInstance "used" - DSName "value" - Legend "Used " - Color "ff0000" - Area true - Stack true - Format "%5.1lf%s" - - - - - Host "/any/" - Plugin "processes" - PluginInstance "" - Type "ps_state" - TypeInstance "/all/" - - Title "Processes" - VerticalLabel "Processes" - - - TypeInstance "paging" - DSName "value" - Legend "Paging " - Color "ffb000" - - - TypeInstance "blocked" - DSName "value" - Legend "Blocked " - Color "ff00ff" - - - TypeInstance "zombies" - DSName "value" - Legend "Zombies " - Color "ff0000" - - - TypeInstance "stopped" - DSName "value" - Legend "Stopped " - Color "a000a0" - - - TypeInstance "running" - DSName "value" - Legend "Running " - Color "00e000" - - - TypeInstance "sleeping" - DSName "value" - Legend "Sleeping" - Color "0000ff" - - - - - Host "/any/" - Plugin "swap" - PluginInstance "" - Type "swap" - TypeInstance "/all/" - - Title "Swap utilization" - VerticalLabel "Bytes" - - diff --git a/configure.ac b/configure.ac index 9c8b628..125f37b 100644 --- a/configure.ac +++ b/configure.ac @@ -30,4 +30,4 @@ AC_CHECK_LIB(fcgi, FCGI_Accept, [], AC_CHECK_LIB(rrd_th, rrd_graph_v, [], [AC_MSG_ERROR(cannot find librrd_th.)], [-lm]) -AC_OUTPUT(Makefile src/Makefile) +AC_OUTPUT(Makefile share/Makefile src/Makefile) diff --git a/share/Makefile.am b/share/Makefile.am new file mode 100644 index 0000000..98d31c5 --- /dev/null +++ b/share/Makefile.am @@ -0,0 +1,2 @@ +dist_sysconf_DATA = collection.conf + diff --git a/share/collection.conf b/share/collection.conf new file mode 100644 index 0000000..eb33fe0 --- /dev/null +++ b/share/collection.conf @@ -0,0 +1,391 @@ + + Host "/any/" + Plugin "cpu" + PluginInstance "/any/" + Type "cpu" + TypeInstance "/all/" + + Title "CPU utilization" + VerticalLabel "Jiffies" + + + TypeInstance "idle" + DSName "value" + Legend "Idle " + Color "e8e8e8" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "nice" + DSName "value" + Legend "Nice " + Color "00e000" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "user" + DSName "value" + Legend "User " + Color "0000ff" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "wait" + DSName "value" + Legend "Wait-IO" + Color "ffb000" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "system" + DSName "value" + Legend "System " + Color "ff0000" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "softirq" + DSName "value" + Legend "SoftIRQ" + Color "ff00ff" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "interrupt" + DSName "value" + Legend "IRQ " + Color "a000a0" + Area true + Stack true + Format "%6.2lf" + + + TypeInstance "steal" + DSName "value" + Legend "Steal " + Color "000000" + Area true + Stack true + Format "%6.2lf" + + + + + Host "/any/" + Plugin "df" + PluginInstance "/any/" + Type "df_complex" + TypeInstance "/all/" + + Title "Diskspace" + VerticalLabel "Bytes" + ShowZero true + + + TypeInstance "used" + DSName "value" + Legend "Used " + Color "ff0000" + Area true + #Stack true + Format "%5.1lf%s" + + + TypeInstance "reserved" + DSName "value" + Legend "Reserved" + Color "ffb000" + Area true + Stack true + Format "%5.1lf%s" + + + TypeInstance "free" + DSName "value" + Legend "Free " + Color "00bf00" + Area true + Stack true + Format "%5.1lf%s" + + + + + Host "/any/" + Plugin "df" + PluginInstance "/any/" + Type "df_inodes" + TypeInstance "/all/" + + Title "Diskspace (Inodes)" + VerticalLabel "Inodes" + ShowZero true + + + TypeInstance "used" + DSName "value" + Legend "Used " + Color "ff0000" + Area true + #Stack true + + + TypeInstance "reserved" + DSName "value" + Legend "Reserved" + Color "ffb000" + Area true + Stack true + + + TypeInstance "free" + DSName "value" + Legend "Free " + Color "00bf00" + Area true + Stack true + + + + + Host "/any/" + Plugin "df" + PluginInstance "" + Type "df" + TypeInstance "/any/" + + Title "Diskspace (legacy)" + VerticalLabel "Bytes" + ShowZero true + + + DSName "used" + Legend "Used" + Color "ff0000" + Area true + #Stack true + Format "%5.1lf%s" + + + DSName "free" + Legend "Free" + Color "00bf00" + Area true + Stack true + Format "%5.1lf%s" + + + + + Host "/any/" + Plugin "disk" + PluginInstance "/any/" + Type "disk_merged" + TypeInstance "" + + Title "Disk merged operations" + + + DSName "read" + Legend "Read " + Color "0000ff" + + + DSName "write" + Legend "Write" + Color "00bf00" + + + + + Host "/any/" + Plugin "disk" + PluginInstance "/any/" + Type "disk_octets" + TypeInstance "" + + Title "Disk octets" + + + DSName "read" + Legend "Read " + Color "0000ff" + + + DSName "write" + Legend "Write" + Color "00bf00" + + + + + Host "/any/" + Plugin "disk" + PluginInstance "/any/" + Type "disk_ops" + TypeInstance "" + + Title "Disk operations" + + + DSName "read" + Legend "Read " + Color "0000ff" + + + DSName "write" + Legend "Write" + Color "00bf00" + + + + + Host "/any/" + Plugin "disk" + PluginInstance "/any/" + Type "disk_time" + TypeInstance "" + + Title "Disk time per op" + + + DSName "read" + Legend "Read " + Color "0000ff" + + + DSName "write" + Legend "Write" + Color "00bf00" + + + + + Host "/any/" + Plugin "memory" + PluginInstance "" + Type "memory" + TypeInstance "/all/" + + Title "Memory utilization" + VerticalLabel "Bytes" + ShowZero true + + + TypeInstance "free" + DSName "value" + Legend "Free " + Color "00e000" + Area true + Stack true + Format "%5.1lf%s" + + + TypeInstance "cached" + DSName "value" + Legend "Cached " + Color "0000ff" + Area true + Stack true + Format "%5.1lf%s" + + + TypeInstance "buffered" + DSName "value" + Legend "Buffered" + Color "ffb000" + Area true + Stack true + Format "%5.1lf%s" + + + TypeInstance "locked" + DSName "value" + Legend "Locked " + Color "ff00ff" + Area true + Stack true + Format "%5.1lf%s" + + + TypeInstance "used" + DSName "value" + Legend "Used " + Color "ff0000" + Area true + Stack true + Format "%5.1lf%s" + + + + + Host "/any/" + Plugin "processes" + PluginInstance "" + Type "ps_state" + TypeInstance "/all/" + + Title "Processes" + VerticalLabel "Processes" + + + TypeInstance "paging" + DSName "value" + Legend "Paging " + Color "ffb000" + + + TypeInstance "blocked" + DSName "value" + Legend "Blocked " + Color "ff00ff" + + + TypeInstance "zombies" + DSName "value" + Legend "Zombies " + Color "ff0000" + + + TypeInstance "stopped" + DSName "value" + Legend "Stopped " + Color "a000a0" + + + TypeInstance "running" + DSName "value" + Legend "Running " + Color "00e000" + + + TypeInstance "sleeping" + DSName "value" + Legend "Sleeping" + Color "0000ff" + + + + + Host "/any/" + Plugin "swap" + PluginInstance "" + Type "swap" + TypeInstance "/all/" + + Title "Swap utilization" + VerticalLabel "Bytes" + + diff --git a/src/Makefile.am b/src/Makefile.am index 9b235ba..9b91a91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,12 @@ AUTOMAKE_OPTIONS = foreign no-dependencies +AM_CPPFLAGS = -DPREFIX='"${prefix}"' +AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/collection.conf"' + if COMPILER_IS_GCC AM_CFLAGS = -Wall -Wextra endif + AM_YFLAGS = -d BUILT_SOURCES = parser.h