fix(monitoring): убрать Node Exporter Full и собирать cAdvisor со всех Docker-хостов
Старый дашборд оставался в каталоге Grafana, потому что копирование его не удаляет. core-secrets и rus-central не попадали в Cadvisor exporter: экспортёра на них не было. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
57aa12b9c5
commit
93958f93e2
14 files changed
+98
-15558
No files matched your search
@@ -20,6 +20,11 @@ cadvisor_image: gcr.io/cadvisor/cadvisor:v0.49.2
|
||||
xray_checker_image: kutovoys/xray-checker:v1.3.1
|
||||
xray_checker_subscription_url: "{{ lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='') }}"
|
||||
vmagent_cluster: homelab
|
||||
# cAdvisor этих хостов слушает :9101. core-mon, core-net и ger-nod-02 пишут его своим агентом.
|
||||
monitoring_cadvisor_port: 9101
|
||||
monitoring_cadvisor_scrape_hosts:
|
||||
- core-secrets
|
||||
- rus-central
|
||||
|
||||
grafana_admin_user: "{{ lookup('ansible.builtin.env', 'ADMIN_USER', default='karpenok') }}"
|
||||
grafana_admin_password: "{{ lookup('ansible.builtin.env', 'ADMIN_PASSWORD', default='') }}"
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -100,6 +100,12 @@
|
||||
mode: "0644"
|
||||
register: grafana_dashboards
|
||||
|
||||
- name: Удалить старый дашборд Node Exporter Full
|
||||
ansible.builtin.file:
|
||||
path: "{{ monitoring_dir }}/grafana/provisioning/dashboards/node-exporter-full.json"
|
||||
state: absent
|
||||
register: grafana_old_dashboard
|
||||
|
||||
- name: Конфиг vmagent на core-mon
|
||||
ansible.builtin.template:
|
||||
src: "{{ item.src }}"
|
||||
@@ -211,7 +217,7 @@
|
||||
|
||||
- name: Перезапустить Grafana, чтобы подхватить datasource
|
||||
ansible.builtin.command: docker compose -f {{ monitoring_dir }}/compose.yaml restart grafana
|
||||
when: grafana_datasources is changed or grafana_dashboards is changed or grafana_dashboard_provider is changed
|
||||
when: grafana_datasources is changed or grafana_dashboards is changed or grafana_dashboard_provider is changed or grafana_old_dashboard is changed
|
||||
changed_when: true
|
||||
|
||||
- name: Дождаться готовности Grafana
|
||||
|
||||
@@ -5,3 +5,9 @@
|
||||
labels:
|
||||
instance: "{{ inventory_hostname }}"
|
||||
cluster: "{{ vmagent_cluster }}"
|
||||
{% for host in monitoring_cadvisor_scrape_hosts %}
|
||||
- targets: ["{{ hostvars[host].ansible_host }}:{{ monitoring_cadvisor_port }}"]
|
||||
labels:
|
||||
instance: "{{ host }}"
|
||||
cluster: "{{ vmagent_cluster }}"
|
||||
{% endfor %}
|
||||
Reference in new issue
Block a user