Use config.json for options related to getting metadata/mappings.

Author: johnsusek

config/config.json

@@ -12,5 +12,8 @@
   "templatesPath": {
     "relative": true,
     "path": "/rule_templates"
-  }
-}
+  },
+  "es_host": "elastalert",
+  "es_port": 9200,
+  "writeback_index": "elastalert_status"
+}

package.json

@@ -28,7 +28,6 @@
     "express": "^4.14.0",
     "fs-extra": "^5.0.0",
     "joi": "^13.1.2",
-    "js-yaml": "^3.12.0",
     "lodash": "^4.15.0",
     "mkdirp": "^0.5.1",
     "object-resolve-path": "^1.1.1",

src/common/config/schema.js

@@ -3,6 +3,9 @@ import Joi from 'joi';
 
 const schema = Joi.object().keys({
   'appName': Joi.string().default('elastalert-server'),
+  'es_host': Joi.string().default('elastalert'),
+  'es_port': Joi.number().default(9200),
+  'writeback_index': Joi.string().default('elastalert_status'),
   'port': Joi.number().default(3030),
   'elastalertPath': Joi.string().default('/opt/elastalert'),
   'rulesPath': Joi.object().keys({

src/common/elasticsearch_client.js

@@ -1,22 +1,9 @@
-import yaml from 'js-yaml';
-import fs from 'fs';
-import process from 'process';
 import elasticsearch from 'elasticsearch';
-
-export function getConfig() {
-  try {
-    var appRoot = process.cwd();
-    var config = yaml.safeLoad(fs.readFileSync(appRoot + '/config/elastalert.yaml', 'utf8'));
-    return config;
-  } catch (e) {
-    console.error(e);
-  }
-}
+import config from './config';
 
 export function getClient() {
-  var config = getConfig();
   var client = new elasticsearch.Client({
-    hosts: [ `http://${config.es_host}:${config.es_port}`]
+    hosts: [ `http://${config.get('es_host')}:${config.get('es_port')}`]
   });
   return client;
 }

src/handlers/mapping/get.js

@@ -1,12 +1,12 @@
 import { getClient } from '../../common/elasticsearch_client';
 
-var client = getClient();
-
 export default function metadataHandler(request, response) {
   /**
    * @type {ElastalertServer}
    */
 
+  var client = getClient();
+
   client.indices.getMapping({
     index: request.params.index
   }).then(function(resp) {

src/handlers/metadata/get.js

@@ -1,7 +1,6 @@
-import { getConfig, getClient } from '../../common/elasticsearch_client';
+import config from '../../common/config';
+import { getClient } from '../../common/elasticsearch_client';
 
-var config = getConfig();
-var client = getClient();
 
 function getQueryString(request) {
   if (request.params.type === 'elastalert_error') {
@@ -16,8 +15,10 @@ export default function metadataHandler(request, response) {
   /**
    * @type {ElastalertServer}
    */
+  var client = getClient();
+
   client.search({
-    index: config.writeback_index,
+    index: config.get('writeback_index'),
     type: request.params.type,
     body: {
       from : request.query.from || 0,