[ovs-dev] [PATCH] xenserver: Collect xenserver configured timezone in bugtool report

Sajjad Lateef slateef at nicira.com
Wed Jun 1 21:17:09 UTC 2011


xenserver logs can be in any timezone, as configured by user
during install time. Also, the timezone data is not currently
recorded in the bugtool report. Therefore, it is currently not
possible to easily correlate logs collected on xenserver with
logs from other devices on the network.

With this change, xen-info capability of the bugtool plugin
has been extended to collect the time information in RFC3339
format, which includes the timezone information.

Signed-off-by: Sajjad Lateef <slateef at nicira.com>
---
 debian/copyright.in                                |    3 +-
 xenserver/README                                   |    5 ++++
 xenserver/automake.mk                              |    1 +
 .../etc_xensource_bugtool_xen-info_openvswitch.xml |   21 ++++++++++++++++++++
 xenserver/openvswitch-xen.spec                     |    4 +++
 5 files changed, 33 insertions(+), 1 deletions(-)
 create mode 100644 xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml

diff --git a/debian/copyright.in b/debian/copyright.in
index d7ca64a..14cb95c 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -53,8 +53,9 @@ License:
   GNU Lesser General Public Licence version 2.1.
 
 	debian/ovs-bugtool
-	xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
 	xenserver/etc_xensource_bugtool_network-status_openvswitch.xml [*]
+	xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
+	xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml [*]
 	xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show [*]
 
 	* These components are only distributed in the source package.
diff --git a/xenserver/README b/xenserver/README
index 3f26776..42e694d 100644
--- a/xenserver/README
+++ b/xenserver/README
@@ -45,6 +45,11 @@ files are:
         xen-bugtool extension to collect kernel information relevant to
         Open vSwitch.
 
+    etc_xensource_bugtool_xen-info_openvswitch.xml
+
+        xen-bugtool extension to collect hypervisor configuration information
+        relevant to Open vSwitch.
+
     etc_xensource_scripts_vif
 
         Open vSwitch-aware replacement for Citrix script of the same name.
diff --git a/xenserver/automake.mk b/xenserver/automake.mk
index 225386b..17b8e56 100644
--- a/xenserver/automake.mk
+++ b/xenserver/automake.mk
@@ -17,6 +17,7 @@ EXTRA_DIST += \
 	xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \
 	xenserver/etc_xensource_bugtool_network-status_openvswitch.xml \
 	xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml \
+	xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml \
 	xenserver/etc_xensource_scripts_vif \
 	xenserver/openvswitch-xen.spec \
 	xenserver/opt_xensource_libexec_InterfaceReconfigure.py \
diff --git a/xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml b/xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml
new file mode 100644
index 0000000..0a410c9
--- /dev/null
+++ b/xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml
@@ -0,0 +1,21 @@
+<!--
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of version 2.1 of the GNU Lesser General Public
+ License as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+
+ Copyright (C) 2011 Nicira Networks.
+-->
+
+<collect>
+    <command label="timezone">date --rfc-3339=seconds</command>
+</collect>
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index 4b3019d..e1ce9bc 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -88,6 +88,9 @@ install -m 644 xenserver/etc_xensource_bugtool_network-status_openvswitch.xml \
 install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info
 install -m 644 xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml \
          $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info/openvswitch.xml
+install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/xen-info
+install -m 644 xenserver/etc_xensource_bugtool_xen-info_openvswitch.xml \
+         $RPM_BUILD_ROOT/etc/xensource/bugtool/xen-info/openvswitch.xml
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
 install -m 644 vswitchd/vswitch.ovsschema \
          $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema
@@ -323,6 +326,7 @@ exit 0
 /etc/xapi.d/plugins/openvswitch-cfg-update
 /etc/xensource/bugtool/network-status/openvswitch.xml
 /etc/xensource/bugtool/kernel-info/openvswitch.xml
+/etc/xensource/bugtool/xen-info/openvswitch.xml
 /etc/logrotate.d/openvswitch
 /etc/profile.d/openvswitch.sh
 /usr/share/openvswitch/python/ovs/__init__.py
-- 
1.7.2.5




More information about the dev mailing list