Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ namespace: ethdevops
# The name of the collection. Has the same character restrictions as 'namespace'
name: infrastructure
# The version of the collection. Must be compatible with semantic versioning
version: 1.5.42
version: 1.5.46
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
# @nicks:irc/im.site#channel'
authors:
- Markus Keil <markus.keil@ethereum.org>
- Paul Jickling <paul.jickling@ethereum.org>
### OPTIONAL but strongly recommended
# A short summary description of the collection
description: General ansible roles from EF devops
Expand Down
2 changes: 1 addition & 1 deletion roles/vector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Default variables are defined in [defaults/main.yaml](defaults/main.yaml)
|----------|-------------|---------|
| `vector_extra_metrics` | Additional metrics configuration | `""` |
| `vector_install_nodexporter` | Install node_exporter | `true` |
| `vector_version` | Vector version to install | `"0.51.1-1"` |
| `vector_version` | Vector version to install | `"0.57.0-1"` |

## Dependencies

Expand Down
2 changes: 1 addition & 1 deletion roles/vector/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
vector_extra_metrics: ""
vector_install_nodexporter: true
vector_version: "0.55.0-1"
vector_version: "0.57.0-1"
vector_use_openbao: false
# OpenBao/Vault secret configuration
vector_vault_secret_path: "secret/common/metric_ingress"
Expand Down
39 changes: 27 additions & 12 deletions roles/vector/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,33 @@
ansible.builtin.command: dpkg --print-architecture
register: vector_system_arch
changed_when: false
- name: Download Vector deb package
ansible.builtin.get_url:
url: "https://apt.vector.dev/pool/v/ve/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
dest: "/tmp/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
mode: '0644'
- name: Install Vector using dpkg
ansible.builtin.apt:
deb: "/tmp/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
- name: Clean up downloaded deb file
ansible.builtin.file:
path: "/tmp/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
state: absent
- name: Get installed Vector version
ansible.builtin.command: dpkg-query -W -f='${Version}' vector
register: vector_installed
changed_when: false
failed_when: false
- name: Check whether the pinned Vector version is newer than the installed one
ansible.builtin.command: >-
dpkg --compare-versions "{{ vector_installed.stdout }}" lt "{{ vector_version }}"
register: vector_upgrade_needed
changed_when: false
failed_when: false
when: vector_installed.rc == 0
- name: Install pinned Vector version
when: (vector_installed.rc | default(1)) != 0 or (vector_upgrade_needed.rc | default(1)) == 0
block:
- name: Download Vector deb package
ansible.builtin.get_url:
url: "https://apt.vector.dev/pool/v/ve/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
dest: "/tmp/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
mode: '0644'
- name: Install Vector using dpkg
ansible.builtin.apt:
deb: "/tmp/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
- name: Clean up downloaded deb file
ansible.builtin.file:
path: "/tmp/vector_{{ vector_version }}_{{ vector_system_arch.stdout }}.deb"
state: absent
- name: Copy vector multi systemd unit
ansible.builtin.copy:
src: vector-multi.service
Expand Down
Loading