Forgejo Valkey monitoring: deploying valkey exported alongside with valkey to export its metrics #3548

Merged

dkirwan merged 2 commits from amedvede/ansible:forgejo_zabbix into main 2026-07-30 14:22:06 +00:00

Conversation 3 Commits 2 Files changed 8 +137 -5

amedvede commented 2026-07-29 13:46:40 +00:00

Member

Copy link

No description provided.

amedvede added 2 commits 2026-07-29 13:46:40 +00:00

feat(forgejo): add zabbix bearer token access to the forgejo metrics on prod ... 35f7b2e93c

Signed-off-by: Anton Medvedev <amedvede@redhat.com>

feat(forgejo): deploying redis exporter, that will export metrics from valkey and later be accessible from zabbix agent ... 615aa310aa

Signed-off-by: Anton Medvedev <amedvede@redhat.com>

amedvede 2026-07-29 13:46:57 +00:00

• added the
  ai-review-please
  label
• requested review from dkirwan

forgejo-actions commented 2026-07-29 13:47:26 +00:00

Copy link

AI Code Review

Detailed Code Review

The implementation successfully introduces the Valkey exporter and simplifies the metrics authentication setup by removing the conditional toggle. The Kubernetes deployment template follows strong security practices (dropping all capabilities, running as non-root, and utilizing seccomp profiles) and correctly maps the existing authentication secrets for Valkey.

The removal of forgejo_metrics_zabbix_enabled is a sensible move to ensure that monitoring is consistently available across environments via the OpenShift delegate URLs without requiring extra configuration. No critical bugs or security vulnerabilities were identified.

📂 File Reviews

📄 `roles/openshift-apps/forgejo/tasks/deploy-valkey.yaml` - Adds Ansible tasks to template and apply the Valkey exporter deployment and service.

• Minor [Suggestion]: Using ansible.builtin.command to run oc apply will cause the task to report as 'changed' on every playbook run, reducing idempotency visibility.
  • Suggestion: Consider utilizing the kubernetes.core.k8s module for resource application, or add a mechanism to track changes (e.g., changed_when: false or comparing states).

✅ Summary

• Overall Assessment: The changes are well-structured, follow security best practices, and correctly configure the metrics exporter and OAuth proxy. No critical issues were identified.
• Minor Suggestions:
  • Consider using kubernetes.core.k8s Ansible module instead of shelling out to oc apply for better idempotency.

---

🤖 AI Code Review | Generated with ai-code-review | Model: gemini-3.1-pro-preview

⚠️ AI-generated suggestions may be incorrect. Verify before applying. Not a replacement for human review.

## AI Code Review ### Detailed Code Review The implementation successfully introduces the Valkey exporter and simplifies the metrics authentication setup by removing the conditional toggle. The Kubernetes deployment template follows strong security practices (dropping all capabilities, running as non-root, and utilizing seccomp profiles) and correctly maps the existing authentication secrets for Valkey. The removal of `forgejo_metrics_zabbix_enabled` is a sensible move to ensure that monitoring is consistently available across environments via the OpenShift delegate URLs without requiring extra configuration. No critical bugs or security vulnerabilities were identified. #### 📂 File Reviews <details> <summary><strong>📄 `roles/openshift-apps/forgejo/tasks/deploy-valkey.yaml`</strong> - Adds Ansible tasks to template and apply the Valkey exporter deployment and service.</summary> - **Minor** [Suggestion]: Using `ansible.builtin.command` to run `oc apply` will cause the task to report as 'changed' on every playbook run, reducing idempotency visibility. - *Suggestion:* Consider utilizing the `kubernetes.core.k8s` module for resource application, or add a mechanism to track changes (e.g., `changed_when: false` or comparing states). </details> ### ✅ Summary - **Overall Assessment:** The changes are well-structured, follow security best practices, and correctly configure the metrics exporter and OAuth proxy. No critical issues were identified. - **Minor Suggestions:** - Consider using `kubernetes.core.k8s` Ansible module instead of shelling out to `oc apply` for better idempotency. --- 🤖 **AI Code Review** | Generated with [ai-code-review](https://gitlab.com/redhat/edge/ci-cd/ai-code-review) | **Model:** `gemini-3.1-pro-preview` ⚠️ *AI-generated suggestions may be incorrect. Verify before applying. Not a replacement for human review.*

amedvede commented 2026-07-29 13:53:51 +00:00

Author

Member

Copy link

To deploy only valkey changes use
ansible-playbook playbooks/openshift-apps/forgejo.yml -t valkey

