diff --git a/plays/all.yml b/plays/all.yml index 524572fe..1a6b2278 100644 --- a/plays/all.yml +++ b/plays/all.yml @@ -66,6 +66,8 @@ tags: prometheus - role: promtail tags: promtail + - role: loki + tags: loki - role: grafana tags: grafana - role: restic_server diff --git a/roles/loki/README.md b/roles/loki/README.md index cb45dfa8..830fa44a 100644 --- a/roles/loki/README.md +++ b/roles/loki/README.md @@ -8,7 +8,7 @@ Configure the role. ```yml # https://hub.docker.com/r/grafana/loki/ -loki_image: grafana/loki:2.3.0 +loki_image: grafana/loki loki_hostname: loki01 loki_description: log index for grafana # default: Loki loki_nginx_data_dir: /usr/share/nginx/proxies # default: "{{ nginx_data_dir }}/proxies" diff --git a/roles/mysqld_exporter/README.md b/roles/mysqld_exporter/README.md index 4242ff32..e7516fe2 100644 --- a/roles/mysqld_exporter/README.md +++ b/roles/mysqld_exporter/README.md @@ -8,7 +8,7 @@ Configure the role. ```yml # https://hub.docker.com/r/prom/mysqld-exporter/ -mysqld_exporter_image: prom/mysqld-exporter:v0.15.1 +mysqld_exporter_image: prom/mysqld-exporter:v0.16.0 mysqld_exporter_hostname: myexport01 mysqld_exporter_description: Database metric for mysql01 # default: "MySQL Exporter {{ mysqld_exporter_server }}" mysqld_exporter_data_dir: /usr/share/myexport # default: "/usr/share/{{ mysqld_exporter_hostname }}" diff --git a/roles/prometheus/README.md b/roles/prometheus/README.md index a2156e53..49e6e2d5 100644 --- a/roles/prometheus/README.md +++ b/roles/prometheus/README.md @@ -96,3 +96,14 @@ Select multiple inventories when deploying. ```bash ansible-playbook -i inventories/odoo -i inventories/nextcloud -i inventories/setup plays/setup.yml -l prometheus -t prometheus ``` + +### Clear Prometheus data + +Remove container and volume. + +```bash +docker rm -f prom01 +docker volume rm prom01 +``` + +Then redeploy. \ No newline at end of file diff --git a/task b/task index 80a9c567..b3b8ecc9 100755 --- a/task +++ b/task @@ -14,7 +14,7 @@ function help() { echo "|$(printf '%*s' $((cmd_width + 2)) '' | tr ' ' '-')|$(printf '%*s' $((opt_width + 2)) '' | tr ' ' '-')|$(printf '%*s' $((desc_width + 2)) '' | tr ' ' '-')|" printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "generate-vault-password" "[vault_id] [password]" "Generate a password file for Ansible vault." printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "convert-vault-file" "[vault_id] [path]" "Re-encrypt vault file as single strings." - printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "encrypt-string" "[vault_id] [key:value]" "Generate encrypted string with Ansible Vault." + printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "encrypt-string" "[vault_id] [key:value] -q" "Generate encrypted string with Ansible Vault." printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "install" "" "Install Ansible and dependencies with uv." printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "install-exo" "" "Install Exoscale CLI." printf "| %-${cmd_width}s | %-${opt_width}s | %-${desc_width}s |\n" "upgrade" "" "Upgrade Ansible and dependencies with uv." @@ -63,8 +63,10 @@ function encrypt-string() { STRING_KEY=$(echo "$2" | cut -d ':' -f 1) STRING_VALUE=$(echo "$2" | cut -d ':' -f 2 | sed 's/^ *//') - echo "Found key: $STRING_KEY" - echo "Encrypting value: $STRING_VALUE" + if [ "$3" != "-q" ]; then + echo "Found key: $STRING_KEY" + echo "Encrypting value: $STRING_VALUE" + fi ansible-vault encrypt_string --encrypt-vault-id="$1" --name "$STRING_KEY" "$STRING_VALUE" }