Skip to content

Commit 4bc3982

Browse files
committed
Create Monitoring VPE Gateway servive-based
1 parent 67b44d9 commit 4bc3982

1 file changed

Lines changed: 20 additions & 5 deletions

File tree

serverless-fleets/init-fleet-sandbox

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ else
309309
sysdig_access_key=$(echo $sysdig_key | jq '.credentials["Sysdig Access Key"]' -r)
310310
sysdig_collector_host=$(echo "$sysdig_key" | jq '.credentials["Sysdig Collector Endpoint"]' -r)
311311
sysdig_instance=$(ibmcloud resource service-instance $sysdig_name -o JSON)
312-
sysdig_crn=$(echo "$sysdig_instance"|jq -r '.[0].crn')
312+
sysdig_crn_instance_based=$(echo "$sysdig_instance"|jq -r '.[0].crn')
313+
sysdig_crn_service_based=${sysdig_crn_instance_based%a/*}::endpoint:private.${REGION}.monitoring.cloud.ibm.com
313314
fi
314315

315316
#
@@ -493,19 +494,33 @@ fi
493494

494495
if [[ "$SETUP_MONITORING" == "true" ]]; then
495496
if ! ibmcloud is endpoint-gateway "${vpegw_monitoring}" --vpc $vpc_name >/dev/null 2>&1; then
496-
print_msg "\nCreating a VPE Gateway to enable monitoring ingestion ..."
497+
print_msg "\nCreating a service-based VPE Gateway to enable monitoring ingestion ..."
497498
ibmcloud is endpoint-gateway-create \
498499
--vpc $vpc_name \
499500
--sg $vpc_name-group \
500-
--target ${sysdig_crn} \
501+
--target ${sysdig_crn_service_based} \
501502
--name "${vpegw_sysdig}" \
502503
--new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_1}\"},\"name\":\"${vpegw_monitoring}-ip-1\",\"auto_delete\":true}" \
503504
--new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_2}\"},\"name\":\"${vpegw_monitoring}-ip-2\",\"auto_delete\":true}" \
504505
--new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_3}\"},\"name\":\"${vpegw_monitoring}-ip-3\",\"auto_delete\":true}" \
505506
--dns-resolution-binding-mode disabled
506507
if [ $? -ne 0 ]; then
507-
print_error "Monitoring VPE Gateway creation failed!"
508-
abortScript
508+
print_error "Monitoring service-based VPE Gateway creation failed, fallback to instance-based creation ..."
509+
print_msg "\nCreating an instance-based VPE Gateway to enable monitoring ingestion ..."
510+
ibmcloud is endpoint-gateway-create \
511+
--vpc $vpc_name \
512+
--sg $vpc_name-group \
513+
--target ${sysdig_crn_instance_based} \
514+
--name "${vpegw_sysdig}" \
515+
--new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_1}\"},\"name\":\"${vpegw_monitoring}-ip-1\",\"auto_delete\":true}" \
516+
--new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_2}\"},\"name\":\"${vpegw_monitoring}-ip-2\",\"auto_delete\":true}" \
517+
--new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_3}\"},\"name\":\"${vpegw_monitoring}-ip-3\",\"auto_delete\":true}" \
518+
--dns-resolution-binding-mode disabled
519+
520+
if [ $? -ne 0 ]; then
521+
print_error "Monitoring instance-based VPE Gateway creation failed!"
522+
abortScript
523+
fi
509524
fi
510525
fi
511526
fi

0 commit comments

Comments
 (0)