Rename http_check metric to k8s_service_health
Depends-On: I521055718afacdea81ae898e398ec5d2c5f5fd23
Change-Id: I81f27bcb728a65f3dbcf537fd5eec5d6b6b4327a
diff --git a/kubernetes/meta/collectd.yml b/kubernetes/meta/collectd.yml
index 232770e..95134d9 100644
--- a/kubernetes/meta/collectd.yml
+++ b/kubernetes/meta/collectd.yml
@@ -20,28 +20,33 @@
interval: 30
url:
{%- if master.get('enabled', False) %}
- k8s-apiserver:
+ apiserver:
expected_code: 200
expected_content: ok
url: http://{{ master.apiserver.insecure_address }}:{{ master.apiserver.get('insecure_port', '8080') }}/healthz
- k8s-scheduler:
+ metric_name: k8s_service_health
+ scheduler:
expected_code: 200
expected_content: ok
url: http://127.0.0.1:10251/healthz
- k8s-controller-manager:
+ metric_name: k8s_service_health
+ controller-manager:
expected_code: 200
expected_content: ok
url: http://127.0.0.1:10252/healthz
+ metric_name: k8s_service_health
{%- endif %}
{%- if pool.get('enabled', False) %}
- k8s-kubelet:
+ kubelet:
expected_code: 200
expected_content: ok
url: http://127.0.0.1:10248/healthz
- k8s-proxy:
+ metric_name: k8s_service_health
+ proxy:
expected_code: 200
expected_content: ok
url: http://127.0.0.1:10249/healthz
+ metric_name: k8s_service_health
{%- endif %}
{%- if master.get('enabled', False) %}
collectd_kubectl_get:
diff --git a/kubernetes/meta/heka.yml b/kubernetes/meta/heka.yml
index 65ef392..476156b 100644
--- a/kubernetes/meta/heka.yml
+++ b/kubernetes/meta/heka.yml
@@ -70,9 +70,9 @@
description: 'K8s {{ kube_service }} is locally down'
severity: down
rules:
- - metric: http_check
+ - metric: k8s_service_health
field:
- service: k8s-{{ kube_service }}
+ service: {{ kube_service }}
relational_operator: '=='
threshold: 0
window: 60
@@ -122,9 +122,9 @@
description: 'K8s kubelet is locally down'
severity: down
rules:
- - metric: http_check
+ - metric: k8s_service_health
field:
- service: k8s-kubelet
+ service: kubelet
relational_operator: '=='
threshold: 0
window: 60
@@ -134,9 +134,9 @@
description: 'K8s proxy is locally down'
severity: down
rules:
- - metric: http_check
+ - metric: k8s_service_health
field:
- service: k8s-proxy
+ service: proxy
relational_operator: '=='
threshold: 0
window: 60