minor fixes and add github workflow (#1)

* translate README.md

* fix variables

* fix min_ansible_version

* add github workflow and fix molecule

* fix role_name

* fix APT cache update pre_task

* add locale_gen pre_task

* fix locale for RedHat 8

* add tar install task

* run tar installation task with sudo

* run tar installation task with sudo v2

* run tar installation task with sudo v3

* update converge.yml

* debug

* debug v2

* fix conditions

Author: antmelekhin

.github/workflows/molecule.yml

@@ -0,0 +1,36 @@
+---
+name: 'Molecule'
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  test:
+    name: 'Test'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: 'rockylinux8'
+            command: '/usr/sbin/init'
+          - distro: 'ubuntu2004'
+            command: '/lib/systemd/systemd'
+          - distro: 'debian11'
+            command: '/lib/systemd/systemd'
+
+    steps:
+      - name: 'Checkout the codebase'
+        uses: actions/checkout@v2
+
+      - name: 'Test role'
+        uses: gofrolist/molecule-action@v2
+        with:
+          molecule_command: test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_DOCKER_COMMAND: ${{ matrix.command }}

README.md

@@ -1,54 +1,59 @@
 Postgres Exporter
 =================
 
-Ansible роль для установки, настройки и обновления [Postgres Exporter](https://github.com/prometheus-community/postgres_exporter).
+An Ansible role for install, configure and update [Postgres Exporter](https://github.com/prometheus-community/postgres_exporter).
 
-Требования
-----------
+Requirements
+------------
 
-- Поддерживаемая версия Ansible: 2.7 и выше.
-- `pywinrm` для подключения [Ansible через WinRM](https://docs.ansible.com/ansible/latest/user_guide/windows_winrm.html) (для Windows).
-- `gnu-tar` при использовании Mac в качестве управляющего хоста (`brew install gnu-tar`).
-- Список поддерживаемых платформ описан в файле метаданных роли.
+- Supported version of Ansible: 2.9 and highter.
+- `gnu-tar` on Mac as deployer host (`brew install gnu-tar`).
+- List of all supported platforms described in role meta.
 
-Используемые переменные
------------------------
+Role Variables
+--------------
 
-- `postgres_exporter_version` Версия Postgres Exporter для установки (default: `0.11.1`).
-- `postgres_exporter_package_name` Имя пакета.
-- `postgres_exporter_download_url` Ссылка на скачивание архива с приложением.
-- `postgres_exporter_user` Unix имя пользователя (default: `postgres`).
-- `postgres_exporter_group` Unix группа пользователя (default: `postgres`).
-- `postgres_exporter_install_path` Каталог, в который будет распакован бинарник (default: `/usr/local/bin`).
-- `postgres_exporter_data_source_name` Строка подключения к БД (default: `user=postgres host=/var/run/postgresql/ sslmode=disable`).
-- `postgres_exporter_extend_query_path` Путь до YAML файла содержащего дополнительные sql-запросы для записи метрик (default: `''`).
-- `postgres_exporter_log_level` Уровень логирования экспортера (default: `info`).
+- `postgres_exporter_version` The specific version of Postgres Exporter to download (default: `0.11.1`).
+- `postgres_exporter_archive_name` Postgres Exporter archive name (default: `postgres_exporter-{{ postgres_exporter_version }}.linux-{{ _postgres_exporter_architecture }}`).
+- `postgres_exporter_archive_extension` Postgres Exporter archive extension (default: `tar.gz`)
+- `postgres_exporter_download_url` URL to download an archive with Postgres Exporter.
+- `postgres_exporter_user` and `postgres_exporter_group` Unix username and group (default: `postgres`).
+- `postgres_exporter_install_path` Path to Postgres Exporter installation directory (default: `/usr/local/bin`).
+- `postgres_exporter_data_source_name` Accepts URI form and key=value form arguments. The URI may contain the username and password to connect with. (default: `user=postgres host=/var/run/postgresql/ sslmode=disable`).
+- `postgres_exporter_extend_query_path` Path to a YAML file containing custom queries to run. (default: `''`).
+- `postgres_exporter_log_level` Postgres Exporter logging level.
 
-Зависимости
------------
+  Available values:
+  - `debug`
+  - `info` (default)
+  - `warn`
+  - `error`
 
-Отсутствуют.
+Dependencies
+------------
 
-Пример использования
---------------------
+None.
 
-- Устанавливаем и настраиваем Postgres Exporter:
+Example Playbook
+----------------
+
+- Install and configure Postgres Exporter:
 
   ```yaml
   ---
   - name: 'Setup Postgres Exporter'
     hosts: all
 
     roles:
-      - role: ansible-role-postgres-exporter
+      - role: antmelekhin.postgres_exporter
   ```
 
-Лицензия
---------
+License
+-------
 
 MIT
 
-Информация об авторе
---------------------
+Author Information
+------------------
 
-Мелехин Антон.
+Melekhin Anton.

defaults/main.yml

@@ -1,12 +1,15 @@
 ---
 # See available releases: https://github.com/prometheus-community/postgres_exporter/releases
 postgres_exporter_version: '0.11.1'
-postgres_exporter_package_name: 'postgres_exporter-{{ postgres_exporter_version }}.linux-{{ _postgres_exporter_architecture }}'
-postgres_exporter_download_url: 'https://github.com/prometheus-community/postgres_exporter/releases/download/v{{ postgres_exporter_version }}/{{ postgres_exporter_package_name }}.tar.gz'
+postgres_exporter_archive_name: 'postgres_exporter-{{ postgres_exporter_version }}.linux-{{ _postgres_exporter_architecture }}'
+postgres_exporter_archive_extension: 'tar.gz'
+postgres_exporter_download_url: 'https://github.com/prometheus-community/postgres_exporter/releases/download/v{{ postgres_exporter_version }}'
 
+# Postgres Exporter user.
 postgres_exporter_user: 'postgres'
 postgres_exporter_group: '{{ postgres_exporter_user }}'
 
+# Postgres Exporter directories.
 postgres_exporter_install_path: '/usr/local/bin'
 
 # See available environment variables: https://github.com/prometheus-community/postgres_exporter#environment-variables

meta/main.yml

@@ -7,7 +7,7 @@ galaxy_info:
 
   license: MIT
 
-  min_ansible_version: '2.7'
+  min_ansible_version: '2.9'
 
   platforms:
     - name: EL

molecule/default/converge.yml

@@ -1,11 +1,31 @@
 ---
-- name: Converge
+- name: 'Prepare an Ansible host for Github Actions'
+  hosts: localhost
+
+  tasks:
+    - name: 'Install tar for delegated to localhost tasks'
+      apk:
+        name: tar
+        update_cache: true
+      when: ansible_os_family == 'Alpine'
+
+- name: 'Converge'
   hosts: all
+  vars:
+    locale: 'en_US.UTF-8'
 
   pre_tasks:
     - name: 'Update APT cache'
       ansible.builtin.apt:
         update_cache: true
+      when: ansible_os_family == 'Debian'
+
+    - name: 'Set database locale if using RedHat 8'
+      set_fact:
+        locale: 'C.UTF-8'
+      when:
+        - ansible_os_family == 'RedHat' and
+          ansible_distribution_major_version == '8'
 
   roles:
     - role: geerlingguy.postgresql
@@ -15,10 +35,10 @@
           role_attr_flags: SUPERUSER
       postgresql_databases:
         - name: 'molecule'
-          lc_collate: 'en_US.UTF-8'
-          lc_ctype: 'en_US.UTF-8'
+          lc_collate: '{{ locale }}'
+          lc_ctype: '{{ locale }}'
           encoding: 'UTF-8'
           template: 'template0'
           owner: 'molecule'
 
-    - role: ansible-role-postgres-exporter
+    - role: antmelekhin.postgres_exporter

molecule/default/molecule.yml

@@ -8,15 +8,18 @@ lint: |
   set -e
   yamllint .
 platforms:
-  - name: ubuntu-2004
-    image: jrei/systemd-ubuntu:20.04
+  - name: instance
+    image: 'geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest'
+    command: "${MOLECULE_DOCKER_COMMAND:-'/lib/systemd/systemd'}"
     published_ports:
       - 0.0.0.0:9187:9187/udp
       - 0.0.0.0:9187:9187/tcp
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+      - /var/lib/containerd
+    cgroupns_mode: host
     privileged: true
-    command: '/lib/systemd/systemd'
+    pre_build_image: true
 provisioner:
   name: ansible
 verifier:

tasks/install.yml

@@ -6,26 +6,32 @@
   changed_when: false
   register: _postgres_exporter_version_check
 
-- block:
+- name: 'Download and unarchive Postgres Exporter'
+  block:
+    - name: 'Set archive fullname and temporary directory for Postgres Exporter'
+      ansible.builtin.set_fact:
+        _postgres_exporter_archive: '{{ postgres_exporter_archive_name }}.{{ postgres_exporter_archive_extension }}'
+        _postgres_exporter_tmp_dir: '{{ postgres_exporter_archive_name }}'
+
     - name: 'Download Postgres Exporter binary to local folder'
       ansible.builtin.get_url:
-        url: '{{ postgres_exporter_download_url }}'
-        dest: '/tmp/{{ postgres_exporter_package_name }}.tar.gz'
+        url: '{{ postgres_exporter_download_url }}/{{ _postgres_exporter_archive }}'
+        dest: '/tmp/{{ _postgres_exporter_archive }}'
         mode: 0644
       delegate_to: localhost
       check_mode: false
 
     - name: 'Unarchive Postgres Exporter binary'
       ansible.builtin.unarchive:
-        src: '/tmp/{{ postgres_exporter_package_name }}.tar.gz'
+        src: '/tmp/{{ _postgres_exporter_archive }}'
         dest: '/tmp'
-        creates: '/tmp/{{ postgres_exporter_package_name }}/postgres_exporter'
+        creates: '/tmp/{{ _postgres_exporter_tmp_dir }}/postgres_exporter'
       delegate_to: localhost
       check_mode: false
 
     - name: 'Copy Postgres Exporter binary into place'
       ansible.builtin.copy:
-        src: '/tmp/{{ postgres_exporter_package_name }}/postgres_exporter'
+        src: '/tmp/{{ _postgres_exporter_tmp_dir }}/postgres_exporter'
         dest: '{{ postgres_exporter_install_path }}/postgres_exporter'
         owner: '{{ postgres_exporter_user }}'
         group: '{{ postgres_exporter_group }}'