From 71df85d7345a8b7457fb2694ce6004b912150c48 Mon Sep 17 00:00:00 2001
From: simitt <silvia.mitter@elastic.co>
Date: Tue, 20 Nov 2018 12:38:27 +0100
Subject: [PATCH 1/2] kibana: fix sync check for Kibana index pattern.

fixes #1570
---
 script/are_kibana_saved_objects_updated.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/are_kibana_saved_objects_updated.py b/script/are_kibana_saved_objects_updated.py
index 98738c4034..f49b1919ff 100755
--- a/script/are_kibana_saved_objects_updated.py
+++ b/script/are_kibana_saved_objects_updated.py
@@ -81,8 +81,10 @@ def iterate(val_id, key, v1, v2):
             for item1, item2 in zip(v1, v2):
                 ret_val = max(ret_val, iterate(val_id, key, *json_val(item1, item2)))
     else:
-        d = jsondiff.diff(*json_val(v1, v2))
+        d = jsondiff.JsonDiffer(syntax='symmetric').diff(*json_val(v1, v2))
         if d:
+            if key == "attributes.title":
+                return ret_val
             ret_val = 2
             print("Difference for id '{}' for key '{}'".format(val_id, key))
             try:
@@ -126,6 +128,9 @@ def main():
     exit_val = max(exit_val, iterate(k["id"], "", s, k))
     if exit_val == 0:
         print("up-to-date")
+    if "title" in k["attributes"]:
+        print("`title` need to be set dynamically, remove it from the index-pattern!")
+        exit_val = 3
 
     return exit_val
 

From cb7bf76f0656cc761683555af37a4dba6b1df6f6 Mon Sep 17 00:00:00 2001
From: simitt <silvia.mitter@elastic.co>
Date: Tue, 20 Nov 2018 15:16:01 +0100
Subject: [PATCH 2/2] Add changelog entry.

---
 changelogs/head.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index b5d6fe66a2..7b793e17ac 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -9,3 +9,8 @@ https://github.com/elastic/apm-server/compare/6.5\...master[View commits]
 - Set some configuration defaults (setup.template.settings.index.*, logging.metrics.enabled) in code {pull}1494[1494].
 - Add `span.sync` property to intake json spec and index field in ES. {pull}1548[1548].
 - Make `service.framework` properties optional and nullable {pull}1546[1546].
+
+[float]
+==== Bug fixes
+
+- Fix index pattern bundled with Kibana to be in sync with ES template pull{1571}[1571].