Monitor kubernetes deployed without calico
Change-Id: I4f2ff0d51018b6f915ab20e375f59e3c58814265
diff --git a/kubernetes/meta/prometheus.yml b/kubernetes/meta/prometheus.yml
index f73bd29..d463d54 100644
--- a/kubernetes/meta/prometheus.yml
+++ b/kubernetes/meta/prometheus.yml
@@ -9,13 +9,13 @@
{%- endif %}
server:
-{%- if network.get('engine', '') == 'calico' and network.get('prometheus', {}).get('enabled', False) %}
target:
kubernetes:
enabled: true
api_ip: {{ pool.apiserver.host }}
cert_name: prometheus-server.crt
key_name: prometheus-server.key
+{%- if network.get('engine', '') == 'calico' and network.get('prometheus', {}).get('enabled', False) %}
static:
calico:
endpoint:
diff --git a/kubernetes/meta/telegraf.yml b/kubernetes/meta/telegraf.yml
index 660e8eb..3689e47 100644
--- a/kubernetes/meta/telegraf.yml
+++ b/kubernetes/meta/telegraf.yml
@@ -25,10 +25,10 @@
{%- if pool.get('enabled', False) %}
hypercube-kubelet:
pattern: "hyperkube.*kubelet"
- hypercube-proxy:
- pattern: "hyperkube.*proxy"
{%- endif %}
{%- if network is defined and network.get('engine', None) == 'calico' %}
+ hypercube-proxy:
+ pattern: "hyperkube.*proxy"
calico-docker:
pattern: "docker run .*projectcalico/calico/node"
calico-felix: