Fix auto-discovery for latest versions on Kubernetes

etcd/assets/configuration/spec.yaml

@@ -44,12 +44,32 @@ files:
     options: []
   - template: instances
     options:
+    - name: possible_prometheus_urls
+      required: true
+      description: |
+        The URLs to try to get your application metrics that are exposed by Prometheus.
+        The check will try each URLs in the list and will use the first working one.
+        One of possible_prometheus_urls or prometheus_url parameter is required.
+      value:
+        type: array
+        items:
+          type: string
+        example:
+          - https://%%host%%:2379/metrics
+          - http://%%host%%:2379/metrics
     - name: prometheus_url
       description: |
         Prometheus endpoint of your etcd instance.
+        One of possible_prometheus_urls or prometheus_url parameter is required.
 
         Note: To monitor ETCD versions pre-3.x.x, set `use_preview` to `false` and use the `url` configuration option.
-      required: true
+      required: false
       value:
         example: http://%%host%%:2379/metrics
         type: string
+    - name: ssl_verify
+      required: true
+      description: Used to verify self signed certificates.
+      value:
+        type: boolean
+        example: false

etcd/datadog_checks/etcd/data/auto_conf.yaml

@@ -14,9 +14,24 @@ init_config:
 #
 instances:
 
-    ## @param prometheus_url - string - required
+    ## @param possible_prometheus_urls - list of strings - required
+    ## The URLs to try to get your application metrics that are exposed by Prometheus.
+    ## The check will try each URLs in the list and will use the first working one.
+    ## One of possible_prometheus_urls or prometheus_url parameter is required.
+    #
+  - possible_prometheus_urls:
+      - https://%%host%%:2379/metrics
+      - http://%%host%%:2379/metrics
+
+    ## @param prometheus_url - string - optional - default: http://%%host%%:2379/metrics
     ## Prometheus endpoint of your etcd instance.
+    ## One of possible_prometheus_urls or prometheus_url parameter is required.
     ##
     ## Note: To monitor ETCD versions pre-3.x.x, set `use_preview` to `false` and use the `url` configuration option.
     #
-  - prometheus_url: http://%%host%%:2379/metrics
+    # prometheus_url: http://%%host%%:2379/metrics
+
+    ## @param ssl_verify - boolean - required
+    ## Used to verify self signed certificates.
+    #
+    ssl_verify: false