From 0b813a372f67858e1422a832cc922f10d5149f93 Mon Sep 17 00:00:00 2001
From: Sajjad Lateef <slateef@nicira.com>
Date: Wed, 1 Jun 2011 14:15:51 -0700
Subject: [PATCH] xenserver: Collect xenserver configured timezone in bugtool
 report

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, system-configuration capability of the bugtool plugin
has been added. Also, added an extension to this capability to collect
the time information in RFC3339 format, which includes the system timezone.

Signed-off-by: Sajjad Lateef <slateef@nicira.com>
---
 debian/copyright.in                           |  2 ++
 xenserver/README                              | 12 +++++++++++
 xenserver/automake.mk                         |  2 ++
 ...xensource_bugtool_system-configuration.xml | 21 +++++++++++++++++++
 ...gtool_system-configuration_openvswitch.xml | 21 +++++++++++++++++++
 xenserver/openvswitch-xen.spec                |  7 +++++++
 6 files changed, 65 insertions(+)
 create mode 100644 xenserver/etc_xensource_bugtool_system-configuration.xml
 create mode 100644 xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml

diff --git a/debian/copyright.in b/debian/copyright.in
index d7ca64af..354ab804 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -55,6 +55,8 @@ License:
 	debian/ovs-bugtool
 	xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
 	xenserver/etc_xensource_bugtool_network-status_openvswitch.xml [*]
+	xenserver/etc_xensource_bugtool_system-configuration.xml [*]
+	xenserver/etc_xensource_bugtool_system-configuration_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 3f267760..60524de4 100644
--- a/xenserver/README
+++ b/xenserver/README
@@ -45,6 +45,18 @@ files are:
         xen-bugtool extension to collect kernel information relevant to
         Open vSwitch.
 
+    etc_xensource_bugtool_system-configuration.xml
+
+        Custom xen-bugtool category to collect system configuration data.
+        This category is configured to collect up to 1Mb of data, take
+        up to 60 seconds to collect data, run every time and is hidden from
+        display in xencenter.
+
+    etc_xensource_bugtool_system-configuration_openvswitch.xml
+
+        xen-bugtool extension to collect system configuration information
+        relevant to Open vSwitch, including timezone.
+
     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 225386b9..b3fab0c7 100644
--- a/xenserver/automake.mk
+++ b/xenserver/automake.mk
@@ -17,6 +17,8 @@ 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_system-configuration.xml \
+	xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml \
 	xenserver/etc_xensource_scripts_vif \
 	xenserver/openvswitch-xen.spec \
 	xenserver/opt_xensource_libexec_InterfaceReconfigure.py \
diff --git a/xenserver/etc_xensource_bugtool_system-configuration.xml b/xenserver/etc_xensource_bugtool_system-configuration.xml
new file mode 100644
index 00000000..584d8f71
--- /dev/null
+++ b/xenserver/etc_xensource_bugtool_system-configuration.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE bugtool SYSTEM "/usr/share/xen-bugtool/bugtool.xsd">
+<!--
+ 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.
+-->
+<capability pii="no" min_size="-1" max_size="1000000" min_time="-1" max_time="60" mime="text/plain" checked="true" hidden="true">
+</capability>
diff --git a/xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml b/xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml
new file mode 100644
index 00000000..0a410c97
--- /dev/null
+++ b/xenserver/etc_xensource_bugtool_system-configuration_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 78da1d5a..a5c1409b 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -88,6 +88,11 @@ 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 -m 644 xenserver/etc_xensource_bugtool_system-configuration.xml \
+         $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration.xml
+install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration
+install -m 644 xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml \
+         $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration/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
@@ -321,6 +326,8 @@ 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/system-configuration.xml
+/etc/xensource/bugtool/system-configuration/openvswitch.xml
 /etc/logrotate.d/openvswitch
 /etc/profile.d/openvswitch.sh
 /usr/share/openvswitch/python/ovs/__init__.py
-- 
2.30.2