From 56436fe607f4a8466e6e7cb0388ff6f4a55f5189 Mon Sep 17 00:00:00 2001 From: Sergey Malyuk Date: Mon, 8 Dec 2025 15:35:57 +0300 Subject: [PATCH] fix linter errors --- roles/alertmanager/README.md | 4 ++-- roles/alertmanager/defaults/main.yml | 4 ++-- roles/alertmanager/meta/main.yml | 6 +++--- .../default/alertmanager/alertmanager.yml | 18 +++++++++--------- .../alertmanager/molecule/default/converge.yml | 2 +- roles/alertmanager/molecule/default/verify.yml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/roles/alertmanager/README.md b/roles/alertmanager/README.md index a8a57da..7ef20e9 100644 --- a/roles/alertmanager/README.md +++ b/roles/alertmanager/README.md @@ -15,8 +15,8 @@ Role Variables ``` alertmanager_version: 0.28.1 # version of Alertmanager (AM) -config_dir: "/etc/alertmanager/conf" # where to place AM configs -storage_dir: "/var/lib/alertmanager" # path to AM storage +alertmanager_config_dir: "/etc/alertmanager/conf" # where to place AM configs +alertmanager_storage_dir: "/var/lib/alertmanager" # path to AM storage alertmanager_dir: "/etc/alertmanager" # where to install AM on target alertmanager_user: "alertmanager" # system user name alertmanager_group: "alertmanager" # system group name diff --git a/roles/alertmanager/defaults/main.yml b/roles/alertmanager/defaults/main.yml index 88707b3..4e14295 100644 --- a/roles/alertmanager/defaults/main.yml +++ b/roles/alertmanager/defaults/main.yml @@ -1,7 +1,7 @@ --- alertmanager_version: 0.28.1 -config_dir: "/etc/alertmanager/conf" -storage_dir: "/var/lib/alertmanager" +alertmanager_config_dir: "/etc/alertmanager/conf" +alertmanager_storage_dir: "/var/lib/alertmanager" alertmanager_dir: "/etc/alertmanager" alertmanager_user: alertmanager alertmanager_group: alertmanager diff --git a/roles/alertmanager/meta/main.yml b/roles/alertmanager/meta/main.yml index 942b852..0cebb5a 100644 --- a/roles/alertmanager/meta/main.yml +++ b/roles/alertmanager/meta/main.yml @@ -1,6 +1,6 @@ --- galaxy_info: - role_name: "alertmanager" + role_name: alertmanager namespace: genlab author: "Alexander Gorelyshev" company: "Genlab, LLC" @@ -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/alertmanager/molecule/default/alertmanager/alertmanager.yml b/roles/alertmanager/molecule/default/alertmanager/alertmanager.yml index 7c3bff0..78e14ea 100644 --- a/roles/alertmanager/molecule/default/alertmanager/alertmanager.yml +++ b/roles/alertmanager/molecule/default/alertmanager/alertmanager.yml @@ -7,20 +7,20 @@ global: # Other global settings like resolve_timeout, http_config, etc. -route: +route: # Default receiver for alerts receiver: 'default-receiver' - # Labels used for grouping alerts - group_by: ['alertname', 'instance', 'severity'] + # Labels used for grouping alerts + group_by: ['alertname', 'instance', 'severity'] - # Timing settings (group_wait, group_interval, repeat_interval) - # You can have nested 'routes' for more complex routing logic + # Timing settings (group_wait, group_interval, repeat_interval) + # You can have nested 'routes' for more complex routing logic receivers: - name: 'default-receiver' email_configs: - - to: 'ops-team@example.com' + - to: 'ops-team@example.com' inhibit_rules: # Rules to suppress alerts based on other alerts @@ -31,6 +31,6 @@ inhibit_rules: severity: 'warning' # Suppress 'warning' alerts if a 'critical' alert is also firing -templates: - # Paths to template files for customizing notifications - - '/etc/alertmanager/templates/*.tmpl' \ No newline at end of file +templates: + # Paths to template files for customizing notifications + - '/etc/alertmanager/templates/*.tmpl' diff --git a/roles/alertmanager/molecule/default/converge.yml b/roles/alertmanager/molecule/default/converge.yml index 3f7be92..470c151 100644 --- a/roles/alertmanager/molecule/default/converge.yml +++ b/roles/alertmanager/molecule/default/converge.yml @@ -2,5 +2,5 @@ - name: Converge hosts: all roles: - - role: genlab.alertmanager + - role: genlab.common.alertmanager config_source_dir: alertmanager diff --git a/roles/alertmanager/molecule/default/verify.yml b/roles/alertmanager/molecule/default/verify.yml index 0836d76..37eb46f 100644 --- a/roles/alertmanager/molecule/default/verify.yml +++ b/roles/alertmanager/molecule/default/verify.yml @@ -9,7 +9,7 @@ - name: "Include default vars" ansible.builtin.include_vars: dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/defaults/" - extensions: [ 'yml' ] + extensions: ['yml'] - name: "Check if Alertmanager is installed" changed_when: false