Deprecation warnings on system indices

[willemdh]

Hello,

I'm trying to repare our clusters for migration to 7. So I started going through the deprecation logs and was able to clean out most of them. What is left now seems to be mostly related to the system indices .watches and .triggered_watches which have the following deprecation warnings:

#! Deprecation: Setting index.mapper.dynamic is deprecated since indices may not have more than one type anymore.
#! Deprecation: [_all] is deprecated in 6.0+ and will be removed in 7.0. As a replacement, you can use [copy_to] on mapping fields to create your own catch all field.
#! Deprecation: [types removal] The parameter include_type_name should be explicitly specified in put template requests to prepare for 7.0. In 7.0 include_type_name will default to 'false', and requests are expected to omit the type name in mapping definitions.

Can I safely update the .watch and .triggered_watches templates, so thay no longer generate those warnings?

{
  ".triggered_watches" : {
    "order" : 2147483647,
    "index_patterns" : [
      ".triggered_watches*"
    ],
    "settings" : {
      "index" : {
        "format" : "6",
        "mapper" : {
          "dynamic" : "false"
        },
        "refresh_interval" : "-1",
        "number_of_shards" : "1",
        "priority" : "900"
      }
    },
    "mappings" : {
      "doc" : {
        "dynamic" : "strict",
        "_all" : {
          "enabled" : false
        },
        "properties" : {
          "trigger_event" : {
            "type" : "object",
            "dynamic" : true,
            "enabled" : false,
            "properties" : {
              "schedule" : {
                "type" : "object",
                "dynamic" : true,
                "properties" : {
                  "triggered_time" : {
                    "type" : "date"
                  },
                  "scheduled_time" : {
                    "type" : "date"
                  }
                }
              }
            }
          },
          "state" : {
            "type" : "keyword"
          }
        }
      }
    },
    "aliases" : { }
  }
}

Already went through all recommendations in the upgrade assistant..

Grtz

Willem