diff --git a/src/nfs.c b/src/nfs.c
index 1592c911d25ea7e10444ae0b27fc666b0dd38c87..d0f33c5238269638d00ae52b8bb462b3489ddb0f 100644 (file)
--- a/src/nfs.c
+++ b/src/nfs.c
/**
* collectd - src/nfs.c
/**
* collectd - src/nfs.c
- * Copyright (C) 2005 Jason Pepas
+ * Copyright (C) 2005,2006 Jason Pepas
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
#define MODULE_NAME "nfs"
#define MODULE_NAME "nfs"
-#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT)
+/* #if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) */
+#if KERNEL_LINUX
# define NFS_HAVE_READ 1
#else
# define NFS_HAVE_READ 0
# define NFS_HAVE_READ 1
#else
# define NFS_HAVE_READ 0
static char *nfs2_procedures_ds_def[] =
{
static char *nfs2_procedures_ds_def[] =
{
- "DS:null:COUNTER:25:0:U",
- "DS:getattr:COUNTER:25:0:U",
- "DS:setattr:COUNTER:25:0:U",
- "DS:root:COUNTER:25:0:U",
- "DS:lookup:COUNTER:25:0:U",
- "DS:readlink:COUNTER:25:0:U",
- "DS:read:COUNTER:25:0:U",
- "DS:wrcache:COUNTER:25:0:U",
- "DS:write:COUNTER:25:0:U",
- "DS:create:COUNTER:25:0:U",
- "DS:remove:COUNTER:25:0:U",
- "DS:rename:COUNTER:25:0:U",
- "DS:link:COUNTER:25:0:U",
- "DS:symlink:COUNTER:25:0:U",
- "DS:mkdir:COUNTER:25:0:U",
- "DS:rmdir:COUNTER:25:0:U",
- "DS:readdir:COUNTER:25:0:U",
- "DS:fsstat:COUNTER:25:0:U",
+ "DS:null:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:getattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:setattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:root:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:lookup:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:readlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:read:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:wrcache:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:write:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:create:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:remove:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:rename:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:link:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:symlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:mkdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:rmdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:readdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:fsstat:COUNTER:"COLLECTD_HEARTBEAT":0:U",
NULL
};
static int nfs2_procedures_ds_num = 18;
static char *nfs3_procedures_ds_def[] =
{
NULL
};
static int nfs2_procedures_ds_num = 18;
static char *nfs3_procedures_ds_def[] =
{
- "DS:null:COUNTER:25:0:U",
- "DS:getattr:COUNTER:25:0:U",
- "DS:setattr:COUNTER:25:0:U",
- "DS:lookup:COUNTER:25:0:U",
- "DS:access:COUNTER:25:0:U",
- "DS:readlink:COUNTER:25:0:U",
- "DS:read:COUNTER:25:0:U",
- "DS:write:COUNTER:25:0:U",
- "DS:create:COUNTER:25:0:U",
- "DS:mkdir:COUNTER:25:0:U",
- "DS:symlink:COUNTER:25:0:U",
- "DS:mknod:COUNTER:25:0:U",
- "DS:remove:COUNTER:25:0:U",
- "DS:rmdir:COUNTER:25:0:U",
- "DS:rename:COUNTER:25:0:U",
- "DS:link:COUNTER:25:0:U",
- "DS:readdir:COUNTER:25:0:U",
- "DS:readdirplus:COUNTER:25:0:U",
- "DS:fsstat:COUNTER:25:0:U",
- "DS:fsinfo:COUNTER:25:0:U",
- "DS:pathconf:COUNTER:25:0:U",
- "DS:commit:COUNTER:25:0:U",
+ "DS:null:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:getattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:setattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:lookup:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:access:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:readlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:read:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:write:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:create:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:mkdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:symlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:mknod:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:remove:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:rmdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:rename:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:link:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:readdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:readdirplus:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:fsstat:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:fsinfo:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:pathconf:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+ "DS:commit:COUNTER:"COLLECTD_HEARTBEAT":0:U",
NULL
};
static int nfs3_procedures_ds_num = 22;
NULL
};
static int nfs3_procedures_ds_num = 22;
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT && 0
extern kstat_ctl_t *kc;
static kstat_t *nfs2_ksp_client;
static kstat_t *nfs2_ksp_server;
extern kstat_ctl_t *kc;
static kstat_t *nfs2_ksp_client;
static kstat_t *nfs2_ksp_server;
static void nfs_init (void)
{
static void nfs_init (void)
{
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT && 0
kstat_t *ksp_chain;
nfs2_ksp_client = NULL;
kstat_t *ksp_chain;
nfs2_ksp_client = NULL;
}
#endif /* NFS_HAVE_READ */
}
#endif /* NFS_HAVE_READ */
-#if defined(KERNEL_LINUX)
+#if KERNEL_LINUX
static void nfs_read_stats_file (FILE *fh, char *inst)
{
char buffer[BUFSIZE];
static void nfs_read_stats_file (FILE *fh, char *inst)
{
char buffer[BUFSIZE];
#endif /* defined(KERNEL_LINUX) */
#undef BUFSIZE
#endif /* defined(KERNEL_LINUX) */
#undef BUFSIZE
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT && 0
static void nfs2_read_kstat (kstat_t *ksp, char *inst)
{
unsigned long long values[18];
static void nfs2_read_kstat (kstat_t *ksp, char *inst)
{
unsigned long long values[18];
#if NFS_HAVE_READ
static void nfs_read (void)
{
#if NFS_HAVE_READ
static void nfs_read (void)
{
-#if defined(KERNEL_LINUX)
+#if KERNEL_LINUX
FILE *fh;
if ((fh = fopen ("/proc/net/rpc/nfs", "r")) != NULL)
FILE *fh;
if ((fh = fopen ("/proc/net/rpc/nfs", "r")) != NULL)
/* #endif defined(KERNEL_LINUX) */
/* #endif defined(KERNEL_LINUX) */
-#elif defined(HAVE_LIBKSTAT)
+#elif HAVE_LIBKSTAT && 0
if (nfs2_ksp_client != NULL)
nfs2_read_kstat (nfs2_ksp_client, "client");
if (nfs2_ksp_server != NULL)
if (nfs2_ksp_client != NULL)
nfs2_read_kstat (nfs2_ksp_client, "client");
if (nfs2_ksp_server != NULL)