Merge pull request #1751 from bradbeam/calicoprometheus

Adding calico/node env vars for prometheus configuration
This commit is contained in:
Spencer Smith 2017-10-05 17:29:12 -04:00 committed by GitHub
commit d13b07ba59
2 changed files with 14 additions and 0 deletions

View file

@ -31,6 +31,12 @@ calicoctl_cpu_limit: 100m
calicoctl_memory_requests: 32M
calicoctl_cpu_requests: 50m
# Enable Prometheus Metrics endpoint for felix
calico_felix_prometheusmetricsenabled: "false"
calico_felix_prometheusmetricsport: 9091
calico_felix_prometheusgometricsenabled: "true"
calico_felix_prometheusprocessmetricsenabled: "true"
# Should calico ignore kernel's RPF check setting,
# see https://github.com/projectcalico/felix/blob/ab8799eaea66627e5db7717e62fca61fd9c08646/python/calico/felix/config.py#L198
calico_node_ignorelooserpf: false

View file

@ -82,6 +82,14 @@ spec:
- name: FELIX_IPINIPMTU
value: "{{ calico_mtu }}"
{% endif %}
- name: FELIX_PROMETHEUSMETRICSENABLED
value: "{{ calico_felix_prometheusmetricsenabled }}"
- name: FELIX_PROMETHEUSMETRICSPORT
value: "{{ calico_felix_prometheusmetricsport }}"
- name: FELIX_PROMETHEUSGOMETRICSENABLED
value: "{{ calico_felix_prometheusgometricsenabled }}"
- name: FELIX_PROMETHEUSPROCESSMETRICSENABLED
value: "{{ calico_felix_prometheusprocessmetricsenabled }}"
# Location of the CA certificate for etcd.
- name: ETCD_CA_CERT_FILE
valueFrom: