Merge pull request #7309 from jsanda/heapster-concurrency-limit

Automatic merge from submit-queue.

[BZ 1513706] make concurrenyLimit  configurable

Make the concurrencyLimit param of heapster's hawkular sink configurable.

roles/openshift_metrics/defaults/main.yaml

@@ -31,6 +31,7 @@ openshift_metrics_heapster_limits_cpu: null
 openshift_metrics_heapster_requests_memory: 0.9375G
 openshift_metrics_heapster_requests_cpu: null
 openshift_metrics_heapster_nodeselector: ""
+openshift_metrics_heapster_concurrency_limit: 5
 
 openshift_metrics_install_hawkular_agent: False
 openshift_metrics_hawkular_agent_limits_memory: null

roles/openshift_metrics/templates/heapster.j2

@@ -44,7 +44,7 @@ spec:
         - "--wrapper.username_file=/hawkular-account/hawkular-metrics.username"
         - "--wrapper.password_file=/hawkular-account/hawkular-metrics.password"
         - "--wrapper.endpoint_check=https://hawkular-metrics:443/hawkular/metrics/status"
-        - "--sink=hawkular:https://hawkular-metrics:443?tenant=_system&labelToTenant=pod_namespace&labelNodeId={{openshift_metrics_node_id}}&caCert=/hawkular-metrics-certs/tls.crt&user=%username%&pass=%password%&filter=label(container_name:^system.slice.*|^user.slice)"
+        - "--sink=hawkular:https://hawkular-metrics:443?tenant=_system&labelToTenant=pod_namespace&labelNodeId={{openshift_metrics_node_id}}&caCert=/hawkular-metrics-certs/tls.crt&user=%username%&pass=%password%&filter=label(container_name:^system.slice.*|^user.slice)&concurrencyLimit={{ openshift_metrics_heapster_concurrency_limit }}"
 {% endif %}
         env:
         - name: STARTUP_TIMEOUT