|
309 | 309 | sysdig_access_key=$(echo $sysdig_key | jq '.credentials["Sysdig Access Key"]' -r) |
310 | 310 | sysdig_collector_host=$(echo "$sysdig_key" | jq '.credentials["Sysdig Collector Endpoint"]' -r) |
311 | 311 | 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 |
313 | 314 | fi |
314 | 315 |
|
315 | 316 | # |
|
493 | 494 |
|
494 | 495 | if [[ "$SETUP_MONITORING" == "true" ]]; then |
495 | 496 | 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 ..." |
497 | 498 | ibmcloud is endpoint-gateway-create \ |
498 | 499 | --vpc $vpc_name \ |
499 | 500 | --sg $vpc_name-group \ |
500 | | - --target ${sysdig_crn} \ |
| 501 | + --target ${sysdig_crn_service_based} \ |
501 | 502 | --name "${vpegw_sysdig}" \ |
502 | 503 | --new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_1}\"},\"name\":\"${vpegw_monitoring}-ip-1\",\"auto_delete\":true}" \ |
503 | 504 | --new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_2}\"},\"name\":\"${vpegw_monitoring}-ip-2\",\"auto_delete\":true}" \ |
504 | 505 | --new-reserved-ip "{\"subnet\": {\"id\": \"${subnet_id_3}\"},\"name\":\"${vpegw_monitoring}-ip-3\",\"auto_delete\":true}" \ |
505 | 506 | --dns-resolution-binding-mode disabled |
506 | 507 | 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 |
509 | 524 | fi |
510 | 525 | fi |
511 | 526 | fi |
|
0 commit comments