LGTM, thanks On Wed, 14 Oct 2015 at 12:26 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> With the addition of the new data collector, the configuration has been > extended as well: the collection interval for the new data collector is now > part of the configuration. Adapt the sample configuration accordingly. > Also update the minimally complete 2.17 configuration. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > test/data/cluster_config_2.17.json | 4 ++++ > test/py/cfgupgrade_unittest.py | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/test/data/cluster_config_2.17.json > b/test/data/cluster_config_2.17.json > index 7bd73ad..51ff31f 100644 > --- a/test/data/cluster_config_2.17.json > +++ b/test/data/cluster_config_2.17.json > @@ -37,6 +37,10 @@ > "active": true, > "interval": 5000000.0 > }, > + "kvm-inst-rss": { > + "active": true, > + "interval": 5000000.0 > + }, > "lv": { > "active": true, > "interval": 5000000.0 > diff --git a/test/py/cfgupgrade_unittest.py > b/test/py/cfgupgrade_unittest.py > index e425388..0706f53 100755 > --- a/test/py/cfgupgrade_unittest.py > +++ b/test/py/cfgupgrade_unittest.py > @@ -70,6 +70,7 @@ def GetMinimalConfig(): > "diagnose": { "active": True, "interval": 5000000 }, > "diskstats": { "active": True, "interval": 5000000 }, > "drbd": { "active": True, "interval": 5000000 }, > + "kvm-inst-rss": { "active": True, "interval": 5000000 }, > "lv": { "active": True, "interval": 5000000 }, > "inst-status-xen": { "active": True, "interval": 5000000 }, > "cpu-avg-load": { "active": True, "interval": 5000000 }, > -- > 2.6.0.rc2.230.g3dd15c0 > > -- Helga Velroyen Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
