rpms/vhostmd/F-12 vhostmd.conf,1.2,1.3 vhostmd.spec,1.3,1.4
Richard W.M. Jones
rjones at fedoraproject.org
Mon Nov 2 11:03:49 UTC 2009
Author: rjones
Update of /cvs/pkgs/rpms/vhostmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655
Modified Files:
vhostmd.conf vhostmd.spec
Log Message:
Some changes to the default configuration file suggested by SAP to make it more CIM standards compliant.
Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vhostmd.conf 15 Oct 2009 17:53:54 -0000 1.2
+++ vhostmd.conf 2 Nov 2009 11:03:47 -0000 1.3
@@ -39,55 +39,112 @@ within the vm element.
</metric>
<metric type="string" context="host">
<name>VirtualizationVendor</name>
- <action>echo Fedora</action>
+ <action>rpm -qi libvirt| grep Vendor: |awk '{print substr($0, index($0,$5)) }'</action>
</metric>
+ <!-- SAP "CIM" -->
<metric type="string" context="host">
- <name>VirtualizationProductInfo</name>
+ <name>VirtProductInfo</name>
<action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
</metric>
- <metric type="uint32" context="host">
- <name>TotalPhyCPUs</name>
- <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+ <!-- SAP "CIM" -->
+ <metric type="string" context="host">
+ <name>HostSystemInfo</name>
+ <action>hostname -s</action>
</metric>
+ <!-- SAP "CIM" -->
<metric type="uint32" context="host">
- <name>NumCPUs</name>
+ <name>NumberOfPhysicalCPUsUtilized</name>
<action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
</metric>
+ <!-- SAP "CIM" -->
<metric type="uint64" context="host">
- <name>TotalPhyMem</name>
- <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
+ <name>MemoryAllocatedToVirtualServers</name>
+ <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{ printf "%d\n" $3/1024 }'</action>
</metric>
+ <!-- SAP "CIM" -->
<metric type="uint64" context="host">
- <name>UsedMem</name>
- <action>free | grep '^Mem:' | gawk '{print $3}'</action>
+ <name>FreePhysicalMemory</name>
+ <action>
+ free|egrep -i '^[[:space:]]*(Mem:)' \
+ |awk 'BEGIN { sum = 0; }
+ { sum += $4; }
+ END { printf "%10d\n", sum/1024; }'
+ </action>
+ </metric>
+ <metric type="uint64" context="host">
+ <name>UsedPhysicalMemory</name>
+ <action>
+ free|egrep -i '^[[:space:]]*(Mem:)' \
+ |awk 'BEGIN { sum = 0; }
+ { sum += $3; }
+ END { printf "%10d\n", sum/1024; }'
+ </action>
</metric>
+ <!-- SAP "CIM" -->
<metric type="uint64" context="host">
- <name>FreeMem</name>
- <action>free | grep '^Mem:' | gawk '{print $4}'</action>
+ <name>FreeVirtualMemory</name>
+ <action>
+ free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \
+ |awk 'BEGIN { sum = 0; }
+ { sum += $4; }
+ END { printf "%10d\n", sum/1024; }'
+ </action>
+ </metric>
+ <!-- SAP "CIM" -->
+ <metric type="uint64" context="host">
+ <name>UsedVirtualMemory</name>
+ <action>
+ free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \
+ |awk 'BEGIN { sum = 0; }
+ { sum += $3; }
+ END { printf "%10d\n", sum/1024; }'
+ </action>
</metric>
<metric type="uint64" context="host">
<name>PagedInMemory</name>
<action>echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))"</action>
</metric>
+ <!-- SAP "CIM" -->
<metric type="uint64" context="host">
+ <!-- TODO: CHECK -->
<name>PagedOutMemory</name>
<action>echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))"</action>
</metric>
<metric type="group" context="host">
<name>PageRates</name>
<action>pagerate.pl</action>
+ <!-- SAP "CIM" -->
<variable name="PageInRate" type="uint64"/>
<variable name="PageFaultRate" type="uint64"/>
</metric>
<!--<metric type="real64" context="host">
- <name>TotalCPUTime</name>
- <action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
+ <name>TotalCPUTime</name>
+ <action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
gawk -F: '/CPU time/ {print $2;}'</action>
</metric>-->
+ <!-- SAP "CIM" -->
<metric type="real64" context="vm">
<name>TotalCPUTime</name>
<action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
gawk -F: '/CPU time/ {print $2;}'</action>
</metric>
+ <metric type="uint32" context="vm">
+ <name>NumberOfAssignedPhysicalCPUs</name>
+ <action>virsh -r CONNECT dominfo NAME | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+ </metric>
+ <!-- SAP "CIM" -->
+ <metric type="uint64" context="vm">
+ <name>PhysicalMemoryAllocatedToVirtualSystem</name>
+ <action>virsh -r CONNECT dominfo NAME | grep 'Max memory:' | gawk -F' +' '{printf "%d\n", $3/1024}'</action>
+ </metric>
+ <!-- will only be supported by Fedora -->
+ <!-- <metric type="uint64" context="vm">
+ <name>UsedMem</name>
+ <action>virsh -r CONNECT dominfo NAME | grep 'Used memory:' | gawk -F' +' '{printf "%d\n", $3/1024}'</action>
+ </metric> -->
</metrics>
</vhostmd>
+<!--
+ vi:ts=2:sw=2:expandtab:ignorecase:
+-->
+<!-- EOF -->
Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vhostmd.spec 16 Oct 2009 16:10:56 -0000 1.3
+++ vhostmd.spec 2 Nov 2009 11:03:47 -0000 1.4
@@ -8,7 +8,7 @@
Summary: Virtualization host metrics daemon
Name: vhostmd
Version: 0.4
-Release: 0.5.gite9db007b%{?dist}
+Release: 0.6.gite9db007b%{?dist}
License: GPLv2+
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +183,10 @@ exit 0
%changelog
+* Mon Nov 2 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.6.gite9db007b
+- Some changes to the default configuration file suggested by SAP to
+ make it more CIM standards compliant.
+
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
- New upstream based on git e9db007b.
- Fix segfault in vm-dump-metrics (RHBZ#529348).
More information about the fedora-extras-commits
mailing list