Export the dcVersionInformation for the Drbd collector

Also, update the JSON output (and the design document) so that it is not
in camelcase anymore. This is part of a bigger effort to remove camelcase
from the exposed JSON.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>

diff --git a/doc/design-monitoring-agent.rst b/doc/design-monitoring-agent.rst
index 13702f5..5f40fea 100644 (file)
--- a/doc/design-monitoring-agent.rst
+++ b/doc/design-monitoring-agent.rst
@@ -66,7 +66,7 @@ the data collectors:
   report. Built-in data collectors (as opposed to those implemented as
   plugins) should have "B" as the version number.
 
-``formatVersion``
+``format_version``
   The format of what is represented in the "data" field for each data
   collector might change over time. Every time this happens, the
   format_version should be changed, so that who reads the report knows
@@ -103,7 +103,7 @@ Here follows a minimal example of a report::
   {
       "name" : "TheCollectorIdentifier",
       "version" : "1.2",
-      "formatVersion" : 1,
+      "format_version" : 1,
       "timestamp" : 1351607182000000000,
       "category" : null,
       "kind" : 0,
@@ -112,7 +112,7 @@ Here follows a minimal example of a report::
   {
       "name" : "AnotherDataCollector",
       "version" : "B",
-      "formatVersion" : 7,
+      "format_version" : 7,
       "timestamp" : 1351609526123854000,
       "category" : "storage",
       "kind" : 1,

diff --git a/src/Ganeti/DataCollectors/Drbd.hs b/src/Ganeti/DataCollectors/Drbd.hs
index 92f53ee..5f50793 100644 (file)
--- a/src/Ganeti/DataCollectors/Drbd.hs
+++ b/src/Ganeti/DataCollectors/Drbd.hs
@@ -29,6 +29,7 @@ module Ganeti.DataCollectors.Drbd
   , arguments
   , dcName
   , dcVersion
+  , dcFormatVersion
   ) where