[grafana] set the interval for the serviceMonitor to 30s so that irate()[1m] queries in the operators default Grafana dashboard work #2498
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
winem
requested review from
maorfr,
torstenwalter,
Xtigyro and
zanhsieh
as code owners
|
|
…e()[1m] queries in the operators default Grafana dashboard work Signed-off-by: Marcel Weinberg <mweinberg-os@email.de>
winem
force-pushed
the
winem/reduce-grafana-service-monitor-scrape-interval
branch
from
b61fb42
to
fb908d7
Compare
Signed-off-by: Marcel Weinberg <mweinberg-os@email.de>
winem
force-pushed
the
winem/reduce-grafana-service-monitor-scrape-interval
branch
from
3ecea03
to
019e635
Compare
zanhsieh
approved these changes
Oct 14, 2023
coolguy1771
pushed a commit
to coolguy1771/home-ops
that referenced
this pull request
Oct 14, 2023
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [grafana](https://grafana.net) ([source](https://togithub.com/grafana/helm-charts)) | patch | `6.60.4` -> `6.60.6` | --- ### Release Notes <details> <summary>grafana/helm-charts (grafana)</summary> ### [`v6.60.6`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.6) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.5...grafana-6.60.6) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Update Grafana to v10.1.5 by [@​Footur](https://togithub.com/Footur) in [grafana/helm-charts#2706 **Full Changelog**: grafana/helm-charts@grafana-6.60.5...grafana-6.60.6 ### [`v6.60.5`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.5) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.4...grafana-6.60.5) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] set the interval for the serviceMonitor to 30s so that irate()\[1m] queries in the operators default Grafana dashboard work by [@​winem](https://togithub.com/winem) in [grafana/helm-charts#2498 #### New Contributors - [@​winem](https://togithub.com/winem) made their first contribution in [grafana/helm-charts#2498 **Full Changelog**: grafana/helm-charts@helm-loki-5.29.0...grafana-6.60.5 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xOS4wIiwidXBkYXRlZEluVmVyIjoiMzcuMTkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: lumiere-bot <98047013+lumiere-bot[bot]@users.noreply.github.com>
spiceratops
added a commit
to spiceratops/k8s-gitops
that referenced
this pull request
Oct 16, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [grafana](https://grafana.net) ([source](https://togithub.com/grafana/helm-charts)) | minor | `6.58.9` -> `6.60.6` | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>grafana/helm-charts (grafana)</summary> ### [`v6.60.6`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.6) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.5...grafana-6.60.6) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Update Grafana to v10.1.5 by [@​Footur](https://togithub.com/Footur) in [grafana/helm-charts#2706 **Full Changelog**: grafana/helm-charts@grafana-6.60.5...grafana-6.60.6 ### [`v6.60.5`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.5) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.4...grafana-6.60.5) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] set the interval for the serviceMonitor to 30s so that irate()\[1m] queries in the operators default Grafana dashboard work by [@​winem](https://togithub.com/winem) in [grafana/helm-charts#2498 #### New Contributors - [@​winem](https://togithub.com/winem) made their first contribution in [grafana/helm-charts#2498 **Full Changelog**: grafana/helm-charts@helm-loki-5.29.0...grafana-6.60.5 ### [`v6.60.4`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.4) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.3...grafana-6.60.4) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] fix: add missing `| quote` for `sidecar.dashboards.labelValue` by [@​cwrau](https://togithub.com/cwrau) in [grafana/helm-charts#2696 #### New Contributors - [@​cwrau](https://togithub.com/cwrau) made their first contribution in [grafana/helm-charts#2696 **Full Changelog**: grafana/helm-charts@grafana-6.60.3...grafana-6.60.4 ### [`v6.60.3`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.3) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.2...grafana-6.60.3) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Upgrade grafana to 10.1.4 by [@​BenjaminHerbert](https://togithub.com/BenjaminHerbert) in [grafana/helm-charts#2694 **Full Changelog**: grafana/helm-charts@helm-loki-5.25.0...grafana-6.60.3 ### [`v6.60.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.2) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.1...grafana-6.60.2) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] fix: allow using existing clusterrole by [@​gadisn](https://togithub.com/gadisn) in [grafana/helm-charts#2691 #### New Contributors - [@​gadisn](https://togithub.com/gadisn) made their first contribution in [grafana/helm-charts#2691 **Full Changelog**: grafana/helm-charts@lgtm-distributed-1.0.0...grafana-6.60.2 ### [`v6.60.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.1) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.60.0...grafana-6.60.1) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Fix missing label for dashboard configmap by [@​goodard](https://togithub.com/goodard) in [grafana/helm-charts#2647 #### New Contributors - [@​goodard](https://togithub.com/goodard) made their first contribution in [grafana/helm-charts#2647 **Full Changelog**: grafana/helm-charts@grafana-6.60.0...grafana-6.60.1 ### [`v6.60.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.60.0) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.59.5...grafana-6.60.0) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] avoid storing secrets in config map by [@​YuleZ](https://togithub.com/YuleZ) in [grafana/helm-charts#2663 - \[tempo-distributed] adjust minReplicas for ingester by [@​dheeg](https://togithub.com/dheeg) in [grafana/helm-charts#2664 #### New Contributors - [@​dheeg](https://togithub.com/dheeg) made their first contribution in [grafana/helm-charts#2664 **Full Changelog**: grafana/helm-charts@rollout-operator-0.9.1...grafana-6.60.0 ### [`v6.59.5`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.59.5) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Update Grafana to v10.1.2 by [@​Footur](https://togithub.com/Footur) in [grafana/helm-charts#2659 **Full Changelog**: grafana/helm-charts@loki-distributed-0.74.5...grafana-6.59.5 ### [`v6.59.4`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.59.4) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Remove unsupported property on extraExposePorts by [@​jifwin](https://togithub.com/jifwin) in [grafana/helm-charts#2597 **Full Changelog**: grafana/helm-charts@loki-distributed-0.73.0...grafana-6.59.4 ### [`v6.59.3`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.59.3) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.59.2...grafana-6.59.3) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Fix Security vulnerability found in scan 2623 by [@​zanac1986](https://togithub.com/zanac1986) in [grafana/helm-charts#2643 **Full Changelog**: grafana/helm-charts@grafana-6.59.2...grafana-6.59.3 ### [`v6.59.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.59.2) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.59.1...grafana-6.59.2) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Deprecate rbac.authorization.k8s.io/v1beta1 by [@​zanac1986](https://togithub.com/zanac1986) in [grafana/helm-charts#2642 **Full Changelog**: grafana/helm-charts@grafana-agent-0.23.0...grafana-6.59.2 ### [`v6.59.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.59.1) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.59.0...grafana-6.59.1) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] bump grafana version to 10.1.1 by [@​venkatamutyala](https://togithub.com/venkatamutyala) in [grafana/helm-charts#2630 **Full Changelog**: grafana/helm-charts@loki-distributed-0.72.0...grafana-6.59.1 ### [`v6.59.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.59.0) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.58.10...grafana-6.59.0) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Update Grafana to v10.1.0 by [@​Footur](https://togithub.com/Footur) in [grafana/helm-charts#2613 **Full Changelog**: grafana/helm-charts@k8s-monitoring-0.1.13...grafana-6.59.0 ### [`v6.58.10`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.58.10) [Compare Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.58.9...grafana-6.58.10) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Add support for PDB apiVersion to be specified by [@​titirigaiulian](https://togithub.com/titirigaiulian) in [grafana/helm-charts#2572 #### New Contributors - [@​titirigaiulian](https://togithub.com/titirigaiulian) made their first contribution in [grafana/helm-charts#2572 **Full Changelog**: grafana/helm-charts@helm-loki-5.15.0...grafana-6.58.10 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/spiceratops/k8s-gitops). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44LjEiLCJ1cGRhdGVkSW5WZXIiOiIzNy44LjEiLCJ0YXJnZXRCcmFuY2giOiJtYWluIn0=-->
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses the issue I reported in #2497
With this change the Grafana metrics are scraped every 30 seconds so that the dashboards that use irate queries with an interval of
1mdo not showNo dataanymore.In my opinion it's more suitable to update the scrape interval to be aligned with the defaults of the other service monitor than to update the queries in the dashboard: https://github.com/prometheus-operator/kube-prometheus/blob/main/manifests/grafana-dashboardDefinitions.yaml