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>
Showing
- Makefile.am 1 addition, 0 deletionsMakefile.am
- man/mon-collector.rst 14 additions, 3 deletionsman/mon-collector.rst
- src/Ganeti/DataCollectors/CLI.hs 24 additions, 0 deletionssrc/Ganeti/DataCollectors/CLI.hs
- src/Ganeti/DataCollectors/Drbd.hs 43 additions, 11 deletionssrc/Ganeti/DataCollectors/Drbd.hs
- test/data/instance-minor-pairing.txt 2 additions, 0 deletionstest/data/instance-minor-pairing.txt
- test/hs/shelltests/htools-mon-collector.test 8 additions, 11 deletionstest/hs/shelltests/htools-mon-collector.test
Loading
Please register or sign in to comment