Merge "Add RBAC permissions for netchecker server in kube-addons.sls"
diff --git a/kubernetes/meta/prometheus.yml b/kubernetes/meta/prometheus.yml
index d463d54..f7a4c67 100644
--- a/kubernetes/meta/prometheus.yml
+++ b/kubernetes/meta/prometheus.yml
@@ -181,7 +181,7 @@
{% endraw %}
KubernetesProcessDown:
if: >-
- procstat_running{process_name=~"hypercube-.*"} == 0
+ procstat_running{process_name=~"hyperkube-.*"} == 0
{% raw %}
labels:
severity: warning
diff --git a/kubernetes/meta/telegraf.yml b/kubernetes/meta/telegraf.yml
index 3689e47..8be559f 100644
--- a/kubernetes/meta/telegraf.yml
+++ b/kubernetes/meta/telegraf.yml
@@ -15,19 +15,19 @@
procstat:
process:
{%- if master.get('enabled', False) %}
- hypercube-apiserver:
+ hyperkube-apiserver:
pattern: "hyperkube.*apiserver"
- hypercube-scheduler:
+ hyperkube-scheduler:
pattern: "hyperkube.*scheduler"
- hypercube-controller-manager:
+ hyperkube-controller-manager:
pattern: "hyperkube.*controller-manager"
{%- endif %}
{%- if pool.get('enabled', False) %}
- hypercube-kubelet:
+ hyperkube-kubelet:
pattern: "hyperkube.*kubelet"
{%- endif %}
{%- if network is defined and network.get('engine', None) == 'calico' %}
- hypercube-proxy:
+ hyperkube-proxy:
pattern: "hyperkube.*proxy"
calico-docker:
pattern: "docker run .*projectcalico/calico/node"