Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grafana/helm-charts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: grafana-8.7.1
Choose a base ref
...
head repository: grafana/helm-charts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: grafana-8.8.0
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on Dec 10, 2024

  1. feat(grafana): Introduce profiling container port

    In order to enable profiling using Grafana Alloy and Grafana Pyroscope
    currently you would need to abuse another container port or insert a
    dummy container to facitilitate profile collection.
    
    This is because a containerPort is matched with the annotations to
    enable profiling. As a workaround I am "abusing" the port :9094, as for
    the example I am working on it is unused. This change will make it
    possible to coexist with gossip-tcp and you would be able to enable
    profiling like this:
    
    ```
    helm upgrade -n pyroscope-test --install grafana grafana/grafana \
      --set env.GF_DIAGNOSTICS_PROFILING_ENABLED=true \
      --set env.GF_DIAGNOSTICS_PROFILING_ADDR=0.0.0.0 \
      --set env.GF_DIAGNOSTICS_PROFILING_PORT=6060 \
      --set-string 'podAnnotations.profiles\.grafana\.com/cpu\.scrape=true' \
      --set-string 'podAnnotations.profiles\.grafana\.com/cpu\.port=6060' \
      --set-string 'podAnnotations.profiles\.grafana\.com/memory\.scrape=true' \
      --set-string 'podAnnotations.profiles\.grafana\.com/memory\.port=6060' \
      --set-string 'podAnnotations.profiles\.grafana\.com/goroutine\.scrape=true' \
      --set-string 'podAnnotations.profiles\.grafana\.com/goroutine\.port=6060'
    ```
    
    This is realted to grafana/pyroscope#3753
    
    Signed-off-by: Christian Simon <simon@swine.de>
    simonswine committed Dec 10, 2024
    Configuration menu
    Copy the full SHA
    16d47d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2024

  1. Merge branch 'main' into 20241210_improve-profiling-of-grafana

    Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
    jkroepke authored Dec 12, 2024
    Configuration menu
    Copy the full SHA
    a07707f View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2024

  1. Configuration menu
    Copy the full SHA
    fd7c627 View commit details
    Browse the repository at this point in the history
  2. Update Chart.yaml

    Signed-off-by: MH <zanhsieh@gmail.com>
    zanhsieh authored Dec 15, 2024
    Configuration menu
    Copy the full SHA
    d068f9c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3472 from simonswine/20241210_improve-profiling-o…

    …f-grafana
    
    [grafana] feat(grafana): Introduce profiling container port
    zanhsieh authored Dec 15, 2024
    Configuration menu
    Copy the full SHA
    e134ec8 View commit details
    Browse the repository at this point in the history
Loading