From 65925bea6f9e8874da2be9a1beed36aadf1e2932 Mon Sep 17 00:00:00 2001 From: Sergey Malyuk Date: Fri, 12 Dec 2025 17:10:49 +0300 Subject: [PATCH] fix linter errors --- roles/ipmi_exporter/defaults/main.yml | 14 +++++++------- roles/ipmi_exporter/meta/main.yml | 4 ++-- .../molecule/default/converge.yml | 2 +- .../ipmi_exporter/molecule/default/verify.yml | 14 +++++++------- roles/ipmi_exporter/tasks/configure.yml | 4 ++-- roles/ipmi_exporter/tasks/install.yml | 16 ++++++++-------- .../templates/ipmi_exporter.service.j2 | 18 +++++++++--------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/roles/ipmi_exporter/defaults/main.yml b/roles/ipmi_exporter/defaults/main.yml index a019389..c67b875 100644 --- a/roles/ipmi_exporter/defaults/main.yml +++ b/roles/ipmi_exporter/defaults/main.yml @@ -1,8 +1,8 @@ --- -ipmi_exp_version: 1.10.1 -ipmi_exp_dir: "/etc/exporters" -ipmi_exp_config_dir: "/etc/exporters/config" -ipmi_exp_log_level: "info" -ipmi_exp_log_format: "logfmt" -ipmi_exp_web_listen_address: "localhost:9290" -ipmi_exp_args: "" +ipmi_exporter_version: 1.10.1 +ipmi_exporter_dir: "/etc/exporters" +ipmi_exporter_config_dir: "/etc/exporters/config" +ipmi_exporter_log_level: "info" +ipmi_exporter_log_format: "logfmt" +ipmi_exporter_web_listen_address: "localhost:9290" +ipmi_exporter_args: "" diff --git a/roles/ipmi_exporter/meta/main.yml b/roles/ipmi_exporter/meta/main.yml index 416e73c..3c37e0c 100644 --- a/roles/ipmi_exporter/meta/main.yml +++ b/roles/ipmi_exporter/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/ipmi_exporter/molecule/default/converge.yml b/roles/ipmi_exporter/molecule/default/converge.yml index abf2fc6..40122c5 100644 --- a/roles/ipmi_exporter/molecule/default/converge.yml +++ b/roles/ipmi_exporter/molecule/default/converge.yml @@ -2,5 +2,5 @@ - name: Converge hosts: all roles: - - role: genlab.ipmi_exporter + - role: genlab.common.ipmi_exporter ipmi_exp_source_dir: "molecule/default/" diff --git a/roles/ipmi_exporter/molecule/default/verify.yml b/roles/ipmi_exporter/molecule/default/verify.yml index ffdfe90..95aeb62 100644 --- a/roles/ipmi_exporter/molecule/default/verify.yml +++ b/roles/ipmi_exporter/molecule/default/verify.yml @@ -8,7 +8,7 @@ - name: "Include default vars" ansible.builtin.include_vars: dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/defaults/" - extensions: [ 'yml' ] + extensions: ['yml'] - name: "Check if ipmi_exporter is installed" changed_when: false @@ -17,21 +17,21 @@ - name: "Check ipmi_exporter version" ansible.builtin.assert: - that: "ipmi_exporter_installed_version.stdout is regex('{{ ipmi_exp_version }}')" - success_msg: "ipmi_exporter version {{ ipmi_exp_version }} is installed and working" - fail_msg: "ipmi_exporter version {{ ipmi_exp_version }} is not installed or not working correctly" + that: "ipmi_exporter_installed_version.stdout is regex('{{ ipmi_exporter_version }}')" + success_msg: "ipmi_exporter version {{ ipmi_exporter_version }} is installed and working" + fail_msg: "ipmi_exporter version {{ ipmi_exporter_version }} is not installed or not working correctly" # kics-scan ignore-block - name: Check if /metrics endpoint is reachable ansible.builtin.uri: - url: "http://{{ ipmi_exp_web_listen_address }}/metrics" + url: "http://{{ ipmi_exporter_web_listen_address }}/metrics" return_content: true status_code: 200 timeout: 60 - register: metrics_check + register: ipmi_exporter_metrics_check - name: "Fail if /metrics doesn't contain ipmi_exporter_build_info line" ansible.builtin.assert: - that: "'ipmi_exporter_build_info' in metrics_check.content" + that: "'ipmi_exporter_build_info' in ipmi_exporter_metrics_check.content" fail_msg: "ipmi_exporter /metrics endpoint doesn't contain ipmi_exporter_build_info line!" success_msg: "ipmi_exporter /metrics endpoint contains ipmi_exporter_build_info line!" diff --git a/roles/ipmi_exporter/tasks/configure.yml b/roles/ipmi_exporter/tasks/configure.yml index 3851e6f..04af8f5 100644 --- a/roles/ipmi_exporter/tasks/configure.yml +++ b/roles/ipmi_exporter/tasks/configure.yml @@ -4,7 +4,7 @@ when: ipmi_exp_source_dir is defined and ipmi_exp_source_dir | length > 0 ansible.builtin.template: src: "{{ ipmi_exp_source_dir }}/ipmi_local.conf" - dest: "{{ ipmi_exp_config_dir }}/ipmi_local.conf" + dest: "{{ ipmi_exporter_config_dir }}/ipmi_local.conf" owner: root group: root mode: '0640' @@ -14,7 +14,7 @@ when: ipmi_exp_web_source_dir is defined and ipmi_exp_web_source_dir | length > 0 ansible.builtin.template: src: "{{ ipmi_exp_web_source_dir }}/web_conf.yaml" - dest: "{{ ipmi_exp_config_dir }}/web_conf.yaml" + dest: "{{ ipmi_exporter_config_dir }}/web_conf.yaml" owner: root group: root mode: '0640' diff --git a/roles/ipmi_exporter/tasks/install.yml b/roles/ipmi_exporter/tasks/install.yml index 1466d76..4d9ec03 100644 --- a/roles/ipmi_exporter/tasks/install.yml +++ b/roles/ipmi_exporter/tasks/install.yml @@ -9,9 +9,9 @@ - name: "Assert version correctness" ansible.builtin.assert: - that: "ipmi_exporter_ver.stdout is regex('{{ ipmi_exp_version }}')" - success_msg: "ipmi_exporter version {{ ipmi_exp_version }} is installed and working" - fail_msg: "ipmi_exporter version {{ ipmi_exp_version }} is not installed or not working correctly" + that: "ipmi_exporter_ver.stdout is regex('{{ ipmi_exporter_version }}')" + success_msg: "ipmi_exporter version {{ ipmi_exporter_version }} is installed and working" + fail_msg: "ipmi_exporter version {{ ipmi_exporter_version }} is not installed or not working correctly" rescue: - name: "Create ipmi_exporter directories" @@ -22,20 +22,20 @@ group: root mode: "0755" with_items: - - "{{ ipmi_exp_dir }}" - - "{{ ipmi_exp_config_dir }}" + - "{{ ipmi_exporter_dir }}" + - "{{ ipmi_exporter_config_dir }}" - name: "Unarchive ipmi_exporter tar file" notify: "(Re)start and enable ipmi_exporter" ansible.builtin.unarchive: src: "https://github.com/prometheus-community/ipmi_exporter/releases/\ - download/v{{ ipmi_exp_version }}/ipmi_exporter-{{ ipmi_exp_version }}.linux-amd64.tar.gz" - dest: "{{ ipmi_exp_dir }}" + download/v{{ ipmi_exporter_version }}/ipmi_exporter-{{ ipmi_exporter_version }}.linux-amd64.tar.gz" + dest: "{{ ipmi_exporter_dir }}" remote_src: true - name: "Move ipmi_exporter binary" ansible.builtin.copy: - src: "{{ ipmi_exp_dir }}/ipmi_exporter-{{ ipmi_exp_version }}.linux-amd64/ipmi_exporter" + src: "{{ ipmi_exporter_dir }}/ipmi_exporter-{{ ipmi_exporter_version }}.linux-amd64/ipmi_exporter" dest: "/usr/local/bin/ipmi_exporter" mode: "0755" owner: root diff --git a/roles/ipmi_exporter/templates/ipmi_exporter.service.j2 b/roles/ipmi_exporter/templates/ipmi_exporter.service.j2 index bf61227..6b41d18 100644 --- a/roles/ipmi_exporter/templates/ipmi_exporter.service.j2 +++ b/roles/ipmi_exporter/templates/ipmi_exporter.service.j2 @@ -8,17 +8,17 @@ StartLimitBurst=5 [Service] Type=simple ExecStart=/usr/local/bin/ipmi_exporter \ - --web.listen-address={{ ipmi_exp_web_listen_address }} \ - --log.level={{ ipmi_exp_log_level }} \ - --log.format={{ ipmi_exp_log_format }} \ -{% if ipmi_exp_args is defined and ipmi_exp_args | length > 0 %} - {{ ipmi_exp_args }} \ + --web.listen-address={{ ipmi_exporter_web_listen_address }} \ + --log.level={{ ipmi_exporter_log_level }} \ + --log.format={{ ipmi_exporter_log_format }} \ +{% if ipmi_exporter_args is defined and ipmi_exporter_args | length > 0 %} + {{ ipmi_exporter_args }} \ {% endif %} -{% if ipmi_exp_source_dir is defined and ipmi_exp_source_dir | length > 0 %} - --config.file={{ ipmi_exp_config_dir }}/ipmi_local.conf \ +{% if ipmi_exporter_source_dir is defined and ipmi_exporter_source_dir | length > 0 %} + --config.file={{ ipmi_exporter_config_dir }}/ipmi_local.conf \ {% endif %} -{% if ipmi_exp_web_source_dir is defined and ipmi_exp_web_source_dir | length > 0 %} - --web.config.file={{ ipmi_exp_config_dir }}/web_conf.yaml +{% if ipmi_exporter_web_source_dir is defined and ipmi_exporter_web_source_dir | length > 0 %} + --web.config.file={{ ipmi_exporter_config_dir }}/web_conf.yaml {% endif %} SyslogIdentifier=ipmi_exporter