From 1f371faad6ee13880c08cd0becb63d7fbb3ac92b Mon Sep 17 00:00:00 2001 From: Sergey Malyuk Date: Fri, 12 Dec 2025 12:05:49 +0300 Subject: [PATCH] fix linter errors --- roles/prometheus/README.md | 8 +++---- roles/prometheus/defaults/main.yml | 4 ++-- roles/prometheus/meta/main.yml | 4 ++-- .../prometheus/molecule/default/converge.yml | 4 ++-- .../default/prometheus/prometheus.yml | 4 ++-- .../default/prometheus/rules/alertrules.yml | 22 +++++++++---------- roles/prometheus/molecule/default/verify.yml | 14 ++++++------ roles/prometheus/tasks/configure.yml | 6 ++--- roles/prometheus/tasks/install.yml | 4 ++-- .../templates/prometheus.service.j2 | 6 ++--- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/roles/prometheus/README.md b/roles/prometheus/README.md index d8894ce..672f379 100644 --- a/roles/prometheus/README.md +++ b/roles/prometheus/README.md @@ -17,9 +17,9 @@ prometheus_version: 3.2.1 # prometheus version prometheus_dir: "/etc/prometheus" # where to install prometheus prometheus_user: prometheus # user name prometheus_group: prometheus # groups name -config_dir: "/etc/prometheus/conf" # where to place prometheus config -db_dir: "/var/lib/prometheus" # where to store prometheus db -config_source_dir: prometheus # path to config files on source +prometheus_config_dir: "/etc/prometheus/conf" # where to place prometheus config +prometheus_db_dir: "/var/lib/prometheus" # where to store prometheus db +prometheus_config_source_dir: prometheus # path to config files on source alertrules_source_dir: prometheus/rules # path to rule files on source ``` @@ -34,7 +34,7 @@ Example Playbook ```yaml roles: - role: genlab.prometheus - config_source_dir: mydir/configs + prometheus_config_source_dir: mydir/configs alertrules_source_dir: mydir/configs/rules prometheus_version: 3.2.1 ``` diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index 891c50d..5ecc61c 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -3,5 +3,5 @@ prometheus_version: 3.2.1 prometheus_dir: "/etc/prometheus" prometheus_user: prometheus prometheus_group: prometheus -config_dir: "/etc/prometheus/conf" -db_dir: "/var/lib/prometheus" +prometheus_config_dir: "/etc/prometheus/conf" +prometheus_db_dir: "/var/lib/prometheus" diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml index b65335e..b4335ec 100644 --- a/roles/prometheus/meta/main.yml +++ b/roles/prometheus/meta/main.yml @@ -10,8 +10,8 @@ galaxy_info: platforms: - name: "Ubuntu" - versions: [ "focal", "jammy", "noble" ] + versions: ["focal", "jammy", "noble"] - galaxy_tags: [ ] + galaxy_tags: [] dependencies: [] diff --git a/roles/prometheus/molecule/default/converge.yml b/roles/prometheus/molecule/default/converge.yml index 1d9f0cf..a9b0439 100644 --- a/roles/prometheus/molecule/default/converge.yml +++ b/roles/prometheus/molecule/default/converge.yml @@ -3,6 +3,6 @@ hosts: all roles: - - role: genlab.prometheus - config_source_dir: prometheus + - role: genlab.common.prometheus + prometheus_config_source_dir: prometheus alertrules_source_dir: prometheus/rules diff --git a/roles/prometheus/molecule/default/prometheus/prometheus.yml b/roles/prometheus/molecule/default/prometheus/prometheus.yml index 9368ee3..31854f4 100644 --- a/roles/prometheus/molecule/default/prometheus/prometheus.yml +++ b/roles/prometheus/molecule/default/prometheus/prometheus.yml @@ -1,6 +1,6 @@ --- global: - scrape_interval: 15s + scrape_interval: 15s evaluation_interval: 15s rule_files: @@ -11,4 +11,4 @@ rule_files: scrape_configs: - job_name: prometheus static_configs: - - targets: ['localhost:9090'] \ No newline at end of file + - targets: ['localhost:9090'] diff --git a/roles/prometheus/molecule/default/prometheus/rules/alertrules.yml b/roles/prometheus/molecule/default/prometheus/rules/alertrules.yml index f85947d..dc3c47f 100644 --- a/roles/prometheus/molecule/default/prometheus/rules/alertrules.yml +++ b/roles/prometheus/molecule/default/prometheus/rules/alertrules.yml @@ -1,13 +1,13 @@ groups: -- name: example - labels: - team: myteam - rules: - - alert: HighRequestLatency - expr: job:request_latency_seconds:mean5m{job="myjob"} > 0.5 - for: 10m - keep_firing_for: 5m + - name: example labels: - severity: page - annotations: - summary: High request latency \ No newline at end of file + team: myteam + rules: + - alert: HighRequestLatency + expr: job:request_latency_seconds:mean5m{job="myjob"} > 0.5 + for: 10m + keep_firing_for: 5m + labels: + severity: page + annotations: + summary: High request latency diff --git a/roles/prometheus/molecule/default/verify.yml b/roles/prometheus/molecule/default/verify.yml index 350252a..c085dd1 100644 --- a/roles/prometheus/molecule/default/verify.yml +++ b/roles/prometheus/molecule/default/verify.yml @@ -9,16 +9,16 @@ - name: "Include default vars" ansible.builtin.include_vars: dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/defaults/" - extensions: [ 'yml' ] + extensions: ['yml'] - name: "Check if Prometheus is installed" changed_when: false ansible.builtin.command: "prometheus --version" - register: prom_installed_version + register: prometheus_installed_version - name: "Check Prometheus version" ansible.builtin.assert: - that: "prom_installed_version.stdout is regex('{{ prometheus_version }}')" + that: "prometheus_installed_version.stdout is regex('{{ prometheus_version }}')" success_msg: "Prometheus version {{ prometheus_version }} is installed and working" fail_msg: "Prometheus version {{ prometheus_version }} is not installed or not working correctly" @@ -30,11 +30,11 @@ status_code: 200 method: GET body_format: json - register: prom_health + register: prometheus_health - name: "Debug Prometheus health status" ansible.builtin.assert: - that: "prom_health.content | trim == 'Prometheus Server is Healthy.'" + that: "prometheus_health.content | trim == 'Prometheus Server is Healthy.'" success_msg: "Prometheus is healthy" fail_msg: "Prometheus is not healthy" @@ -46,10 +46,10 @@ status_code: 200 method: GET body_format: json - register: prom_ready + register: prometheus_ready - name: "Debug Prometheus readiness status" ansible.builtin.assert: - that: "prom_ready.content | trim == 'Prometheus Server is Ready.'" + that: "prometheus_ready.content | trim == 'Prometheus Server is Ready.'" success_msg: "Prometheus is ready" fail_msg: "Prometheus is not ready" diff --git a/roles/prometheus/tasks/configure.yml b/roles/prometheus/tasks/configure.yml index 8e31514..cbad1ad 100644 --- a/roles/prometheus/tasks/configure.yml +++ b/roles/prometheus/tasks/configure.yml @@ -3,19 +3,19 @@ notify: "(Re)start Prometheus service" ansible.builtin.copy: src: "{{ item }}" - dest: "{{ config_dir }}/{{ item | basename }}" + dest: "{{ prometheus_config_dir }}/{{ item | basename }}" owner: "{{ prometheus_user }}" group: "{{ prometheus_group }}" mode: "0660" with_fileglob: - - "{{ config_source_dir }}/*.yml" + - "{{ prometheus_config_source_dir }}/*.yml" - name: "Copy alert rules" notify: "(Re)start Prometheus service" when: alertrules_source_dir is defined ansible.builtin.copy: src: "{{ item }}" - dest: "{{ config_dir }}/{{ item | basename }}" + dest: "{{ prometheus_config_dir }}/{{ item | basename }}" owner: "{{ prometheus_user }}" group: "{{ prometheus_group }}" mode: "0660" diff --git a/roles/prometheus/tasks/install.yml b/roles/prometheus/tasks/install.yml index 05ebb7a..3118047 100644 --- a/roles/prometheus/tasks/install.yml +++ b/roles/prometheus/tasks/install.yml @@ -37,9 +37,9 @@ group: "{{ prometheus_group }}" mode: "0755" with_items: - - "{{ config_dir }}" + - "{{ prometheus_config_dir }}" - "{{ prometheus_dir }}" - - "{{ db_dir }}" + - "{{ prometheus_db_dir }}" - name: "Download Prometheus binary" ansible.builtin.get_url: diff --git a/roles/prometheus/templates/prometheus.service.j2 b/roles/prometheus/templates/prometheus.service.j2 index 839c5f4..2f17191 100644 --- a/roles/prometheus/templates/prometheus.service.j2 +++ b/roles/prometheus/templates/prometheus.service.j2 @@ -9,12 +9,12 @@ User=prometheus Group=prometheus Type=simple ExecStart=/usr/local/bin/prometheus \ - --config.file {{ config_dir }}/prometheus.yml \ - --storage.tsdb.path {{ db_dir }} \ + --config.file {{ prometheus_config_dir }}/prometheus.yml \ + --storage.tsdb.path {{ prometheus_db_dir }} \ --storage.tsdb.retention.time=30d # Security hardening -ReadWritePaths={{ db_dir }} +ReadWritePaths={{ prometheus_db_dir }} ProtectSystem=strict NoNewPrivileges=true PrivateTmp=true