[azure] Prevent pipeline script error

leehinman · leehinman · commit ecb8260a35d1 · 2021-10-05T20:34:37.000-05:00
- prevent creating new HashMap with null - remove ignore_failure - improve error.message Relates #1789
diff --git a/packages/azure/changelog.yml b/packages/azure/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.9.2"
+  changes:
+    - description: Prevent pipeline script error
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/1870
 - version: "0.9.1"
   changes:
     - description: Fix logic that checks for the 'forwarded' tag
diff --git a/packages/azure/data_stream/activitylogs/elasticsearch/ingest_pipeline/default.yml b/packages/azure/data_stream/activitylogs/elasticsearch/ingest_pipeline/default.yml
@@ -213,7 +213,6 @@ processors:
       ignore_failure: true
   - script:
       lang: painless
-      ignore_failure: true
       params:
         "write":
           type:
@@ -231,7 +230,11 @@ processors:
         if (ctx?.azure?.activitylogs?.category == null) {
           return;
         }
-        def hm = new HashMap(params.get(ctx.azure.activitylogs.category.toLowerCase()));
+        def category = ctx.azure.activitylogs.category.toLowerCase();
+        if (params.get(category) == null) {
+          return;
+        }
+        def hm = new HashMap(params.get(category));
         hm.forEach((k, v) -> ctx.event[k] = v);
   - geoip:
       field: source.ip
@@ -296,4 +299,5 @@ processors:
 on_failure:
   - set:
       field: error.message
-      value: '{{ _ingest.on_failure_message }}'
+      value: |-
+        Processor "{{ _ingest.on_failure_processor_type }}" with tag "{{ _ingest.on_failure_processor_tag }}" in pipeline "{{ _ingest.on_failure_pipeline }}" failed with message "{{ _ingest.on_failure_message }}"
diff --git a/packages/azure/data_stream/platformlogs/elasticsearch/ingest_pipeline/default.yml b/packages/azure/data_stream/platformlogs/elasticsearch/ingest_pipeline/default.yml
@@ -199,7 +199,6 @@ processors:
       ignore_missing: true
   - script:
       lang: painless
-      ignore_failure: true
       params:
         "write":
           type:
@@ -217,7 +216,11 @@ processors:
         if (ctx?.azure?.platformlogs?.category == null) {
           return;
         }
-        def hm = new HashMap(params.get(ctx.azure.platformlogs.category.toLowerCase()));
+        def category = ctx.azure.platformlogs.category.toLowerCase();
+        if (params.get(category) == null) {
+          return;
+        }
+        def hm = new HashMap(params.get(category));
         hm.forEach((k, v) -> ctx.event[k] = v);
   - geoip:
       field: source.ip
@@ -255,4 +258,5 @@ processors:
 on_failure:
 - set:
     field: error.message
-    value: '{{ _ingest.on_failure_message }}'
+    value: |-
+      Processor "{{ _ingest.on_failure_processor_type }}" with tag "{{ _ingest.on_failure_processor_tag }}" in pipeline "{{ _ingest.on_failure_pipeline }}" failed with message "{{ _ingest.on_failure_message }}"
diff --git a/packages/azure/data_stream/springcloudlogs/elasticsearch/ingest_pipeline/default.yml b/packages/azure/data_stream/springcloudlogs/elasticsearch/ingest_pipeline/default.yml
@@ -246,7 +246,6 @@ processors:
       ignore_missing: true
   - script:
       lang: painless
-      ignore_failure: true
       params:
         "write":
           type:
@@ -264,7 +263,11 @@ processors:
         if (ctx?.azure?.springcloudlogs?.category == null) {
           return;
         }
-        def hm = new HashMap(params.get(ctx.azure.springcloudlogs.category.toLowerCase()));
+        def category = ctx.azure.springcloudlogs.category.toLowerCase();
+        if (params.get(category) == null) {
+          return;
+        }
+        def hm = new HashMap(params.get(category));
         hm.forEach((k, v) -> ctx.event[k] = v);
   - geoip:
       field: source.ip
@@ -299,4 +302,5 @@ processors:
 on_failure:
   - set:
       field: error.message
-      value: '{{ _ingest.on_failure_message }}'
+      value: |-
+        Processor "{{ _ingest.on_failure_processor_type }}" with tag "{{ _ingest.on_failure_processor_tag }}" in pipeline "{{ _ingest.on_failure_pipeline }}" failed with message "{{ _ingest.on_failure_message }}"
diff --git a/packages/azure/manifest.yml b/packages/azure/manifest.yml
@@ -1,6 +1,6 @@
 name: azure
 title: Azure Logs
-version: 0.9.1
+version: 0.9.2
 release: beta
 description: This Elastic integration collects logs from Azure
 type: integration
