From 89be04a7a4689228e82e97e6ed97d12342019a51 Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Wed, 7 Jun 2017 11:29:44 +0200
Subject: [PATCH] sadf: Update DTD/XSD documents

Take into account new fields names for "sar -d".

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---
 sadf.h                                   |  2 +-
 xml/{sysstat-3.3.dtd => sysstat-3.4.dtd} | 14 +++++++++-----
 xml/sysstat.xsd                          | 14 +++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)
 rename xml/{sysstat-3.3.dtd => sysstat-3.4.dtd} (98%)

diff --git a/sadf.h b/sadf.h
index f6d052a..0b5d17e 100644
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"3.3"
+#define XML_DTD_VERSION	"3.4"
 
 /* Various constants */
 #define DO_SAVE		0
diff --git a/xml/sysstat-3.3.dtd b/xml/sysstat-3.4.dtd
similarity index 98%
rename from xml/sysstat-3.3.dtd
rename to xml/sysstat-3.4.dtd
index 76741b9..1a4c00e 100644
--- a/xml/sysstat-3.3.dtd
+++ b/xml/sysstat-3.4.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.3 for sysstat. See sadf.h -->
+<!--DTD v3.4 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -247,10 +247,14 @@
 <!ATTLIST disk-device
 	dev CDATA #REQUIRED
 	tps CDATA #REQUIRED
-	rd_sec CDATA #REQUIRED
-	wr_sec CDATA #REQUIRED
-	avgrq-sz CDATA #REQUIRED
-	avgqu-sz CDATA #REQUIRED
+	rd_sec CDATA #IMPLIED
+	wr_sec CDATA #IMPLIED
+	rkB CDATA #REQUIRED
+	wkB CDATA #REQUIRED
+	avgrq-sz CDATA #IMPLIED
+	areq-sz CDATA #REQUIRED
+	avgqu-sz CDATA #IMPLIED
+	aqu-sz CDATA #REQUIRED
 	await CDATA #REQUIRED
 	svctm CDATA #REQUIRED
 	util-percent CDATA #REQUIRED
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index d66a4fe..1f700d7 100644
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat" targetNamespace="http://pagesperso-orange.fr/sebastien.godard/sysstat" elementFormDefault="qualified">
 <xs:annotation>
-	<xs:appinfo>-- XML Schema v3.3 for sysstat. See sadf.h --</xs:appinfo>
+	<xs:appinfo>-- XML Schema v3.4 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -341,10 +341,14 @@
 <xs:complexType name="disk-device-type">
 	<xs:attribute name="dev" type="xs:string" use="required"></xs:attribute>
 	<xs:attribute name="tps" type="hundredth-type" use="required"></xs:attribute>
-	<xs:attribute name="rd_sec" type="hundredth-type" use="required"></xs:attribute>
-	<xs:attribute name="wr_sec" type="hundredth-type" use="required"></xs:attribute>
-	<xs:attribute name="avgrq-sz" type="hundredth-type" use="required"></xs:attribute>
-	<xs:attribute name="avgqu-sz" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="rd_sec" type="hundredth-type"></xs:attribute>
+	<xs:attribute name="wr_sec" type="hundredth-type"></xs:attribute>
+	<xs:attribute name="rkB" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="wkB" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="avgrq-sz" type="hundredth-type"></xs:attribute>
+	<xs:attribute name="areq-sz" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="avgqu-sz" type="hundredth-type"></xs:attribute>
+	<xs:attribute name="aqu-sz" type="hundredth-type" use="required"></xs:attribute>
 	<xs:attribute name="await" type="hundredth-type" use="required"></xs:attribute>
 	<xs:attribute name="svctm" type="hundredth-type" use="required"></xs:attribute>
 	<xs:attribute name="util-percent" type="hundredth-type" use="required"></xs:attribute>
-- 
2.40.0