CCCHH/ansible-infra
CCCHH/ansible-infra
3
2
Fork 1
Code Issues 13 Pull requests 14 Wiki Activity Actions

alloy(role): pull in alloy role that works from fux #112

Merged
c6ristian merged 6 commits from fix/alloy into main 2026-07-23 20:34:03 +02:00
Conversation 7 Commits 6 Files changed 246 +222 -19245
c6ristian commented 2026-07-09 21:20:19 +02:00
Owner
Copy link
No description provided.
alloy(role): pull in alloy role that works from fux
All checks were successful
/ build (pull_request) Successful in 32s
Details
/ Ansible Lint (push) Successful in 2m23s
Details
/ Ansible Lint (pull_request) Successful in 2m25s
Details
0b5fa03ac3
forgejo-actions commented 2026-07-09 21:20:47 +02:00
Copy link

You can view your changes at https://staging.infra-docs.hamburg.ccc.de/pr112/

You can view your changes at https://staging.infra-docs.hamburg.ccc.de/pr112/
echtnurich commented 2026-07-09 23:07:16 +02:00
Owner
Copy link

+555 -19211 👀

Das Review krieg ich erst nach der Kassenprüfung hin, sorry

scnr

**+555 -19211** 👀 Das Review krieg ich erst nach der Kassenprüfung hin, sorry _scnr_
😆 1
c6ristian force-pushed fix/alloy from 0b5fa03ac3
All checks were successful
/ build (pull_request) Successful in 32s
Details
/ Ansible Lint (push) Successful in 2m23s
Details
/ Ansible Lint (pull_request) Successful in 2m25s
Details
to 25bf4da29d
All checks were successful
/ build (pull_request) Successful in 28s
Details
/ Ansible Lint (push) Successful in 3m9s
Details
/ Ansible Lint (pull_request) Successful in 3m13s
Details
2026-07-09 23:12:23 +02:00 Compare
june requested changes 2026-07-11 13:47:02 +02:00
Dismissed
june left a comment
Copy link

Very nice moving away from the upstream role to a much simpler custom role!
Please see the comments and also please provide an argument_specs as well as a README, see the forgejo_runner roles README as well as the certbot roles README as references.

