Merge branch 'candidate-8.4.x' into candidate-8.6.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

helm/managed/logging/elastic/values.yaml

@@ -58,7 +58,6 @@ elasticsearch:
                 echo 'Successfully added hpccpipeline !'
               else
                 echo 'Failed to add hpccpipeline.'
-                exit $rc
               fi
             fi
 
@@ -185,6 +184,5 @@ kibana:
               echo Index pattern creation response:  ${httpcode}
             else
               echo Failed to retrieve index pattern information from Kibana: ${httpcode}
-              exit ${httpcode}
             fi
             curl -X PUT 'localhost:5601/s/default/api/saved_objects/config/7.16.3' -H "kbn-xsrf: true" -H "Content-Type: application/json" -d '{"attributes": {"defaultRoute": "/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now%2Fd,to:now%2Fd))&_a=(columns:!(kubernetes.container.name,hpcc.log.message,hpcc.log.audience,hpcc.log.class,hpcc.log.jobid,hpcc.log.timestamp),filters:!(),index:hpcc-filebeat-pattern,interval:auto)"}}'

plugins/proxies/lib_fileservices.ecllib

@@ -112,4 +112,4 @@ export FileServices := SERVICE : plugin('fileservices'), time
   integer4 GetExpireDays(const varstring lfn) : c,context,entrypoint='fsGetExpireDays';
   SetExpireDays(const varstring lfn, integer4 expireDays) : c,context,entrypoint='fsSetExpireDays';
   ClearExpireDays(const varstring lfn) : c,context,entrypoint='fsClearExpireDays';
-end;
+END;

plugins/spark/spark-hadoop

@@ -1 +1 @@
-Subproject commit 6d6afd563813a10d38c9a3c9027a07d74e581cf7
+Subproject commit 3ee6812b740a24ae6304c4754fdf69511dab693e