To test changes use on os_control_stg machine.
To chech if exported is deployed:

oc get deploy,pod,svc -n forgejo -l app=valkey-exporter

To check its health status:

curl -sS -w '\nHTTP %{http_code}\n' \
  http://valkey-exporter.forgejo.svc.cluster.local:9121/health

Metrics scrape test:

curl -sS http://valkey-exporter.forgejo.svc.cluster.local:9121/metrics | head -40

To deploy only valkey changes use ```ansible-playbook playbooks/openshift-apps/forgejo.yml -t valkey``` To test changes use on `os_control_stg` machine. To chech if exported is deployed: ``` oc get deploy,pod,svc -n forgejo -l app=valkey-exporter ``` To check its health status: ``` curl -sS -w '\nHTTP %{http_code}\n' \ http://valkey-exporter.forgejo.svc.cluster.local:9121/health ``` Metrics scrape test: ``` curl -sS http://valkey-exporter.forgejo.svc.cluster.local:9121/metrics | head -40 ```

amedvede force-pushed forgejo_zabbix from 615aa310aa to f73bf62c2b 2026-07-29 13:57:51 +00:00 Compare

forgejo-actions commented 2026-07-29 13:58:39 +00:00

Copy link

AI Code Review

Detailed Code Review

The implementation successfully adds the Valkey exporter and simplifies the Zabbix integration by removing a redundant boolean toggle. The Kubernetes resources are well-structured, employing proper security contexts, resource limits, and health probes. The Ansible tasks correctly use tags and templating.

However, there is a minor risk in the Ansible deploy-valkey.yaml tasks related to how resources are applied, as oc apply can occasionally fail if the object doesn't exist yet but has certain immutable field expectations depending on the cluster state. This is mitigated by the retries, but utilizing the kubernetes.core.k8s Ansible module is generally more robust and idempotent than running oc apply via command module.

📂 File Reviews

📄 `roles/openshift-apps/forgejo/tasks/deploy-valkey.yaml` - Adds tasks to template and apply the Valkey exporter deployment and service.

• Minor [Suggestion]: Using ansible.builtin.command with oc apply is less robust than using the native kubernetes.core.k8s module, which handles idempotency and state validation better.
  • Suggestion: Consider migrating to kubernetes.core.k8s for applying Kubernetes manifests, though the current retry mechanism mitigates immediate failure risks.

✅ Summary

• Overall Assessment: No critical issues identified. The changes are structurally sound and follow standard deployment practices for OpenShift/Ansible.
• Minor Suggestions:
  • Consider replacing shell oc apply commands with the native kubernetes.core.k8s Ansible module for better idempotency and error handling.

---

🤖 AI Code Review | Generated with ai-code-review | Model: gemini-3.1-pro-preview

⚠️ AI-generated suggestions may be incorrect. Verify before applying. Not a replacement for human review.

## AI Code Review ### Detailed Code Review The implementation successfully adds the Valkey exporter and simplifies the Zabbix integration by removing a redundant boolean toggle. The Kubernetes resources are well-structured, employing proper security contexts, resource limits, and health probes. The Ansible tasks correctly use tags and templating. However, there is a minor risk in the Ansible `deploy-valkey.yaml` tasks related to how resources are applied, as `oc apply` can occasionally fail if the object doesn't exist yet but has certain immutable field expectations depending on the cluster state. This is mitigated by the retries, but utilizing the `kubernetes.core.k8s` Ansible module is generally more robust and idempotent than running `oc apply` via `command` module. #### 📂 File Reviews <details> <summary><strong>📄 `roles/openshift-apps/forgejo/tasks/deploy-valkey.yaml`</strong> - Adds tasks to template and apply the Valkey exporter deployment and service.</summary> - **Minor** [Suggestion]: Using `ansible.builtin.command` with `oc apply` is less robust than using the native `kubernetes.core.k8s` module, which handles idempotency and state validation better. - *Suggestion:* Consider migrating to `kubernetes.core.k8s` for applying Kubernetes manifests, though the current retry mechanism mitigates immediate failure risks. </details> ### ✅ Summary - **Overall Assessment:** No critical issues identified. The changes are structurally sound and follow standard deployment practices for OpenShift/Ansible. - **Minor Suggestions:** - Consider replacing shell `oc apply` commands with the native `kubernetes.core.k8s` Ansible module for better idempotency and error handling. --- 🤖 **AI Code Review** | Generated with [ai-code-review](https://gitlab.com/redhat/edge/ci-cd/ai-code-review) | **Model:** `gemini-3.1-pro-preview` ⚠️ *AI-generated suggestions may be incorrect. Verify before applying. Not a replacement for human review.*

