*** empty log message ***

ganglia · Jan 28, 2005 · 2873b19 · 2873b19
1 parent 8d40ce1
commit 2873b19
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/monitor-core/Makefile.am b/monitor-core/Makefile.am
@@ -36,7 +36,7 @@ CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune
 
 ChangeLog::
 	touch ChangeLog
-#	$(CHANGE_LOG_GEN_BIN) $(CHANGE_LOG_GEN_FLAGS)
+	$(CHANGE_LOG_GEN_BIN) $(CHANGE_LOG_GEN_FLAGS)
 
 CLEANFILES = ganglia.sub pod2htm*
 

diff --git a/monitor-core/gmond/Makefile.am b/monitor-core/gmond/Makefile.am
@@ -14,7 +14,7 @@ gmond.conf.5: conf.pod gmond.conf.html
 	pod2man --name="gmond.conf" --section=5 conf.pod --center="Ganglia Monitoring System" --release="ganglia/@VERSION@" > gmond.conf.5
 
 gmond.conf.html: conf.pod
-	pod2html --noindex --title="gmond.conf @VERSION@" --infile=conf.pod --outfile=gmond.conf.html
+	pod2html --title="Ganglia Monitoring Daemon v@VERSION@ Configuration" --header --infile=conf.pod --outfile=gmond.conf.html
 
 #monitor.c server.c listen.c cleanup.c \
 #metric.h dtd.h 

diff --git a/monitor-core/lib/libgmond.c b/monitor-core/lib/libgmond.c
@@ -246,6 +246,17 @@ collection_group { \n\
     name = \"cpu_wio\" \n\
     value_threshold = \"1.0\" \n\
   } \n\
+  /* The next two metrics are optional if you want more detail... \n\
+     ... since they are accounted for in cpu_system.  \n\
+  metric { \n\
+    name = \"cpu_intr\" \n\
+    value_threshold = \"1.0\" \n\
+  } \n\
+  metric { \n\
+    name = \"cpu_sintr\" \n\
+    value_threshold = \"1.0\" \n\
+  } \n\
+  */ \n\
 } \n\
 \n\
 collection_group { \n\