Don't mix snake case and kebab case

Author: sloria

README.md

@@ -48,7 +48,7 @@ from elasticsearch_metrics import metrics
 
 
 class PageView(metrics.Metric):
-    user_id = metrics.Integer()
+    user_id = metrics.Integer(index=True, doc_values=True)
 ```
 
 Use the `sync_metrics` management command to ensure that the [index template](https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html)
@@ -68,7 +68,7 @@ user = User.objects.latest()
 
 # By default we create an index for each day.
 # Therefore, this will persist the document
-# to an index called, e.g. "myapp_pageview-2020.02.04"
+# to an index called, e.g. "myapp_pageview_2020.02.04"
 PageView.record(user_id=user.id)
 ```
 
@@ -115,7 +115,7 @@ Each `Metric` will have its own [index template](https://www.elastic.co/guide/en
 The index template name and glob pattern are computed from the app label
 for the containing app and the class's name. For example, a `PageView`
 class defined in `myapp/metrics.py` will have an index template with the
-name `myapp_pageview` and a template glob pattern of `myapp_pageview-*`.
+name `myapp_pageview` and a template glob pattern of `myapp_pageview_*`.
 
 If you declare a `Metric` outside of an app, you will need to set
 `app_label`.
@@ -135,7 +135,7 @@ class PageView(metrics.Metric):
 
     class Meta:
         template_name = "myapp_pviews"
-        template = "myapp_pviews-*"
+        template = "myapp_pviews_*"
 ```
 
 ## Abstract metrics

elasticsearch_metrics/metrics.py

@@ -59,7 +59,7 @@ def __new__(mcls, name, bases, attrs):  # noqa: B902
             if not template_name:
                 template_name = "{}_{}".format(app_label, metric_name)
             # template is <app label>_<lowercased class name>-*
-            template = template or "{}_{}-*".format(app_label, metric_name)
+            template = template or "{}_{}_*".format(app_label, metric_name)
 
         new_cls._template_name = template_name
         new_cls._template = template
@@ -115,7 +115,7 @@ class BaseMetric(object):
         from elasticsearch_metrics import metrics
 
         class PageView(metrics.Metric):
-            user_id = metrics.Integer()
+            user_id = metrics.Integer(index=True, doc_values=True)
 
             class Index:
                 settings = {
@@ -220,7 +220,7 @@ def get_index_name(cls, date=None):
             settings, "ELASTICSEARCH_METRICS_DATE_FORMAT", DEFAULT_DATE_FORMAT
         )
         date_formatted = date.strftime(dateformat)
-        return "{}-{}".format(cls._template_name, date_formatted)
+        return "{}_{}".format(cls._template_name, date_formatted)
 
     @classmethod
     def record(cls, timestamp=None, **kwargs):

tests/test_management_commands/test_show_metrics.py

@@ -4,4 +4,4 @@
 def test_without_args(run_mgmt_command):
     out, err = run_mgmt_command(Command, ["show_metrics"])
     assert "DummyMetric" in out
-    assert "dummyapp_dummymetric-*" in out
+    assert "dummyapp_dummymetric_*" in out

tests/test_metrics.py

@@ -36,21 +36,21 @@ def test_get_index_name(self):
         date = dt.date(2020, 2, 14)
         assert (
             PreprintView.get_index_name(date=date)
-            == "osf_metrics_preprintviews-2020.02.14"
+            == "osf_metrics_preprintviews_2020.02.14"
         )
 
     def test_get_index_name_respects_date_format_setting(self, settings):
         settings.ELASTICSEARCH_METRICS_DATE_FORMAT = "%Y-%m-%d"
         date = dt.date(2020, 2, 14)
         assert (
             PreprintView.get_index_name(date=date)
-            == "osf_metrics_preprintviews-2020-02-14"
+            == "osf_metrics_preprintviews_2020-02-14"
         )
 
     def test_get_index_name_gets_index_for_today_by_default(self):
         today = timezone.now().date()
         today_formatted = today.strftime("%Y.%m.%d")
-        assert PreprintView.get_index_name() == "osf_metrics_preprintviews-{}".format(
+        assert PreprintView.get_index_name() == "osf_metrics_preprintviews_{}".format(
             today_formatted
         )
 
@@ -102,7 +102,7 @@ def test_get_index_template_default_template_name(self):
         template = DummyMetric.get_index_template()
         assert isinstance(template, IndexTemplate)
         assert template._template_name == "dummyapp_dummymetric"
-        assert "dummyapp_dummymetric-*" in template.to_dict()["index_patterns"]
+        assert "dummyapp_dummymetric_*" in template.to_dict()["index_patterns"]
 
     def test_get_index_template_uses_app_label_in_class_meta(self):
         class MyMetric(metrics.Metric):
@@ -120,7 +120,7 @@ def test_template_name_defined_with_no_template_falls_back_to_default_template(
         assert template._template_name == "dummymetric"
         # template is not specified, so it's generated
         assert (
-            "dummyapp_dummymetricwithexplicittemplatename-*"
+            "dummyapp_dummymetricwithexplicittemplatename_*"
             in template.to_dict()["index_patterns"]
         )