extend promethues metrics scraping from standalone-kubelet

5 files changed, 32 insertions, 0 deletions

diff --git a/roles/monitoring/prometheus/exporter/standalone-kubelet/tasks/main.yml b/roles/monitoring/prometheus/exporter/standalone-kubelet/tasks/main.yml
index e676f263..ffeb974f 100644
--- a/roles/monitoring/prometheus/exporter/standalone-kubelet/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/standalone-kubelet/tasks/main.yml
@@ -7,5 +7,15 @@
           proxy_ssl_certificate /etc/ssl/standalone-kubelet/client/crt.pem;
           proxy_ssl_certificate_key /etc/ssl/standalone-kubelet/client/key.pem;
       }
+      location = /standalone-kubelet/resource {
+          proxy_pass https://{{ kubernetes_standalone_address | default('127.0.0.1') }}:{{ kubernetes_standalone_port | default(10250) }}/metrics/resource;
+          proxy_ssl_certificate /etc/ssl/standalone-kubelet/client/crt.pem;
+          proxy_ssl_certificate_key /etc/ssl/standalone-kubelet/client/key.pem;
+      }
+      location = /standalone-kubelet/probes {
+          proxy_pass https://{{ kubernetes_standalone_address | default('127.0.0.1') }}:{{ kubernetes_standalone_port | default(10250) }}/metrics/probes;
+          proxy_ssl_certificate /etc/ssl/standalone-kubelet/client/crt.pem;
+          proxy_ssl_certificate_key /etc/ssl/standalone-kubelet/client/key.pem;
+      }
     dest: /etc/prometheus/exporter/standalone-kubelet.locations
   notify: reload nginx
diff --git a/roles/monitoring/prometheus/server/defaults/main/main.yml b/roles/monitoring/prometheus/server/defaults/main/main.yml
index 1e0dcf32..21430a3d 100644
--- a/roles/monitoring/prometheus/server/defaults/main/main.yml
+++ b/roles/monitoring/prometheus/server/defaults/main/main.yml
@@ -36,6 +36,8 @@ prometheus_server_rules:
   snmp: "{{ prometheus_server_rules_snmp + prometheus_server_rules_snmp_extra }}"
   snmp/probe: "{{ prometheus_server_rules_snmp__probe + prometheus_server_rules_snmp__probe_extra }}"
   standalone-kubelet: "{{ prometheus_server_rules_standalone_kubelet + prometheus_server_rules_standalone_kubelet_extra }}"
+  standalone-kubelet/resource: "{{ prometheus_server_rules_standalone_kubelet__resource + prometheus_server_rules_standalone_kubelet__resource_extra }}"
+  standalone-kubelet/probes: "{{ prometheus_server_rules_standalone_kubelet__probes + prometheus_server_rules_standalone_kubelet__probes_extra }}"
   modbus: "{{ prometheus_server_rules_modbus + prometheus_server_rules_modbus_extra }}"
   modbus/probe: "{{ prometheus_server_rules_modbus__probe + prometheus_server_rules_modbus__probe_extra }}"
 
diff --git a/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__probes.yml b/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__probes.yml
new file mode 100644
index 00000000..a384045c
--- /dev/null
+++ b/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__probes.yml
@@ -0,0 +1,3 @@
+---
+prometheus_server_rules_standalone_kubelet__probes_extra: []
+prometheus_server_rules_standalone_kubelet__probes: []
diff --git a/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__resource.yml b/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__resource.yml
new file mode 100644
index 00000000..6894e16f
--- /dev/null
+++ b/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__resource.yml
@@ -0,0 +1,3 @@
+---
+prometheus_server_rules_standalone_kubelet__resource_extra: []
+prometheus_server_rules_standalone_kubelet__resource: []
diff --git a/roles/monitoring/prometheus/server/templates/jobs/standalone-kubelet.j2 b/roles/monitoring/prometheus/server/templates/jobs/standalone-kubelet.j2
new file mode 100644
index 00000000..eafd740a
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/standalone-kubelet.j2
@@ -0,0 +1,14 @@
+  - job_name: '{{ job }}'
+    metrics_path: /{{ job }}
+    scheme: https
+    tls_config:
+      ca_file: /etc/ssl/prometheus/ca-crt.pem
+      cert_file: /etc/ssl/prometheus/server/scrape-crt.pem
+      key_file: /etc/ssl/prometheus/server/scrape-key.pem
+    file_sd_configs:
+    - files:
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
+    metric_relabel_configs:
+    - source_labels: [ "__name__" ]
+      regex: "(kubernetes_feature_enabled|apiserver_.*)"
+      action: drop