[Pkg-ganeti-devel] [ganeti] 47/165: Provide Xen CPU-load collector in MonD

[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 3d05fa1ec611dba02faa700ba2f46b80c1f474fe
Author: Klaus Aehlig <aehlig at google.com>
Date:   Tue Feb 17 10:22:09 2015 +0100

    Provide Xen CPU-load collector in MonD
    
    Add the Xen-specific CPU-load data collector to the
    standard collectors provided by the monitoring daemon.
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Hrvoje Ribicic <riba at google.com>
---
 lib/tools/cfgupgrade.py        | 9 +++++++++
 src/Ganeti/Constants.hs        | 1 +
 src/Ganeti/DataCollectors.hs   | 6 ++++++
 test/py/cfgupgrade_unittest.py | 1 +
 4 files changed, 17 insertions(+)

diff --git a/lib/tools/cfgupgrade.py b/lib/tools/cfgupgrade.py
index 4e8b11b..eb18f0a 100644
--- a/lib/tools/cfgupgrade.py
+++ b/lib/tools/cfgupgrade.py
@@ -682,7 +682,16 @@ class CfgUpgrade(object):
 
   # DOWNGRADE ------------------------------------------------------------
 
+  @classmethod
+  def DowngradeCollectors(cls, collectors):
+    if constants.DATA_COLLECTOR_XEN_CPU_LOAD in collectors:
+      del collectors[constants.DATA_COLLECTOR_XEN_CPU_LOAD]
+
+  def DowngradeCluster(self, cluster):
+    self.DowngradeCollectors(cluster["data_collectors"])
+
   def DowngradeAll(self):
+    self.DowngradeCluster(self.config_data["cluster"])
     self.config_data["version"] = version.BuildVersion(DOWNGRADE_MAJOR,
                                                        DOWNGRADE_MINOR, 0)
     return True
diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
index 9f6bf1b..c9f893e 100644
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@ -5295,6 +5295,7 @@ dataCollectorNames =
                       , dataCollectorDrbd
                       , dataCollectorLv
                       , dataCollectorInstStatus
+                      , dataCollectorXenCpuLoad
                       ]
 
 dataCollectorStateActive :: String
diff --git a/src/Ganeti/DataCollectors.hs b/src/Ganeti/DataCollectors.hs
index 70d6207..bca6848 100644
--- a/src/Ganeti/DataCollectors.hs
+++ b/src/Ganeti/DataCollectors.hs
@@ -42,6 +42,7 @@ import qualified Ganeti.DataCollectors.Diskstats as Diskstats
 import qualified Ganeti.DataCollectors.Drbd as Drbd
 import qualified Ganeti.DataCollectors.InstStatus as InstStatus
 import qualified Ganeti.DataCollectors.Lv as Lv
+import qualified Ganeti.DataCollectors.XenCpuLoad as XenCpuLoad
 import Ganeti.DataCollectors.Types (DataCollector(..),ReportBuilder(..))
 import Ganeti.JSON (GenericContainer(..))
 import Ganeti.Objects
@@ -51,6 +52,7 @@ import Ganeti.Types
 collectors :: [DataCollector]
 collectors =
   [ cpuLoadCollector
+  , xenCpuLoadCollector
   , diskStatsCollector
   , drdbCollector
   , instStatusCollector
@@ -84,3 +86,7 @@ collectors =
       DataCollector CPUload.dcName CPUload.dcCategory CPUload.dcKind
         (StatefulR CPUload.dcReport) (Just CPUload.dcUpdate) activeConfig
         updateInterval
+    xenCpuLoadCollector =
+      DataCollector XenCpuLoad.dcName XenCpuLoad.dcCategory XenCpuLoad.dcKind
+        (StatefulR XenCpuLoad.dcReport) (Just XenCpuLoad.dcUpdate) activeConfig
+        updateInterval
diff --git a/test/py/cfgupgrade_unittest.py b/test/py/cfgupgrade_unittest.py
index d23667a..dc0bcdd 100755
--- a/test/py/cfgupgrade_unittest.py
+++ b/test/py/cfgupgrade_unittest.py
@@ -72,6 +72,7 @@ def GetMinimalConfig():
         "lv": { "active": True, "interval": 5000000 },
         "inst-status-xen": { "active": True, "interval": 5000000 },
         "cpu-avg-load": { "active": True, "interval": 5000000 },
+        "xen-cpu-avg-load": { "active": True, "interval": 5000000 },
       },
     },
     "instances": {},

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