Add another test for elasticsearch output

- requested by elastic#7

outputs/elasticsearch/output_test.go

@@ -85,7 +85,7 @@ func TestTopologyInES(t *testing.T) {
 	}
 }
 
-func TestEvents(t *testing.T) {
+func TestOneEvent(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping events publish in short mode, because they require Elasticsearch")
 	}
@@ -144,3 +144,74 @@ func TestEvents(t *testing.T) {
 		t.Errorf("Too many results")
 	}
 }
+
+func TestEvents(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping events publish in short mode, because they require Elasticsearch")
+	}
+	ts := time.Now()
+
+	elasticsearchOutput := createElasticsearchConnection()
+
+	event := common.MapStr{}
+	event["type"] = "redis"
+	event["status"] = "OK"
+	event["responsetime"] = 34
+	event["dst_ip"] = "192.168.21.1"
+	event["dst_port"] = 6379
+	event["src_ip"] = "192.168.22.2"
+	event["src_port"] = 6378
+	event["agent"] = "appserver1"
+	r := common.MapStr{}
+	r["request"] = "MGET key1"
+	r["response"] = "value1"
+	event["redis"] = r
+
+	index := fmt.Sprintf("%s-%d.%02d.%02d", elasticsearchOutput.Index, ts.Year(), ts.Month(), ts.Day())
+
+	es := NewElasticsearch("http://localhost:9200")
+
+	if es == nil {
+		t.Errorf("Failed to create Elasticsearch connection")
+	}
+	_, err := es.DeleteIndex(index)
+	if err != nil {
+		t.Errorf("Failed to delete index: %s", err)
+	}
+
+	err = elasticsearchOutput.PublishEvent(ts, event)
+	if err != nil {
+		t.Errorf("Failed to publish the event: %s", err)
+	}
+
+	r = common.MapStr{}
+	r["request"] = "MSET key1 value1"
+	r["response"] = 0
+	event["redis"] = r
+
+	err = elasticsearchOutput.PublishEvent(ts, event)
+	if err != nil {
+		t.Errorf("Failed to publish the event: %s", err)
+	}
+
+	es.Refresh(index)
+
+	resp, err := es.Search(index, "?search?q=agent:appserver1", "{}")
+
+	if err != nil {
+		t.Errorf("Failed to query elasticsearch: %s", err)
+	}
+	defer resp.Body.Close()
+	objresp, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Errorf("Failed to read body from response")
+	}
+	var search_res ESSearchResults
+	err = json.Unmarshal(objresp, &search_res)
+	if err != nil {
+		t.Errorf("Failed to unmarshal response: %s", err)
+	}
+	if search_res.Hits.Total != 2 {
+		t.Errorf("Too many results")
+	}
+}