Fixes issue 870.
Signed-off-by: Aaron Karper <akar...@google.com>
---
src/Ganeti/Constants.hs | 3 +++
src/Ganeti/Monitoring/Server.hs | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
index 178fd3d..89459f6 100644
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@ -4648,6 +4648,9 @@ mondTimeInterval = 5
mondLatestApiVersion :: Int
mondLatestApiVersion = 1
+mondDefaultCategory :: String
+mondDefaultCategory = "default"
+
-- * Disk access modes
diskUserspace :: String
diff --git a/src/Ganeti/Monitoring/Server.hs b/src/Ganeti/Monitoring/Server.hs
index fb5bcb1..bc860bd 100644
--- a/src/Ganeti/Monitoring/Server.hs
+++ b/src/Ganeti/Monitoring/Server.hs
@@ -147,9 +147,11 @@ dcListItem :: DataCollector -> J.JSValue
dcListItem dc =
J.JSArray
[ J.showJSON $ dName dc
- , maybe J.JSNull J.showJSON $ dCategory dc
+ , maybe defaultCategory J.showJSON $ dCategory dc
, J.showJSON $ dKind dc
]
+ where
+ defaultCategory = J.showJSON C.mondDefaultCategory
-- | Handler for returning lists.
listHandler :: Snap ()
--
2.0.0.526.g5318336
