Feature/lga 2849 pingdom alerting (#50)

* Add pingdom URL * Update deploy dev * Change the helm * Join list * Update pingdom ip * Change to ben address * Update whitelist build * Change parsing of pingdom ips * Add list * Change range to ips * Update name
ministryofjustice · Oct 21, 2024 · 444eccc · 444eccc
1 parent e938748
commit 444eccc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -54,6 +54,8 @@ jobs:
           # Pull ranges from shared LAA IP ranges and then remove spaces,
           # replace linebreaks with commas, remove last comma, and escape commas for helm input
           SHARED_IP_RANGES_LAA=$(curl -s https://raw.githubusercontent.com/ministryofjustice/laa-ip-allowlist/main/cidrs.txt | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
+          PINGDOM_IPS=$(curl -s  https://my.pingdom.com/probes/ipv4 | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
+          echo "PINGDOM_IPS=$PINGDOM_IPS" >> $GITHUB_ENV
           echo "SHARED_IP_RANGES_LAA=$SHARED_IP_RANGES_LAA" >> $GITHUB_ENV
 
       - name: Upgrade the Helm chart
@@ -80,5 +82,6 @@ jobs:
           --set ingress.hosts[0].host=${HOST_NAME} \
           --set ingress.tls[0].hosts[0]=${HOST_NAME} \
           --set sharedIPRangesLAA=$SHARED_IP_RANGES_LAA \
+          --set pingdomIPs=$PINGDOM_IPS \
           --force \
           --install
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -49,11 +49,13 @@ jobs:
           kubectl config set-context ${KUBE_CLUSTER} --cluster=${KUBE_CLUSTER} --user=deploy-user --namespace=${KUBE_NAMESPACE}
           kubectl config use-context ${KUBE_CLUSTER}
 
-      - name: Fetch and set SHARED_IP_RANGES_LAA environment variable
+      - name: Fetch and set whitelist IP environment variables
         run: |
           # Pull ranges from shared LAA IP ranges and then remove spaces,
           # replace linebreaks with commas, remove last comma, and escape commas for helm input
           SHARED_IP_RANGES_LAA=$(curl -s https://raw.githubusercontent.com/ministryofjustice/laa-ip-allowlist/main/cidrs.txt | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
+          PINGDOM_IPS=$(curl -s https://my.pingdom.com/probes/ipv4 | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
+          echo "PINGDOM_IPS=$PINGDOM_IPS" >> $GITHUB_ENV
           echo "SHARED_IP_RANGES_LAA=$SHARED_IP_RANGES_LAA" >> $GITHUB_ENV
 
       - name: Upgrade the Helm chart
@@ -71,5 +73,6 @@ jobs:
           --set image.repository=${REGISTRY}/${REPOSITORY} \
           --set image.tag=${IMAGE_TAG} \
           --set sharedIPRangesLAA=$SHARED_IP_RANGES_LAA \
+          --set pingdomIPs=$PINGDOM_IPS \
           --force \
           --install
diff --git a/helm_deploy/laa-access-civil-legal-aid/templates/_helpers.tpl b/helm_deploy/laa-access-civil-legal-aid/templates/_helpers.tpl
@@ -24,7 +24,7 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 
 {{- define "laa-access-civil-legal-aid.whitelist" -}}
-{{ join "," .Values.sharedIPRangesLAA}}
+{{ join "," (list .Values.sharedIPRangesLAA .Values.pingdomIPs)}}
 {{- end -}}
 
 {{/*