Introduce containers keyword; added examples; bump version

dpiquet · Mar 2, 2016 · 236a322 · 236a322
1 parent 59dfdfd
commit 236a322
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/pve-monitor.conf b/pve-monitor.conf
@@ -21,6 +21,20 @@ openvz example {
     disk 80 90
 }
 
+# lxc example
+lxc example-lxc-host {
+    mem 80 90
+    cpu 80 95
+    disk 80 90
+}
+
+# container (lxc or openvz)
+container example-ct {
+    mem 80 90
+    cpu 80 95
+    disk 80 90
+}
+
 # qemu example
 qemu msvm {
     mem 80 90

diff --git a/pve-monitor.pl b/pve-monitor.pl
@@ -38,7 +38,7 @@
 use Switch;
 
 my $configurationFile = './pve-monitor.conf';
-my $pluginVersion = '1.06';
+my $pluginVersion = '1.07';
 
 my %status = (
     'UNDEF'    => -1,
@@ -76,6 +76,9 @@ sub usage {
     print "    Check the state of the cluster's Qemu virtual machines\n";
     print "  --openvz\n";
     print "    Check the state of the cluster's OpenVZ virtual machines\n";
+    print "    [DEPRECATED] We keep it for pve-monitor < 1.07 back compat\n";
+	print "  --containers\n";
+	print "    Check the state of the cluster's containers (both openvz and lxc)\n";
     print "  --pools\n";
     print "    Check the state of the cluster's virtual machines and/or storages in defined pools\n";
     print "  --qdisk\n";
@@ -97,6 +100,7 @@ sub is_number {
 GetOptions ("nodes"       => \$arguments{nodes},
             "storages"    => \$arguments{storages},
             "openvz"      => \$arguments{openvz},
+            "containers"   => \$arguments{openvz},
             "qemu"        => \$arguments{qemu},
             "pools"       => \$arguments{pools},
             "qdisk"       => \$arguments{qdisk},