Made a change so now the zabbix URL is specified via the system property zabbix.zabbixUrl instead of specifying the host/port because given the full URL is more flexible e.g. if they're using https or the endpoint is not the same (previously assumed /zabbix). The zabbix URL specifies the web servers URL where the the API can be accessed e.g. http://myzabbixhost.com

Author: Ryan Rupp

settings.sh

@@ -35,6 +35,14 @@ PID_FILE="/tmp/zabbix_java.pid"
 # Default:
 # START_POLLERS=0
 
+### Option: zabbix.zabbixUrl
+#   The URL of the zabbix front end server
+#   which will be used for API calls.
+#
+# Mandatory: no
+# Default:
+# ZABBIX_URL=http://localhost/zabbix
+
 ### Option: zabbix.apiUser
 #	The API username to use
 #
@@ -47,21 +55,4 @@ PID_FILE="/tmp/zabbix_java.pid"
 #
 # Mandatory: no
 # Default:
-# API_PASSWORD=zabbix
-
-### Option: zabbix.apiHost
-#   The host name or IP address
-#   of the Zabbix front end which
-#   the API connection will use.
-#
-# Mandatory: no
-# Default:
-# API_HOST=localhost
-
-### Option: zabbix.apiPort
-#   The Zabbix frontend port for API usage.
-#
-# Mandatory: no
-# Default:
-# API_PORT=80
-
+# API_PASSWORD=zabbix

src/com/zabbix/gateway/ConfigurationManager.java

@@ -35,10 +35,9 @@ class ConfigurationManager
 	public static final String LISTEN_IP = "listenIP";
 	public static final String LISTEN_PORT = "listenPort";
 	public static final String START_POLLERS = "startPollers";
+	public static final String ZABBIX_URL = "zabbixUrl";
 	public static final String API_USER = "apiUser";
 	public static final String API_PASSWORD = "apiPassword";
-	public static final String API_HOST = "apiHost";
-	public static final String API_PORT = "apiPort";
 
 	private static ConfigurationParameter[] parameters =
 	{
@@ -81,10 +80,8 @@ public void execute(Object value)
 		new ConfigurationParameter(API_PASSWORD, ConfigurationParameter.TYPE_STRING, "zabbix",
 				null,
 				null),
-		new ConfigurationParameter(API_HOST, ConfigurationParameter.TYPE_INETADDRESS, getAddressDefault(),
-				null,
-				null),
-		new ConfigurationParameter(API_PORT, ConfigurationParameter.TYPE_INTEGER, 80,
+		new ConfigurationParameter(ZABBIX_URL, ConfigurationParameter.TYPE_STRING,
+				"http://localhost/zabbix",
 				null,
 				null)
 	};

src/com/zabbix/gateway/JavaGateway.java

@@ -113,8 +113,7 @@ public void run()
 			// Setup the JmxConfigurationManager which will handle retrieving the proper JmxConfiguration
 			// to support additional properties such as specifying the JMX protocol and endpoint
 			JmxConfigurationManager jmxManager = new JmxConfigurationManager(
-					(InetAddress) ConfigurationManager.getParameter(ConfigurationManager.API_HOST).getValue(),
-	    			ConfigurationManager.getIntegerParameterValue(ConfigurationManager.API_PORT),
+					ConfigurationManager.getStringParameterValue(ConfigurationManager.ZABBIX_URL),
 	    			ConfigurationManager.getStringParameterValue(ConfigurationManager.API_USER),
 	    	        apiPassword);
 

src/com/zabbix/gateway/JmxConfigurationManager.java

@@ -20,7 +20,6 @@
 package com.zabbix.gateway;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -48,8 +47,8 @@ public class JmxConfigurationManager {
     private final ConcurrentMap<String, JmxConfiguration> _jmxConfigs =
     		new ConcurrentHashMap<String, JmxConfiguration>();
 
-    public JmxConfigurationManager(InetAddress apiHost, Integer apiPort, String apiUser, String apiPassword) {
-    	_zabbixApi = new ZabbixApi(apiHost, apiPort,
+    public JmxConfigurationManager(String zabbixUrl, String apiUser, String apiPassword) {
+    	_zabbixApi = new ZabbixApi(zabbixUrl,
     			apiUser, apiPassword);
     }
 

src/com/zabbix/gateway/ZabbixApi.java

@@ -25,7 +25,7 @@
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
-import java.net.InetAddress;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -76,20 +76,31 @@ public class ZabbixApi {
     final static int SOCKET_TIMEOUT = 1000; // 1 second
     final static int READ_TIMEOUT = 2000; // 2 seconds
 
-    private String _zabbixConn;
-    private String _authKey;
-    private int _requestId;
+    private final URL _zabbixApiUrl;
+    private final String _authKey;
+    private final int _requestId;
 
     /**
      * Creates a new Zabbix API connection and logs it in.
-     * @param host The Zabbix API frontend host or IP address
-     * @param port The Zabbix API frontend port
+     * @param zabbixUrl The root url of the Zabbix server e.g. http://myzabbixserver
      * @param username The Zabbix API username (must be a valid user)
      * @param password The Zabbix API password for the user
      */
-    public ZabbixApi(InetAddress host, Integer port, String username, String password) {
-    	_zabbixConn =  host.getHostAddress() + ":" + port;
-    	logger.debug("Initializing Zabbix API with connection: " + _zabbixConn);
+    public ZabbixApi(String zabbixUrl, String username, String password) {
+    	final StringBuilder urlBuilder = new StringBuilder(zabbixUrl);
+    	if (!zabbixUrl.endsWith("/")) {
+    		urlBuilder.append('/');
+    	}
+    	urlBuilder.append("api_jsonrpc.php");
+    	
+    	try {
+			_zabbixApiUrl = new URL(urlBuilder.toString());
+		} 
+    	catch (MalformedURLException e) {
+			throw new IllegalArgumentException("An invalid Zabbix URL was specified: " + zabbixUrl);
+		}
+    	
+    	logger.debug("Initializing Zabbix API with connection: " + _zabbixApiUrl);
     	_requestId = 1;
     	_authKey = login(username, password, _requestId);
     }
@@ -264,9 +275,8 @@ private JSONObject zabbixApiCall(String jrpc) throws IOException, JSONException
         BufferedReader rd;
         OutputStreamWriter wr;
         HttpURLConnection conn;
-        URL zabbixApiUrl = new URL("http://" + _zabbixConn + "/zabbix/api_jsonrpc.php");
 
-        conn = (HttpURLConnection)zabbixApiUrl.openConnection();
+        conn = (HttpURLConnection)_zabbixApiUrl.openConnection();
         conn.setRequestProperty(CONTENT_TYPE, APP_JRPC);
         conn.setRequestMethod("POST");
         conn.setDoOutput(true);

startup.sh

@@ -29,11 +29,8 @@ fi
 if [ -n "$API_PASSWORD" ]; then
 	ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.apiPassword=$API_PASSWORD"
 fi
-if [ -n "$API_HOST" ]; then
-ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.apiHost=$API_HOST"
-fi
-if [ -n "$API_PORT" ]; then
-ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.apiPort=$API_PORT"
+if [ -n "$ZABBIX_URL" ]; then
+ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.zabbixUrl=$ZABBIX_URL"
 fi
 if [ -n "$PID_FILE" ]; then
 	ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.pidFile=$PID_FILE"