From: David Crane <davidc@donorschoose.org>
Date: Sun, 4 Oct 2015 02:33:00 +0000 (+0000)
Subject: GenericJMX plugin: Implement the "PluginName" config option.
X-Git-Tag: collectd-5.6.0~541
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e2ad9c0;p=collectd.git

GenericJMX plugin: Implement the "PluginName" config option.

Issue: #1291
Signed-off-by: Florian Forster <octo@collectd.org>
---

diff --git a/bindings/java/org/collectd/java/GenericJMXConfValue.java b/bindings/java/org/collectd/java/GenericJMXConfValue.java
index 48a69273..802622c5 100644
--- a/bindings/java/org/collectd/java/GenericJMXConfValue.java
+++ b/bindings/java/org/collectd/java/GenericJMXConfValue.java
@@ -70,6 +70,7 @@ class GenericJMXConfValue
   private List<String> _attributes;
   private String _instance_prefix;
   private List<String> _instance_from;
+  private String _plugin_name;
   private boolean _is_table;
 
   /**
@@ -480,6 +481,7 @@ class GenericJMXConfValue
     this._attributes = new ArrayList<String> ();
     this._instance_prefix = null;
     this._instance_from = new ArrayList<String> ();
+    this._plugin_name = null;
     this._is_table = false;
 
     /*
@@ -528,6 +530,12 @@ class GenericJMXConfValue
         String tmp = getConfigString (child);
         if (tmp != null)
           this._instance_from.add (tmp);
+        else if (child.getKey ().equalsIgnoreCase ("PluginName"))
+        {
+          String tmp = getConfigString (child);
+          if (tmp != null)
+            this._plugin_name = tmp;
+        }
       }
       else
         throw (new IllegalArgumentException ("Unknown option: "
@@ -582,6 +590,10 @@ class GenericJMXConfValue
 
     vl = new ValueList (pd);
     vl.setType (this._ds_name);
+    if (this._plugin_name != null)
+    {
+      vl.setPlugin (this._plugin_name);
+    }
 
     /*
      * Build the instnace prefix from the fixed string prefix and the