Monitors in integrations folder (#2274)

* feat: k8s monitors - handle single string argument passed as `sumologic.setup.monitors.notificationEmails` * feat: k8s monitors - install k8s monitors in integrations folder * fix: k8s monitors - remove spaces from placeholders * feat: k8s monitors - changelog * feat: k8s monitors - use --data-urlencode for monitors query parameter * feat: k8s monitors - bump setup job version
SumoLogic · May 6, 2022 · 41181bd · 41181bd
1 parent 484b502
commit 41181bd
Show file tree

Hide file tree

Showing 15 changed files with 862 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - feat(fluentd): expose extra configuration for fluentd output plugin [#2244][#2244]
-- feat(monitors): the Sumo Logic monitors installation as part of the setup job [#2250][#2250]
+- feat(monitors): the Sumo Logic monitors installation as part of the setup job [#2250][#2250], [#2274][#2274]
 
 ### Changed
 
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#2250]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2250
 [#2251]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2251
 [#2272]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2272
+[#2274]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2274
 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.7.1...main
 
 ## [v2.7.1]

diff --git a/deploy/helm/sumologic/conf/setup/monitors.sh b/deploy/helm/sumologic/conf/setup/monitors.sh
@@ -7,25 +7,50 @@ readonly SUMOLOGIC_ACCESSKEY
 SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL:=""}
 readonly SUMOLOGIC_BASE_URL
 
+INTEGRATIONS_FOLDER_NAME="Sumo Logic Integrations"
 MONITORS_FOLDER_NAME="Kubernetes"
 {{- if eq .Values.sumologic.setup.monitors.monitorStatus "enabled" }}
 MONITORS_DISABLED="false"
 {{- else }}
 MONITORS_DISABLED="true"
 {{- end}}
 
-# verify if the k8s monitors folder already exists
-MONITORS_RESPONSE="$(curl -XGET -s \
-        -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
-        "${SUMOLOGIC_BASE_URL}"v1/monitors/search?query=type:folder%20"${MONITORS_FOLDER_NAME}" | jq '.[]' )"
-readonly MONITORS_RESPONSE
 MONITORS_ROOT_ID="$(curl -XGET -s \
         -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
         "${SUMOLOGIC_BASE_URL}"v1/monitors/root | jq -r '.id' )"
 readonly MONITORS_ROOT_ID
 
+# verify if the integrations folder already exists
+INTEGRATIONS_RESPONSE="$(curl -XGET -s -G \
+        -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+        "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+        --data-urlencode "query=type:folder ${INTEGRATIONS_FOLDER_NAME}" | \
+        jq '.[]' )"
+readonly INTEGRATIONS_RESPONSE
+
+INTEGRATIONS_FOLDER_ID="$( echo "${INTEGRATIONS_RESPONSE}" | \
+        jq -r "select(.item.name == \"${INTEGRATIONS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+
+# and create it if necessary
+if [[ -z "${INTEGRATIONS_FOLDER_ID}" ]]; then
+  INTEGRATIONS_FOLDER_ID="$(curl -XPOST -s \
+              -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+              -H "Content-Type: application/json" \
+              -d "{\"name\":\"${INTEGRATIONS_FOLDER_NAME}\",\"type\":\"MonitorsLibraryFolder\",\"description\":\"Monitors provided by the Sumo Logic integrations.\"}" \
+              "${SUMOLOGIC_BASE_URL}"v1/monitors?parentId="${MONITORS_ROOT_ID}" | \
+              jq -r " .id" )"
+fi
+
+# verify if the k8s monitors folder already exists
+MONITORS_RESPONSE="$(curl -XGET -s -G \
+        -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+        "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+        --data-urlencode "query=type:folder ${MONITORS_FOLDER_NAME}" | \
+        jq '.[]' )"
+readonly MONITORS_RESPONSE
+
 MONITORS_FOLDER_ID="$( echo "${MONITORS_RESPONSE}" | \
-        jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+        jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${INTEGRATIONS_FOLDER_ID}\") | .item.id" )"
 readonly MONITORS_FOLDER_ID
 
 if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
@@ -44,9 +69,12 @@ if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
   fi
 
 {{- if not (.Values.sumologic.setup.monitors.notificationEmails | empty) }}
-
+{{- if kindIs "slice" .Values.sumologic.setup.monitors.notificationEmails }}
   NOTIFICATIONS_RECIPIENTS='{{- .Values.sumologic.setup.monitors.notificationEmails | toRawJson }}'
-  NOTIFICATIONS_CONTENT="subject=\"Monitor Alert: {{ printf `{{ TriggerType }}` }} on {{ printf `{{ Name }}` }}\",message_body=\"Triggered {{ printf `{{ TriggerType }}` }} Alert on {{ printf `{{ Name }}` }}: {{ printf `{{ QueryURL }}` }}\""
+{{- else }}
+  NOTIFICATIONS_RECIPIENTS='[{{- .Values.sumologic.setup.monitors.notificationEmails | toRawJson }}]'
+{{- end }}
+  NOTIFICATIONS_CONTENT="subject=\"Monitor Alert: {{ printf `{{TriggerType}}` }} on {{ printf `{{Name}}` }}\",message_body=\"Triggered {{ printf `{{TriggerType}}` }} alert on {{ printf `{{Name}}` }}: {{ printf `{{QueryURL}}` }}\""
   NOTIFICATIONS_SETTINGS="recipients=${NOTIFICATIONS_RECIPIENTS},connection_type=\"Email\",time_zone=\"UTC\""
 {{- end }}
 
@@ -56,6 +84,7 @@ if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
       -var="access_key=${SUMOLOGIC_ACCESSKEY}" \
       -var="environment=${SUMOLOGIC_ENV}" \
       -var="folder=${MONITORS_FOLDER_NAME}" \
+      -var="folder_parent_id=${INTEGRATIONS_FOLDER_ID}" \
       -var="monitors_disabled=${MONITORS_DISABLED}" \
 {{- if not (.Values.sumologic.setup.monitors.notificationEmails | empty) }}
       -var="email_notifications_critical=[{${NOTIFICATIONS_SETTINGS},${NOTIFICATIONS_CONTENT},run_for_trigger_types=[\"Critical\", \"ResolvedCritical\"]}]" \

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -96,7 +96,7 @@ sumologic:
     job:
       image:
         repository: public.ecr.aws/sumologic/kubernetes-setup
-        tag: 3.2.2
+        tag: 3.3.0
         pullPolicy: IfNotPresent
       ## Optionally specify an array of pullSecrets.
       ## They will be added to serviceaccount that is used for Sumo Logic's

diff --git a/tests/helm/terraform/static/all_fields.output.yaml b/tests/helm/terraform/static/all_fields.output.yaml
@@ -155,21 +155,46 @@ data:
     SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL:=""}
     readonly SUMOLOGIC_BASE_URL
 
+    INTEGRATIONS_FOLDER_NAME="Sumo Logic Integrations"
     MONITORS_FOLDER_NAME="Kubernetes"
     MONITORS_DISABLED="false"
 
-    # verify if the k8s monitors folder already exists
-    MONITORS_RESPONSE="$(curl -XGET -s \
-            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
-            "${SUMOLOGIC_BASE_URL}"v1/monitors/search?query=type:folder%20"${MONITORS_FOLDER_NAME}" | jq '.[]' )"
-    readonly MONITORS_RESPONSE
     MONITORS_ROOT_ID="$(curl -XGET -s \
             -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
             "${SUMOLOGIC_BASE_URL}"v1/monitors/root | jq -r '.id' )"
     readonly MONITORS_ROOT_ID
 
