diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-07-29 02:04:23 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-07-29 02:04:23 +0200 |
| commit | 76c30a85dd6eb4e7fde74ec31fd10cbbec220a0f (patch) | |
| tree | 8bd4712a71d964151edb22d0eb103881c817c8dc /roles/monitoring/prometheus | |
| parent | retire outdated raspbian (diff) | |
prometheus/standalone-kubelet: simply config and scrape all sub-jobs on all hosts
Diffstat (limited to 'roles/monitoring/prometheus')
4 files changed, 22 insertions, 8 deletions
diff --git a/roles/monitoring/prometheus/server/defaults/main/main.yml b/roles/monitoring/prometheus/server/defaults/main/main.yml index 21430a3d..1e0dcf32 100644 --- a/roles/monitoring/prometheus/server/defaults/main/main.yml +++ b/roles/monitoring/prometheus/server/defaults/main/main.yml @@ -36,8 +36,6 @@ 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 deleted file mode 100644 index a384045c..00000000 --- a/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__probes.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -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 deleted file mode 100644 index 6894e16f..00000000 --- a/roles/monitoring/prometheus/server/defaults/main/rules_standalone-kubelet__resource.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -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 index eafd740a..77e7aeed 100644 --- a/roles/monitoring/prometheus/server/templates/jobs/standalone-kubelet.j2 +++ b/roles/monitoring/prometheus/server/templates/jobs/standalone-kubelet.j2 @@ -12,3 +12,25 @@ - source_labels: [ "__name__" ] regex: "(kubernetes_feature_enabled|apiserver_.*)" action: drop + + - job_name: '{{ job }}/resource' + metrics_path: /{{ job }}/resource + 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" + + - job_name: '{{ job }}/probes' + metrics_path: /{{ job }}/probes + 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" |