Update DTD and XSD documents

Take into account new PSI metrics names

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/xml/sysstat-3.9.dtd b/xml/sysstat-3.9.dtd
index 3e945c80b724168612733b5dede19aece32f325c..1910f2f7727bce70e424c480fa0a77e7982e9698 100644 (file)
--- a/xml/sysstat-3.9.dtd
+++ b/xml/sysstat-3.9.dtd
@@ -624,7 +624,7 @@
        some_avg10 CDATA #REQUIRED
        some_avg60 CDATA #REQUIRED
        some_avg300 CDATA #REQUIRED
-       some_total CDATA #REQUIRED
+       some_avg CDATA #REQUIRED
 >
 
 <!ELEMENT psi-io EMPTY>
@@ -632,11 +632,11 @@
        some_avg10 CDATA #REQUIRED
        some_avg60 CDATA #REQUIRED
        some_avg300 CDATA #REQUIRED
-       some_total CDATA #REQUIRED
+       some_avg CDATA #REQUIRED
        full_avg10 CDATA #REQUIRED
        full_avg60 CDATA #REQUIRED
        full_avg300 CDATA #REQUIRED
-       full_total CDATA #REQUIRED
+       full_avg CDATA #REQUIRED
 >
 
 <!ELEMENT psi-mem EMPTY>
@@ -644,9 +644,9 @@
        some_avg10 CDATA #REQUIRED
        some_avg60 CDATA #REQUIRED
        some_avg300 CDATA #REQUIRED
-       some_total CDATA #REQUIRED
+       some_avg CDATA #REQUIRED
        full_avg10 CDATA #REQUIRED
        full_avg60 CDATA #REQUIRED
        full_avg300 CDATA #REQUIRED
-       full_total CDATA #REQUIRED
+       full_avg CDATA #REQUIRED
 >

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 263aa9ea9b221699ebb1b13674095da89bafba59..6e8743384e92d35074bf0be1fab856b70714c45d 100644 (file)
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -808,7 +808,7 @@
        <xs:attribute name="some_avg10" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="some_avg60" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="some_avg300" type="hundredth-type" use="required"></xs:attribute>
-       <xs:attribute name="some_total" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="some_avg" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
 <xs:element name="psi-io" type="psi-full-type"></xs:element>
@@ -817,11 +817,11 @@
        <xs:attribute name="some_avg10" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="some_avg60" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="some_avg300" type="hundredth-type" use="required"></xs:attribute>
-       <xs:attribute name="some_total" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="some_avg" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="full_avg10" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="full_avg60" type="hundredth-type" use="required"></xs:attribute>
        <xs:attribute name="full_avg300" type="hundredth-type" use="required"></xs:attribute>
-       <xs:attribute name="full_total" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="full_avg" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
 </xs:schema>