Very nice moving away from the upstream role to a much simpler custom role! Please see the comments and also please provide an argument_specs as well as a README, see the [`forgejo_runner` roles README](https://git.hamburg.ccc.de/CCCHH/ansible-infra/src/branch/main/roles/forgejo_runner/README.md) as well as the [`certbot` roles README](https://git.hamburg.ccc.de/CCCHH/ansible-infra/src/branch/main/roles/certbot/README.md) as references.
roles/alloy/tasks/install_debian.yml Outdated
@ -0,0 +12,4 @@
- name: Run cache update
ansible.builtin.apt:
update_cache: true
june commented 2026-07-11 13:39:19 +02:00
Owner
Copy link

This can be moved into the next step or is there a reason to have this in a separate step?

This can be moved into the next step or is there a reason to have this in a separate step?
c6ristian commented 2026-07-14 19:11:10 +02:00
Author
Owner
Copy link

This is best practice to avoid conflicts

This is best practice to avoid conflicts
👍 1
june marked this conversation as resolved
roles/alloy/tasks/main.yaml Outdated
@ -20,1 +1,3 @@
when: alloy__additional_configs_dir is defined and alloy__additional_configs_dir != ""
---
- name: Deploy Grafana Alloy with config
tags: [ alloy ]
june commented 2026-07-11 13:39:37 +02:00
Owner
Copy link

Let's leave the tags at the playbook level.

Let's leave the tags at the playbook level.
june commented 2026-07-17 18:29:06 +02:00
Owner
Copy link

The tag is still here, we already have the alloy tag in the playbook, so it can just be removed.

The tag is still here, we already have the alloy tag [in the playbook](https://git.hamburg.ccc.de/CCCHH/ansible-infra/src/branch/main/playbooks/deploy.yaml#L119-L125), so it can just be removed.
c6ristian marked this conversation as resolved
roles/alloy/tasks/main.yaml Outdated
@ -23,2 +5,2 @@
ansible.builtin.apt:
name: rsync
- name: Install Alloy on Debian
when: ansible_facts['distribution'] == "Debian"
june commented 2026-07-11 13:39:58 +02:00
Owner
Copy link

We only have the Debian case, so having this be distro-specific isn't needed. I would rather have this role just fail, if someone tries to run it on an unsupported platform, instead of just no alloy package existing being installed.

We only have the Debian case, so having this be distro-specific isn't needed. I would rather have this role just fail, if someone tries to run it on an unsupported platform, instead of just no `alloy` package existing being installed.
c6ristian marked this conversation as resolved
roles/alloy/tasks/unpoller.yaml Outdated
@ -0,0 +1,76 @@
---
- name: Install and Setup unpoller
june commented 2026-07-11 13:43:47 +02:00
Owner
Copy link

Do we want/need unpoller support? If not, I would rather keep this role simpler and remove it.

Do we want/need unpoller support? If not, I would rather keep this role simpler and remove it.
c6ristian marked this conversation as resolved 
- add README
- add argument_specs
- removed tags
alloy(role): remove unpoller support
All checks were successful
/ build (pull_request) Successful in 52s
Details
/ Ansible Lint (pull_request) Successful in 2m55s
Details
/ Ansible Lint (push) Successful in 3m4s
Details
3f1108cf2c
june requested changes 2026-07-17 18:30:03 +02:00
Dismissed
june left a comment
Copy link

Thanks for implementing the changes, some small comments.

Thanks for implementing the changes, some small comments.
roles/alloy/README.md Outdated
@ -0,0 +9,4 @@
## Required Arguments
- `alloy_config_default`: The default Alloy configuration. Recomanded for configuration that hosts of a groupe share.
june commented 2026-07-14 00:48:29 +02:00
Owner
Copy link

Recomanded -> Recommended

Recomanded -> Recommended
june commented 2026-07-17 18:22:57 +02:00
Owner
Copy link

Since alloy_config_default has a default configuration set, it should be listed under Optional Arguments. I guess another option would be to truly have this as a required configuration and then just setting the config, which is quite specific to the Chaosknoten use case as a group var maybe?

Since `alloy_config_default` has a default configuration set, it should be listed under Optional Arguments. I guess another option would be to truly have this as a required configuration and then just setting the config, which is quite specific to the Chaosknoten use case as a group var maybe?
june marked this conversation as resolved
roles/alloy/README.md Outdated
@ -0,0 +13,4 @@
## Optional Arguments
- `alloy_config_additional`: Additional Alloy configuration appended to the default config. Recomanded for per host configuration
june commented 2026-07-14 00:48:42 +02:00
Owner
Copy link

Recomanded -> Recommended

Recomanded -> Recommended
june marked this conversation as resolved
roles/alloy/defaults/main.yaml Outdated
@ -5,3 +8,3 @@
basic_auth {
username = "chaos"
password = "chaos_password"
password = "{{ metrics__chaos_password }}"
june commented 2026-07-17 18:24:37 +02:00
Owner
Copy link

Maybe have this be an alloy variable which is documented in the README as well? See the comment in the README, if we move this config to the group vars then the this variable can be kept as is.

Maybe have this be an alloy variable which is documented in the README as well? See the comment in the README, if we move this config to the group vars then the this variable can be kept as is.
june marked this conversation as resolved
roles/alloy/meta/argument_specs.yaml Outdated
@ -0,0 +3,4 @@
options:
alloy_config_default:
type: str
required: true
june commented 2026-07-17 18:25:42 +02:00
Owner
Copy link

This doesn't do anything as a default is provided.

This doesn't do anything as a default is provided.
june marked this conversation as resolved
alloy(role): remove alloy_config_default contents from role
All checks were successful
/ build (pull_request) Successful in 56s
Details
/ Ansible Lint (pull_request) Successful in 3m28s
Details
/ Ansible Lint (push) Successful in 3m36s
Details
e8d05c6542
 
alloy_config_default should be set in group vars
june approved these changes 2026-07-18 00:43:22 +02:00
Dismissed
june left a comment
Copy link

Awesome! Just the removing the tag remaining in the main.yaml and then we can merge this. :3

Awesome! Just the removing the tag remaining in the `main.yaml` and then we can merge this. :3
june requested changes 2026-07-18 00:43:47 +02:00
Dismissed
june left a comment
Copy link

Oops, should have been a request changes :D

Oops, should have been a request changes :D
alloy(role): remove tags from role
All checks were successful
/ build (pull_request) Successful in 30s
Details
/ Ansible Lint (pull_request) Successful in 2m36s
Details
/ Ansible Lint (push) Successful in 2m37s
Details
147737c7a2
june approved these changes 2026-07-22 21:50:22 +02:00
june left a comment
Copy link

Nice, let's go!

Nice, let's go!
c6ristian force-pushed fix/alloy from 147737c7a2
All checks were successful
/ build (pull_request) Successful in 30s
Details
/ Ansible Lint (pull_request) Successful in 2m36s
Details
/ Ansible Lint (push) Successful in 2m37s
Details
to 34f6cfc186
All checks were successful
/ build (pull_request) Successful in 29s
Details
/ Ansible Lint (push) Successful in 3m52s
Details
/ Ansible Lint (pull_request) Successful in 3m58s
Details
/ cleanup-staging (pull_request) Successful in 6s
Details
2026-07-23 20:30:00 +02:00 Compare
c6ristian scheduled this pull request to auto merge when all checks succeed 2026-07-23 20:30:36 +02:00
c6ristian scheduled this pull request to auto merge when all checks succeed 2026-07-23 20:32:54 +02:00
c6ristian scheduled this pull request to auto merge when all checks succeed 2026-07-23 20:34:01 +02:00
c6ristian deleted branch fix/alloy 2026-07-23 20:34:03 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
june
Labels
Clear labels   
bug
Something is not working

  
duplicate
This issue or pull request already exists

  
enhancement
New feature

  
help wanted
Need some help

  
invalid
Something is wrong

  
question
More information is needed

  
renovate
Created automatically by Renovate.

  
waiting on upstream
Waiting on upstream until this can be merged.

  
wontfix
This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
renovate
waiting on upstream
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Blocks
#90 alloy role needs documentation
CCCHH/ansible-infra
Reference
CCCHH/ansible-infra!112
No description provided.