Support instance-minor pairing in the DRBD collector
authorMichele Tartara <mtartara@google.com>
Tue, 8 Jan 2013 12:45:08 +0000 (12:45 +0000)
committerMichele Tartara <mtartara@google.com>
Tue, 8 Jan 2013 16:16:57 +0000 (17:16 +0100)
commitd78970bac4e297aaf0fbd337fa68e98507dac8e3
tree20292ee6e6551543fd5a7d1083ba24a06b446323
parenteb62691c7d21ad5fa03181dc863a67334e4212b4
Support instance-minor pairing in the DRBD collector

This commits enables the DRBD data collector to use the Confd client to
gather information about the pairing between DRBD minors and instances.

For testing purposes, the DRBD data collector now requires either zero
or two parameters: one is the DRBD file, one is the pairings file.
When no parameter is passed, the collector is in "production mode" and takes
the data from /proc/drbd and from the Confd client.

The shell tests of mon-collector are updated accordingly.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Makefile.am
man/mon-collector.rst
src/Ganeti/DataCollectors/CLI.hs
src/Ganeti/DataCollectors/Drbd.hs
test/data/instance-minor-pairing.txt [new file with mode: 0644]
test/hs/shelltests/htools-mon-collector.test