Permalink
Browse files

*** empty log message ***

  • Loading branch information...
1 parent 358eba4 commit df1da4377b198938cbaaf84643df4b2ca6a35b29 massie committed Jan 13, 2005
@@ -1,13 +1,21 @@
SUBDIRS = gstat
-EXTRA_DIST = gmond.init gmond.conf
+EXTRA_DIST = gmond.init gmond.conf gmond.conf.5 gmond.conf.html conf.pod
AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/srclib/libmetrics/ -I$(top_builddir)/srclib/expat/lib/ -I$(top_builddir)/srclib/apr/include/ -I$(top_builddir)/srclib/confuse/src/
sbin_PROGRAMS = gmond
# metric.h and dtd.h are for gmetad/gmetric for now....
gmond_SOURCES = gmond.c cmdline.c cmdline.h conf.c conf.h dtd.h metric.h
+man_MANS = gmond.conf.5
+
+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
+
#monitor.c server.c listen.c cleanup.c \
#metric.h dtd.h
# Add -lintl??? for libconfuse on cygwin?
View
@@ -1,6 +1,11 @@
#ifndef CONF_H
#define CONF_H 1
+/***** IMPORTANT ************
+Any changes that you make to this file need to be reconciled in ./conf.pod
+in order for the documentation to be in order with the code
+****************************/
+
#include "confuse.h"
void init_validate_funcs(void);
@@ -47,13 +52,6 @@ collection_group { \n\
} \n\
"
-static cfg_opt_t location_opts[] = {
- CFG_INT("rack", -1, CFGF_NONE ),
- CFG_INT("rank", -1, CFGF_NONE ),
- CFG_INT("plane", -1, CFGF_NONE ),
- CFG_END()
-};
-
static cfg_opt_t cluster_opts[] = {
CFG_STR("name", NULL, CFGF_NONE ),
CFG_STR("owner", NULL, CFGF_NONE ),
@@ -129,7 +127,6 @@ static cfg_opt_t metric_opts[] = {
CFG_STR("units", NULL, CFGF_NONE ),
CFG_STR("name", NULL, CFGF_NONE ),
CFG_INT("current_state", 0, CFGF_NONE), /* high_alert, high_warning, normal, low_warning, low_alert */
- CFG_END(), /* hack.. this holds the value */
CFG_END()
};
@@ -151,7 +148,6 @@ static cfg_opt_t collection_group_opts[] = {
static cfg_opt_t gmond_opts[] = {
- CFG_SEC("location", location_opts, CFGF_NONE),
CFG_SEC("cluster", cluster_opts, CFGF_NONE),
CFG_SEC("behavior", behavior_opts, CFGF_NONE),
CFG_SEC("udp_send_channel", udp_send_channel_opts, CFGF_MULTI),
View
@@ -4,7 +4,7 @@
#define DTD "\
<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"yes\"?>\n\
<!DOCTYPE GANGLIA_XML [\n\
- <!ELEMENT GANGLIA_XML (GRID)*>\n\
+ <!ELEMENT GANGLIA_XML (GRID|CLUSTER|HOST)*>\n\
<!ATTLIST GANGLIA_XML VERSION CDATA #REQUIRED>\n\
<!ATTLIST GANGLIA_XML SOURCE CDATA #REQUIRED>\n\
<!ELEMENT GRID (CLUSTER | GRID | HOSTS | METRICS)*>\n\
Oops, something went wrong.

0 comments on commit df1da43

Please sign in to comment.