From b84009b006712c6c8b524ba590b10122246f3d56 Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sat, 1 Dec 2018 11:15:38 +0100
Subject: [PATCH] Update DTD and XSD documents

Update DTD and XSD documents to take into account new discard I/O
metrics.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---
 sadf.h                                   | 2 +-
 xml/{sysstat-3.6.dtd => sysstat-3.7.dtd} | 4 +++-
 xml/sysstat.xsd                          | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename xml/{sysstat-3.6.dtd => sysstat-3.7.dtd} (99%)

diff --git a/sadf.h b/sadf.h
index 1150e44..3540a1e 100644
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"3.6"
+#define XML_DTD_VERSION	"3.7"
 
 /* Various constants */
 #define DO_SAVE		0
diff --git a/xml/sysstat-3.6.dtd b/xml/sysstat-3.7.dtd
similarity index 99%
rename from xml/sysstat-3.6.dtd
rename to xml/sysstat-3.7.dtd
index d296fbb..88d8854 100644
--- a/xml/sysstat-3.6.dtd
+++ b/xml/sysstat-3.7.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.6 for sysstat. See sadf.h -->
+<!--DTD v3.7 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -253,8 +253,10 @@
 	tps CDATA #REQUIRED
 	rd_sec CDATA #IMPLIED
 	wr_sec CDATA #IMPLIED
+	dc_sec CDATA #IMPLIED
 	rkB CDATA #REQUIRED
 	wkB CDATA #REQUIRED
+	dkB CDATA #IMPLIED
 	avgrq-sz CDATA #IMPLIED
 	areq-sz CDATA #REQUIRED
 	avgqu-sz CDATA #IMPLIED
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index bad6d88..be096da 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.6 for sysstat. See sadf.h --</xs:appinfo>
+	<xs:appinfo>-- XML Schema v3.7 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -345,8 +345,10 @@
 	<xs:attribute name="tps" 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="dc_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="dkB" type="hundredth-type"></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>
-- 
2.40.0