diff --git a/bindings/java/org/collectd/java/GenericJMXConfConnection.java b/bindings/java/org/collectd/java/GenericJMXConfConnection.java
index 0108b53fdb1d5f3b56e7d477c54c5c2ef35a73ad..81aee033e774ce32208d410a33b3094dbcfc384e 100644 (file)
/*
* collectd/java - org/collectd/java/GenericJMXConfConnection.java
- * Copyright (C) 2009 Florian octo Forster
+ * Copyright (C) 2009-2012 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at verplant.org>
+ * Florian octo Forster <octo at collectd.org>
*/
package org.collectd.java;
import java.util.List;
+import java.util.Map;
import java.util.Iterator;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
import javax.management.remote.JMXServiceURL;
import javax.management.remote.JMXConnector;
class GenericJMXConfConnection
{
+ private String _username = null;
+ private String _password = null;
private String _host = null;
+ private String _instance_prefix = null;
private String _service_url = null;
private MBeanServerConnection _jmx_connection = null;
private List<GenericJMXConfMBean> _mbeans = null;
return (v.getString ());
} /* }}} String getConfigString */
+ private String getHost () /* {{{ */
+ {
+ if (this._host != null)
+ {
+ return (this._host);
+ }
+
+ try
+ {
+ InetAddress localHost = InetAddress.getLocalHost();
+ return (localHost.getHostName ());
+ }
+ catch (UnknownHostException e)
+ {
+ return ("localhost");
+ }
+ } /* }}} String getHost */
+
private void connect () /* {{{ */
{
JMXServiceURL service_url;
JMXConnector connector;
+ Map environment;
if (_jmx_connection != null)
return;
+ environment = null;
+ if (this._password != null)
+ {
+ String[] credentials;
+
+ if (this._username == null)
+ this._username = new String ("monitorRole");
+
+ credentials = new String[] { this._username, this._password };
+
+ environment = new HashMap ();
+ environment.put (JMXConnector.CREDENTIALS, credentials);
+ }
+
try
{
service_url = new JMXServiceURL (this._service_url);
- connector = JMXConnectorFactory.connect (service_url);
+ connector = JMXConnectorFactory.connect (service_url, environment);
_jmx_connection = connector.getMBeanServerConnection ();
}
catch (Exception e)
if (tmp != null)
this._host = tmp;
}
+ else if (child.getKey ().equalsIgnoreCase ("User"))
+ {
+ String tmp = getConfigString (child);
+ if (tmp != null)
+ this._username = tmp;
+ }
+ else if (child.getKey ().equalsIgnoreCase ("Password"))
+ {
+ String tmp = getConfigString (child);
+ if (tmp != null)
+ this._password = tmp;
+ }
else if (child.getKey ().equalsIgnoreCase ("ServiceURL"))
{
String tmp = getConfigString (child);
if (tmp != null)
this._service_url = tmp;
}
+ else if (child.getKey ().equalsIgnoreCase ("InstancePrefix"))
+ {
+ String tmp = getConfigString (child);
+ if (tmp != null)
+ this._instance_prefix = tmp;
+ }
else if (child.getKey ().equalsIgnoreCase ("Collect"))
{
String tmp = getConfigString (child);
+ ((this._host != null) ? this._host : "(null)"));
pd = new PluginData ();
- pd.setHost ((this._host != null) ? this._host : "localhost");
+ pd.setHost (this.getHost ());
pd.setPlugin ("GenericJMX");
for (int i = 0; i < this._mbeans.size (); i++)
- this._mbeans.get (i).query (this._jmx_connection, pd);
+ {
+ int status;
+
+ status = this._mbeans.get (i).query (this._jmx_connection, pd,
+ this._instance_prefix);
+ if (status != 0)
+ {
+ this._jmx_connection = null;
+ return;
+ }
+ } /* for */
} /* }}} void query */
public String toString ()