[PATCH 08/12] Additional Windows PMDA uname metrics

[Nathan Scott <nscott@xxxxxxxxxx>]

There are several uname-related metrics which we don't export from the
Windows agent at the moment.  This adds them all in, or placeholders for
those I don't quite know how to extract yet.  This makes the output from
the pcp(1) command make a bit more sense on Windows.

-- 
Nathan

Index: devel-pcp-2.5.99/src/pmdas/windows/GNUmakefile
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/GNUmakefile 2006-11-20
11:44:33.488030250 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/GNUmakefile 2006-11-20
11:46:05.033751500 +1100
@@ -34,7 +34,7 @@ SHIM_OBJECTS = $(SHIM_CFILES:.c=.obj)
LLDLIBS = -lpcp -lpcp_pmda
LCFLAGS = -I.
PMNS = pmns.disk pmns.kernel pmns.mem pmns.network \
-   pmns.sqlserver pmns.filesys pmns.hinv
+   pmns.sqlserver pmns.filesys pmns.hinv pmns.pmda
LSRCFILES = $(SHIM_CFILES) \
    Install Remove $(PMNS) root README \
    GNUmakefile.install shim.save.uu \
Index: devel-pcp-2.5.99/src/pmdas/windows/README
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/README 2006-11-20
11:46:29.259265500 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/README 2006-11-20
11:47:20.222450500 +1100
@@ -13,7 +13,7 @@ Data Helper) APIs.  To view the help tex
the following command will list all the available metrics and their
explanatory "help" text:

- $ pminfo -fT windows
+ $ pminfo -fT kernel disk mem network filesys sqlserver hinv pmda

Installation
============
Index: devel-pcp-2.5.99/src/pmdas/windows/Remove
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/Remove 2006-11-20
11:47:31.467153250 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/Remove 2006-11-20
11:47:40.031688500 +1100
@@ -37,7 +37,7 @@ iam=windows

# has to match top-level names in ./root and be the same as Install
#
-pmns_name="hinv kernel disk mem network sqlserver filesys"
+pmns_name="hinv kernel disk mem network sqlserver filesys pmda"

# Do it
#
Index: devel-pcp-2.5.99/src/pmdas/windows/Install
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/Install 2006-11-20
11:48:02.189073250 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/Install 2006-11-20
11:48:08.241451500 +1100
@@ -41,7 +41,7 @@ pmda_interface=3

# has to match top-level names in ./root and be the same as Remove
#
-pmns_name="hinv kernel disk mem network sqlserver filesys"
+pmns_name="hinv kernel disk mem network sqlserver filesys pmda"

# Do it
#
Index: devel-pcp-2.5.99/src/pmdas/windows/data.c
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/data.c 2006-11-20
11:49:49.043751250 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/data.c 2006-11-20
11:52:19.825174500 +1100
@@ -624,6 +624,37 @@ static struct {
PMDA_PMUNITS(0, 0, 0, 0, 0, 0)
       }, Q_KERNEL, M_NONE, ""
     },
+/* kernel.uname.version */
+    { { PMDA_PMID(0,111), PM_TYPE_STRING, PM_INDOM_NULL,
PM_SEM_DISCRETE,
+ PMDA_PMUNITS(0,0,0,0,0,0)
+      }, Q_KERNEL, M_NONE, ""
+    },
+/* kernel.uname.sysname */
+    { { PMDA_PMID(0,112), PM_TYPE_STRING, PM_INDOM_NULL,
PM_SEM_DISCRETE,
+ PMDA_PMUNITS(0,0,0,0,0,0)
+      }, Q_KERNEL, M_NONE, ""
+    },
+/* kernel.uname.machine */
+    { { PMDA_PMID(0,113), PM_TYPE_STRING, PM_INDOM_NULL,
PM_SEM_DISCRETE,
+ PMDA_PMUNITS(0,0,0,0,0,0)
+      }, Q_KERNEL, M_NONE, ""
+    },
+/* kernel.uname.nodename */
+    { { PMDA_PMID(0,114), PM_TYPE_STRING, PM_INDOM_NULL,
PM_SEM_DISCRETE,
+ PMDA_PMUNITS(0,0,0,0,0,0)
+      }, Q_KERNEL, M_NONE, ""
+    },
+
+/* pmda.uname */
+    { { PMDA_PMID(0,115), PM_TYPE_STRING, PM_INDOM_NULL,
PM_SEM_DISCRETE,
+ PMDA_PMUNITS(0,0,0,0,0,0)
+      }, Q_KERNEL, M_NONE, ""
+    },
+/* pmda.version */
+    { { PMDA_PMID(0,116), PM_TYPE_STRING, PM_INDOM_NULL,
PM_SEM_DISCRETE,
+ PMDA_PMUNITS(0,0,0,0,0,0)
+      }, Q_KERNEL, M_NONE, ""
+    },

};

Index: devel-pcp-2.5.99/src/pmdas/windows/pmns.kernel
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/pmns.kernel 2006-11-20
11:58:04.822735500 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/pmns.kernel 2006-11-20
11:58:54.229823250 +1100
@@ -40,4 +40,8 @@ kernel.all.file {
kernel.uname {
     distro WINDOWS:0:109
     release WINDOWS:0:110
+    version WINDOWS:0:111
+    sysname WINDOWS:0:112
+    machine WINDOWS:0:113
+    nodename WINDOWS:0:114
}
Index: devel-pcp-2.5.99/src/pmdas/windows/pmns.pmda
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ devel-pcp-2.5.99/src/pmdas/windows/pmns.pmda 2006-11-20
11:59:07.514653500 +1100
@@ -0,0 +1,4 @@
+pmda {
+    uname WINDOWS:0:115
+    version WINDOWS:0:116
+}
Index: devel-pcp-2.5.99/src/pmdas/windows/root
===================================================================
--- devel-pcp-2.5.99.orig/src/pmdas/windows/root 2006-11-20
11:59:31.692164500 +1100
+++ devel-pcp-2.5.99/src/pmdas/windows/root 2006-11-20
11:59:45.561031250 +1100
@@ -12,6 +12,7 @@ root {
mem
network
sqlserver
+ pmda
}

#include "pmns.hinv"
@@ -21,4 +22,5 @@ root {
#include "pmns.mem"
#include "pmns.network"
#include "pmns.sqlserver"
+#include "pmns.pmda"