From 828d22194563f92926f3474921ad99cca8797aab Mon Sep 17 00:00:00 2001 From: Jooyoung Kim <59524380+joozero@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:42:21 -0700 Subject: [PATCH] NGINX Mon Pattern yaml file revision (#126) * add nginx scenario * fix link * add nginx construct * change nginx configuration to add-on * rollback origin cdk json file * remove nginx sample yaml file * reflect feedback * Update single-new-eks-nginx-opensource-observability.md * Update existing-eks-nginx-observability.md * Update existing-eks-nginx-observability.md * Update existing-eks-opensource-observability.md * Update existing-eks-nginx-observability.md * change nginx yaml file path * add external ip env in detail --- .../existing-eks-nginx-observability.md | 4 ++-- .../single-new-eks-nginx-opensource-observability.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md b/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md index 248c6827..f6d6d1dd 100644 --- a/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md +++ b/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md @@ -178,13 +178,13 @@ kubectl get pods -n nginx-ingress-sample 4. Set an EXTERNAL-IP variable to the value of the EXTERNAL-IP column in the row of the NGINX ingress controller. ``` -EXTERNAL_IP=your-nginx-controller-external-ip +EXTERNAL_IP=$(kubectl get svc blueprints-addon-nginx-ingress-nginx-controller -n nginx-ingress-sample --output jsonpath='{.status.loadBalancer.ingress[0].hostname}') ``` 5. Start some sample NGINX traffic by entering the following command. ``` SAMPLE_TRAFFIC_NAMESPACE=nginx-sample-traffic -curl https://raw.githubusercontent.com/aws-samples/amazon-cloudwatch-container-insights/master/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/sample_traffic/nginx-traffic/nginx-traffic-sample.yaml | +curl https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/k8s-deployment-manifest-templates/nginx/nginx-traffic-sample.yaml | sed "s/{{external_ip}}/$EXTERNAL_IP/g" | sed "s/{{namespace}}/$SAMPLE_TRAFFIC_NAMESPACE/g" | kubectl apply -f - diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md index b3f10a5b..fc509c8d 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md @@ -104,16 +104,16 @@ kubectl get pods -n nginx-ingress-sample 4. Set an EXTERNAL-IP variable to the value of the EXTERNAL-IP column in the row of the NGINX ingress controller. ``` -EXTERNAL_IP=your-nginx-controller-external-ip +EXTERNAL_IP=$(kubectl get svc blueprints-addon-nginx-ingress-nginx-controller -n nginx-ingress-sample --output jsonpath='{.status.loadBalancer.ingress[0].hostname}') ``` 5. Start some sample NGINX traffic by entering the following command. ``` SAMPLE_TRAFFIC_NAMESPACE=nginx-sample-traffic -curl https://raw.githubusercontent.com/aws-samples/amazon-cloudwatch-container-insights/master/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/sample_traffic/nginx-traffic/nginx-traffic-sample.yaml | +curl https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/k8s-deployment-manifest-templates/nginx/nginx-traffic-sample.yaml | sed "s/{{external_ip}}/$EXTERNAL_IP/g" | sed "s/{{namespace}}/$SAMPLE_TRAFFIC_NAMESPACE/g" | -kubectl apply -f - +kubectl apply -f - ``` ## Verify the resources