Merge branch 'develop' into 'master'

martijnrondeel · martijnrondeel · commit c34459af71d3 · 2018-09-25T12:26:27.000+02:00
Fix typo in configuration section in the readme

See merge request back-end/elastalert!30
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ You can use the following config options:
     "relative": true, // Whether to use a path relative to the `elastalertPath` folder.
     "path": "/server_data" // The path to the data folder.
   },
-  "es_host": "elastalert", // For getting metadata and field mappings, connect to this ES server
+  "es_host": "localhost", // For getting metadata and field mappings, connect to this ES server
   "es_port": 9200, // Port for above
   "writeback_index": "elastalert_status" // Writeback index to examine for /metadata endpoint
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ You can use the following config options:`
`71`	`71`	"relative": true, // Whether to use a path relative to the `elastalertPath` folder.
`72`	`72`	`"path": "/server_data" // The path to the data folder.`
`73`	`73`	`},`
`74`		`- "es_host": "elastalert", // For getting metadata and field mappings, connect to this ES server`
	`74`	`+ "es_host": "localhost", // For getting metadata and field mappings, connect to this ES server`
`75`	`75`	`"es_port": 9200, // Port for above`
`76`	`76`	`"writeback_index": "elastalert_status" // Writeback index to examine for /metadata endpoint`
`77`	`77`	`}`