+    # verify if the integrations folder already exists
+    INTEGRATIONS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${INTEGRATIONS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly INTEGRATIONS_RESPONSE
+
+    INTEGRATIONS_FOLDER_ID="$( echo "${INTEGRATIONS_RESPONSE}" | \
+            jq -r "select(.item.name == \"${INTEGRATIONS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+
+    # and create it if necessary
+    if [[ -z "${INTEGRATIONS_FOLDER_ID}" ]]; then
+      INTEGRATIONS_FOLDER_ID="$(curl -XPOST -s \
+                  -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+                  -H "Content-Type: application/json" \
+                  -d "{\"name\":\"${INTEGRATIONS_FOLDER_NAME}\",\"type\":\"MonitorsLibraryFolder\",\"description\":\"Monitors provided by the Sumo Logic integrations.\"}" \
+                  "${SUMOLOGIC_BASE_URL}"v1/monitors?parentId="${MONITORS_ROOT_ID}" | \
+                  jq -r " .id" )"
+    fi
+
+    # verify if the k8s monitors folder already exists
+    MONITORS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${MONITORS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly MONITORS_RESPONSE
+
     MONITORS_FOLDER_ID="$( echo "${MONITORS_RESPONSE}" | \
-            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${INTEGRATIONS_FOLDER_ID}\") | .item.id" )"
     readonly MONITORS_FOLDER_ID
 
     if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
@@ -193,6 +218,7 @@ data:
           -var="access_key=${SUMOLOGIC_ACCESSKEY}" \
           -var="environment=${SUMOLOGIC_ENV}" \
           -var="folder=${MONITORS_FOLDER_NAME}" \
+          -var="folder_parent_id=${INTEGRATIONS_FOLDER_ID}" \
           -var="monitors_disabled=${MONITORS_DISABLED}" \
           || { echo "Error during applying Terraform monitors."; exit 1; }
     else

diff --git a/tests/helm/terraform/static/collector_fields.output.yaml b/tests/helm/terraform/static/collector_fields.output.yaml
@@ -154,21 +154,46 @@ data:
     SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL:=""}
     readonly SUMOLOGIC_BASE_URL
 
+    INTEGRATIONS_FOLDER_NAME="Sumo Logic Integrations"
     MONITORS_FOLDER_NAME="Kubernetes"
     MONITORS_DISABLED="false"
 
-    # verify if the k8s monitors folder already exists
-    MONITORS_RESPONSE="$(curl -XGET -s \
-            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
-            "${SUMOLOGIC_BASE_URL}"v1/monitors/search?query=type:folder%20"${MONITORS_FOLDER_NAME}" | jq '.[]' )"
-    readonly MONITORS_RESPONSE
     MONITORS_ROOT_ID="$(curl -XGET -s \
             -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
             "${SUMOLOGIC_BASE_URL}"v1/monitors/root | jq -r '.id' )"
     readonly MONITORS_ROOT_ID
 
