From 4fe045803316d8ac8a0a4ee4c4e10186e34d835f Mon Sep 17 00:00:00 2001
From: Michele Tartara <mtartara@google.com>
Date: Tue, 30 Apr 2013 12:34:57 +0200
Subject: [PATCH] Factor out function for building report
Instead of building the report as part of the "Main" function, have it
built by its own dedicated function, so that it will be able to export it
directly to the monitoring daemon when needed.
Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
---
src/Ganeti/DataCollectors/InstStatus.hs | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/Ganeti/DataCollectors/InstStatus.hs b/src/Ganeti/DataCollectors/InstStatus.hs
index f3a8c1cec..3566c5762 100644
--- a/src/Ganeti/DataCollectors/InstStatus.hs
+++ b/src/Ganeti/DataCollectors/InstStatus.hs
@@ -179,15 +179,22 @@ buildStatus domains uptimes inst = do
trail
status
--- | Main function.
-main :: Options -> [String] -> IO ()
-main opts _ = do
- curNode <- getHostName
- let node = fromMaybe curNode $ optNode opts
- answer <- getInstances node (optConfdAddr opts) (optConfdPort opts)
+-- | Build the report of this data collector, containing all the information
+-- about the status of the instances.
+buildInstStatusReport :: Maybe String -> Maybe Int -> IO DCReport
+buildInstStatusReport srvAddr srvPort = do
+ node <- getHostName
+ answer <- getInstances node srvAddr srvPort
inst <- exitIfBad "Can't get instance info from ConfD" answer
domains <- getInferredDomInfo
uptimes <- getUptimeInfo
let primaryInst = fst inst
iStatus <- mapM (buildStatus domains uptimes) primaryInst
- putStrLn $ J.encode iStatus
+ let jsonReport = J.showJSON iStatus
+ buildReport dcName dcVersion dcFormatVersion dcCategory dcKind jsonReport
+
+-- | Main function.
+main :: Options -> [String] -> IO ()
+main opts _ = do
+ report <- buildInstStatusReport (optConfdAddr opts) (optConfdPort opts)
+ putStrLn $ J.encode report
--
GitLab