mirror of
https://github.com/valitydev/wazuh-kibana-app.git
synced 2024-11-07 10:18:57 +00:00
Fix custom index pattern create function
This commit is contained in:
parent
447b41e5fe
commit
2cad620599
@ -119,10 +119,30 @@ module.exports = (server, options) => {
|
||||
|
||||
const customPatternRegex = new RegExp(/[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}/g);
|
||||
if(id && customPatternRegex.test(id.trim())){
|
||||
server.log([blueWazuh, 'initialize', 'info'], 'Custom id detected for index pattern...');
|
||||
id = (configurationFile && typeof configurationFile.pattern !== 'undefined') ? configurationFile.pattern : 'wazuh-alerts-3.x-*';
|
||||
patternId = 'index-pattern:' + id.trim();
|
||||
server.log([blueWazuh, 'initialize', 'info'], 'Modified values to be default values, now checking if default index pattern exists...');
|
||||
const data = await elasticRequest
|
||||
.callWithInternalUser('search', {
|
||||
index: '.kibana',
|
||||
type: 'doc',
|
||||
body: {
|
||||
"query": {
|
||||
"match": {
|
||||
"_id":"index-pattern:" + id
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
if(data && data.hits && data.hits.total > 0) {
|
||||
server.log([blueWazuh, 'initialize', 'info'], 'Default index pattern exists, skipping its creation...');
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
await elasticRequest
|
||||
.callWithInternalUser('create', {
|
||||
index: '.kibana',
|
||||
@ -136,7 +156,7 @@ module.exports = (server, options) => {
|
||||
}
|
||||
}
|
||||
});
|
||||
return;
|
||||
return id;
|
||||
}catch(error){
|
||||
return Promise.reject(error)
|
||||
}
|
||||
@ -161,7 +181,7 @@ module.exports = (server, options) => {
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
return data;
|
||||
} catch (error) {
|
||||
return Promise.reject(error);
|
||||
@ -230,25 +250,27 @@ module.exports = (server, options) => {
|
||||
*/
|
||||
const importAppObjects = async (id,firstTime) => {
|
||||
try {
|
||||
const patternId = 'index-pattern:' + id;
|
||||
let patternId = 'index-pattern:' + id;
|
||||
let indexPatternList = await searchIndexPatternById(id);
|
||||
|
||||
if (!firstTime && indexPatternList.hits.total < 1) {
|
||||
log('initialize.js importAppObjects', 'Visualizations pattern not found. Creating it...','info')
|
||||
server.log([blueWazuh, 'initialize', 'info'], 'Visualizations pattern not found. Creating it...');
|
||||
await createCustomPattern(patternId,id)
|
||||
id = await createCustomPattern(patternId,id)
|
||||
firstTime = true;
|
||||
}
|
||||
patternId = 'index-pattern:' + id;
|
||||
|
||||
if(firstTime && indexPatternList.hits.total < 1){
|
||||
log('initialize.js importAppObjects', 'Waiting for index pattern creation to complete...','info')
|
||||
server.log([blueWazuh, 'initialize', 'info'], 'Waiting for index pattern creation to complete...');
|
||||
let waitTill = new Date(new Date().getTime() + 0.2 * 1000);
|
||||
let waitTill = new Date(new Date().getTime() + 0.5 * 1000);
|
||||
while(waitTill > new Date()){
|
||||
indexPatternList = await searchIndexPatternById(id);
|
||||
if(indexPatternList.hits.total >= 1) break;
|
||||
else waitTill = new Date(new Date().getTime() + 0.2 * 1000);
|
||||
else waitTill = new Date(new Date().getTime() + 0.5 * 1000);
|
||||
}
|
||||
server.log([blueWazuh, 'initialize', 'info'], 'Index pattern created...');
|
||||
}
|
||||
|
||||
log('initialize.js importAppObjects', 'Importing/Updating index pattern known fields...','info')
|
||||
|
Loading…
Reference in New Issue
Block a user