+    # verify if the integrations folder already exists
+    INTEGRATIONS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${INTEGRATIONS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly INTEGRATIONS_RESPONSE
+
+    INTEGRATIONS_FOLDER_ID="$( echo "${INTEGRATIONS_RESPONSE}" | \
+            jq -r "select(.item.name == \"${INTEGRATIONS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+
+    # and create it if necessary
+    if [[ -z "${INTEGRATIONS_FOLDER_ID}" ]]; then
+      INTEGRATIONS_FOLDER_ID="$(curl -XPOST -s \
+                  -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+                  -H "Content-Type: application/json" \
+                  -d "{\"name\":\"${INTEGRATIONS_FOLDER_NAME}\",\"type\":\"MonitorsLibraryFolder\",\"description\":\"Monitors provided by the Sumo Logic integrations.\"}" \
+                  "${SUMOLOGIC_BASE_URL}"v1/monitors?parentId="${MONITORS_ROOT_ID}" | \
+                  jq -r " .id" )"
+    fi
+
+    # verify if the k8s monitors folder already exists
+    MONITORS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${MONITORS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly MONITORS_RESPONSE
+
     MONITORS_FOLDER_ID="$( echo "${MONITORS_RESPONSE}" | \
-            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${INTEGRATIONS_FOLDER_ID}\") | .item.id" )"
     readonly MONITORS_FOLDER_ID
 
     if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
@@ -192,6 +217,7 @@ data:
           -var="access_key=${SUMOLOGIC_ACCESSKEY}" \
           -var="environment=${SUMOLOGIC_ENV}" \
           -var="folder=${MONITORS_FOLDER_NAME}" \
+          -var="folder_parent_id=${INTEGRATIONS_FOLDER_ID}" \
           -var="monitors_disabled=${MONITORS_DISABLED}" \
           || { echo "Error during applying Terraform monitors."; exit 1; }
     else

diff --git a/tests/helm/terraform/static/conditional_sources.output.yaml b/tests/helm/terraform/static/conditional_sources.output.yaml
@@ -144,21 +144,46 @@ data:
     SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL:=""}
     readonly SUMOLOGIC_BASE_URL
 
+    INTEGRATIONS_FOLDER_NAME="Sumo Logic Integrations"
     MONITORS_FOLDER_NAME="Kubernetes"
     MONITORS_DISABLED="false"
 
-    # verify if the k8s monitors folder already exists
-    MONITORS_RESPONSE="$(curl -XGET -s \
-            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
-            "${SUMOLOGIC_BASE_URL}"v1/monitors/search?query=type:folder%20"${MONITORS_FOLDER_NAME}" | jq '.[]' )"
-    readonly MONITORS_RESPONSE
     MONITORS_ROOT_ID="$(curl -XGET -s \
             -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
             "${SUMOLOGIC_BASE_URL}"v1/monitors/root | jq -r '.id' )"
     readonly MONITORS_ROOT_ID
 
+    # verify if the integrations folder already exists
+    INTEGRATIONS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${INTEGRATIONS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly INTEGRATIONS_RESPONSE
+
+    INTEGRATIONS_FOLDER_ID="$( echo "${INTEGRATIONS_RESPONSE}" | \
+            jq -r "select(.item.name == \"${INTEGRATIONS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+
+    # and create it if necessary
+    if [[ -z "${INTEGRATIONS_FOLDER_ID}" ]]; then
+      INTEGRATIONS_FOLDER_ID="$(curl -XPOST -s \
+                  -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+                  -H "Content-Type: application/json" \
+                  -d "{\"name\":\"${INTEGRATIONS_FOLDER_NAME}\",\"type\":\"MonitorsLibraryFolder\",\"description\":\"Monitors provided by the Sumo Logic integrations.\"}" \
+                  "${SUMOLOGIC_BASE_URL}"v1/monitors?parentId="${MONITORS_ROOT_ID}" | \
+                  jq -r " .id" )"
+    fi
+
+    # verify if the k8s monitors folder already exists
+    MONITORS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${MONITORS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly MONITORS_RESPONSE
+
     MONITORS_FOLDER_ID="$( echo "${MONITORS_RESPONSE}" | \
-            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${INTEGRATIONS_FOLDER_ID}\") | .item.id" )"
     readonly MONITORS_FOLDER_ID
 
     if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
@@ -182,6 +207,7 @@ data:
           -var="access_key=${SUMOLOGIC_ACCESSKEY}" \
           -var="environment=${SUMOLOGIC_ENV}" \
           -var="folder=${MONITORS_FOLDER_NAME}" \
+          -var="folder_parent_id=${INTEGRATIONS_FOLDER_ID}" \
           -var="monitors_disabled=${MONITORS_DISABLED}" \
           || { echo "Error during applying Terraform monitors."; exit 1; }
     else

diff --git a/tests/helm/terraform/static/custom.output.yaml b/tests/helm/terraform/static/custom.output.yaml
@@ -144,21 +144,46 @@ data:
     SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL:=""}
     readonly SUMOLOGIC_BASE_URL
 
+    INTEGRATIONS_FOLDER_NAME="Sumo Logic Integrations"
     MONITORS_FOLDER_NAME="Kubernetes"
     MONITORS_DISABLED="false"
 
-    # verify if the k8s monitors folder already exists
-    MONITORS_RESPONSE="$(curl -XGET -s \
-            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
-            "${SUMOLOGIC_BASE_URL}"v1/monitors/search?query=type:folder%20"${MONITORS_FOLDER_NAME}" | jq '.[]' )"
-    readonly MONITORS_RESPONSE
     MONITORS_ROOT_ID="$(curl -XGET -s \
             -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
             "${SUMOLOGIC_BASE_URL}"v1/monitors/root | jq -r '.id' )"
     readonly MONITORS_ROOT_ID
 
+    # verify if the integrations folder already exists
+    INTEGRATIONS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${INTEGRATIONS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly INTEGRATIONS_RESPONSE
+
+    INTEGRATIONS_FOLDER_ID="$( echo "${INTEGRATIONS_RESPONSE}" | \
+            jq -r "select(.item.name == \"${INTEGRATIONS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+
+    # and create it if necessary
+    if [[ -z "${INTEGRATIONS_FOLDER_ID}" ]]; then
+      INTEGRATIONS_FOLDER_ID="$(curl -XPOST -s \
+                  -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+                  -H "Content-Type: application/json" \
+                  -d "{\"name\":\"${INTEGRATIONS_FOLDER_NAME}\",\"type\":\"MonitorsLibraryFolder\",\"description\":\"Monitors provided by the Sumo Logic integrations.\"}" \
+                  "${SUMOLOGIC_BASE_URL}"v1/monitors?parentId="${MONITORS_ROOT_ID}" | \
+                  jq -r " .id" )"
+    fi
+
+    # verify if the k8s monitors folder already exists
+    MONITORS_RESPONSE="$(curl -XGET -s -G \
+            -u "${SUMOLOGIC_ACCESSID}:${SUMOLOGIC_ACCESSKEY}" \
+            "${SUMOLOGIC_BASE_URL}"v1/monitors/search \
+            --data-urlencode "query=type:folder ${MONITORS_FOLDER_NAME}" | \
+            jq '.[]' )"
+    readonly MONITORS_RESPONSE
+
     MONITORS_FOLDER_ID="$( echo "${MONITORS_RESPONSE}" | \
-            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${MONITORS_ROOT_ID}\") | .item.id" )"
+            jq -r "select(.item.name == \"${MONITORS_FOLDER_NAME}\") | select(.item.parentId == \"${INTEGRATIONS_FOLDER_ID}\") | .item.id" )"
     readonly MONITORS_FOLDER_ID
 
     if [[ -z "${MONITORS_FOLDER_ID}" ]]; then
@@ -182,6 +207,7 @@ data:
           -var="access_key=${SUMOLOGIC_ACCESSKEY}" \
           -var="environment=${SUMOLOGIC_ENV}" \
           -var="folder=${MONITORS_FOLDER_NAME}" \
+          -var="folder_parent_id=${INTEGRATIONS_FOLDER_ID}" \
           -var="monitors_disabled=${MONITORS_DISABLED}" \
           || { echo "Error during applying Terraform monitors."; exit 1; }
     else