From 4155a8bc0e3d05fb335a1b887160c70985bf73bd Mon Sep 17 00:00:00 2001
From: Jordan Sissel <jls@semicomplete.com>
Date: Fri, 6 Sep 2013 18:04:23 -0700
Subject: [PATCH] Use 'message' as the default field

---
 CHANGELOG | 3 +++
 Makefile  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6073f149d..56be1ca0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
 1.2.1 (???)
+  # general
+  - web: kibana's default dashboard now works with the new logstash 1.2 schema.
+
   ## inputs
   - feature: pipe: reopen the pipe and retry on any error. (#619, Jonathan Van
     Eenwyk)
diff --git a/Makefile b/Makefile
index b793c1108..4f8a8dacf 100644
--- a/Makefile
+++ b/Makefile
@@ -373,4 +373,4 @@ package:
 vendor/kibana: | build
 	$(QUIET)mkdir vendor/kibana || true
 	$(DOWNLOAD_COMMAND) - $(KIBANA_URL) | tar -C $@ -zx --strip-components=1
-	$(QUIET)mv vendor/kibana/dashboards/logstash.json vendor/kibana/dashboards/default.json
+	$(QUIET)sed -e "s/@message/message/g" vendor/kibana/dashboards/logstash.json > vendor/kibana/dashboards/default.json