lunny/helm-chart
1
0
Fork 0
Code Issues 36 Pull Requests 14 Actions Packages Projects Releases 93 Wiki Activity

feat(serviceMonitor): custom configuration #710

Merged
volker.raschek merged 4 commits from refs/pull/710/head into main 2024-09-18 17:55:29 +00:00
Conversation 5 Commits 4 Files Changed 4 +140 -19
volker.raschek commented 2024-09-06 21:00:44 +00:00 (Migrated from gitea.com)
Copy Link

This patch extends the serviceMonitor resource to specify a custom TLS
configuration used by prometheus to scrape the metrics.

Furthermore, the interval and scrapeTimeout can now be adapted without changing
the global defaults of the prometheus instance.

This patch extends the serviceMonitor resource to specify a custom TLS configuration used by prometheus to scrape the metrics. Furthermore, the interval and scrapeTimeout can now be adapted without changing the global defaults of the prometheus instance.
justusbunsi (Migrated from gitea.com) reviewed 2024-09-06 21:00:45 +00:00
pat-s (Migrated from gitea.com) reviewed 2024-09-11 13:03:41 +00:00
pat-s (Migrated from gitea.com) left a comment
Copy Link

Thanks!

Did you run make readme? This should actually reduce the changes to README.md to a minimum.

Thanks! Did you run `make readme`? This should actually reduce the changes to `README.md` to a minimum.
templates/gitea/servicemonitor.yaml
pat-s (Migrated from gitea.com) commented 2024-09-11 13:06:22 +00:00
Copy Link

If we add this, we should note that dependency in the README somewhere.

If we add this, we should note that dependency in the README somewhere.
pat-s (Migrated from gitea.com) commented 2024-09-11 14:14:03 +00:00
Copy Link

I've adapted the documentation of gitea.metrics.serviceMonitor.enabled. If this is not enough, I will be happy to write a few more lines in the README.

I've adapted the documentation of `gitea.metrics.serviceMonitor.enabled`. If this is not enough, I will be happy to write a few more lines in the README.
pat-s (Migrated from gitea.com) commented 2024-09-12 07:22:16 +00:00
Copy Link

Ah sorry, just realized that serviceMonitor is nested below metrics and hence this dependency should be clear. But I see you already changed it, thanks!

Ah sorry, just realized that `serviceMonitor` is nested below `metrics` and hence this dependency *should* be clear. But I see you already changed it, thanks!
values.yaml
@ -463,4 +358,3 @@
## @param gitea.metrics.enabled Enable Gitea metrics
## @param gitea.metrics.token used for `bearer` token authentication on metrics endpoint. If not specified or empty metrics endpoint is public.
## @param gitea.metrics.serviceMonitor.enabled Enable Gitea metrics service monitor. Requires, that `gitea.metrics.enabled` is also set to true, to enable metrics generally.
## @param gitea.metrics.serviceMonitor.interval Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.
pat-s (Migrated from gitea.com) commented 2024-09-11 13:03:41 +00:00
Copy Link

Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.

-> Missing dot after "scraped".

> Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used. -> Missing dot after "scraped".
pat-s (Migrated from gitea.com) commented 2024-09-11 14:14:39 +00:00
Copy Link

I have fixed this in the latest commits.

I have fixed this in the latest commits.
values.yaml
pat-s (Migrated from gitea.com) commented 2024-09-11 13:04:01 +00:00
Copy Link

Missing dot again.

Missing dot again.
pat-s (Migrated from gitea.com) commented 2024-09-11 14:14:59 +00:00
Copy Link

I have fixed this in the latest commits, too.

I have fixed this in the latest commits, too.
values.yaml
@ -470,7 +364,6 @@ gitea:
## @param gitea.metrics.serviceMonitor.tlsConfig TLS configuration to use when scraping the metric endpoint by Prometheus.
pat-s (Migrated from gitea.com) commented 2024-09-11 13:04:13 +00:00
Copy Link

prometheus -> Prometheus

prometheus -> Prometheus
pat-s (Migrated from gitea.com) commented 2024-09-11 14:15:41 +00:00
Copy Link

Fixed

Fixed
pat-s (Migrated from gitea.com) approved these changes 2024-09-12 07:25:42 +00:00
pat-s (Migrated from gitea.com) left a comment
Copy Link

LGTM

Given that we just issued a release, this will be queued for the next one which has to wait a bit.
You should be able to use the branch until then, if urgent.

Let's see if @justusbunsi has some comments until then :)

LGTM Given that we just issued a release, this will be queued for the next one which has to wait a bit. You should be able to use the branch until then, if urgent. Let's see if @justusbunsi has some comments until then :)
volker.raschek commented 2024-09-18 12:44:19 +00:00 (Migrated from gitea.com)
Copy Link

Hi @pat-s,
have you heard anything from @justusbunsi ?

Hi @pat-s, have you heard anything from @justusbunsi ?
justusbunsi commented 2024-09-18 15:39:43 +00:00 (Migrated from gitea.com)
Copy Link

@volker.raschek

Hi @pat-s,
have you heard anything from @justusbunsi ?

Apologies for the silence. Was on vacation. Have to catch up several things and cannot review in detail. From a quick review, nothing to add.

Thanks for the PR.

@volker.raschek >Hi @pat-s, >have you heard anything from @justusbunsi ? Apologies for the silence. Was on vacation. Have to catch up several things and cannot review in detail. From a quick review, nothing to add. Thanks for the PR.
volker.raschek commented 2024-10-17 16:06:31 +00:00 (Migrated from gitea.com)
Copy Link

Hi @pat-s and @justusbunsi,
can you release a new version of this chart with the latest available gitea version?

I can than switch back to the normal release cycle instead of using a dedicated branch, which includes my patch.

Hi @pat-s and @justusbunsi, can you release a new version of this chart with the latest available gitea version? I can than switch back to the normal release cycle instead of using a dedicated branch, which includes my patch.
pat-s commented 2024-10-18 08:10:31 +00:00 (Migrated from gitea.com)
Copy Link

Scheduled for today.

Scheduled for today.
👍 1
justusbunsi commented 2024-10-18 15:29:47 +00:00 (Migrated from gitea.com)
Copy Link

🚀 Released with https://gitea.com/gitea/helm-chart/releases/tag/v10.5.0

🚀 Released with https://gitea.com/gitea/helm-chart/releases/tag/v10.5.0
❤️ 1
Sign in to join this conversation.
Reviewers
No Reviewers
justusbunsi
pat-s
Labels
Clear labels
has/backport
in progress
invalid
kind/breaking
kind/bug
kind/build
kind/dependency
kind/deployment
kind/docs
kind/enhancement
kind/feature
kind/lint
kind/proposal
kind/question
kind/refactor
kind/security
kind/testing
kind/translation
kind/ui
need/backport
priority/critical
priority/low
priority/maybe
priority/medium
reviewed/duplicate
reviewed/invalid
reviewed/wontfix
skip-changelog
status/blocked
status/needs-feedback
status/needs-reviews
status/wip
upstream/gitea
upstream/other
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: lunny/helm-chart#710
No description provided.
Delete Branch "refs/pull/710/head"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?