From: <ca...@us...> - 2008-06-11 07:45:47
|
Revision: 1403 http://ganglia.svn.sourceforge.net/ganglia/?rev=1403&view=rev Author: carenas Date: 2008-06-11 00:45:46 -0700 (Wed, 11 Jun 2008) Log Message: ----------- build: call libtoolize explicitally after automake ensures the config.{guess,sub} files that will be copied come from automake Modified Paths: -------------- trunk/monitor-core/bootstrap trunk/monitor-core/libmetrics/bootstrap Modified: trunk/monitor-core/bootstrap =================================================================== --- trunk/monitor-core/bootstrap 2008-06-11 06:51:15 UTC (rev 1402) +++ trunk/monitor-core/bootstrap 2008-06-11 07:45:46 UTC (rev 1403) @@ -10,10 +10,12 @@ aclocal && echo "Running autoheader" && autoheader && -echo "Running libtoolize"&& -mkdir -p build && libtoolize --copy +echo "Creating build" && +mkdir -p build && echo "Running automake" && -automake --add-missing --copy && +automake --add-missing --copy 2>/dev/null +echo "Running libtoolize" && +libtoolize --automake --copy && automake --add-missing --copy && echo "Running autoconf" && autoconf Modified: trunk/monitor-core/libmetrics/bootstrap =================================================================== --- trunk/monitor-core/libmetrics/bootstrap 2008-06-11 06:51:15 UTC (rev 1402) +++ trunk/monitor-core/libmetrics/bootstrap 2008-06-11 07:45:46 UTC (rev 1403) @@ -9,7 +9,9 @@ echo "Creating build" && mkdir -p build && echo "Running automake" && -automake --add-missing --copy && +automake --add-missing --copy 2>/dev/null +echo "Running libtoolize" && +libtoolize --automake --copy && automake --add-missing --copy && echo "Running autoconf" && autoconf && echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ber...@us...> - 2008-06-12 23:28:20
|
Revision: 1409 http://ganglia.svn.sourceforge.net/ganglia/?rev=1409&view=rev Author: bernardli Date: 2008-06-12 16:28:24 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Cleanup setup for gmetad-python, added new RPM subpackage. Note the following changes: - configuration: /etc/ganglia/gmetad-python.conf - init script: /etc/init.d/gmetad-python Modified Paths: -------------- trunk/monitor-core/configure.in trunk/monitor-core/ganglia.spec.in trunk/monitor-core/gmetad-python/Gmetad/gmetad_config.py.in trunk/monitor-core/gmetad-python/setup.py.in Added Paths: ----------- trunk/monitor-core/gmetad-python/gmetad-python.conf.in Removed Paths: ------------- trunk/monitor-core/gmetad-python/gmetad.conf.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-12 23:13:49 UTC (rev 1408) +++ trunk/monitor-core/configure.in 2008-06-12 23:28:24 UTC (rev 1409) @@ -616,7 +616,7 @@ gmetad/conf.c gmetad-python/setup.py gmetad-python/Gmetad/gmetad_config.py - gmetad-python/gmetad.conf + gmetad-python/gmetad-python.conf gmetad-python/plugins/rrd_plugin.py gmetric/Makefile include/Makefile Modified: trunk/monitor-core/ganglia.spec.in =================================================================== --- trunk/monitor-core/ganglia.spec.in 2008-06-12 23:13:49 UTC (rev 1408) +++ trunk/monitor-core/ganglia.spec.in 2008-06-12 23:28:24 UTC (rev 1409) @@ -81,6 +81,31 @@ This gmetad daemon aggregates monitoring data from several clusters to form a monitoring grid. It also keeps metric history using rrdtool. +%package gmetad-python +Summary: Ganglia Meta daemon in Python http://ganglia.sourceforge.net/ +Group: System Environment/Base +Requires: python-rrdtool +Obsoletes: ganglia-monitor-core-gmetad < %{version} +Obsoletes: ganglia-monitor-core < %{version} +Provides: ganglia-monitor-core-gmetad = %{version} +Provides: ganglia-monitor-core = %{version} +Conflicts: ganglia-gmetad + +%description gmetad-python +Ganglia is a scalable, real-time monitoring and execution environment +with all execution requests and statistics expressed in an open +well-defined XML format. + +This gmetad daemon aggregates monitoring data from several clusters +to form a monitoring grid. It also keeps metric history using rrdtool. + +gmetad-python is a re-write of the original gmetad code (written in C) +with pluggable interface. The RRD files, both the metric RRDs and summary +RRDs are being written by RRD plugins rather than directly from gmetad. +This provides the ability to plug in new metric storage modules to support +other types of storage mechanisms other than RRD and also the ability to +plug in any type of gmetad-level analysis. + %package gmond Summary: Ganglia Monitor daemon http://ganglia.sourceforge.net/ Group: System Environment/Base @@ -153,6 +178,9 @@ %__mv /etc/gmetad.conf %{conf_dir} fi +%post gmetad-python +/sbin/chkconfig --add gmetad-python + %post gmond /sbin/chkconfig --add gmond @@ -186,6 +214,13 @@ /sbin/chkconfig --del gmetad fi +%preun gmetad-python +if [ "$1" = 0 ] +then + /etc/init.d/gmetad-python stop + /sbin/chkconfig --del gmetad-python +fi + %preun gmond if [ "$1" = 0 ] then @@ -221,9 +256,13 @@ %if 0%{?suse_version} %__cp -f gmond/gmond.init.SuSE $RPM_BUILD_ROOT/etc/init.d/gmond %__cp -f gmetad/gmetad.init.SuSE $RPM_BUILD_ROOT/etc/init.d/gmetad + sed -e 's/sbin\/gmetad/sbin\/gmetad.py/' gmetad/gmetad.init.SuSE > $RPM_BUILD_ROOT/etc/init.d/gmetad-python + chmod +x $RPM_BUILD_ROOT/etc/init.d/gmetad-python %else %__cp -f gmond/gmond.init $RPM_BUILD_ROOT/etc/init.d/gmond %__cp -f gmetad/gmetad.init $RPM_BUILD_ROOT/etc/init.d/gmetad + sed -e 's/sbin\/gmetad/sbin\/gmetad.py/' gmetad/gmetad.init > $RPM_BUILD_ROOT/etc/init.d/gmetad-python + chmod +x $RPM_BUILD_ROOT/etc/init.d/gmetad-python %endif %__install -d -m 0755 $RPM_BUILD_ROOT%{conf_dir} @@ -257,6 +296,10 @@ %__install -m 0644 mans/*.1* $RPM_BUILD_ROOT%{_mandir}/man1/ %__install -m 0644 gmond/gmond.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/gmond.conf.5 +# gmetad-python +cd gmetad-python +%{__python} setup.py install --install-scripts=/usr/sbin --root=$RPM_BUILD_ROOT --record=GMETAD_PYTHON_FILES + %endif %ifnarch noarch @@ -269,6 +312,11 @@ %{_mandir}/man1/gmetad.1* %config(noreplace) %{conf_dir}/gmetad.conf +%files gmetad-python -f gmetad-python/GMETAD_PYTHON_FILES +%defattr(-,root,root) +/etc/init.d/gmetad-python +%config(noreplace) %{conf_dir}/gmetad-python.conf + %files gmond %defattr(-,root,root) %attr(0500,root,root)%{_bindir}/gmetric @@ -358,6 +406,8 @@ %__rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 10 2008 Bernard Li <be...@va...> +- New subpackage gmetad-python for the Python re-write of gmetad * Wed Jun 04 2008 Bernard Li <be...@va...> - Add ganglia_gexec.h to ganglia-devel package * Tue May 06 2008 Bernard Li <be...@va...> Modified: trunk/monitor-core/gmetad-python/Gmetad/gmetad_config.py.in =================================================================== --- trunk/monitor-core/gmetad-python/Gmetad/gmetad_config.py.in 2008-06-12 23:13:49 UTC (rev 1408) +++ trunk/monitor-core/gmetad-python/Gmetad/gmetad_config.py.in 2008-06-12 23:28:24 UTC (rev 1409) @@ -284,8 +284,8 @@ help='Write process-id to file', default=None) parser.add_option('-c', '--conf', action='store', - help='Location of gmetad configuration file (default=\'/etc/ganglia/gmetad.conf\')', - default='/etc/ganglia/gmetad.conf') + help='Location of gmetad configuration file (default=\'/etc/ganglia/gmetad-python.conf\')', + default='/etc/ganglia/gmetad-python.conf') parser.add_option('-l', '--logfile', action='store', help='Log messages to this path in addition to syslog; overrides configuration', default=None) Copied: trunk/monitor-core/gmetad-python/gmetad-python.conf.in (from rev 1407, trunk/monitor-core/gmetad-python/gmetad.conf.in) =================================================================== --- trunk/monitor-core/gmetad-python/gmetad-python.conf.in (rev 0) +++ trunk/monitor-core/gmetad-python/gmetad-python.conf.in 2008-06-12 23:28:24 UTC (rev 1409) @@ -0,0 +1,125 @@ +# This is an example of a Ganglia Meta Daemon configuration file +# http://ganglia.sourceforge.net/ +# +# $Id: gmetad.conf.in 1308 2008-05-03 23:22:28Z carenas $ +# +#------------------------------------------------------------------------------- +# Setting the debug_level to 1 will keep daemon in the forground and +# show only error messages. Setting this value higher than 1 will make +# gmetad output debugging information and stay in the foreground. +# default: 0 +# debug_level 10 +# +#------------------------------------------------------------------------------- +# What to monitor. The most important section of this file. +# +# The data_source tag specifies either a cluster or a grid to +# monitor. If we detect the source is a cluster, we will maintain a complete +# set of RRD databases for it, which can be used to create historical +# graphs of the metrics. If the source is a grid (it comes from another gmetad), +# we will only maintain summary RRDs for it. +# +# Format: +# data_source "my cluster" [polling interval] address1:port addreses2:port ... +# +# The keyword 'data_source' must immediately be followed by a unique +# string which identifies the source, then an optional polling interval in +# seconds. The source will be polled at this interval on average. +# If the polling interval is omitted, 15sec is asssumed. +# +# A list of machines which service the data source follows, in the +# format ip:port, or name:port. If a port is not specified then 8649 +# (the default gmond port) is assumed. +# default: There is no default value +# +# data_source "my cluster" 10 localhost my.machine.edu:8649 1.2.3.5:8655 +# data_source "my grid" 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651 +# data_source "another source" 1.3.4.7:8655 1.3.4.8 + +data_source "my cluster" localhost + +# +#------------------------------------------------------------------------------- +# Scalability mode. If on, we summarize over downstream grids, and respect +# authority tags. If off, we take on 2.5.0-era behavior: we do not wrap our output +# in <GRID></GRID> tags, we ignore all <GRID> tags we see, and always assume +# we are the "authority" on data source feeds. This approach does not scale to +# large groups of clusters, but is provided for backwards compatibility. +# default: on +# scalable off +# +#------------------------------------------------------------------------------- +# The name of this Grid. All the data sources above will be wrapped in a GRID +# tag with this name. +# default: unspecified +# gridname "MyGrid" +# +#------------------------------------------------------------------------------- +# The authority URL for this grid. Used by other gmetads to locate graphs +# for our data sources. Generally points to a ganglia/ +# website on this machine. +# default: "http://hostname/ganglia/", +# where hostname is the name of this machine, as defined by gethostname(). +# authority "http://mycluster.org/newprefix/" +# +#------------------------------------------------------------------------------- +# List of machines this gmetad will share XML with. Localhost +# is always trusted. +# default: There is no default value +# trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org +# +#------------------------------------------------------------------------------- +# If you want any host which connects to the gmetad XML to receive +# data, then set this value to "on" +# default: off +# all_trusted on +# +#------------------------------------------------------------------------------- +# If you don't want gmetad to setuid then set this to off +# default: on +# setuid off +# +#------------------------------------------------------------------------------- +# User gmetad will setuid to (defaults to "nobody") +# default: "nobody" +# setuid_username "nobody" +# +#------------------------------------------------------------------------------- +# The port gmetad will answer requests for XML +# default: 8651 +# xml_port 8651 +# +#------------------------------------------------------------------------------- +# The port gmetad will answer queries for XML. This facility allows +# simple subtree and summation views of the XML tree. +# default: 8652 +# interactive_port 8652 +# +#------------------------------------------------------------------------------- +# The number of threads answering XML requests +# default: 4 +# server_threads 10 +# + +#------------------------------------------------------------------------------- +# Where gmetad looks for python plugins +# default: "@libdir@/ganglia/python_modules/gmetad" +plugins_dir @libdir@/ganglia/python_modules/gmetad + +rrd { +# +# Round-Robin Archives +# You can specify custom Round-Robin archives here (defaults are listed below) +# +# RRAs "RRA:AVERAGE:0.5:1:244" "RRA:AVERAGE:0.5:24:244" "RRA:AVERAGE:0.5:168:244" "RRA:AVERAGE:0.5:672:244" \ +# "RRA:AVERAGE:0.5:5760:374" +# + +#------------------------------------------------------------------------------- +# Where gmetad stores its round-robin databases +# default: "@varstatedir@/ganglia/rrds" +# rrd_rootdir "/some/other/place" +} + +rrdsummary { +} Deleted: trunk/monitor-core/gmetad-python/gmetad.conf.in =================================================================== --- trunk/monitor-core/gmetad-python/gmetad.conf.in 2008-06-12 23:13:49 UTC (rev 1408) +++ trunk/monitor-core/gmetad-python/gmetad.conf.in 2008-06-12 23:28:24 UTC (rev 1409) @@ -1,125 +0,0 @@ -# This is an example of a Ganglia Meta Daemon configuration file -# http://ganglia.sourceforge.net/ -# -# $Id: gmetad.conf.in 1308 2008-05-03 23:22:28Z carenas $ -# -#------------------------------------------------------------------------------- -# Setting the debug_level to 1 will keep daemon in the forground and -# show only error messages. Setting this value higher than 1 will make -# gmetad output debugging information and stay in the foreground. -# default: 0 -# debug_level 10 -# -#------------------------------------------------------------------------------- -# What to monitor. The most important section of this file. -# -# The data_source tag specifies either a cluster or a grid to -# monitor. If we detect the source is a cluster, we will maintain a complete -# set of RRD databases for it, which can be used to create historical -# graphs of the metrics. If the source is a grid (it comes from another gmetad), -# we will only maintain summary RRDs for it. -# -# Format: -# data_source "my cluster" [polling interval] address1:port addreses2:port ... -# -# The keyword 'data_source' must immediately be followed by a unique -# string which identifies the source, then an optional polling interval in -# seconds. The source will be polled at this interval on average. -# If the polling interval is omitted, 15sec is asssumed. -# -# A list of machines which service the data source follows, in the -# format ip:port, or name:port. If a port is not specified then 8649 -# (the default gmond port) is assumed. -# default: There is no default value -# -# data_source "my cluster" 10 localhost my.machine.edu:8649 1.2.3.5:8655 -# data_source "my grid" 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651 -# data_source "another source" 1.3.4.7:8655 1.3.4.8 - -data_source "my cluster" localhost - -# -#------------------------------------------------------------------------------- -# Scalability mode. If on, we summarize over downstream grids, and respect -# authority tags. If off, we take on 2.5.0-era behavior: we do not wrap our output -# in <GRID></GRID> tags, we ignore all <GRID> tags we see, and always assume -# we are the "authority" on data source feeds. This approach does not scale to -# large groups of clusters, but is provided for backwards compatibility. -# default: on -# scalable off -# -#------------------------------------------------------------------------------- -# The name of this Grid. All the data sources above will be wrapped in a GRID -# tag with this name. -# default: unspecified -# gridname "MyGrid" -# -#------------------------------------------------------------------------------- -# The authority URL for this grid. Used by other gmetads to locate graphs -# for our data sources. Generally points to a ganglia/ -# website on this machine. -# default: "http://hostname/ganglia/", -# where hostname is the name of this machine, as defined by gethostname(). -# authority "http://mycluster.org/newprefix/" -# -#------------------------------------------------------------------------------- -# List of machines this gmetad will share XML with. Localhost -# is always trusted. -# default: There is no default value -# trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org -# -#------------------------------------------------------------------------------- -# If you want any host which connects to the gmetad XML to receive -# data, then set this value to "on" -# default: off -# all_trusted on -# -#------------------------------------------------------------------------------- -# If you don't want gmetad to setuid then set this to off -# default: on -# setuid off -# -#------------------------------------------------------------------------------- -# User gmetad will setuid to (defaults to "nobody") -# default: "nobody" -# setuid_username "nobody" -# -#------------------------------------------------------------------------------- -# The port gmetad will answer requests for XML -# default: 8651 -# xml_port 8651 -# -#------------------------------------------------------------------------------- -# The port gmetad will answer queries for XML. This facility allows -# simple subtree and summation views of the XML tree. -# default: 8652 -# interactive_port 8652 -# -#------------------------------------------------------------------------------- -# The number of threads answering XML requests -# default: 4 -# server_threads 10 -# - -#------------------------------------------------------------------------------- -# Where gmetad looks for python plugins -# default: "@libdir@/ganglia/python_modules/gmetad" -plugins_dir @libdir@/ganglia/python_modules/gmetad - -rrd { -# -# Round-Robin Archives -# You can specify custom Round-Robin archives here (defaults are listed below) -# -# RRAs "RRA:AVERAGE:0.5:1:244" "RRA:AVERAGE:0.5:24:244" "RRA:AVERAGE:0.5:168:244" "RRA:AVERAGE:0.5:672:244" \ -# "RRA:AVERAGE:0.5:5760:374" -# - -#------------------------------------------------------------------------------- -# Where gmetad stores its round-robin databases -# default: "@varstatedir@/ganglia/rrds" -# rrd_rootdir "/some/other/place" -} - -rrdsummary { -} Modified: trunk/monitor-core/gmetad-python/setup.py.in =================================================================== --- trunk/monitor-core/gmetad-python/setup.py.in 2008-06-12 23:13:49 UTC (rev 1408) +++ trunk/monitor-core/gmetad-python/setup.py.in 2008-06-12 23:28:24 UTC (rev 1409) @@ -2,10 +2,10 @@ from glob import glob setup(name='gmetad-python', - version='0.0.1', + version='@VERSION@', description='Gmetad implementation in Python.', packages=['Gmetad'], scripts=['gmetad.py'], - data_files=[('/etc/ganglia', ['gmetad.conf']), + data_files=[('/etc/ganglia', ['gmetad-python.conf']), ('@libdir@/ganglia/python_modules/gmetad', glob('plugins/*.py'))] ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-06-16 02:37:08
|
Revision: 1416 http://ganglia.svn.sourceforge.net/ganglia/?rev=1416&view=rev Author: carenas Date: 2008-06-15 19:37:16 -0700 (Sun, 15 Jun 2008) Log Message: ----------- libganglia: rename scoreboard.h to avoid namespace conflict with APR avoid build errors if APR's include directory presides libganglia, as it also has a header named scoreboard.h Modified Paths: -------------- trunk/monitor-core/gmond/gmond.c trunk/monitor-core/gmond/modules/status/mod_gstatus.c trunk/monitor-core/lib/Makefile.am trunk/monitor-core/lib/scoreboard.c Added Paths: ----------- trunk/monitor-core/lib/gm_scoreboard.h Removed Paths: ------------- trunk/monitor-core/lib/scoreboard.h Modified: trunk/monitor-core/gmond/gmond.c =================================================================== --- trunk/monitor-core/gmond/gmond.c 2008-06-14 18:46:35 UTC (rev 1415) +++ trunk/monitor-core/gmond/gmond.c 2008-06-16 02:37:16 UTC (rev 1416) @@ -29,7 +29,7 @@ #include "dtd.h" /* the DTD definition for our XML */ #include "g25_config.h" /* for converting old file formats to new */ #include "daemon_init.h" -#include "scoreboard.h" +#include "gm_scoreboard.h" #include "ganglia_priv.h" /* Specifies a single value metric callback */ Modified: trunk/monitor-core/gmond/modules/status/mod_gstatus.c =================================================================== --- trunk/monitor-core/gmond/modules/status/mod_gstatus.c 2008-06-14 18:46:35 UTC (rev 1415) +++ trunk/monitor-core/gmond/modules/status/mod_gstatus.c 2008-06-16 02:37:16 UTC (rev 1416) @@ -36,7 +36,7 @@ #include <stdlib.h> #include "file.h" -#include "scoreboard.h" +#include "gm_scoreboard.h" #include <apr_strings.h> Modified: trunk/monitor-core/lib/Makefile.am =================================================================== --- trunk/monitor-core/lib/Makefile.am 2008-06-14 18:46:35 UTC (rev 1415) +++ trunk/monitor-core/lib/Makefile.am 2008-06-16 02:37:16 UTC (rev 1416) @@ -27,7 +27,7 @@ dotconf.c dotconf.h error_msg.c ganglia_priv.h \ ganglia.c hash.c hash.h inetaddr.c llist.c llist.h \ my_inet_ntop.c my_inet_ntop.h net.h rdwr.c rdwr.h readdir.c readdir.h tcp.c \ -scoreboard.c scoreboard.h apr_net.c apr_net.h libgmond.c +scoreboard.c gm_scoreboard.h apr_net.c apr_net.h libgmond.c libganglia_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ Copied: trunk/monitor-core/lib/gm_scoreboard.h (from rev 1415, trunk/monitor-core/lib/scoreboard.h) =================================================================== --- trunk/monitor-core/lib/gm_scoreboard.h (rev 0) +++ trunk/monitor-core/lib/gm_scoreboard.h 2008-06-16 02:37:16 UTC (rev 1416) @@ -0,0 +1,54 @@ +#ifndef GM_SCOREBOARD_H +#define GM_SCOREBOARD_H 1 + +#include <apr_pools.h> + +/* Author: Brad Nicholes (bnicholes novell.com) */ + +enum ganglia_scoreboard_types { + GSB_UNKNOWN = 0, + GSB_COUNTER = 1, + GSB_READ_RESET = 2, + GSB_STATE = 3 +}; +typedef enum ganglia_scoreboard_types ganglia_scoreboard_types; + +/* predefined scoreboard elements */ +#define PKTS_RECVD_ALL "gmond_pkts_recvd_all" +#define PKTS_RECVD_FAILED "gmond_pkts_recvd_failed" +#define PKTS_RECVD_IGNORED "gmond_pkts_recvd_ignored" +#define PKTS_RECVD_METADATA "gmond_pkts_recvd_metadata" +#define PKTS_RECVD_VALUE "gmond_pkts_recvd_value" +#define PKTS_RECVD_REQUEST "gmond_pkts_recvd_request" +#define PKTS_SENT_ALL "gmond_pkts_sent_all" +#define PKTS_SENT_METADATA "gmond_pkts_sent_metadata" +#define PKTS_SENT_VALUE "gmond_pkts_sent_value" +#define PKTS_SENT_REQUEST "gmond_pkts_sent_request" +#define PKTS_SENT_FAILED "gmond_pkts_sent_failed" + +/* The scoreboard is only enabled when --enable-status is set on configure */ +#ifdef GSTATUS +void ganglia_scoreboard_init(apr_pool_t *pool); +void* ganglia_scoreboard_iterator(); +char* ganglia_scoreboard_next(void **intr); +void ganglia_scoreboard_add(char *name, ganglia_scoreboard_types type); +int ganglia_scoreboard_get(char *name); +void ganglia_scoreboard_set(char *name, int val); +void ganglia_scoreboard_reset(char *name); +int ganglia_scoreboard_inc(char *name); +void ganglia_scoreboard_dec(char *name); +ganglia_scoreboard_types ganglia_scoreboard_type(char *name); +#else +#define ganglia_scoreboard_init(p) +#define ganglia_scoreboard_iterator() (NULL) +#define ganglia_scoreboard_next(i) (NULL) +#define ganglia_scoreboard_add(n,t) +#define ganglia_scoreboard_get(n) (0) +#define ganglia_scoreboard_set(n,v) +#define ganglia_scoreboard_reset(n) +#define ganglia_scoreboard_inc(n) +#define ganglia_scoreboard_dec(n) +#define ganglia_scoreboard_type(n) (GSB_UNKNOWN) +#endif + +#endif /*GM_SCOREBOARD_H*/ Modified: trunk/monitor-core/lib/scoreboard.c =================================================================== --- trunk/monitor-core/lib/scoreboard.c 2008-06-14 18:46:35 UTC (rev 1415) +++ trunk/monitor-core/lib/scoreboard.c 2008-06-16 02:37:16 UTC (rev 1416) @@ -4,7 +4,7 @@ #include "ganglia_priv.h" #include "gm_msg.h" -#include "scoreboard.h" +#include "gm_scoreboard.h" #include <apr_hash.h> #include <apr_strings.h> Deleted: trunk/monitor-core/lib/scoreboard.h =================================================================== --- trunk/monitor-core/lib/scoreboard.h 2008-06-14 18:46:35 UTC (rev 1415) +++ trunk/monitor-core/lib/scoreboard.h 2008-06-16 02:37:16 UTC (rev 1416) @@ -1,57 +0,0 @@ -#ifndef SCOREBOARD_H -#define SCOREBOARD_H 1 - -#include <apr_pools.h> - -/* Author: Brad Nicholes (bnicholes novell.com) */ - -enum ganglia_scoreboard_types { - GSB_UNKNOWN = 0, - GSB_COUNTER = 1, - GSB_READ_RESET = 2, - GSB_STATE = 3 -}; -typedef enum ganglia_scoreboard_types ganglia_scoreboard_types; - -/* predefined scoreboard elements */ -#define PKTS_RECVD_ALL "gmond_pkts_recvd_all" -#define PKTS_RECVD_FAILED "gmond_pkts_recvd_failed" -#define PKTS_RECVD_IGNORED "gmond_pkts_recvd_ignored" -#define PKTS_RECVD_METADATA "gmond_pkts_recvd_metadata" -#define PKTS_RECVD_VALUE "gmond_pkts_recvd_value" -#define PKTS_RECVD_REQUEST "gmond_pkts_recvd_request" -#define PKTS_SENT_ALL "gmond_pkts_sent_all" -#define PKTS_SENT_METADATA "gmond_pkts_sent_metadata" -#define PKTS_SENT_VALUE "gmond_pkts_sent_value" -#define PKTS_SENT_REQUEST "gmond_pkts_sent_request" -#define PKTS_SENT_FAILED "gmond_pkts_sent_failed" - - -/* The scoreboard is only enabled whe --enable-status is set on configure */ -#ifdef GSTATUS -void ganglia_scoreboard_init(apr_pool_t *pool); -void* ganglia_scoreboard_iterator(); -char* ganglia_scoreboard_next(void **intr); -void ganglia_scoreboard_add(char *name, ganglia_scoreboard_types type); -int ganglia_scoreboard_get(char *name); -void ganglia_scoreboard_set(char *name, int val); -void ganglia_scoreboard_reset(char *name); -int ganglia_scoreboard_inc(char *name); -void ganglia_scoreboard_dec(char *name); -ganglia_scoreboard_types ganglia_scoreboard_type(char *name); -#else -#define ganglia_scoreboard_init(p) -#define ganglia_scoreboard_iterator() (NULL) -#define ganglia_scoreboard_next(i) (NULL) -#define ganglia_scoreboard_add(n,t) -#define ganglia_scoreboard_get(n) (0) -#define ganglia_scoreboard_set(n,v) -#define ganglia_scoreboard_reset(n) -#define ganglia_scoreboard_inc(n) -#define ganglia_scoreboard_dec(n) -#define ganglia_scoreboard_type(n) (GSB_UNKNOWN) -#endif - -#endif /*SCOREBOARD_H*/ - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-06-16 05:35:25
|
Revision: 1417 http://ganglia.svn.sourceforge.net/ganglia/?rev=1417&view=rev Author: carenas Date: 2008-06-15 22:35:32 -0700 (Sun, 15 Jun 2008) Log Message: ----------- build: solaris: use c99 support from Sun Studio Modified Paths: -------------- trunk/monitor-core/configure.in trunk/monitor-core/libmetrics/configure.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-16 02:37:16 UTC (rev 1416) +++ trunk/monitor-core/configure.in 2008-06-16 05:35:32 UTC (rev 1417) @@ -541,7 +541,7 @@ if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" else - CFLAGS="$CFLAGS -D__STDC__ -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" + CFLAGS="$CFLAGS -xc99 -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" fi AC_DEFINE(SOLARIS,1,SOLARIS);; *freebsd*) CFLAGS="-pthread $CFLAGS -D_REENTRANT" Modified: trunk/monitor-core/libmetrics/configure.in =================================================================== --- trunk/monitor-core/libmetrics/configure.in 2008-06-16 02:37:16 UTC (rev 1416) +++ trunk/monitor-core/libmetrics/configure.in 2008-06-16 05:35:32 UTC (rev 1417) @@ -121,7 +121,7 @@ if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -D__EXTENSIONS__ -DHAVE_STRERROR" else - CFLAGS="$CFLAGS -D__STDC__ -DHAVE_STRERROR" + CFLAGS="$CFLAGS -xc99 -DHAVE_STRERROR" fi AC_DEFINE(SOLARIS,1,SOLARIS);; *freebsd*) OS="freebsd" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-06-16 07:16:04
|
Revision: 1418 http://ganglia.svn.sourceforge.net/ganglia/?rev=1418&view=rev Author: carenas Date: 2008-06-16 00:16:13 -0700 (Mon, 16 Jun 2008) Log Message: ----------- build: solaris: support for Sun Studio 12 consolidate and simplify logic to handle different compilers in Solaris, update suppport for C99 as used since ganglia-3.1 Modified Paths: -------------- trunk/monitor-core/configure.in trunk/monitor-core/libmetrics/configure.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-16 05:35:32 UTC (rev 1417) +++ trunk/monitor-core/configure.in 2008-06-16 07:16:13 UTC (rev 1418) @@ -538,10 +538,10 @@ EXPORT_SYMBOLS="-export-all-symbols" ;; *solaris*) AC_DEFINE(SUPPORT_GEXEC, 0, SUPPORT_GEXEC) - if test "$ac_cv_prog_gcc" = yes; then - CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" - else - CFLAGS="$CFLAGS -xc99 -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" + CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" + if test "$ac_cv_prog_gcc" != yes; then + CFLAGS="$CFLAGS -xc99" + LIBS="-lm $LIBS" fi AC_DEFINE(SOLARIS,1,SOLARIS);; *freebsd*) CFLAGS="-pthread $CFLAGS -D_REENTRANT" Modified: trunk/monitor-core/libmetrics/configure.in =================================================================== --- trunk/monitor-core/libmetrics/configure.in 2008-06-16 05:35:32 UTC (rev 1417) +++ trunk/monitor-core/libmetrics/configure.in 2008-06-16 07:16:13 UTC (rev 1418) @@ -118,11 +118,7 @@ *darwin*) OS="darwin" AC_DEFINE(DARWIN,1,DARWIN);; *solaris*) OS="solaris" - if test "$ac_cv_prog_gcc" = yes; then - CFLAGS="$CFLAGS -D__EXTENSIONS__ -DHAVE_STRERROR" - else - CFLAGS="$CFLAGS -xc99 -DHAVE_STRERROR" - fi + CFLAGS="$CFLAGS -DHAVE_STRERROR" AC_DEFINE(SOLARIS,1,SOLARIS);; *freebsd*) OS="freebsd" AC_DEFINE(FREEBSD, 1, FREEBSD) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-06-24 10:39:20
|
Revision: 1453 http://ganglia.svn.sourceforge.net/ganglia/?rev=1453&view=rev Author: carenas Date: 2008-06-24 03:33:42 -0700 (Tue, 24 Jun 2008) Log Message: ----------- build: linux: debian package support out of tree Modified Paths: -------------- trunk/monitor-core/ganglia.pod Removed Paths: ------------- trunk/monitor-core/debian/ Modified: trunk/monitor-core/ganglia.pod =================================================================== --- trunk/monitor-core/ganglia.pod 2008-06-24 10:13:11 UTC (rev 1452) +++ trunk/monitor-core/ganglia.pod 2008-06-24 10:33:42 UTC (rev 1453) @@ -735,18 +735,10 @@ =item B<Where are the debian packages?> -Here is an email message from Preston Smith for Debian users +Debian packages for 2.5 are available from the main Debian archive +there was never an oficial Debian package for 3.0 but packages for 3.1 are +going to be available in Debian experimental very soon. - Debian packages for Debian 3.0 (woody) are available at - http://www.physics.purdue.edu/~psmith/ganglia - (i386, sparc, and powerpc are there presently, more architectures will - appear when I get them built.) - Packages for "unstable" (sid) will be available in the main Debian - archive soon. - - Also, a CVS note: I checked in the debian/ directory used to create - debian packages. - =item B<How should I configure multihomed machines?> Here is an email that Matt Massie sent to a user having problems with This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bni...@us...> - 2008-06-24 19:39:17
|
Revision: 1461 http://ganglia.svn.sourceforge.net/ganglia/?rev=1461&view=rev Author: bnicholes Date: 2008-06-24 12:38:34 -0700 (Tue, 24 Jun 2008) Log Message: ----------- Construct the library path to the modules within the gmond based off of configure parameters rather than hard code it in the configuration Modified Paths: -------------- trunk/monitor-core/configure.in trunk/monitor-core/gmond/gmond.c trunk/monitor-core/gmond/modules/conf.d/example.conf.in trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in trunk/monitor-core/lib/default_conf.h.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/configure.in 2008-06-24 19:38:34 UTC (rev 1461) @@ -172,6 +172,11 @@ [ --with-libconfuse=DIR Specify location for libconfuse], [if test x"$withval" != xno; then libconfuse=yes; libconfusepath=$withval; fi]) +AC_ARG_WITH( moduledir, +[ --with-moduledir=DIR Base directory for dynamically loadable modules], + moduledir="$withval", + moduledir=${libdir}/ganglia) + AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging output and compile options], @@ -518,6 +523,7 @@ else libdir="$prefix/lib" fi + moduledir=${libdir}/ganglia fi ;; *ia64-*hpux*) CFLAGS="$CFLAGS -D_PSTAT64 -D_HPUX_SOURCE" @@ -591,6 +597,10 @@ dnl Python module config files need to know where to look for libraries (/usr/lib vs /usr/lib64) AC_SUBST_FILE(libdir) +AC_DEFINE_UNQUOTED(GANGLIA_MODULE_DIR, ["$moduledir"], GANGLIA_MODULE_DIR) +AC_SUBST(moduledir) + + AC_OUTPUT(Makefile ganglia-config tests/Makefile Modified: trunk/monitor-core/gmond/gmond.c =================================================================== --- trunk/monitor-core/gmond/gmond.c 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/gmond/gmond.c 2008-06-24 19:38:34 UTC (rev 1461) @@ -1687,6 +1687,7 @@ char *modPath=NULL, *modName=NULL, *modparams=NULL, *modLanguage=NULL; apr_array_header_t *modParams_list = NULL; int k; + apr_status_t merge_ret; cfg_t *module = cfg_getnsec(tmp, "module", j); @@ -1699,6 +1700,15 @@ continue; modPath = cfg_getstr(module, "path"); +#ifdef GANGLIA_MODULE_DIR + if(modPath) + { + merge_ret = apr_filepath_merge(&modPath, GANGLIA_MODULE_DIR, modPath, + APR_FILEPATH_NOTRELATIVE | APR_FILEPATH_NATIVE, global_context); + if (merge_ret != APR_SUCCESS) + modPath = cfg_getstr(module, "path"); + } +#endif modName = cfg_getstr(module, "name"); modparams = cfg_getstr(module, "params"); modParams_list = apr_array_make(global_context, 2, sizeof(mmparam)); Modified: trunk/monitor-core/gmond/modules/conf.d/example.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/example.conf.in 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/gmond/modules/conf.d/example.conf.in 2008-06-24 19:38:34 UTC (rev 1461) @@ -1,7 +1,7 @@ modules { module { name = "example_module" - path = "@libdir@/ganglia/modexample.so" + path = "modexample.so" params = "An extra raw parameter" param RandomMax { value = 75 Modified: trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in 2008-06-24 19:38:34 UTC (rev 1461) @@ -1,7 +1,7 @@ modules { module { name = "gstatus_module" - path = "@libdir@/ganglia/modgstatus.so" + path = "modgstatus.so" } } Modified: trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/gmond/modules/conf.d/modpython.conf.in 2008-06-24 19:38:34 UTC (rev 1461) @@ -7,8 +7,8 @@ modules { module { name = "python_module" - path = "@libdir@/ganglia/modpython.so" - params = "@libdir@/ganglia/python_modules" + path = "modpython.so" + params = "@moduledir@/python_modules" } } Modified: trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in 2008-06-24 19:38:34 UTC (rev 1461) @@ -1,7 +1,7 @@ modules { module { name = "multicpu_module" - path = "@libdir@/ganglia/modmulticpu.so" + path = "modmulticpu.so" } } Modified: trunk/monitor-core/lib/default_conf.h.in =================================================================== --- trunk/monitor-core/lib/default_conf.h.in 2008-06-24 18:38:16 UTC (rev 1460) +++ trunk/monitor-core/lib/default_conf.h.in 2008-06-24 19:38:34 UTC (rev 1461) @@ -67,31 +67,31 @@ } \n\ module { \n\ name = \"cpu_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/modcpu.so\" \n\ +@modpathstart@ path = \"modcpu.so\" \n\ } \n\ module { \n\ name = \"disk_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/moddisk.so\" \n\ +@modpathstart@ path = \"moddisk.so\" \n\ } \n\ module { \n\ name = \"load_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/modload.so\" \n\ +@modpathstart@ path = \"modload.so\" \n\ } \n\ module { \n\ name = \"mem_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/modmem.so\" \n\ +@modpathstart@ path = \"modmem.so\" \n\ } \n\ module { \n\ name = \"net_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/modnet.so\" \n\ +@modpathstart@ path = \"modnet.so\" \n\ } \n\ module { \n\ name = \"proc_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/modproc.so\" \n\ +@modpathstart@ path = \"modproc.so\" \n\ } \n\ module { \n\ name = \"sys_module\" \n\ -@modpathstart@ path = \"@libdir@/ganglia/modsys.so\" \n\ +@modpathstart@ path = \"modsys.so\" \n\ } \n\ } \n\ \n\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bni...@us...> - 2008-06-24 19:50:39
|
Revision: 1462 http://ganglia.svn.sourceforge.net/ganglia/?rev=1462&view=rev Author: bnicholes Date: 2008-06-24 12:49:53 -0700 (Tue, 24 Jun 2008) Log Message: ----------- remove the extra .conf file processing that was necessary to resolve the library paths Modified Paths: -------------- trunk/monitor-core/configure.in Added 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/multicpu.conf Removed Paths: ------------- trunk/monitor-core/gmond/modules/conf.d/example.conf.in trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-24 19:38:34 UTC (rev 1461) +++ trunk/monitor-core/configure.in 2008-06-24 19:49:53 UTC (rev 1462) @@ -611,10 +611,7 @@ gmond/Makefile gstat/Makefile gmond/modules/Makefile - gmond/modules/conf.d/example.conf gmond/modules/conf.d/modpython.conf - gmond/modules/conf.d/multicpu.conf - gmond/modules/conf.d/modgstatus.conf gmond/modules/example/Makefile gmond/modules/cpu/Makefile gmond/modules/disk/Makefile Copied: trunk/monitor-core/gmond/modules/conf.d/example.conf (from rev 1461, trunk/monitor-core/gmond/modules/conf.d/example.conf.in) =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/example.conf (rev 0) +++ trunk/monitor-core/gmond/modules/conf.d/example.conf 2008-06-24 19:49:53 UTC (rev 1462) @@ -0,0 +1,35 @@ +modules { + module { + name = "example_module" + path = "modexample.so" + params = "An extra raw parameter" + param RandomMax { + value = 75 + } + param ConstantValue { + value = 25 + } + } +} + + +#/* Test DSO metric */ +collection_group { + collect_every = 10 + time_threshold = 50 + metric { + name = "Random_Numbers" + title = "Random Numbers Metric" + value_threshold = 1.0 + } +} + +collection_group { + collect_once = yes + time_threshold = 20 + metric { + name = "Constant_Number" + title = "Constant Number Metric" + } +} + Deleted: trunk/monitor-core/gmond/modules/conf.d/example.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/example.conf.in 2008-06-24 19:38:34 UTC (rev 1461) +++ trunk/monitor-core/gmond/modules/conf.d/example.conf.in 2008-06-24 19:49:53 UTC (rev 1462) @@ -1,35 +0,0 @@ -modules { - module { - name = "example_module" - path = "modexample.so" - params = "An extra raw parameter" - param RandomMax { - value = 75 - } - param ConstantValue { - value = 25 - } - } -} - - -#/* Test DSO metric */ -collection_group { - collect_every = 10 - time_threshold = 50 - metric { - name = "Random_Numbers" - title = "Random Numbers Metric" - value_threshold = 1.0 - } -} - -collection_group { - collect_once = yes - time_threshold = 20 - metric { - name = "Constant_Number" - title = "Constant Number Metric" - } -} - Copied: trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf (from rev 1461, trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in) =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf (rev 0) +++ trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf 2008-06-24 19:49:53 UTC (rev 1462) @@ -0,0 +1,65 @@ +modules { + module { + name = "gstatus_module" + path = "modgstatus.so" + } +} + + +/* Gmond status metrics */ +collection_group { + collect_every = 10 + time_threshold = 20 + metric { + name = "gmond_pkts_recvd_all" + title = "Gmond All Pkts Recvd" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_recvd_failed" + title = "Gmond Failed Pkts Recvd" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_recvd_ignored" + title = "Gmond Ignored Pkts Recvd" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_recvd_metadata" + title = "Gmond Metadata Pkts Recvd" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_recvd_value" + title = "Gmond Data Pkts Recvd" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_recvd_request" + title = "Gmond Metadata Request Pkts" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_sent_all" + title = "Gmond All Sent Pkts" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_sent_metadata" + title = "Gmond Metadata Pkts Sent" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_sent_value" + title = "Gmond Data Pkts Sent" + value_threshold = 1.0 + } + metric { + name = "gmond_pkts_sent_request" + title = "Gmond Metadata Requests Sent" + value_threshold = 1.0 + } +} + + Deleted: trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in 2008-06-24 19:38:34 UTC (rev 1461) +++ trunk/monitor-core/gmond/modules/conf.d/modgstatus.conf.in 2008-06-24 19:49:53 UTC (rev 1462) @@ -1,65 +0,0 @@ -modules { - module { - name = "gstatus_module" - path = "modgstatus.so" - } -} - - -/* Gmond status metrics */ -collection_group { - collect_every = 10 - time_threshold = 20 - metric { - name = "gmond_pkts_recvd_all" - title = "Gmond All Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_failed" - title = "Gmond Failed Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_ignored" - title = "Gmond Ignored Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_metadata" - title = "Gmond Metadata Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_value" - title = "Gmond Data Pkts Recvd" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_recvd_request" - title = "Gmond Metadata Request Pkts" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_all" - title = "Gmond All Sent Pkts" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_metadata" - title = "Gmond Metadata Pkts Sent" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_value" - title = "Gmond Data Pkts Sent" - value_threshold = 1.0 - } - metric { - name = "gmond_pkts_sent_request" - title = "Gmond Metadata Requests Sent" - value_threshold = 1.0 - } -} - - Copied: trunk/monitor-core/gmond/modules/conf.d/multicpu.conf (from rev 1461, trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in) =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/multicpu.conf (rev 0) +++ trunk/monitor-core/gmond/modules/conf.d/multicpu.conf 2008-06-24 19:49:53 UTC (rev 1462) @@ -0,0 +1,52 @@ +modules { + module { + name = "multicpu_module" + path = "modmulticpu.so" + } +} + + +#/* Multi CPU DSO metric */ +#/* Additional metrics should be added to the +# collection group to represent each CPU +# discovered on the system. See available +# discovered metics through ./gmond -m command. */ +collection_group { + collect_every = 10 + time_threshold = 50 + metric { + name = "multicpu_user0" + title = "CPU-0 User" + value_threshold = 1.0 + } + metric { + name = "multicpu_nice0" + title = "CPU-0 Nice" + value_threshold = 1.0 + } + metric { + name = "multicpu_system0" + title = "CPU-0 System" + value_threshold = 1.0 + } + metric { + name = "multicpu_idle0" + title = "CPU-0 Idle" + value_threshold = 1.0 + } + metric { + name = "multicpu_wio0" + title = "CPU-0 wio" + value_threshold = 1.0 + } + metric { + name = "multicpu_intr0" + title = "CPU-0 intr" + value_threshold = 1.0 + } + metric { + name = "multicpu_sintr0" + title = "CPU-0 sintr" + value_threshold = 1.0 + } +} Deleted: trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in =================================================================== --- trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in 2008-06-24 19:38:34 UTC (rev 1461) +++ trunk/monitor-core/gmond/modules/conf.d/multicpu.conf.in 2008-06-24 19:49:53 UTC (rev 1462) @@ -1,52 +0,0 @@ -modules { - module { - name = "multicpu_module" - path = "modmulticpu.so" - } -} - - -#/* Multi CPU DSO metric */ -#/* Additional metrics should be added to the -# collection group to represent each CPU -# discovered on the system. See available -# discovered metics through ./gmond -m command. */ -collection_group { - collect_every = 10 - time_threshold = 50 - metric { - name = "multicpu_user0" - title = "CPU-0 User" - value_threshold = 1.0 - } - metric { - name = "multicpu_nice0" - title = "CPU-0 Nice" - value_threshold = 1.0 - } - metric { - name = "multicpu_system0" - title = "CPU-0 System" - value_threshold = 1.0 - } - metric { - name = "multicpu_idle0" - title = "CPU-0 Idle" - value_threshold = 1.0 - } - metric { - name = "multicpu_wio0" - title = "CPU-0 wio" - value_threshold = 1.0 - } - metric { - name = "multicpu_intr0" - title = "CPU-0 intr" - value_threshold = 1.0 - } - metric { - name = "multicpu_sintr0" - 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. |
From: <ca...@us...> - 2008-06-25 03:40:45
|
Revision: 1464 http://ganglia.svn.sourceforge.net/ganglia/?rev=1464&view=rev Author: carenas Date: 2008-06-24 20:40:54 -0700 (Tue, 24 Jun 2008) Log Message: ----------- include: avoid conflicting names for members when used by C++ code Reported by Fabio while trying to compile mod_example with g++ as shown by : /usr/include/gm_protocol.h:73: error: declaration of 'u_short Ganglia_gmetric_ushort::u_short' /usr/include/sys/types.h:36: error: changes meaning of 'u_short' from 'typedef __u_short u_short' /usr/include/gm_protocol.h:94: error: declaration of 'u_int Ganglia_gmetric_uint::u_int' /usr/include/sys/types.h:37: error: changes meaning of 'u_int' from 'typedef __u_int u_int' Modified Paths: -------------- trunk/monitor-core/gmond/gmond.c trunk/monitor-core/lib/gm_protocol.x Modified: trunk/monitor-core/gmond/gmond.c =================================================================== --- trunk/monitor-core/gmond/gmond.c 2008-06-24 19:58:29 UTC (rev 1463) +++ trunk/monitor-core/gmond/gmond.c 2008-06-25 03:40:54 UTC (rev 1464) @@ -806,7 +806,7 @@ else if(!strcasecmp("heartbeat", metricName)) { /* nothing more needs to be done. we handled the timestamps above. */ - host->gmond_started = vmsg->Ganglia_value_msg_u.gu_int.u_int; + host->gmond_started = vmsg->Ganglia_value_msg_u.gu_int.ui; debug_msg("Got a heartbeat message %d\n", host->gmond_started); /* Processing is finished */ } @@ -1034,20 +1034,20 @@ apr_pstrdup(metric->pool, message->Ganglia_value_msg_u.gstr.str); break; case gmetric_ushort: - vmessage->Ganglia_value_msg_u.gu_short.u_short = - message->Ganglia_value_msg_u.gu_short.u_short; + vmessage->Ganglia_value_msg_u.gu_short.us = + message->Ganglia_value_msg_u.gu_short.us; break; case gmetric_short: - vmessage->Ganglia_value_msg_u.gs_short.s_short = - message->Ganglia_value_msg_u.gs_short.s_short; + vmessage->Ganglia_value_msg_u.gs_short.ss = + message->Ganglia_value_msg_u.gs_short.ss; break; case gmetric_uint: - vmessage->Ganglia_value_msg_u.gu_int.u_int = - message->Ganglia_value_msg_u.gu_int.u_int; + vmessage->Ganglia_value_msg_u.gu_int.ui = + message->Ganglia_value_msg_u.gu_int.ui; break; case gmetric_int: - vmessage->Ganglia_value_msg_u.gs_int.s_int = - message->Ganglia_value_msg_u.gs_int.s_int; + vmessage->Ganglia_value_msg_u.gs_int.si = + message->Ganglia_value_msg_u.gs_int.si; break; case gmetric_float: vmessage->Ganglia_value_msg_u.gf.f = @@ -1344,18 +1344,18 @@ case GANGLIA_VALUE_STRING: return message->Ganglia_value_msg_u.gstr.str; case GANGLIA_VALUE_UNSIGNED_SHORT: - apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gu_short.u_short); + apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gu_short.us); return value; case GANGLIA_VALUE_SHORT: /* For right now.. there are no metrics which are signed shorts... use u_short */ - apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gs_short.s_short); + apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gs_short.ss); return value; case GANGLIA_VALUE_UNSIGNED_INT: - apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gu_int.u_int); + apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gu_int.ui); return value; case GANGLIA_VALUE_INT: /* For right now.. there are no metric which are signed ints... use u_int */ - apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gs_int.s_int); + apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gs_int.si); return value; case GANGLIA_VALUE_FLOAT: apr_snprintf(value, 1024, metric->fmt, message->Ganglia_value_msg_u.gf.f); @@ -1382,18 +1382,18 @@ case gmetric_string: return message->Ganglia_value_msg_u.gstr.str; case gmetric_ushort: - apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gu_short.fmt, message->Ganglia_value_msg_u.gu_short.u_short); + apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gu_short.fmt, message->Ganglia_value_msg_u.gu_short.us); return value; case gmetric_short: /* For right now.. there are no metrics which are signed shorts... use u_short */ - apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gs_short.fmt, message->Ganglia_value_msg_u.gs_short.s_short); + apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gs_short.fmt, message->Ganglia_value_msg_u.gs_short.ss); return value; case gmetric_uint: - apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gu_int.fmt, message->Ganglia_value_msg_u.gu_int.u_int); + apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gu_int.fmt, message->Ganglia_value_msg_u.gu_int.ui); return value; case gmetric_int: /* For right now.. there are no metric which are signed ints... use u_int */ - apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gs_int.fmt, message->Ganglia_value_msg_u.gs_int.s_int); + apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gs_int.fmt, message->Ganglia_value_msg_u.gs_int.si); return value; case gmetric_float: apr_snprintf(value, 1024, message->Ganglia_value_msg_u.gf.fmt, message->Ganglia_value_msg_u.gf.f); @@ -2147,16 +2147,16 @@ cb->msg.Ganglia_value_msg_u.gstr.str = cb->now.str; break; case GANGLIA_VALUE_UNSIGNED_SHORT: - cb->msg.Ganglia_value_msg_u.gu_short.u_short = cb->now.uint16; + cb->msg.Ganglia_value_msg_u.gu_short.us = cb->now.uint16; break; case GANGLIA_VALUE_SHORT: - cb->msg.Ganglia_value_msg_u.gs_short.s_short = cb->now.int16; + cb->msg.Ganglia_value_msg_u.gs_short.ss = cb->now.int16; break; case GANGLIA_VALUE_UNSIGNED_INT: - cb->msg.Ganglia_value_msg_u.gu_int.u_int = cb->now.uint32; + cb->msg.Ganglia_value_msg_u.gu_int.ui = cb->now.uint32; break; case GANGLIA_VALUE_INT: - cb->msg.Ganglia_value_msg_u.gs_int.s_int = cb->now.int32; + cb->msg.Ganglia_value_msg_u.gs_int.si = cb->now.int32; break; case GANGLIA_VALUE_FLOAT: cb->msg.Ganglia_value_msg_u.gf.f = cb->now.f; Modified: trunk/monitor-core/lib/gm_protocol.x =================================================================== --- trunk/monitor-core/lib/gm_protocol.x 2008-06-24 19:58:29 UTC (rev 1463) +++ trunk/monitor-core/lib/gm_protocol.x 2008-06-25 03:40:54 UTC (rev 1464) @@ -54,25 +54,25 @@ struct Ganglia_gmetric_ushort { struct Ganglia_metric_id metric_id; string fmt<>; - unsigned short u_short; + unsigned short us; }; struct Ganglia_gmetric_short { struct Ganglia_metric_id metric_id; string fmt<>; - short s_short; + short ss; }; struct Ganglia_gmetric_int { struct Ganglia_metric_id metric_id; string fmt<>; - int s_int; + int si; }; struct Ganglia_gmetric_uint { struct Ganglia_metric_id metric_id; string fmt<>; - unsigned int u_int; + unsigned int ui; }; struct Ganglia_gmetric_string { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-06-30 21:48:54
|
Revision: 1478 http://ganglia.svn.sourceforge.net/ganglia/?rev=1478&view=rev Author: carenas Date: 2008-06-30 14:47:57 -0700 (Mon, 30 Jun 2008) Log Message: ----------- gmond: network reconfiguration makes gmond go deaf workaround BUG38 by retrying to join the multicast channel if gone apparently deaf. http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=38 Signed-off-by: Timothy Witham <tim...@in...> Signed-off-by: Carlo Marcelo Arenas Belon <ca...@sa...> Modified Paths: -------------- trunk/monitor-core/gmond/gmond.c trunk/monitor-core/lib/apr_net.c trunk/monitor-core/lib/apr_net.h Modified: trunk/monitor-core/gmond/gmond.c =================================================================== --- trunk/monitor-core/gmond/gmond.c 2008-06-30 20:18:09 UTC (rev 1477) +++ trunk/monitor-core/gmond/gmond.c 2008-06-30 21:47:57 UTC (rev 1478) @@ -51,6 +51,8 @@ int deaf; /* Mute mode boolean */ int mute; +/* last time we received any data */ +apr_time_t udp_last_heard; /* Cluster tag boolean */ int cluster_tag = 0; /* This host's location */ @@ -453,7 +455,7 @@ } static void -setup_listen_channels_pollset( void ) +setup_listen_channels_pollset( int reset ) { apr_status_t status; int i; @@ -463,7 +465,8 @@ Ganglia_channel *channel; /* Create my incoming pollset */ - apr_pollset_create(&listen_channels, total_listen_channels, global_context, 0); + if (!reset) + apr_pollset_create(&listen_channels, total_listen_channels, global_context, 0); /* Process all the udp_recv_channels */ for(i = 0; i< num_udp_recv_channels; i++) @@ -471,7 +474,7 @@ cfg_t *udp_recv_channel; char *mcast_join, *mcast_if, *bindaddr, *family; int port; - apr_socket_t *socket = NULL; + static apr_socket_t *socket = NULL; apr_pollfd_t socket_pollfd; apr_pool_t *pool = NULL; int32_t sock_family = APR_INET; @@ -496,7 +499,12 @@ if( mcast_join ) { /* Listen on the specified multicast channel */ - socket = create_mcast_server(pool, sock_family, mcast_join, port, bindaddr, mcast_if ); + if (reset) { /* network reset? rejoin existing socket */ + join_mcast(pool, socket, mcast_join, port, mcast_if); + return; + } else + socket = create_mcast_server(pool, sock_family, mcast_join, port, bindaddr, mcast_if ); + if(!socket) { err_msg("Error creating multicast server mcast_join=%s port=%d mcast_if=%s family='%s'. Exiting.\n", @@ -1572,8 +1580,12 @@ /* Poll for incoming data */ status = apr_pollset_poll(listen_channels, timeout, &num, &descs); - if(status != APR_SUCCESS) - return; + if (status != APR_SUCCESS && status != APR_TIMEUP) { + char buff[128]; + debug_msg("apr_pollset_poll returned unexpected status %d = %s\n", + status, apr_strerror(status, buff, 128)); + return; + } for(i = 0; i< num ; i++) { @@ -1582,6 +1594,7 @@ { case UDP_RECV_CHANNEL: process_udp_recv_channel(descs+i, now); + udp_last_heard = apr_time_now(); break; case TCP_ACCEPT_CHANNEL: process_tcp_accept_channel(descs+i, now); @@ -2518,7 +2531,7 @@ if(!deaf) { - setup_listen_channels_pollset(); + setup_listen_channels_pollset(0); } /* even if mute, a send channel may be needed to send a request for metadata */ @@ -2544,7 +2557,7 @@ hosts = apr_hash_make( global_context ); /* Initialize time variables */ - last_cleanup = next_collection = now = apr_time_now(); + udp_last_heard = last_cleanup = next_collection = now = apr_time_now(); /* Loop */ for(;!done;) @@ -2569,6 +2582,10 @@ if(!deaf) { + /* if we went deaf, re-subscribe to the multicast channel */ + if ((now - udp_last_heard) > 60 * APR_USEC_PER_SEC) + setup_listen_channels_pollset(1); + /* cleanup the data if the cleanup threshold has been met */ if( (now - last_cleanup) > apr_time_make(cleanup_threshold,0)) { Modified: trunk/monitor-core/lib/apr_net.c =================================================================== --- trunk/monitor-core/lib/apr_net.c 2008-06-30 20:18:09 UTC (rev 1477) +++ trunk/monitor-core/lib/apr_net.c 2008-06-30 21:47:57 UTC (rev 1478) @@ -206,8 +206,8 @@ } /*XXX This should really be replaced by the APR mcast functions */ -static apr_status_t -mcast_join( apr_pool_t *context, apr_socket_t *sock, char *mcast_channel, apr_port_t port, char *ifname ) +apr_status_t +join_mcast( apr_pool_t *context, apr_socket_t *sock, char *mcast_channel, apr_port_t port, char *ifname ) { apr_status_t status; int rval; @@ -327,13 +327,13 @@ { /* for(each interface) * { - * mcast_join(...); + * join_mcast(...); * } */ } else { - status = mcast_join(context, socket, mcast_ip, port, interface ); + status = join_mcast(context, socket, mcast_ip, port, interface ); } return status == APR_SUCCESS? socket: NULL; Modified: trunk/monitor-core/lib/apr_net.h =================================================================== --- trunk/monitor-core/lib/apr_net.h 2008-06-30 20:18:09 UTC (rev 1477) +++ trunk/monitor-core/lib/apr_net.h 2008-06-30 21:47:57 UTC (rev 1478) @@ -13,6 +13,9 @@ APR_DECLARE(apr_status_t) apr_sockaddr_ip_buffer_get(char *addr, int len, apr_sockaddr_t *sockaddr); +apr_status_t +join_mcast( apr_pool_t *context, apr_socket_t *sock, char *mcast_channel, apr_port_t port, char *ifname ); + apr_socket_t * create_mcast_client(apr_pool_t *context, char *mcast_ip, apr_port_t port, int ttl); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-07-01 04:38:19
|
Revision: 1483 http://ganglia.svn.sourceforge.net/ganglia/?rev=1483&view=rev Author: carenas Date: 2008-06-30 21:38:29 -0700 (Mon, 30 Jun 2008) Log Message: ----------- build: remove bogus svn:executable for some Makefile.am files Property Changed: ---------------- trunk/monitor-core/gmond/modules/cpu/Makefile.am trunk/monitor-core/gmond/modules/disk/Makefile.am trunk/monitor-core/gmond/modules/example/Makefile.am trunk/monitor-core/gmond/modules/memory/Makefile.am trunk/monitor-core/gmond/modules/network/Makefile.am trunk/monitor-core/gmond/modules/status/Makefile.am trunk/monitor-core/gmond/modules/system/Makefile.am trunk/monitor-core/libmetrics/Makefile.am trunk/monitor-core/libmetrics/tests/Makefile.am trunk/monitor-core/tests/Makefile.am Property changes on: trunk/monitor-core/gmond/modules/cpu/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/gmond/modules/disk/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/gmond/modules/example/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/gmond/modules/memory/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/gmond/modules/network/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/gmond/modules/status/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/gmond/modules/system/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/libmetrics/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/libmetrics/tests/Makefile.am ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/monitor-core/tests/Makefile.am ___________________________________________________________________ Name: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-07-04 05:25:52
|
Revision: 1508 http://ganglia.svn.sourceforge.net/ganglia/?rev=1508&view=rev Author: carenas Date: 2008-07-03 22:26:01 -0700 (Thu, 03 Jul 2008) Log Message: ----------- gmond: define a module_dir global setting to override at runtime GANGLIA_MODULE_DIR if module_dir is defined in the global section of gmond.conf use that as the directory path to locate all not localized DSO in the configuration. if omitted use the compile time default. Modified Paths: -------------- trunk/monitor-core/gmond/conf.pod trunk/monitor-core/gmond/gmond.c trunk/monitor-core/lib/libgmond.c Modified: trunk/monitor-core/gmond/conf.pod =================================================================== --- trunk/monitor-core/gmond/conf.pod 2008-07-04 04:22:13 UTC (rev 1507) +++ trunk/monitor-core/gmond/conf.pod 2008-07-04 05:26:01 UTC (rev 1508) @@ -85,7 +85,7 @@ whether is should send/receive date and such. The B<globals> section has the following attributes: B<daemonize>, B<setuid>, B<user>, B<debug_level>, B<mute>, B<deaf>, B<host_dmax>, B<host_tmax>, -B<cleanup_threshold>, B<gexec> and B<send_metadata_interval>. +B<cleanup_threshold>, B<gexec>, B<send_metadata_interval> and B<module_dir>. For example, @@ -149,6 +149,16 @@ However in unicast mode, a resend interval must be established. The interval value is the minimum number of seconds between resends. +The B<module_dir> is an optional parameter indicating the directory where +the DSO modules are to be located. If absent, the value to use is set at +configure time with the --with-moduledir option which will default if omitted +to the a subdirectory named "ganglia" in the directory where libganglia will +be installed. + +For example, in a 32-bit Intel compatible Linux host that is usually: + + /usr/lib/ganglia + =head2 udp_send_channel You can define as many B<udp_send_channel> sections as you like within Modified: trunk/monitor-core/gmond/gmond.c =================================================================== --- trunk/monitor-core/gmond/gmond.c 2008-07-04 04:22:13 UTC (rev 1507) +++ trunk/monitor-core/gmond/gmond.c 2008-07-04 05:26:01 UTC (rev 1508) @@ -71,6 +71,8 @@ int cleanup_threshold = 300; /* Time interval before send another metadata packet */ int send_metadata_interval = 0; +/* The directory where DSO modules are located */ +char *module_dir = NULL; /* The array for outgoing UDP message channels */ Ganglia_udp_send_channels udp_send_channels = NULL; @@ -217,6 +219,8 @@ cleanup_threshold = cfg_getint( tmp, "cleanup_threshold"); /* Get the send meta data packet interval */ send_metadata_interval = cfg_getint( tmp, "send_metadata_interval"); + /* Get the DSO module dir */ + module_dir = cfg_getstr(tmp, "module_dir"); /* Commandline for debug_level trumps configuration file behaviour ... */ if (args_info.debug_given) @@ -1704,7 +1708,7 @@ cfg_t *module = cfg_getnsec(tmp, "module", j); - /* Check the module language to see if were are + /* Check the module language to see if we are meant to handle it or delegate it to an alternate module scripting interface */ @@ -1715,9 +1719,17 @@ modPath = cfg_getstr(module, "path"); if(modPath && *modPath != '/' && *modPath != '.') { - merge_ret = apr_filepath_merge(&modPath, GANGLIA_MODULE_DIR, - modPath, APR_FILEPATH_NOTRELATIVE | APR_FILEPATH_NATIVE, - global_context); + if (module_dir) + merge_ret = apr_filepath_merge(&modPath, module_dir, + modPath, + APR_FILEPATH_NOTRELATIVE | APR_FILEPATH_NATIVE, + global_context); + else + merge_ret = apr_filepath_merge(&modPath, GANGLIA_MODULE_DIR, + modPath, + APR_FILEPATH_NOTRELATIVE | APR_FILEPATH_NATIVE, + global_context); + if (merge_ret != APR_SUCCESS) modPath = cfg_getstr(module, "path"); } Modified: trunk/monitor-core/lib/libgmond.c =================================================================== --- trunk/monitor-core/lib/libgmond.c 2008-07-04 04:22:13 UTC (rev 1507) +++ trunk/monitor-core/lib/libgmond.c 2008-07-04 05:26:01 UTC (rev 1508) @@ -62,6 +62,7 @@ CFG_INT("cleanup_threshold", 300, CFGF_NONE), CFG_BOOL("gexec", 0, CFGF_NONE), CFG_INT("send_metadata_interval", 0, CFGF_NONE), + CFG_STR("module_dir", NULL, CFGF_NONE), CFG_END() }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-07-06 21:28:16
|
Revision: 1525 http://ganglia.svn.sourceforge.net/ganglia/?rev=1525&view=rev Author: carenas Date: 2008-07-06 14:28:26 -0700 (Sun, 06 Jul 2008) Log Message: ----------- documentation: moduledir/libdir doesn't need to be hardcoded anymore Modified Paths: -------------- trunk/monitor-core/ganglia.spec.in trunk/monitor-core/gmond/conf.pod trunk/monitor-core/gmond/modules/python/README Modified: trunk/monitor-core/ganglia.spec.in =================================================================== --- trunk/monitor-core/ganglia.spec.in 2008-07-06 13:15:55 UTC (rev 1524) +++ trunk/monitor-core/ganglia.spec.in 2008-07-06 21:28:26 UTC (rev 1525) @@ -435,7 +435,7 @@ - Set variable conf_dir to /etc/ganglia - Migrate /etc/{gmond,gmetad}.conf files to /etc/ganglia for upgrades etc. * Fri Nov 09 2007 Bernard Li <be...@va...> -- Include .pyc files from /usr/lib/ganglia/python_modules +- Include .pyc files from ${moduledir}/python_modules * Thu Nov 08 2007 Bernard Li <be...@va...> - Clean up /etc/ganglia/conf.d/*.conf.in files * Wed Oct 10 2007 Bernard Li <be...@va...> Modified: trunk/monitor-core/gmond/conf.pod =================================================================== --- trunk/monitor-core/gmond/conf.pod 2008-07-06 13:15:55 UTC (rev 1524) +++ trunk/monitor-core/gmond/conf.pod 2008-07-06 21:28:26 UTC (rev 1525) @@ -396,7 +396,7 @@ modules { module { name = "example_module" - path = "/usr/lib/ganglia/modules/modexample.so" + path = "modexample.so" params = "An extra raw parameter" param RandomMax { value = 75 Modified: trunk/monitor-core/gmond/modules/python/README =================================================================== --- trunk/monitor-core/gmond/modules/python/README 2008-07-06 13:15:55 UTC (rev 1524) +++ trunk/monitor-core/gmond/modules/python/README 2008-07-06 21:28:26 UTC (rev 1525) @@ -94,12 +94,13 @@ the python support module is mod_python.so. A base configuration file is included in the Ganglia source code and should have been installed automatically if done through an RPM. The basic configuration that -should be added to or included by gmond.conf is as follows: +should be added to or included by gmond.conf in a 32bit Linux node is as +follows: modules { module { name = "python_module" - path = "/usr/lib/ganglia/modpython.so" + path = "modpython.so" params = "/usr/lib/ganglia/python_modules" } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |