wildcard type_overrides

datadog_checks_base/datadog_checks/base/checks/openmetrics/mixins.py

@@ -4,7 +4,7 @@
 from __future__ import division
 
 import copy
-from fnmatch import translate
+from fnmatch import fnmatch, translate
 from math import isinf, isnan
 from os.path import isfile
 from re import compile
@@ -247,6 +247,14 @@ def create_scraper_configuration(self, instance=None):
         config['type_overrides'] = default_instance.get('type_overrides', {})
         config['type_overrides'].update(instance.get('type_overrides', {}))
 
+        # `_type_override_patterns` is a dictionary where we store Pattern objects
+        # that match metric names as keys, and their corresponding metric type overrrides as values.
+        config['_type_override_patterns'] = {}
+
+        for metric, type in iteritems(config['type_overrides']):
+            if '*' in metric:
+                config['_type_override_patterns'][compile(translate(metric))] = type
+
         # Some metrics are retrieved from differents hosts and often
         # a label can hold this information, this transfers it to the hostname
         config['label_to_hostname'] = instance.get('label_to_hostname', default_instance.get('label_to_hostname', None))
@@ -392,7 +400,14 @@ def parse_metric_family(self, response, scraper_config):
             self._send_telemetry_counter(
                 self.TELEMETRY_COUNTER_METRICS_INPUT_COUNT, len(metric.samples), scraper_config
             )
-            metric.type = scraper_config['type_overrides'].get(metric.name, metric.type)
+            type_override = scraper_config['type_overrides'].get(metric.name)
+            if type_override:
+                metric.type = type_override
+            elif scraper_config['_type_override_patterns']:
+                for pattern, new_type in iteritems(scraper_config['_type_override_patterns']):
+                    if pattern.search(metric.name):
+                        metric.type = new_type
+                        break
             if metric.type not in self.METRIC_TYPES:
                 continue
             metric.name = self._remove_metric_prefix(metric.name, scraper_config)

datadog_checks_base/tests/test_openmetrics.py

@@ -42,8 +42,11 @@ def close(self):
         pass
 
 
+FAKE_ENDPOINT = 'http://fake.endpoint:10055/metrics'
+
+
 PROMETHEUS_CHECK_INSTANCE = {
-    'prometheus_url': 'http://fake.endpoint:10055/metrics',
+    'prometheus_url': FAKE_ENDPOINT,
     'metrics': [{'process_virtual_memory_bytes': 'process.vm.bytes'}],
     'namespace': 'prometheus',
     # Defaults for checks that were based on PrometheusCheck
@@ -2534,3 +2537,48 @@ def test_http_handler(mocked_openmetrics_check_factory):
 
     assert http_handler.options['headers']['accept-encoding'] == 'gzip'
     assert http_handler.options['headers']['accept'] == 'text/plain'
+
+
+def test_simple_type_overrides(aggregator, mocked_prometheus_check, text_data):
+    """
+    Test that metric type is overridden correctly.
+    """
+    check = mocked_prometheus_check
+    instance = copy.deepcopy(PROMETHEUS_CHECK_INSTANCE)
+    instance['type_overrides'] = {"process_virtual_memory_bytes": "counter"}
+
+    # Make sure we don't send counters as gauges
+    instance['send_monotonic_counter'] = True
+
+    config = check.get_scraper_config(instance)
+    config['_dry_run'] = False
+
+    check.poll = mock.MagicMock(return_value=MockResponse(text_data, text_content_type))
+    check.process(config)
+
+    aggregator.assert_metric('prometheus.process.vm.bytes', count=1, metric_type=aggregator.MONOTONIC_COUNT)
+
+    assert len(check.config_map[FAKE_ENDPOINT]['_type_override_patterns']) == 0
+
+
+def test_wildcard_type_overrides(aggregator, mocked_prometheus_check, text_data):
+    """
+    Test that metric type is overridden correctly with wildcard.
+    """
+    check = mocked_prometheus_check
+    instance = copy.deepcopy(PROMETHEUS_CHECK_INSTANCE)
+    instance['type_overrides'] = {"*_virtual_memory_*": "counter"}
+
+    # Make sure we don't send counters as gauges
+    instance['send_monotonic_counter'] = True
+
+    config = check.get_scraper_config(instance)
+    config['_dry_run'] = False
+
+    check.poll = mock.MagicMock(return_value=MockResponse(text_data, text_content_type))
+    check.process(config)
+
+    aggregator.assert_metric('prometheus.process.vm.bytes', count=1, metric_type=aggregator.MONOTONIC_COUNT)
+
+    # assert the pattern was stored correctly
+    assert len(check.config_map[FAKE_ENDPOINT]['_type_override_patterns']) == 1 and list(check.config_map[FAKE_ENDPOINT]['_type_override_patterns'].values())[0] == 'counter'

datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml

@@ -76,6 +76,7 @@
     Type override allows you to override a type in the prometheus payload
     or type an untyped metrics (they're ignored by default).
     Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    The "*" wildcard can be used to match multiple metric names.
   value:
     example:
       <METRIC_NAME>: <METRIC_TYPE>

gitlab/datadog_checks/gitlab/data/conf.yaml.example

@@ -57,6 +57,7 @@ instances:
     ## Type override allows you to override a type in the prometheus payload
     ## or type an untyped metrics (they're ignored by default).
     ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
     #   <METRIC_NAME>: <METRIC_TYPE>

istio/datadog_checks/istio/data/conf.yaml.example

@@ -126,6 +126,7 @@ instances:
     ## Type override allows you to override a type in the prometheus payload
     ## or type an untyped metrics (they're ignored by default).
     ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
     #   <METRIC_NAME>: <METRIC_TYPE>

kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example

@@ -94,6 +94,7 @@ instances:
     ## Type override allows you to override a type in the prometheus payload
     ## or type an untyped metrics (they're ignored by default).
     ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
     #   <METRIC_NAME>: <METRIC_TYPE>

nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example

@@ -95,6 +95,7 @@ instances:
     ## Type override allows you to override a type in the prometheus payload
     ## or type an untyped metrics (they're ignored by default).
     ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
     #   <METRIC_NAME>: <METRIC_TYPE>

openmetrics/datadog_checks/openmetrics/data/conf.yaml.example

@@ -101,6 +101,7 @@ instances:
     ## Type override allows you to override a type in the prometheus payload
     ## or type an untyped metrics (they're ignored by default).
     ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
     #   <METRIC_NAME>: <METRIC_TYPE>