Makefile.gstlal_feature_extractor_online: remove conditional for dag as it is...

Makefile.gstlal_feature_extractor_online: remove conditional for dag as it is not needed, update with influx backend for monitor jobs

gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_online

@@ -100,6 +100,9 @@ CONDOR_UNIVERSE=vanilla
 # Online DAG Parameters #
 #########################
 
+IFO = H1
+#IFO = L1
+
 TAG = production_online
 
 DATA_SOURCE = framexmit
@@ -119,9 +122,15 @@ SAVE_FORMAT = kafka
 SAVE_CADENCE = 20
 PERSIST_CADENCE = 20
 
+# aggregator settings
+DATA_BACKEND = influx
+INFLUX_HOSTNAME:=${INFLUXDB_HOSTNAME}
+INFLUX_PORT = 8086
+DATABASE_NAME = $(IFO)_gstlal_features
+
 # kafka options
 KAFKA_TOPIC = gstlal_features
-KAFKA_GROUP = group_2
+KAFKA_GROUP = feature_production_online
 ifeq ($(IFO),H1)
 	KAFKA_SERVER:=10.21.6.226:9182
 else
@@ -140,9 +149,6 @@ CLUSTER:=$(shell hostname -d)
 # Auxiliary channel info #
 ##########################
 
-IFO = H1
-#IFO = L1
-
 EPOCH = O3
 LEVEL = lldetchar
 
@@ -184,129 +190,46 @@ all : dag
 	@echo "Submit with: condor_submit_dag feature_extractor_pipe.dag"
 
 dag : $(CHANNEL_LIST) feature_extraction_monitor.yml online-web-deploy
