From: <ca...@us...> - 2009-11-29 06:39:42
|
Revision: 2118 http://ganglia.svn.sourceforge.net/ganglia/?rev=2118&view=rev Author: carenas Date: 2009-11-29 06:39:34 +0000 (Sun, 29 Nov 2009) Log Message: ----------- gmond: module conf cleanup Modified Paths: -------------- trunk/monitor-core/gmond/modules/conf.d/example.conf trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in trunk/monitor-core/gmond/modules/conf.d/multicpu.conf Modified: trunk/monitor-core/gmond/modules/conf.d/example.conf =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/example.conf 2009-11-29 05:59:44 UTC (rev 2117) +++ trunk/monitor-core/gmond/modules/conf.d/example.conf 2009-11-29 06:39:34 UTC (rev 2118) @@ -1,7 +1,7 @@ modules { module { name = "example_module" - path = "modexample.so" + path = "modexample.so" params = "An extra raw parameter" param RandomMax { value = 75 @@ -12,24 +12,23 @@ } } +/* Test DSO metric */ -#/* Test DSO metric */ -collection_group { - collect_every = 10 - time_threshold = 50 - metric { +collection_group { + collect_every = 10 + time_threshold = 50 + metric { name = "Random_Numbers" + value_threshold = 1.0 title = "Random Numbers Metric" - value_threshold = 1.0 - } + } } -collection_group { - collect_once = yes - time_threshold = 20 - metric { +collection_group { + collect_once = yes + time_threshold = 20 + metric { name = "Constant_Number" title = "Constant Number Metric" - } -} - + } +} Modified: trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf 2009-11-29 05:59:44 UTC (rev 2117) +++ trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf 2009-11-29 06:39:34 UTC (rev 2118) @@ -1,11 +1,11 @@ - /* Uncomment the modules section to load the module, then uncomment some or all of the metrics that are required */ -/* modules { +/* +modules { module { name = "gstatus_module" - path = "modgstatus.so" + path = "modgstatus.so" } } @@ -20,63 +20,63 @@ name = "gmond_version_full" title = "gmond version and release" } -} */ +} +*/ - -/* Gmond status metrics */ -/* collection_group { - collect_every = 10 - time_threshold = 20 - metric { - name = "gmond_pkts_recvd_all" +/* Gmond status metrics */ +/* +collection_group { + collect_every = 10 + time_threshold = 20 + metric { + name = "gmond_pkts_recvd_all" + value_threshold = 1.0 title = "Gmond All Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_failed" + } + metric { + name = "gmond_pkts_recvd_failed" + value_threshold = 1.0 title = "Gmond Failed Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_ignored" + } + metric { + name = "gmond_pkts_recvd_ignored" + value_threshold = 1.0 title = "Gmond Ignored Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_metadata" + } + metric { + name = "gmond_pkts_recvd_metadata" + value_threshold = 1.0 title = "Gmond Metadata Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_value" + } + metric { + name = "gmond_pkts_recvd_value" + value_threshold = 1.0 title = "Gmond Data Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_request" + } + metric { + name = "gmond_pkts_recvd_request" + value_threshold = 1.0 title = "Gmond Metadata Request Pkts" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_all" + } + metric { + name = "gmond_pkts_sent_all" + value_threshold = 1.0 title = "Gmond All Sent Pkts" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_metadata" + } + metric { + name = "gmond_pkts_sent_metadata" + value_threshold = 1.0 title = "Gmond Metadata Pkts Sent" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_value" + } + metric { + name = "gmond_pkts_sent_value" + value_threshold = 1.0 title = "Gmond Data Pkts Sent" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_request" + } + metric { + name = "gmond_pkts_sent_request" + value_threshold = 1.0 title = "Gmond Metadata Requests Sent" - value_threshold = 1.0 - } + } } - */ Modified: trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in 2009-11-29 05:59:44 UTC (rev 2117) +++ trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in 2009-11-29 06:39:34 UTC (rev 2118) @@ -1,13 +1,14 @@ -# The modules section describes the module -# that should be loaded. -# name - module name -# path - load path of the .so -# params - path to the directory where mod_python -# should look for python metric modules +/* + params - path to the directory where mod_python + should look for python metric modules + + the "pyconf" files in the include directory below + will be scanned for configurations for those modules +*/ modules { module { name = "python_module" - path = "modpython.so" + path = "modpython.so" params = "@moduledir@/python_modules" } } Modified: trunk/monitor-core/gmond/modules/conf.d/multicpu.conf =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/multicpu.conf 2009-11-29 05:59:44 UTC (rev 2117) +++ trunk/monitor-core/gmond/modules/conf.d/multicpu.conf 2009-11-29 06:39:34 UTC (rev 2118) @@ -1,62 +1,68 @@ modules { module { name = "multicpu_module" - path = "modmulticpu.so" + path = "modmulticpu.so" } } +/* Multi CPU DSO metric */ -#/* Multi CPU DSO metric */ -#/* Additional metrics should be added to the -# collection group to represent each CPU -# discovered on the system. See available -# discovered metrics through ./gmond -m command. */ -collection_group { - collect_every = 10 - time_threshold = 50 +/* Additional metrics should be added to the + collection group to represent each CPU + discovered on the system. See available + discovered metrics through ./gmond -m command. */ -/* If using PCRE, you can enable all metrics for all CPUs just - using the following: */ -/* metric { +collection_group { + collect_every = 10 + time_threshold = 50 + +/* If using PCRE, you can enable all metrics for all CPUs by + uncommenting the following metric template */ +/* + metric { name_match = "multicpu_([a-z]+)([0-9]+)" value_threshold = 1.0 title = "CPU-\\2 \\1" - } */ + } +*/ -/* Manually describe each metric for each core individually */ -/* metric { - name = "multicpu_user0" +/* Manually describe each metric for each core individually + as shown by the following commented example */ +/* + metric { + name = "multicpu_user0" + value_threshold = 1.0 title = "CPU-0 User" - value_threshold = 1.0 - } - metric { - name = "multicpu_nice0" + } + metric { + name = "multicpu_nice0" + value_threshold = 1.0 title = "CPU-0 Nice" - value_threshold = 1.0 - } - metric { - name = "multicpu_system0" + } + metric { + name = "multicpu_system0" + value_threshold = 1.0 title = "CPU-0 System" - value_threshold = 1.0 - } - metric { - name = "multicpu_idle0" + } + metric { + name = "multicpu_idle0" + value_threshold = 1.0 title = "CPU-0 Idle" - value_threshold = 1.0 - } - metric { - name = "multicpu_wio0" + } + metric { + name = "multicpu_wio0" + value_threshold = 1.0 title = "CPU-0 wio" - value_threshold = 1.0 - } - metric { - name = "multicpu_intr0" + } + metric { + name = "multicpu_intr0" + value_threshold = 1.0 title = "CPU-0 intr" - value_threshold = 1.0 - } - metric { - name = "multicpu_sintr0" + } + metric { + name = "multicpu_sintr0" + value_threshold = 1.0 title = "CPU-0 sintr" - value_threshold = 1.0 - } */ + } +*/ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |