[csw-devel] SF.net SVN: gar:[16305] csw/mgar/pkg/ganglia/trunk
d_pocock at users.sourceforge.net
d_pocock at users.sourceforge.net
Sun Nov 27 06:08:53 CET 2011
Revision: 16305
http://gar.svn.sourceforge.net/gar/?rev=16305&view=rev
Author: d_pocock
Date: 2011-11-27 05:08:53 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
ganglia: more config file fixes
Modified Paths:
--------------
csw/mgar/pkg/ganglia/trunk/Makefile
csw/mgar/pkg/ganglia/trunk/files/conf.php
Added Paths:
-----------
csw/mgar/pkg/ganglia/trunk/files/conf.d/
csw/mgar/pkg/ganglia/trunk/files/conf.d/modgstatus.conf
Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile 2011-11-27 04:43:32 UTC (rev 16304)
+++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-11-27 05:08:53 UTC (rev 16305)
@@ -110,6 +110,9 @@
CONFIGURE_ARGS += --disable-python
#CONFIGURE_ARGS += --with-python=/opt/csw
+# modgstatus - for Ganglia version and internal status metrics
+CONFIGURE_ARGS += --enable-status
+
# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris,
# so we skip it. This should be re-assessed with each new release
# from upstream. Proposed fixes for the test suite to be submitted
@@ -139,7 +142,7 @@
PKGFILES_CSWganglia =
PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW .*/modgstatus.conf.CSW .*/sbin/gmond .*/bin/gmetric /etc/opt/csw/init.d/cswgmond
-PKGFILES_CSWgangliaagent += .*/modsys.so .*/modcpu.so .*/modnet.so .*/modmulticpu.so .*/modmem.so .*/modload.so .*/moddisk.so .*/modproc.so
+PKGFILES_CSWgangliaagent += .*/modsys.so .*/modcpu.so .*/modnet.so .*/modmulticpu.so .*/modmem.so .*/modload.so .*/moddisk.so .*/modproc.so .*/modgstatus.so
PKGFILES_CSWlibganglia0 += $(call baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0\.0\.0)
PKGFILES_CSWlibganglia0 += $(call baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0(\.\d+)*)
CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.1.7.so.0.0.0|soname=libganglia-3.1.7.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-1-7-0
@@ -193,9 +196,12 @@
>> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW
@ginstall -D $(FILEDIR)/gmetad.conf \
$(DESTDIR)$(ETCGANGLIA)/gmetad.conf
- @cd $(WORKSRC)/gmond/modules/conf.d; \
+ @cd $(WORKSRC)/gmond/modules/conf.d ; \
for CONF_FILE in *.conf ; \
do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done
+ @cd $(FILEDIR)/conf.d ; \
+ for CONF_FILE in *.conf ; \
+ do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done
@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \
$(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW
ifeq ($(VERSION),3.1.2)
Added: csw/mgar/pkg/ganglia/trunk/files/conf.d/modgstatus.conf
===================================================================
--- csw/mgar/pkg/ganglia/trunk/files/conf.d/modgstatus.conf (rev 0)
+++ csw/mgar/pkg/ganglia/trunk/files/conf.d/modgstatus.conf 2011-11-27 05:08:53 UTC (rev 16305)
@@ -0,0 +1,81 @@
+/* Uncomment the modules section to load the module,
+ then uncomment some or all of the metrics that are required */
+
+
+modules {
+ module {
+ name = "gstatus_module"
+ path = "modgstatus.so"
+ }
+}
+
+collection_group {
+ collect_once = yes
+ time_threshold = 1200
+ metric {
+ name = "gmond_version"
+ title = "gmond version"
+ }
+ metric {
+ 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"
+ value_threshold = 1.0
+ title = "Gmond All Pkts Recvd"
+ }
+ metric {
+ name = "gmond_pkts_recvd_failed"
+ value_threshold = 1.0
+ title = "Gmond Failed Pkts Recvd"
+ }
+ metric {
+ name = "gmond_pkts_recvd_ignored"
+ value_threshold = 1.0
+ title = "Gmond Ignored Pkts Recvd"
+ }
+ metric {
+ name = "gmond_pkts_recvd_metadata"
+ value_threshold = 1.0
+ title = "Gmond Metadata Pkts Recvd"
+ }
+ metric {
+ name = "gmond_pkts_recvd_value"
+ value_threshold = 1.0
+ title = "Gmond Data Pkts Recvd"
+ }
+ metric {
+ name = "gmond_pkts_recvd_request"
+ value_threshold = 1.0
+ title = "Gmond Metadata Request Pkts"
+ }
+ metric {
+ name = "gmond_pkts_sent_all"
+ value_threshold = 1.0
+ title = "Gmond All Sent Pkts"
+ }
+ metric {
+ name = "gmond_pkts_sent_metadata"
+ value_threshold = 1.0
+ title = "Gmond Metadata Pkts Sent"
+ }
+ metric {
+ name = "gmond_pkts_sent_value"
+ value_threshold = 1.0
+ title = "Gmond Data Pkts Sent"
+ }
+ metric {
+ name = "gmond_pkts_sent_request"
+ value_threshold = 1.0
+ title = "Gmond Metadata Requests Sent"
+ }
+}
+*/
Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php
===================================================================
--- csw/mgar/pkg/ganglia/trunk/files/conf.php 2011-11-27 04:43:32 UTC (rev 16304)
+++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2011-11-27 05:08:53 UTC (rev 16305)
@@ -1,5 +1,5 @@
<?php
-# $Id: conf.php.in 1831 2008-09-26 12:18:54Z carenas $
+# $Id: conf.php.in 2194 2010-01-08 16:58:25Z d_pocock $
#
# Gmetad-webfrontend version. Used to check for updates.
#
@@ -25,6 +25,14 @@
# otherwise, change it if it is installed elsewhere (like /usr/bin)
define("RRDTOOL", "/opt/csw/bin/rrdtool");
+# If rrdcached is being used, this argument must specify the
+# socket to use.
+#
+# ganglia-web only requires, and should use, the low-privilege socket
+# created with the -L option to rrdcached. gmetad requires, and must use,
+# the fully privileged socket created with the -l option to rrdcached.
+$rrdcached_socket = "";
+
# Location for modular-graph files.
$graphdir='./graph.d';
@@ -188,4 +196,13 @@
);
$default_graph_size = 'default';
$graph_sizes_keys = array_keys( $graph_sizes );
+
+# In earlier versions of gmetad, hostnames were handled in a case
+# sensitive manner
+# If your hostname directories have been renamed to lower case,
+# set this option to 0 to disable backward compatibility.
+# From version 3.2, backwards compatibility will be disabled by default.
+# default: true (for gmetad < 3.2)
+# default: false (for gmetad >= 3.2)
+$case_sensitive_hostnames = true;
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list