-	if [[ $(DATA_SOURCE) == "lvshm" ]] && [[ $(SAVE_FORMAT) == "hdf5" ]] ; then \
-		gstlal_ll_feature_extractor_pipe \
-			--data-source $(DATA_SOURCE) \
-			--shared-memory-partition H1=LHO_RedDtchr \
-			--shared-memory-assumed-duration 1 \
-			--save-format $(SAVE_FORMAT) \
-			--sample-rate $(SAMPLE_RATE) \
-			--cadence $(SAVE_CADENCE) \
-			--persist-cadence $(PERSIST_CADENCE) \
-			--channel-list $(CHANNEL_LIST) \
-			--out-path $(OUTPATH) \
-			--max-streams $(MAX_STREAMS) \
-			--waveform $(WAVEFORM) \
-			--mismatch $(MISMATCH) \
-			--qhigh $(QHIGH) \
-			$(CONDOR_COMMANDS) \
-			$(SECTION_INCLUDE_COMMANDS) \
-			$(SAFETY_INCLUDE_COMMANDS) \
-			$(FIDELITY_EXCLUDE_COMMANDS) \
-			$(UNSAFE_CHANNEL_INCLUDE_COMMANDS) \
-			--target-channel $(TARGET_CHANNEL) \
-			--disable-kafka-jobs \
-			--condor-universe $(CONDOR_UNIVERSE) \
-			--request-cpu 2 \
-			--request-memory 8GB \
-			--auxiliary-request-memory 8GB \
-			--verbose \
-			--disable-web-service ; \
-	elif [[ $(DATA_SOURCE) == "framexmit" ]] && [[ $(SAVE_FORMAT) == "hdf5" ]] ; then \
-		gstlal_ll_feature_extractor_pipe \
-			--data-source $(DATA_SOURCE) \
-			--save-format $(SAVE_FORMAT) \
-			--sample-rate $(SAMPLE_RATE) \
-			--cadence $(SAVE_CADENCE) \
-			--persist-cadence $(PERSIST_CADENCE) \
-			--channel-list $(CHANNEL_LIST) \
-			--out-path $(OUTPATH) \
-			--max-streams $(MAX_STREAMS) \
-			--waveform $(WAVEFORM) \
-			--mismatch $(MISMATCH) \
-			--qhigh $(QHIGH) \
-			$(CONDOR_COMMANDS) \
-			$(SECTION_INCLUDE_COMMANDS) \
-			$(SAFETY_INCLUDE_COMMANDS) \
-			$(FIDELITY_EXCLUDE_COMMANDS) \
-			$(UNSAFE_CHANNEL_INCLUDE_COMMANDS) \
-			--target-channel $(TARGET_CHANNEL) \
-			--disable-kafka-jobs \
-			--condor-universe $(CONDOR_UNIVERSE) \
-			--request-cpu 2 \
-			--request-memory 8GB \
-			--auxiliary-request-memory 8GB \
-			--verbose \
-			--disable-web-service ; \
-	elif [[ $(DATA_SOURCE) == "lvshm" ]] && [[ $(SAVE_FORMAT) == "kafka" ]] ; then \
-		gstlal_ll_feature_extractor_pipe \
-			--data-source $(DATA_SOURCE) \
-			--shared-memory-partition H1=LHO_RedDtchr \
-			--shared-memory-assumed-duration 1 \
-			--sample-rate $(SAMPLE_RATE) \
-			--cadence $(SAVE_CADENCE) \
-			--persist-cadence $(PERSIST_CADENCE) \
-			--save-format $(SAVE_FORMAT) \
-			--kafka-topic $(KAFKA_TOPIC) \
-			--kafka-server $(KAFKA_SERVER) \
-			--kafka-partition $(KAFKA_GROUP) \
-			--channel-list $(CHANNEL_LIST) \
-			--out-path $(OUTPATH) \
-			--max-streams $(MAX_STREAMS) \
-			--waveform $(WAVEFORM) \
-			--mismatch $(MISMATCH) \
-			--qhigh $(QHIGH) \
-			--tag $(TAG) \
-			--processing-cadence $(PROCESSING_CADENCE) \
-			--request-timeout $(REQUEST_TIMEOUT) \
-			--latency-timeout $(LATENCY_TIMEOUT) \
-			$(CONDOR_COMMANDS) \
-			$(SECTION_INCLUDE_COMMANDS) \
-			$(SAFETY_INCLUDE_COMMANDS) \
-			$(FIDELITY_EXCLUDE_COMMANDS) \
-			$(UNSAFE_CHANNEL_INCLUDE_COMMANDS) \
-			--target-channel $(TARGET_CHANNEL) \
-			--disable-kafka-jobs \
-			--condor-universe $(CONDOR_UNIVERSE) \
-			--request-cpu 2 \
-			--request-memory 8GB \
-			--auxiliary-request-memory 8GB \
-			--verbose \
-			--disable-web-service ; \
-	elif [[ $(DATA_SOURCE) == "framexmit" ]] && [[ $(SAVE_FORMAT) == "kafka" ]] ; then \
-		gstlal_ll_feature_extractor_pipe \
-			--data-source $(DATA_SOURCE) \
-			--save-format $(SAVE_FORMAT) \
-			--sample-rate $(SAMPLE_RATE) \
-			--cadence $(SAVE_CADENCE) \
-			--persist-cadence $(PERSIST_CADENCE) \
-			--kafka-topic $(KAFKA_TOPIC) \
-			--kafka-server $(KAFKA_SERVER) \
-			--kafka-partition $(KAFKA_GROUP) \
-			--channel-list $(CHANNEL_LIST) \
-			--out-path $(OUTPATH) \
-			--max-streams $(MAX_STREAMS) \
-			--waveform $(WAVEFORM) \
-			--mismatch $(MISMATCH) \
-			--qhigh $(QHIGH) \
-			--tag $(TAG) \
-			--processing-cadence $(PROCESSING_CADENCE) \
-			--request-timeout $(REQUEST_TIMEOUT) \
-			--latency-timeout $(LATENCY_TIMEOUT) \
-			$(CONDOR_COMMANDS) \
-			$(SECTION_INCLUDE_COMMANDS) \
-			$(SAFETY_INCLUDE_COMMANDS) \
-			$(FIDELITY_EXCLUDE_COMMANDS) \
-			$(UNSAFE_CHANNEL_INCLUDE_COMMANDS) \
-			--target-channel $(TARGET_CHANNEL) \
-			--disable-kafka-jobs \
-			--condor-universe $(CONDOR_UNIVERSE) \
-			--request-cpu 2 \
-			--request-memory 8GB \
-			--auxiliary-request-memory 8GB \
-			--verbose \
-			--disable-web-service ; \
-	fi ;
+	gstlal_ll_feature_extractor_pipe \
+		--data-source $(DATA_SOURCE) \
+		--shared-memory-partition H1=LHO_RedDtchr \
+		--shared-memory-assumed-duration 1 \
+		--save-format $(SAVE_FORMAT) \
+		--sample-rate $(SAMPLE_RATE) \
+		--cadence $(SAVE_CADENCE) \
+		--persist-cadence $(PERSIST_CADENCE) \
+		--channel-list $(CHANNEL_LIST) \
+		--out-path $(OUTPATH) \
+		--max-streams $(MAX_STREAMS) \
+		--waveform $(WAVEFORM) \
+		--mismatch $(MISMATCH) \
+		--qhigh $(QHIGH) \
+		$(CONDOR_COMMANDS) \
+		$(SECTION_INCLUDE_COMMANDS) \
+		$(SAFETY_INCLUDE_COMMANDS) \
+		$(FIDELITY_EXCLUDE_COMMANDS) \
+		$(UNSAFE_CHANNEL_INCLUDE_COMMANDS) \
+		--target-channel $(TARGET_CHANNEL) \
+		--disable-kafka-jobs \
+		--disable-agg-jobs \
+		--condor-universe $(CONDOR_UNIVERSE) \
+		--tag $(TAG) \
+		--processing-cadence $(PROCESSING_CADENCE) \
+		--request-timeout $(REQUEST_TIMEOUT) \
+		--latency-timeout $(LATENCY_TIMEOUT) \
+		--condor-universe $(CONDOR_UNIVERSE) \
+		--kafka-topic $(KAFKA_TOPIC) \
+		--kafka-server $(KAFKA_SERVER) \
+		--kafka-partition $(KAFKA_GROUP) \
+		--agg-data-backend $(DATA_BACKEND) \
+		--influx-hostname $(INFLUX_HOSTNAME) \
+		--influx-port $(INFLUX_PORT) \
+		--influx-database-name $(DATABASE_NAME) \
+		--request-cpu 2 \
+		--request-memory 8GB \
+		--auxiliary-request-memory 8GB \
+		--verbose \
+		--disable-web-service ; \
 
 online-web-deploy : feature_extraction_monitor.yml
 	scald deploy -c feature_extraction_monitor.yml -o ~/public_html -e