[Pkg-ganeti-devel] [ganeti] 45/165: Extend the state type for stateful collectors

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit edf58209ac127e602aebb82ce9ebe7907f8f0c36
Author: Klaus Aehlig <aehlig at google.com>
Date:   Mon Feb 16 14:18:00 2015 +0100

    Extend the state type for stateful collectors
    
    ...to allow per-instance CPU data collection.
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Hrvoje Ribicic <riba at google.com>
---
 src/Ganeti/DataCollectors/Types.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Ganeti/DataCollectors/Types.hs b/src/Ganeti/DataCollectors/Types.hs
index 869b331..b37049c 100644
--- a/src/Ganeti/DataCollectors/Types.hs
+++ b/src/Ganeti/DataCollectors/Types.hs
@@ -139,7 +139,9 @@ instance JSON DCVersion where
   readJSON v = fail $ "Invalid JSON value " ++ show v ++ " for type DCVersion"
 
 -- | Type for the value field of the above map.
-data CollectorData = CPULoadData (Seq.Seq (ClockTime, [Int]))
+data CollectorData =
+  CPULoadData (Seq.Seq (ClockTime, [Int]))
+  | InstanceCpuLoad (Map.Map String (Seq.Seq (ClockTime, Double)))
 
 -- | Type for the map storing the data of the statefull DataCollectors.
 type CollectorMap = Map.Map String CollectorData

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git