forgejo-helm/forgejo-helm
forgejo-helm/forgejo-helm
Watch
7
33
Fork
You've already forked forgejo-helm
 24
Code Issues 18 Pull requests 6 Releases 137 Packages 1 Activity Actions 2

fix: makes servicemonitor more configurable #1422

Open
only-a-user wants to merge 2 commits from only-a-user/forgejo-helm:fix/servicemonitor into main
pull from: only-a-user/forgejo-helm:fix/servicemonitor
merge into: forgejo-helm:main
Conversation 5 Commits 2 Files changed 3 +44 -20
only-a-user commented 2025-11-14 16:51:34 +00:00
First-time contributor
Copy link
Copy Markdown

I had issues using the service monitor with prometheus, as the labels were constantly overridden, making it impossible to pull the metrics from the forgejo-http service. Additionally, I found the filter options to be a bit sparse, so i added some additional possibilities to configure the service monitor and added some best-practice fields.

Signed-off-by: only-a-user only-a-user@use.startmail.com

I had issues using the service monitor with prometheus, as the labels were constantly overridden, making it impossible to pull the metrics from the `forgejo-http` service. Additionally, I found the filter options to be a bit sparse, so i added some additional possibilities to configure the service monitor and added some best-practice fields. Signed-off-by: only-a-user <only-a-user@use.startmail.com>
fix: makes servicemonitor more configurable
Some checks failed
build / lint-node (pull_request) Failing after 23s
Details
build / lint-helm (pull_request) Successful in 29s
Details
build / e2e (v1.28.15+k3s1) (pull_request) Has been skipped
Details
build / e2e (v1.32.9+k3s1) (pull_request) Has been skipped
Details
build / e2e (v1.33.5+k3s1) (pull_request) Has been skipped
Details
build / test-success (pull_request) Failing after 1s
Details
build / publish (pull_request) Has been skipped
Details
656937ca63 
Signed-off-by: only-a-user <only-a-user@use.startmail.com>
viceice requested changes 2025-11-17 13:07:42 +00:00
viceice left a comment
Copy link
Copy Markdown

Please run pnpm prettier-fix, commit and push

Please run `pnpm prettier-fix`, commit and push
only-a-user commented 2025-11-17 18:49:12 +00:00
Author
First-time contributor
Copy link
Copy Markdown

Hi @viceice,

I ran pnpm prettier-fix and it changed nothing, so there is nothing to commit.

Hi @viceice, I ran `pnpm prettier-fix` and it changed nothing, so there is nothing to commit.
viceice commented 2025-11-17 20:22:01 +00:00
Owner
Copy link
Copy Markdown

@only-a-user wrote in #1422 (comment):

Hi @viceice,

I ran pnpm prettier-fix and it changed nothing, so there is nothing to commit.

ah, sorry. please run pnpm readme:parameters

@only-a-user wrote in https://code.forgejo.org/forgejo-helm/forgejo-helm/pulls/1422#issuecomment-66868: > Hi @viceice, > > I ran `pnpm prettier-fix` and it changed nothing, so there is nothing to commit. ah, sorry. please run `pnpm readme:parameters`
docs: updates readme
All checks were successful
build / lint-node (pull_request) Successful in 22s
Details
build / lint-helm (pull_request) Successful in 26s
Details
build / e2e (v1.28.15+k3s1) (pull_request) Successful in 3m33s
Details
build / e2e (v1.32.9+k3s1) (pull_request) Successful in 3m44s
Details
build / e2e (v1.33.5+k3s1) (pull_request) Successful in 4m11s
Details
build / test-success (pull_request) Successful in 2s
Details
build / publish (pull_request) Has been skipped
Details
e895656455 
Signed-off-by: only-a-user <only-a-user@use.startmail.com>
only-a-user commented 2025-11-21 15:55:55 +00:00
Author
First-time contributor
Copy link
Copy Markdown

All checks have passed, the PR should be ready to merge @viceice.

All checks have passed, the PR should be ready to merge @viceice.
viceice reviewed 2025-11-24 09:33:26 +00:00
viceice left a comment
Copy link
Copy Markdown

please add helm unit tests.

please add helm unit tests.
templates/gitea/servicemonitor.yaml
@ -13,0 +16,4 @@
scrapeTimeout: {{ default "30s" .Values.gitea.metrics.serviceMonitor.scrapeTimeout }}
path: /metrics
port: http
scheme: http
viceice commented 2025-11-24 09:33:08 +00:00
Owner
Copy link
Copy Markdown

isn't this the default value and also path ? we should not set default values if they're not configurable anyways

isn't this the default value and also `path` ? we should not set default values if they're not configurable anyways
templates/gitea/servicemonitor.yaml
@ -13,0 +17,4 @@
path: /metrics
port: http
scheme: http
jobLabel: forgejo
viceice commented 2025-11-24 09:32:08 +00:00
Owner
Copy link
Copy Markdown

what was the default value before this change?

what was the default value before this change?
All checks were successful
build / lint-node (pull_request) Successful in 22s
Required
Details
build / lint-helm (pull_request) Successful in 26s
Required
Details
build / e2e (v1.28.15+k3s1) (pull_request) Successful in 3m33s
Required
Details
build / e2e (v1.32.9+k3s1) (pull_request) Successful in 3m44s
Required
Details
build / e2e (v1.33.5+k3s1) (pull_request) Successful in 4m11s
Required
Details
build / test-success (pull_request) Successful in 2s
Required
Details
build / publish (pull_request) Has been skipped
Details
This pull request has changes requested by an official reviewer.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u fix/servicemonitor:only-a-user-fix/servicemonitor
git switch only-a-user-fix/servicemonitor
Sign in to join this conversation.
Reviewers
No reviewers
viceice
Labels
Clear labels
  
Compat/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Question

   
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Help wanted

  
Status
In progress

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

  
Status
Needs feedback

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Question
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Help wanted
Status
In progress
Status
Need More Info
Status
Needs feedback
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
2 participants
Notifications
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
forgejo-helm/forgejo-helm!1422
No description provided.