From 834dc29099d9c8023f3a3a8fd7532147027f6f13 Mon Sep 17 00:00:00 2001
From: Michele Tartara <mtartara@google.com>
Date: Thu, 14 Mar 2013 12:02:26 +0000
Subject: [PATCH] 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>
---
doc/design-monitoring-agent.rst | 6 +++---
src/Ganeti/DataCollectors/Drbd.hs | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/design-monitoring-agent.rst b/doc/design-monitoring-agent.rst
index 13702f53b..5f40feaf4 100644
--- 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 92f53eef2..5f5079340 100644
--- 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
--
GitLab