Merge pull request #1185 from wazuh/merge-4.8.1-into-4.8.2

Merge 4.8.1 into 4.8.2
wazuh · Jan 10, 2024 · 6ef6883 · 6ef6883
2 parents 086b24c + 41b25fe
commit 6ef6883
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -126,6 +126,7 @@ jobs:
 
     - name: Check documents into wazuh-alerts index
       run: |
+       sleep 120
        docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
        if [[ $docs -gt 100 ]]; then
         echo "wazuh-alerts index documents: ${docs}"
@@ -250,6 +251,7 @@ jobs:
 
     - name: Check documents into wazuh-alerts index
       run: |
+       sleep 120
        docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
        if [[ $docs -gt 100 ]]; then
         echo "wazuh-alerts index documents: ${docs}"

diff --git a/build-docker-images/wazuh-indexer/config/ism-check.sh b/build-docker-images/wazuh-indexer/config/ism-check.sh
@@ -3,12 +3,13 @@ MIN_SHARD_SIZE=${MIN_SHARD_SIZE:-25}
 MIN_INDEX_AGE=${MIN_INDEX_AGE:-"7d"}
 MIN_DOC_COUNT=${MIN_DOC_COUNT:-600000000}
 ISM_PRIORITY=${ISM_PRIORITY:-50}
+WAZUH_TEMPLATE=${WAZUH_TEMPLATE:-"/usr/share/wazuh-indexer/wazuh-template.json"}
 SERVER=`hostname`
 if [[ -n "$INDEXER_PASSWORD"  ]]; then
     until [[ `curl -XGET https://$SERVER:9200/_cat/indices -u admin:SecretPassword -k -s  | grep .opendistro_security | wc -l`  -eq 1 ]]
     do
         echo "Wazuh indexer Security is not initiaized";
         sleep 30
     done
-    bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh  -p $INDEXER_PASSWORD -i $SERVER -P $ISM_PRIORITY -d $MIN_DOC_COUNT -a $MIN_INDEX_AGE -s $MIN_SHARD_SIZE
-fi
+    bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh  -p $INDEXER_PASSWORD -i $SERVER -P $ISM_PRIORITY -d $MIN_DOC_COUNT -a $MIN_INDEX_AGE -s $MIN_SHARD_SIZE -t $WAZUH_TEMPLATE
+fi
diff --git a/build-docker-images/wazuh-manager/config/filebeat.yml b/build-docker-images/wazuh-manager/config/filebeat.yml
@@ -8,8 +8,6 @@ filebeat.modules:
       enabled: false
 
 setup.template.json.enabled: true
-setup.template.json.path: '/etc/filebeat/wazuh-template.json'
-setup.template.json.name: 'wazuh'
 setup.template.overwrite: true
 setup.ilm.enabled: false
 output.elasticsearch: