Update Grafana Alloy

.github/configs/cr.yaml

@@ -1,3 +0,0 @@
-owner: grafana
-git-repo: helm-charts
-skip-existing: true

.github/configs/ct.yaml

@@ -1,15 +0,0 @@
-## Reference: https://github.com/helm/chart-testing/blob/master/doc/ct_lint-and-install.md
-remote: origin
-target-branch: main
-chart-dirs:
-- charts
-chart-repos:
-  - grafana=https://grafana.github.io/helm-charts
-  - minio=https://charts.min.io
-validate-chart-schema: true
-validate-maintainers: true
-validate-yaml: true
-exclude-deprecated: true
-excluded-charts: []
-namespace: meta-monitoring # Need to set the namespace because we create the secret there
-release-label: app.kubernetes.io/instance

.github/workflows/check-for-dependency-updates.yaml

@@ -5,7 +5,7 @@ on:
     workflow_dispatch:
     schedule:
       # Run once a day
-      - cron: '0 7 * * *'
+      - cron: '0 0 * * *'
 
 permissions:
     contents: "write"
@@ -47,6 +47,7 @@ jobs:
                 labels: dependencies
                 branch: chore/update-loki
                 delete-branch: true
+                team-reviewers: loki-team
 
     updateGrafanaAlloy:
         name: Update the Grafana Alloy subchart
@@ -79,6 +80,7 @@ jobs:
                 labels: dependencies
                 branch: chore/update-grafana-alloy
                 delete-branch: true
+                team-reviewers: loki-team
 
     updateMimirDistributed:
         name: Update the Mimir Distributed subchart
@@ -111,6 +113,7 @@ jobs:
                 labels: dependencies
                 branch: chore/update-mimir-distributed
                 delete-branch: true
+                team-reviewers: loki-team
 
     updateTempoDistributed:
         name: Update the Tempo Distributed subchart
@@ -143,6 +146,7 @@ jobs:
                 labels: dependencies
                 branch: chore/update-tempo-distributed
                 delete-branch: true
+                team-reviewers: loki-team
 
     updateMinio:
         name: Update the Minio subchart
@@ -175,3 +179,4 @@ jobs:
                 labels: dependencies
                 branch: chore/update-minio
                 delete-branch: true
+                team-reviewers: loki-team

.github/workflows/helm-release.yml

@@ -1,175 +0,0 @@
-name: Release Helm chart
-on:
-  workflow_dispatch:
-env:
-  CR_CONFIGFILE: "${{ github.workspace }}/source/.github/configs/cr.yaml"
-  CT_CONFIGFILE: "${{ github.workspace }}/source/.github/configs/ct.yaml"
-  CR_INDEX_PATH: "${{ github.workspace }}/.cr-index"
-  CR_PACKAGE_PATH: "${{ github.workspace }}/.cr-release-packages"
-  CR_TOOL_PATH: "${{ github.workspace }}/.cr-tool"
-  CR_VERSION: "1.5.0"
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      changed: ${{ steps.list-changed.outputs.changed }}
-      chartpath: ${{ steps.list-changed.outputs.chartpath }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        path: source
-
-    - name: Install chart-testing
-      uses: helm/chart-testing-action@v2
-
-    - name: List changed charts
-      id: list-changed
-      run: |
-        cd source
-
-        latest_tag=$( if ! git describe --tags --abbrev=0 --match='helm-chart/*' 2> /dev/null ; then git rev-list --max-parents=0 --first-parent HEAD; fi )
-
-        echo "Running: ct list-changed --config ${CT_CONFIGFILE} --since ${latest_tag} --target-branch ${{ github.ref_name }}"
-        changed=$(ct list-changed --config "${CT_CONFIGFILE}" --since "${latest_tag}" --target-branch "${{ github.ref_name }}")
-        echo "${changed}"
-
-        num_changed=$(wc -l <<< ${changed})
-        if [[ "${num_changed}" -gt "1" ]] ; then
-          echo "More than one chart changed, exiting"
-          exit 1
-        fi
-        if [[ -n "${changed}" ]]; then
-          name=$(yq ".name" < ${changed}/Chart.yaml)
-          version=$(yq ".version" < ${changed}/Chart.yaml)
-          tagname="v${version}"
-
-          if [ $(git tag -l "${tagname}") ]; then
-            echo "Tag ${tagname} already exists, skipping release"
-            echo "changed=false" >> $GITHUB_OUTPUT
-          else
-            echo "Releasing ${changed}"
-            echo "changed=true" >> $GITHUB_OUTPUT
-            echo "chartpath=${changed}" >> $GITHUB_OUTPUT
-          fi
-        else
-          echo "No charts have changed, skipping release"
-          echo "changed=false" >> $GITHUB_OUTPUT
-        fi
-
-  release:
-    needs: [setup]
-    runs-on: ubuntu-latest
-    if: needs.setup.outputs.changed == 'true'
-    permissions:
-      contents: write
-      id-token: write
-    steps:
-    - id: get-secrets
-      uses: grafana/shared-workflows/actions/get-vault-secrets@main
-      with:
-        # Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
-        repo_secrets: |
-          APP_ID=github-app:app-id
-          PRIVATE_KEY=github-app:private-key
-    - uses: actions/create-github-app-token@v1
-      id: app-token
-      with:
-        app-id: ${{ env.APP_ID }}
-        private-key: ${{ env.PRIVATE_KEY }}
-        owner: ${{ github.repository_owner }}
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        path: source
-
-    - name: Configure Git
-      run: |
-        cd source
-        git config user.name "$GITHUB_ACTOR"
-        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-    - name: Checkout helm-charts
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        repository: grafana/helm-charts
-        path: helm-charts
-        token: "${{ steps.app-token.outputs.token }}"
-
-    - name: Configure Git for helm-charts
-      run: |
-        cd helm-charts
-        git config user.name "$GITHUB_ACTOR"
-        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-    - name: Set up Helm
-      uses: azure/setup-helm@v4
-
-    - name: Parse Chart.yaml
-      id: parse-chart
-      run: |
-        cd source
-        changed="${{ needs.setup.outputs.chartpath }}"
-        description=$(yq ".description" < ${changed}/Chart.yaml)
-        name=$(yq ".name" < ${changed}/Chart.yaml)
-        version=$(yq ".version" < ${changed}/Chart.yaml)
-
-        echo "chartpath=${changed}" >> $GITHUB_OUTPUT
-        echo "desc=${description}" >> $GITHUB_OUTPUT
-        echo "tagname=v${version}" >> $GITHUB_OUTPUT
-        echo "packagename=${name}-${version}" >> $GITHUB_OUTPUT
-
-    - name: Install CR tool
-      run: |
-        mkdir "${CR_TOOL_PATH}"
-        mkdir "${CR_PACKAGE_PATH}"
-        mkdir "${CR_INDEX_PATH}"
-        curl -sSLo cr.tar.gz "https://github.com/helm/chart-releaser/releases/download/v${CR_VERSION}/chart-releaser_${CR_VERSION}_linux_amd64.tar.gz"
-        tar -xzf cr.tar.gz -C "${CR_TOOL_PATH}"
-        rm -f cr.tar.gz
-
-    - name: Create Helm package
-      run: |
-        cd source
-        helm repo add grafana https://grafana.github.io/helm-charts
-        helm repo add minio https://charts.min.io
-
-        "${CR_TOOL_PATH}/cr" package "${{ steps.parse-chart.outputs.chartpath }}" --config "${CR_CONFIGFILE}" --package-path "${CR_PACKAGE_PATH}"
-
-    - name: Make a release on this repo
-      uses: softprops/action-gh-release@v2
-      with:
-        name: ${{ steps.parse-chart.outputs.tagname }}
-        repository: grafana/meta-monitoring-chart
-        tag_name: ${{ steps.parse-chart.outputs.tagname }}
-        token: ${{ steps.app-token.outputs.token }}
-        generate_release_notes: true
-        files: |
-          ${{ env.CR_PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz
-
-    # Note that this creates a release in grafana/helm-charts with a new tag.
-    # The tag name in grafana/helm-charts is <package>-<version>, while the
-    # tag name for grafana/meta-monitoring-chart is <version>.
-    - name: Make release on Helm Charts
-      uses: softprops/action-gh-release@v2
-      with:
-        name: ${{ steps.parse-chart.outputs.packagename }}
-        repository: grafana/helm-charts
-        tag_name: ${{ steps.parse-chart.outputs.packagename }}
-        token: ${{ steps.app-token.outputs.token }}
-        body: |
-          ${{ steps.parse-chart.outputs.desc }}
-
-          Source commit: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
-
-          Tag on source: https://github.com/${{ github.repository }}/releases/tag/${{ steps.parse-chart.outputs.tagname }}
-        files: |
-          ${{ env.CR_PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz
-
-    - name: Update helm-charts index.yaml
-      run: |
-        cd helm-charts
-        "${CR_TOOL_PATH}/cr" index --config "${CR_CONFIGFILE}" --token "${{ steps.app-token.outputs.token }}" --index-path "${CR_INDEX_PATH}" --package-path "${CR_PACKAGE_PATH}" --push

charts/meta-monitoring/Chart.lock

@@ -1,7 +1,7 @@
 dependencies:
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.2.0
+  version: 5.47.2
 - name: alloy
   repository: https://grafana.github.io/helm-charts
   version: 0.1.1
@@ -10,9 +10,9 @@ dependencies:
   version: 5.3.0
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 1.9.3
+  version: 1.9.2
 - name: minio
   repository: https://charts.min.io
   version: 5.1.0
-digest: sha256:c090cd85d423f39dbbfecb578c1e7cafee26792a952ef63bd0297544baaa27cc
-generated: "2024-04-22T07:02:57.738294723Z"
+digest: sha256:b9521eea011cdf82856ee909f3f42f98722393678799094de2307e89c92bc045
+generated: "2024-04-16T08:02:22.805352422Z"

charts/meta-monitoring/Chart.yaml

@@ -22,7 +22,7 @@ appVersion: "0.0.1"
 dependencies:
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.2.0
+  version: "5.47.2"
   condition: local.logs.enabled
 - name: alloy
   repository: https://grafana.github.io/helm-charts
@@ -33,7 +33,7 @@ dependencies:
   condition: local.metrics.enabled
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 1.9.3
+  version: 1.9.2
   condition: local.traces.enabled
 - name: minio
   repository: https://charts.min.io

charts/meta-monitoring/values.yaml

@@ -202,15 +202,6 @@ kubeStateMetrics:
 loki:
   loki:
     auth_enabled: false
-    schemaConfig:
-      configs:
-        - from: 2024-03-29
-          store: tsdb
-          object_store: s3
-          schema: v13
-          index:
-            prefix: index_
-            period: 24h
     storage:
       type: "s3"
       s3:
@@ -228,13 +219,8 @@ loki:
             secret_access_key: "{{ .Values.global.minio.rootPassword }}"
       compactor:
         retention_enabled: true
-        delete_request_store: s3
       limits_config:
         retention_period: 30d
-  lokiCanary:
-    enabled: false
-  test:
-    enabled: false
   monitoring:
     dashboards:
       enabled: false

docs/create_new_release.md

@@ -1,10 +0,0 @@
-# Create a new release
-
-1. Update the version field in charts/meta-monitoring/Chart.yaml in a new PR. Merge this PR if approved.
-
-2. On the [Actions tab](https://github.com/grafana/meta-monitoring-chart/actions):
-   - Select `Release Helm chart` in the workflows on the left
-   - Click the `Run workflow` button
-   - Leave the `main` branch as is
-   - Click the green `Run workflow` button
-

docs/installation.md

@@ -27,29 +27,16 @@
 
 1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). Fill in the names of the secrets created above as needed.
 
-1. Add the repo
-
-   ```
-   helm repo add grafana https://grafana.github.io/helm-charts
-   ```
-
-1. Fetch the latest charts from the grafana repo
-
-   ```
-   helm repo update grafana
-   ```
-
-
 1. Install this helm chart
 
    ```
-   helm install -n meta -f values.yaml meta grafana/meta-monitoring
+   helm install -n meta -f values.yaml meta ./charts/meta-monitoring
    ```
 
 1. Upgrade
 
    ```
-   helm upgrade --install -f values.yaml -n meta meta grafana/meta-monitoring
+   helm upgrade --install -f values.yaml -n meta meta ./charts/meta-monitoring
    ```
 
 1. Delete this chart: