From 31dcd7932a8ee8c47c69a196c5b4f27e32675747 Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Mon, 14 Nov 2016 14:02:57 +0100
Subject: [PATCH] sadf: Update DTD and XSD documents

Update DTD and XSD documents to take into account new sar metric "free
available memory".

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

diff --git a/sadf.h b/sadf.h
index 632be25..d9691a7 100644
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"3.2"
+#define XML_DTD_VERSION	"3.3"
 
 /* Various constants */
 #define DO_SAVE		0
diff --git a/xml/sysstat-3.2.dtd b/xml/sysstat-3.3.dtd
similarity index 97%
rename from xml/sysstat-3.2.dtd
rename to xml/sysstat-3.3.dtd
index b7f11de..76741b9 100644
--- a/xml/sysstat-3.2.dtd
+++ b/xml/sysstat-3.3.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.2 for sysstat. See sadf.h -->
+<!--DTD v3.3 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -139,7 +139,7 @@
 	bwrtn CDATA #REQUIRED
 >
 
-<!ELEMENT memory (memfree?, memused?, memused-percent?, buffers?, cached?, commit?, commit-percent?, active?, inactive?, dirty?, anonpg?, slab?, kstack?, pgtbl?, vmused?, swpfree?, swpused?, swpused-percent?, swpcad?, swpcad-percent?, frmpg?, bufpg?, campg?)>
+<!ELEMENT memory (memfree?, avail?, memused?, memused-percent?, buffers?, cached?, commit?, commit-percent?, active?, inactive?, dirty?, anonpg?, slab?, kstack?, pgtbl?, vmused?, swpfree?, swpused?, swpused-percent?, swpcad?, swpcad-percent?, frmpg?, bufpg?, campg?)>
 <!ATTLIST memory
 	per CDATA #REQUIRED
 	unit CDATA #REQUIRED
@@ -147,6 +147,8 @@
 
 <!ELEMENT memfree (#PCDATA)>
 
+<!ELEMENT avail (#PCDATA)>
+
 <!ELEMENT memused (#PCDATA)>
 
 <!ELEMENT memused-percent (#PCDATA)>
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index cb489a8..d66a4fe 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.2 for sysstat. See sadf.h --</xs:appinfo>
+	<xs:appinfo>-- XML Schema v3.3 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -248,6 +248,7 @@
 <xs:complexType name="memory-type">
 	<xs:sequence>
 		<xs:element name="memfree" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"></xs:element>
+		<xs:element name="avail" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="memused" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="memused-percent" type="hundredth-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="buffers" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"></xs:element>
-- 
2.40.0