Resolves #1 - Allow the Zabbix API to connect to other frontend ports outside of the default port 80 by allowing new configuration parameters for the apiHost and apiPort set via the settings.sh file.

Author: ryanrupp

settings.sh

@@ -48,3 +48,19 @@ PID_FILE="/tmp/zabbix_java.pid"
 # 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
+

src/com/zabbix/gateway/ConfigurationManager.java

@@ -21,6 +21,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +37,8 @@ class ConfigurationManager
 	public static final String START_POLLERS = "startPollers";
 	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 =
 	{
@@ -75,6 +79,12 @@ public void execute(Object value)
 				null,
 				null),
 		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,
 				null,
 				null)
 	};
@@ -119,4 +129,13 @@ public static String getPackage()
 	{
 		return "com.zabbix.gateway";
 	}
+	
+	private static InetAddress getAddressDefault() {
+		try {
+			return InetAddress.getLocalHost();
+		} catch (UnknownHostException e) {
+			logger.error("An exception occurred when trying to resolve localhost");
+			throw new RuntimeException(e);
+		}
+	}
 }

src/com/zabbix/gateway/JmxConfigurationManager.java

@@ -20,6 +20,7 @@
 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;
@@ -47,7 +48,9 @@ public class JmxConfigurationManager {
     private static final ZabbixApi _zabbixApi;
 
     static {
-    	_zabbixApi = new ZabbixApi("localhost",
+    	_zabbixApi = new ZabbixApi(
+    			(InetAddress) ConfigurationManager.getParameter(ConfigurationManager.API_HOST).getValue(),
+    			ConfigurationManager.getIntegerParameterValue(ConfigurationManager.API_PORT),
     			ConfigurationManager.getStringParameterValue(ConfigurationManager.API_USER),
     	        ConfigurationManager.getStringParameterValue(ConfigurationManager.API_PASSWORD));
     }

src/com/zabbix/gateway/ZabbixApi.java

@@ -25,6 +25,7 @@
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
+import java.net.InetAddress;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,12 +72,20 @@ public class ZabbixApi {
     final static String MACRO = "macro";
     final static String VALUE = "value";
 
-    private String _zabbixIp;
+    private String _zabbixConn;
     private String _authKey;
     private int _requestId;
 
-    public ZabbixApi(String ip, String username, String password) {
-    	_zabbixIp = "localhost";
+    /**
+     * 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 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);
     	_requestId = 1;
     	_authKey = login(username, password, _requestId);
     }
@@ -244,7 +253,7 @@ private JSONObject zabbixApiCall(String jrpc) throws IOException, JSONException
         BufferedReader rd;
         OutputStreamWriter wr;
         HttpURLConnection conn;
-        URL zabbixApiUrl = new URL("http://" + _zabbixIp + "/zabbix/api_jsonrpc.php");
+        URL zabbixApiUrl = new URL("http://" + _zabbixConn + "/zabbix/api_jsonrpc.php");
 
         conn = (HttpURLConnection)zabbixApiUrl.openConnection();
         conn.setRequestProperty(CONTENT_TYPE, APP_JRPC);

startup.sh

@@ -29,6 +29,12 @@ 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"
+fi
 if [ -n "$PID_FILE" ]; then
 	ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.pidFile=$PID_FILE"
 fi