in check_metrics, avoid overasserting

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2022.0.0 (2022-09-07)
+
+Switch to calendar-year major version numbers
+
+* Fix elasticsearch-dsl 6.3.0 incompatibility?
+
 ## 5.0.0 (2018-11-28)
 
 Changes:

elasticsearch_metrics/__init__.py

@@ -3,7 +3,7 @@
 from elasticsearch_dsl.connections import connections
 from django.utils.module_loading import autodiscover_modules
 
-__version__ = "5.0.0"
+__version__ = "2022.0.0"
 
 default_app_config = "elasticsearch_metrics.ElasticsearchMetricsConfig"
 

elasticsearch_metrics/metrics.py

@@ -169,8 +169,12 @@ def check_index_template(cls, using=None):
 
             mappings_in_sync = current_data["mappings"] == template_data["mappings"]
             if "settings" in current_data and "index" in current_data["settings"]:
-                current_settings = current_data["settings"]["index"]
                 template_settings = template_data.get("settings", {})
+                current_settings = {
+                    key: value
+                    for key, value in current_data["settings"]["index"]
+                    if key in template_settings
+                }
                 # ES automatically casts number_of_shards and number_of_replicas to a string
                 # so we need to cast before we compare
                 # TODO: Are there other settings that need to be handled?

setup.py

@@ -60,7 +60,7 @@ def read(fname):
         "metrics",
         "statistics",
     ),
-    install_requires=["elasticsearch-dsl>=6.0.0,<6.3.0"],
+    install_requires=["elasticsearch-dsl>=6.3.0,<7.0.0"],
     extras_require=EXTRAS_REQUIRE,
     classifiers=[
         "Operating System :: OS Independent",