Now, during test setup the test-index with the correct template

Author: Chris Wiechmann

elk-traffic-monitor-api/test/_base.js

@@ -66,12 +66,12 @@ function requestAsync(uri, options, cb) {
 	});
 }
 
-async function sendToElasticsearch(elasticConfig, index, dataset) {
+async function sendToElasticsearch(elasticConfig, index, template, dataset) {
 	console.log(`Creating connection to ElasticSearch cluster: ${elasticConfig.node}`)
 	const client = new Client({
 		node: elasticConfig.node
 	});
-	const mappingConfig = JSON.parse(fs.readFileSync('../logstash/config/traffic_details_index_template.json')).mappings;
+	const mappingConfig = JSON.parse(fs.readFileSync(`../logstash/config/${template}`)).mappings;
 	const createdIndexResponse = await client.indices.create({
 		index: index,
 		body: {

elk-traffic-monitor-api/test/asAdmin/test_circuitpath.js

@@ -40,7 +40,7 @@ describe('Traffic Monitor API', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/circuitpath_test_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/asAdmin/test_getinfo_endpoint.js

@@ -40,7 +40,7 @@ describe('Endpoints', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/getinfo_test_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/asAdmin/test_search_count_AsAdmin.js

@@ -40,7 +40,7 @@ describe('Endpoints', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/search_count_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/asAdmin/test_search_endpoint_AsAdmin.js

@@ -41,7 +41,7 @@ describe('Endpoints', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/search_test_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/asAdmin/test_trace_endpoint.js

@@ -40,7 +40,7 @@ describe('Traffic Monitor API', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/trace_test_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'trace_messages_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/restricted/test_circuitpath_restricted.js

@@ -30,7 +30,7 @@ describe('Traffic Monitor API', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/circuitpath_test_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/restricted/test_getinfo_endpoint_restricted.js

@@ -30,7 +30,7 @@ describe('Endpoints', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/getinfo_test_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})

elk-traffic-monitor-api/test/restricted/test_search_restricted.js

@@ -30,7 +30,7 @@ describe('Endpoints', function () {
 			server.started
 			.then(() => {
 				const entryset = require('../documents/basic/search_count_documents');
-				sendToElasticsearch(elasticConfig, indexName, entryset)
+				sendToElasticsearch(elasticConfig, indexName, 'traffic_details_index_template.json', entryset)
 				.then(() => {
 					resolve();
 				})