amedvede referenced this pull request from forge/forge 2026-07-29 14:04:32 +00:00

Create Zabbix template to monitor the Forge Valkey status #661

amedvede force-pushed forgejo_zabbix from f73bf62c2b to 9ecc970f1e 2026-07-30 14:18:32 +00:00 Compare

dkirwan merged commit 9ecc970f1e into main 2026-07-30 14:22:06 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

dkirwan

Labels

Clear labels   

ai-review-please

label for requesting AI code review

  

freeze-break-request

  

post-freeze

  

Backlog Status

Needs Review

Work items that have been created or updated but need review, refinement, or approval before they can be considered ready for sprint planning.

  

Backlog Status

Ready

Work items that have been reviewed, refined, and are ready to be committed to a sprint. These items have clear requirements and can be worked on immediately when capacity is available.

  

chore

Work that needs to be done but doesn't add new functionality or fix bugs. Maintenance tasks that keep the system running smoothly and the codebase clean.

  

documentation

Work focused on creating, updating, or improving documentation for users, developers, or system administrators.

  

points

01

A task that is simple, small, and has very little uncertainty. It should be easy enough for any team member to pick up and complete quickly, without a lot of discussion or research.

  

points

02

This is a task that is slightly more complex or larger than a "1." It might involve two or three simple steps, but the outcome is still very clear and there's little uncertainty.

  

points

03

Medium-sized task with some noticeable complexity. It might require a bit more thought or collaboration. The steps are well-defined, but it's not a trivial change.

  

points

05

A significant piece of work. It has more complexity and a higher degree of uncertainty than smaller tasks. It might require some research, a design discussion, or collaboration across multiple teams.

  

points

08

Complex task with a lot of uncertainty. It's often the largest size that a team will consider for a single sprint. It likely requires a detailed breakdown and multiple team members to complete.

  

points

13

Any task that feels like it's a "13" or more is considered an Epic. These are too large and uncertain to be worked on in a single sprint and should be broken down.

  

Priority

High

This is for work that is critical and needs to be addressed in the next sprint. It's often for urgent bugs, important features, or a major piece of technical debt that is blocking other work.

  

Priority

Low

This is for work that is good to do but not urgent. It's a candidate for being worked on when there's extra time or when it rises in importance. It can stay in the backlog for a longer period.

  

Priority

Medium

This is for important work that should be done soon, but isn't as urgent as a high-priority item. It will likely be considered for the next 1-2 sprints.

  

Sprint Status

Blocked

Work items that cannot progress due to external dependencies, blockers, or issues that need resolution.

  

Sprint Status

Done

Work items that have been completed, reviewed, and integrated. No further work is needed within the current sprint.

  

Sprint Status

In Progress

Work items currently being worked on by a team member. Active development, research, or implementation is happening.

  

Sprint Status

Review

Work items that are complete but need review, testing, or approval before being marked as done.

  

Sprint Status

To Do

Work items that are committed to the sprint but haven't been started yet. These items are ready to be picked up by team members.

  

Technical Debt

Work that addresses shortcuts, workarounds, or suboptimal implementations that were done previously to meet deadlines. These items improve code quality, maintainability, or performance without adding new features.

  

Work Item

Bug

Issues where the system is not working as intended or designed. Bugs represent deviations from expected behavior.

  

Work Item

Epic

Large initiatives that are broken down into multiple smaller work items (user stories, tasks, bugs). Epics represent significant features or projects that span multiple sprints.

  

Work Item

Spike

Time-boxed research, investigation, or proof-of-concept work to reduce uncertainty or explore solutions. Spikes help inform future development decisions.

  

Work Item

Task

Used to break down larger user stories into smaller, manageable implementation pieces. They focus on the specific technical steps needed to deliver the user story's value.

  

Work Item

User Story

User-facing features or functionality that can be framed from a user perspective, describing what someone wants to accomplish and why.

No labels

ai-review-please

freeze-break-request

post-freeze

Backlog Status

Needs Review

Backlog Status

Ready

chore

documentation

points

01

points

02

points

03

points

05

points

08

points

13

Priority

High

Priority

Low

Priority

Medium

Sprint Status

Blocked

Sprint Status

Done

Sprint Status

In Progress

Sprint Status

Review

Sprint Status

To Do

Technical Debt

Work Item

Bug

Work Item

Epic

Work Item

Spike

Work Item

Task

Work Item

User Story

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

infra/ansible!3548

No description provided.