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>

diff --git a/sadf.h b/sadf.h
index 1150e446f9814801858f9e12d9ad2c792864a093..3540a1ed1b7d145b7a24d1dda8bd75244e7777d2 100644 (file)
--- 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 d296fbb888923a5ad5c75b3ff6a997e2fbf4c740..88d885426c86d31b8dd1a0f4ff9ca80bb5c8af17 100644 (file)
--- 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 bad6d8819a2f224bc97dc7fd6097d75ab175694a..be096da13a6e0548a8eb55e0db09da8e715c9250 100644 (file)
--- 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>