Adapt the config logger to also use kafka_properties

Author: mgotz

services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java

@@ -86,7 +86,7 @@ public AlarmConfigLogger(String topic, String location, String remoteLocation) {
         root = new File(location, this.topic);
         root.mkdirs();
 
-        model = new AlarmClient(props.getProperty(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG), this.topic);
+        model = new AlarmClient(props.getProperty(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG), this.topic, props.getProperty("kafka_properties"));
         model.start();
 
         initialize();

services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLoggingService.java

@@ -44,6 +44,7 @@ private static void help() {
         System.out.println("-help                                      - This text");
         System.out.println("-topics   Accelerator                      - Alarm topics who's associated configuration is to be logged, they can be defined as a comma or colon separated list");
         System.out.println("-bootstrap.servers localhost:9092          - Kafka server address");
+        System.out.println("-kafka_properties /opt/client.properties   - Properties file to load kafka client settings from");
         System.out.println("-repo.location /tmp/alarm_repo             - Location of the alarm configuration repository");
         System.out.println("-remote.location https://remote.git/repo   - Location of the remote git alarm configuration repository");
         System.out.println("-username username                         - username for remote git repo");
@@ -105,6 +106,12 @@ public static void main(String[] original_args) throws InterruptedException {
                     iter.remove();
                     properties.put("bootstrap.servers", iter.next());
                     iter.remove();
+                } else if (cmd.equals("-kafka_properties")) {
+                    if (!iter.hasNext())
+                        throw new Exception("Missing -kafka_properties file name");
+                    iter.remove();
+                    properties.put("kafka_properties",iter.next());
+                    iter.remove();
                 } else if (cmd.equals("-repo.location")) {
                     if (!iter.hasNext())
                         throw new Exception("Missing -repo.location local checkout location for alarm confing repo");

services/alarm-config-logger/src/main/resources/alarm_config_logger.properties

@@ -1,6 +1,7 @@
 # Kafka alarm topics
 bootstrap.servers=localhost:9092
 alarm_topics=Accelerator
+kafka_properties=
 
 # Location of the git repo
 local.location=/tmp/alarm_repo