From be2bd26ab76d5b281d500a1dee91180ebb034ca7 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:26:35 +0100 Subject: [PATCH 01/13] chore: Introduced Renovate (WIP) Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/renovate.json | 23 +++++++++++++++++++++++ .github/workflows/lint-test.yaml | 1 + .github/workflows/linter.yml | 7 +++++-- .github/workflows/release.yaml | 1 + .github/workflows/update-helm-repo.yaml | 5 ++++- 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 .github/renovate.json diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000000..096402da40 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ "config:recommended" ], + "enabledManagers": [ + "custom.regex" + ], + "bumpVersion": "patch", + "ignorePaths": [ + "charts/enterprise-logs-simple/", + "charts/enterprise-metrics/" + ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + "(^|/)\\.github/workflows/.+\\.ya?ml$" + ], + "matchStrings": [ + "# renovate: datasource=(?[\\w-]+) depName=(?[\\w\\/-]+)( extractVersion=(?.*))?\\s+?(default|\\w+_VERSION|version): (?.*)\\s" + ] + } + ] +} diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index f5d3528496..956bd3d808 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -15,6 +15,7 @@ on: type: boolean helm_version: description: version of the helm binary + # renovate: datasource=github-tags depName=helm/helm default: v3.8.2 required: false type: string diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index daa9d1246d..6573443b31 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -21,15 +21,18 @@ jobs: uses: actions/checkout@v2 - name: Check Docs + env: + # renovate: datasource=docker depName=jnorwood/helm-docs + HELM_DOCS_VERSION: v1.8.1 run: | - docker run --rm --volume "$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:v1.8.1 + docker run --rm --volume "$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:${{ env.HELM_DOCS_VERSION }} if ! git diff --exit-code; then echo "Documentation not up to date. Please run helm-docs and commit changes!" >&2 exit 1 fi - name: Lint Code Base - uses: docker://github/super-linter:v3.12.0 + uses: super-linter/super-linter:v3.12.0 env: FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).* FILTER_REGEX_INCLUDE: ${{ inputs.filter_regex_include }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 800c0a59b9..434a53051b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,6 +27,7 @@ jobs: - name: Set up Helm uses: azure/setup-helm@v3.5 with: + # renovate: datasource=github-tags depName=helm/helm version: v3.12.0 - name: Add dependency chart repos diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index 8382c1f231..f8856e26db 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -40,6 +40,8 @@ env: CR_INDEX_PATH: "${{ github.workspace }}/.cr-index" CR_PACKAGE_PATH: "${{ github.workspace }}/.cr-release-packages" CR_TOOL_PATH: "${{ github.workspace }}/.cr-tool" + # renovate: datasource=github-tags depName=helm/chart-releaser extractVersion=^v?(?.*)$ + CR_TOOL_VERSION: 1.4.0 HELM_TAG_PREFIX: "${{ inputs.helm_tag_prefix }}" jobs: @@ -143,6 +145,7 @@ jobs: - name: Install Helm uses: azure/setup-helm@v1 with: + # renovate: datasource=github-tags depName=helm/helm version: v3.5.2 - name: Add dependency chart repos @@ -180,7 +183,7 @@ jobs: 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/v1.4.0/chart-releaser_1.4.0_linux_amd64.tar.gz" + curl -sSLo cr.tar.gz "https://github.com/helm/chart-releaser/releases/download/v${{ env.CR_TOOL_VERSION }}/chart-releaser_${{ env.CR_TOOL_VERSION }}_linux_amd64.tar.gz" tar -xzf cr.tar.gz -C "${CR_TOOL_PATH}" rm -f cr.tar.gz From 18c486d35e76e837728a41dd4370ad2cd4f0a1a3 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:51:49 +0100 Subject: [PATCH 02/13] chore: added "self-hosted" renovate Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/renovate.json | 23 --- .github/renovate.json5 | 177 +++++++++++++++++++ .github/renovate/entrypoint.sh | 17 ++ .github/renovate/postupgrade.sh | 6 + .github/workflows/lint-test.yaml | 3 +- .github/workflows/release.yaml | 2 +- .github/workflows/renovate.yaml | 37 ++++ .github/workflows/update-helm-repo.yaml | 2 +- charts/agent-operator/Chart.yaml | 1 + charts/enterprise-logs/Chart.yaml | 1 + charts/fluent-bit/Chart.yaml | 1 + charts/grafana/Chart.yaml | 1 + charts/loki-canary/Chart.yaml | 1 + charts/loki-distributed/Chart.yaml | 1 + charts/promtail/Chart.yaml | 1 + charts/rollout-operator/Chart.yaml | 1 + charts/snyk-exporter/Chart.yaml | 1 + charts/synthetic-monitoring-agent/Chart.yaml | 1 + charts/tempo-distributed/Chart.yaml | 1 + charts/tempo-vulture/Chart.yaml | 1 + charts/tempo/Chart.yaml | 1 + 21 files changed, 254 insertions(+), 26 deletions(-) delete mode 100644 .github/renovate.json create mode 100644 .github/renovate.json5 create mode 100644 .github/renovate/entrypoint.sh create mode 100644 .github/renovate/postupgrade.sh create mode 100644 .github/workflows/renovate.yaml diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index 096402da40..0000000000 --- a/.github/renovate.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ "config:recommended" ], - "enabledManagers": [ - "custom.regex" - ], - "bumpVersion": "patch", - "ignorePaths": [ - "charts/enterprise-logs-simple/", - "charts/enterprise-metrics/" - ], - "customManagers": [ - { - "customType": "regex", - "fileMatch": [ - "(^|/)\\.github/workflows/.+\\.ya?ml$" - ], - "matchStrings": [ - "# renovate: datasource=(?[\\w-]+) depName=(?[\\w\\/-]+)( extractVersion=(?.*))?\\s+?(default|\\w+_VERSION|version): (?.*)\\s" - ] - } - ] -} diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 0000000000..8c0506ad6e --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,177 @@ +{ + $schema: "https://docs.renovatebot.com/renovate-schema.json", + extends: [ "config:recommended" ], + ignorePaths: [ + "charts/enterprise-logs-simple/", + "charts/enterprise-metrics/", + "charts/lgtm-distributed/", // TODO: needs some more work + "charts/loki-stack/" // TODO: needs some more work + ], + packageRules: [ + { + matchFileNames: [ + "charts/agent-operator/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/agent-operator/Chart.yaml"', + ], + fileFilters: ["charts/agent-operator/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/enterprise-logs/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/enterprise-logs/Chart.yaml"', + ], + fileFilters: ["charts/enterprise-logs/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/fluent-bit/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/fluent-bit/Chart.yaml"', + ], + fileFilters: ["charts/grafana/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/grafana/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/grafana/Chart.yaml"', + ], + fileFilters: ["charts/grafana/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/loki-canary/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/loki-canary/Chart.yaml"', + ], + fileFilters: ["charts/loki-canary/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/loki-distributed/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/loki-distributed/Chart.yaml"', + ], + fileFilters: ["charts/loki-distributed/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/promtail/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/promtail/Chart.yaml"', + ], + fileFilters: ["charts/promtail/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/rollout-operator/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/rollout-operator/Chart.yaml"', + ], + fileFilters: ["charts/rollout-operator/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/synthetic-monitoring-agent/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/synthetic-monitoring-agent/Chart.yaml"', + ], + fileFilters: ["charts/synthetic-monitoring-agent/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/tempo/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/tempo/Chart.yaml"', + ], + fileFilters: ["charts/tempo/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/tempo-distributed/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/tempo-distributed/Chart.yaml"', + ], + fileFilters: ["charts/tempo-distributed/**"], + executionMode: "branch", + }, + }, + { + matchFileNames: [ + "charts/tempo-vulture/", + ], + postUpgradeTasks: { + commands: [ + '.github/renovate/postupgrade.sh "charts/tempo-vulture/Chart.yaml"', + ], + fileFilters: ["charts/tempo-vulture/**"], + executionMode: "branch", + }, + } + ], + customManagers: [ + { + customType: "regex", + fileMatch: [ + "(^|/)\\.github/workflows/.+\\.ya?ml$", + "(^|/)\\.github/.+\\.sh$", + ], + matchStrings: [ + "# renovate: datasource=(?[\\w-]+?) depName=(?[\\w\\/-]+?)( packageName=(?.+?))?( extractVersion=(?.+?))?\\s+?(default|\\w+_VERSION|.*version): (?.*)\\s", + ], + }, + { + customType: "regex", + fileMatch: [ + "Chart.yaml$", + ], + matchStrings: [ + "# renovate: datasource=(?[\\w-]+?) depName=(?[\\w\\/\\.-]+?)( extractVersion=(?.+?))?( versioning=(?.+?))?\\s+?appVersion: \"?(?.*?)\"?\\s", + ], + }, + ], +} diff --git a/.github/renovate/entrypoint.sh b/.github/renovate/entrypoint.sh new file mode 100644 index 0000000000..4b1dfcc73d --- /dev/null +++ b/.github/renovate/entrypoint.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# renovate: datasource=github-tags depName=mikefarah/yq +export YQ_VERSION=v4.40.5 + +# renovate: datasource=github-tags depName=jenkins-x-plugins/jx-release-version +export JENKINS_JX_VERSION=v2.7.3 + +curl -fsSL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 +chmod a+x /usr/local/bin/yq + +curl -fsSL -o /tmp/jx-release.tar.gz https://github.com/jenkins-x-plugins/jx-release-version/releases/download/${JENKINS_JX_VERSION}/jx-release-version-linux-amd64.tar.gz +mkdir -p /tmp/jx && tar -xf /tmp/jx-release.tar.gz -C /tmp/jx +mv /tmp/jx/jx-release-version /usr/local/bin/jx-release-version +chmod a+x /usr/local/bin/jx-release-version + +runuser -u ubuntu renovate diff --git a/.github/renovate/postupgrade.sh b/.github/renovate/postupgrade.sh new file mode 100644 index 0000000000..d9342efbd1 --- /dev/null +++ b/.github/renovate/postupgrade.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +CHARTVERSION=$(jx-release-version -previous-version=from-file:"$1") +export CHARTVERSION + +yq eval '.version = env(CHARTVERSION)' -i "$1" diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 956bd3d808..647a3d8305 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -15,7 +15,7 @@ on: type: boolean helm_version: description: version of the helm binary - # renovate: datasource=github-tags depName=helm/helm + # renovate: datasource=github-tags depName=helm packageName=helm/helm default: v3.8.2 required: false type: string @@ -50,6 +50,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: + # renovate: datasource=docker depName=python python-version: 3.7 - name: Set up chart-testing diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 434a53051b..f40775ecaf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up Helm uses: azure/setup-helm@v3.5 with: - # renovate: datasource=github-tags depName=helm/helm + # renovate: datasource=github-tags depName=helm packageName=helm/helm version: v3.12.0 - name: Add dependency chart repos diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml new file mode 100644 index 0000000000..cb33028b3b --- /dev/null +++ b/.github/workflows/renovate.yaml @@ -0,0 +1,37 @@ +name: Renovate +on: + schedule: + - cron: "0/15 * * * *" + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +jobs: + renovate: + runs-on: ubuntu-latest + steps: + - name: Create a GitHub App installation access token + uses: tibdex/github-app-token@v2 + id: app-token + with: + app_id: ${{ secrets.github_app_id }} + private_key: ${{ secrets.github_app_pem }} + + - name: Checkout + uses: actions/checkout@v4 + + - name: Self-hosted Renovate + uses: renovatebot/github-action@v40.1.4 + with: + token: "${{ steps.app-token.outputs.token }}" + docker-cmd-file: .github/renovate/entrypoint.sh + docker-user: root + env: + LOG_LEVEL: 'debug' + RENOVATE_REPOSITORIES: ${{ env.GITHUB_REPOSITORY }} + RENOVATE_PLATFORM: github + + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^\.github\/renovate-postupgrade\.sh \"charts/[\w-]+/Chart.yaml\"$"]' + RENOVATE_ALLOW_POST_UPGRADE_COMMAND_TEMPLATING: true diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index f8856e26db..1cd39d7336 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -145,7 +145,7 @@ jobs: - name: Install Helm uses: azure/setup-helm@v1 with: - # renovate: datasource=github-tags depName=helm/helm + # renovate: datasource=github-tags depName=helm packageName=helm/helm version: v3.5.2 - name: Add dependency chart repos diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index f709132ebb..9c94afae24 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -3,6 +3,7 @@ name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application version: 0.3.18 +# renovate: datasource=docker depName=docker.io/grafana/agent-operator appVersion: "0.40.2" home: https://grafana.com/docs/agent/v0.40/ icon: https://raw.githubusercontent.com/grafana/agent/v0.40.0/docs/sources/assets/logo_and_name.png diff --git a/charts/enterprise-logs/Chart.yaml b/charts/enterprise-logs/Chart.yaml index 0d5e0ec6ec..344f45db37 100644 --- a/charts/enterprise-logs/Chart.yaml +++ b/charts/enterprise-logs/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: "v2" name: "enterprise-logs" type: application version: "2.5.0" +# renovate: datasource=docker depName=docker.io/grafana/enterprise-logs appVersion: "v1.5.2" kubeVersion: "^1.10.0-0" description: "Grafana Enterprise Logs" diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index c2817cde4b..fdcc2cc38e 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -1,6 +1,7 @@ apiVersion: "v1" name: fluent-bit version: 2.6.0 +# renovate: datasource=docker depName=grafana/fluent-bit-plugin-loki appVersion: v2.1.0 kubeVersion: "^1.10.0-0" description: "Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki" diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 0d8eb8364d..ba380637ca 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,7 @@ apiVersion: v2 name: grafana version: 7.3.6 +# renovate: datasource=docker depName=docker.io/grafana/grafana appVersion: 10.3.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/loki-canary/Chart.yaml b/charts/loki-canary/Chart.yaml index 79503e411f..82aeb2ccee 100644 --- a/charts/loki-canary/Chart.yaml +++ b/charts/loki-canary/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: v2 name: loki-canary description: Helm chart for Grafana Loki Canary type: application +# renovate: datasource=docker depName=docker.io/grafana/loki appVersion: 2.9.1 version: 0.14.0 home: https://github.com/grafana/helm-charts diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 4535797966..599d1b1f4f 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: v2 name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application +# renovate: datasource=docker depName=docker.io/grafana/loki-canary appVersion: 2.9.4 version: 0.78.3 home: https://grafana.github.io/helm-charts diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index ff14820528..ddaafee1c4 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: v2 name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application +# renovate: datasource=docker depName=docker.io/grafana/promtail appVersion: 2.9.3 version: 6.15.5 home: https://grafana.com/loki diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index acff27d8ad..6795289933 100644 --- a/charts/rollout-operator/Chart.yaml +++ b/charts/rollout-operator/Chart.yaml @@ -3,6 +3,7 @@ name: rollout-operator description: "Grafana rollout-operator" type: application version: 0.14.0 +# renovate: datasource=docker depName=docker.io/grafana/rollout-operator appVersion: v0.13.0 home: https://github.com/grafana/rollout-operator kubeVersion: ^1.10.0-0 diff --git a/charts/snyk-exporter/Chart.yaml b/charts/snyk-exporter/Chart.yaml index 607e32a4bf..6663bb7b40 100644 --- a/charts/snyk-exporter/Chart.yaml +++ b/charts/snyk-exporter/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: v2 name: snyk-exporter description: Prometheus exporter for Snyk. version: 0.1.0 +# renovate: datasource=docker depName=docker.io/grafana/snyk_exporter appVersion: v1.4.1 home: https://github.com/grafana/snyk_exporter icon: https://res.cloudinary.com/snyk/image/upload/v1537346326/press-kit/brand/avatar.png diff --git a/charts/synthetic-monitoring-agent/Chart.yaml b/charts/synthetic-monitoring-agent/Chart.yaml index acf3ac73b5..30ff9fb0ed 100644 --- a/charts/synthetic-monitoring-agent/Chart.yaml +++ b/charts/synthetic-monitoring-agent/Chart.yaml @@ -1,4 +1,5 @@ apiVersion: v2 +# renovate: datasource=docker depName=docker.io/grafana/synthetic-monitoring-agent versioning=regex:^v(?\d+)\.(?\d+)\.(?\d+)(-(?\d+)-(?.*))?$ appVersion: v0.9.3-0-gcd7aadd description: Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. home: https://grafana.net diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 5f9ec77378..b33d35888c 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -3,6 +3,7 @@ name: tempo-distributed description: Grafana Tempo in MicroService mode type: application version: 1.8.5 +# renovate: datasource=docker depName=docker.io/grafana/tempo appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index beb63eea88..3d9c82ab01 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -3,6 +3,7 @@ name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application version: 0.4.1 +# renovate: datasource=docker depName=docker.io/grafana/tempo-vulture appVersion: 2.2.3 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 104e2126c5..0e6ff26d6e 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -3,6 +3,7 @@ name: tempo description: Grafana Tempo Single Binary Mode type: application version: 1.7.2 +# renovate: datasource=docker depName=docker.io/grafana/tempo appVersion: 2.3.1 engine: gotpl home: https://grafana.net From 7ad9ecee41e34c28d5a1e208084d4913e4137907 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:42:17 +0100 Subject: [PATCH 03/13] chore: added couple of fixes Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/workflows/linter.yml | 2 +- .github/workflows/renovate.yaml | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 6573443b31..7b3c925ddc 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -32,7 +32,7 @@ jobs: fi - name: Lint Code Base - uses: super-linter/super-linter:v3.12.0 + uses: super-linter/super-linter@v3.12.0 env: FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).* FILTER_REGEX_INCLUDE: ${{ inputs.filter_regex_include }} diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index cb33028b3b..ac7939e81d 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -1,8 +1,11 @@ name: Renovate on: schedule: - - cron: "0/15 * * * *" + - cron: "0 * * * *" workflow_dispatch: + push: + branches: + - main permissions: contents: write @@ -16,22 +19,24 @@ jobs: uses: tibdex/github-app-token@v2 id: app-token with: - app_id: ${{ secrets.github_app_id }} - private_key: ${{ secrets.github_app_pem }} + app_id: ${{ secrets.grafana_github_app_id }} + private_key: ${{ secrets.grafana_github_app_pem }} - name: Checkout uses: actions/checkout@v4 - name: Self-hosted Renovate - uses: renovatebot/github-action@v40.1.4 + uses: renovatebot/github-action@v40.1.5 with: token: "${{ steps.app-token.outputs.token }}" docker-cmd-file: .github/renovate/entrypoint.sh docker-user: root env: LOG_LEVEL: 'debug' - RENOVATE_REPOSITORIES: ${{ env.GITHUB_REPOSITORY }} + RENOVATE_REPOSITORIES: '["${{ github.repository }}"]' RENOVATE_PLATFORM: github - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^\.github\/renovate-postupgrade\.sh \"charts/[\w-]+/Chart.yaml\"$"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^\.github\/renovate/postupgrade\.sh \"charts/[\w-]+/Chart.yaml\"$"]' RENOVATE_ALLOW_POST_UPGRADE_COMMAND_TEMPLATING: true + RENOVATE_PR_HOURLY_LIMIT: 10 + RENOVATE_PR_CONCURRENT_LIMIT: 10 From ced6a9a7912183d40ea38c22e4f79ba90d108c0b Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:42:58 +0100 Subject: [PATCH 04/13] chore: made .sh files executable Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/renovate/entrypoint.sh | 0 .github/renovate/postupgrade.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/renovate/entrypoint.sh mode change 100644 => 100755 .github/renovate/postupgrade.sh diff --git a/.github/renovate/entrypoint.sh b/.github/renovate/entrypoint.sh old mode 100644 new mode 100755 diff --git a/.github/renovate/postupgrade.sh b/.github/renovate/postupgrade.sh old mode 100644 new mode 100755 From dae0c4048dc2d08f89c07961ec1da325103badcd Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:40:06 +0100 Subject: [PATCH 05/13] chore: added couple of fixes Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/renovate.json5 | 24 ++++++++++++------------ .github/workflows/renovate.yaml | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 8c0506ad6e..35f31c825d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -10,7 +10,7 @@ packageRules: [ { matchFileNames: [ - "charts/agent-operator/", + "charts/agent-operator/**", ], postUpgradeTasks: { commands: [ @@ -22,7 +22,7 @@ }, { matchFileNames: [ - "charts/enterprise-logs/", + "charts/enterprise-logs/**", ], postUpgradeTasks: { commands: [ @@ -34,7 +34,7 @@ }, { matchFileNames: [ - "charts/fluent-bit/", + "charts/fluent-bit/**", ], postUpgradeTasks: { commands: [ @@ -46,7 +46,7 @@ }, { matchFileNames: [ - "charts/grafana/", + "charts/grafana/**", ], postUpgradeTasks: { commands: [ @@ -58,7 +58,7 @@ }, { matchFileNames: [ - "charts/loki-canary/", + "charts/loki-canary/**", ], postUpgradeTasks: { commands: [ @@ -70,7 +70,7 @@ }, { matchFileNames: [ - "charts/loki-distributed/", + "charts/loki-distributed/**", ], postUpgradeTasks: { commands: [ @@ -82,7 +82,7 @@ }, { matchFileNames: [ - "charts/promtail/", + "charts/promtail/**", ], postUpgradeTasks: { commands: [ @@ -94,7 +94,7 @@ }, { matchFileNames: [ - "charts/rollout-operator/", + "charts/rollout-operator/**", ], postUpgradeTasks: { commands: [ @@ -106,7 +106,7 @@ }, { matchFileNames: [ - "charts/synthetic-monitoring-agent/", + "charts/synthetic-monitoring-agent/**", ], postUpgradeTasks: { commands: [ @@ -118,7 +118,7 @@ }, { matchFileNames: [ - "charts/tempo/", + "charts/tempo/**", ], postUpgradeTasks: { commands: [ @@ -130,7 +130,7 @@ }, { matchFileNames: [ - "charts/tempo-distributed/", + "charts/tempo-distributed/**", ], postUpgradeTasks: { commands: [ @@ -142,7 +142,7 @@ }, { matchFileNames: [ - "charts/tempo-vulture/", + "charts/tempo-vulture/**", ], postUpgradeTasks: { commands: [ diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index ac7939e81d..86f8aef766 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -19,8 +19,8 @@ jobs: uses: tibdex/github-app-token@v2 id: app-token with: - app_id: ${{ secrets.grafana_github_app_id }} - private_key: ${{ secrets.grafana_github_app_pem }} + app_id: ${{ secrets.github_app_id }} + private_key: ${{ secrets.github_app_pem }} - name: Checkout uses: actions/checkout@v4 @@ -36,7 +36,7 @@ jobs: RENOVATE_REPOSITORIES: '["${{ github.repository }}"]' RENOVATE_PLATFORM: github - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^\.github\/renovate/postupgrade\.sh \"charts/[\w-]+/Chart.yaml\"$"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^\\.github\\/renovate\\/postupgrade\\.sh \"charts\\/[\\w-]+\\/Chart\\.yaml\"$"]' RENOVATE_ALLOW_POST_UPGRADE_COMMAND_TEMPLATING: true RENOVATE_PR_HOURLY_LIMIT: 10 RENOVATE_PR_CONCURRENT_LIMIT: 10 From 44bf743e42bef94f6b52123a3ef6f65866a69b98 Mon Sep 17 00:00:00 2001 From: Tero Paloheimo Date: Fri, 8 Mar 2024 19:14:51 +0200 Subject: [PATCH 06/13] [grafana] Update to version 10.4.0 Signed-off-by: Tero Paloheimo --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index ba380637ca..346aef9801 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: grafana -version: 7.3.6 +version: 7.3.8 # renovate: datasource=docker depName=docker.io/grafana/grafana -appVersion: 10.3.3 +appVersion: 10.4.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From b6386fee67d401f452dacffbb7f5f4b0b62cc571 Mon Sep 17 00:00:00 2001 From: chesha1 Date: Fri, 23 Feb 2024 13:06:15 +0800 Subject: [PATCH 07/13] [loki-stack] update grafana image tag Signed-off-by: chesha1 Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- charts/loki-stack/Chart.yaml | 2 +- charts/loki-stack/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/loki-stack/Chart.yaml b/charts/loki-stack/Chart.yaml index 1242feb0c7..9d66f01143 100644 --- a/charts/loki-stack/Chart.yaml +++ b/charts/loki-stack/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: loki-stack -version: 2.10.1 +version: 2.10.2 appVersion: v2.9.3 kubeVersion: "^1.10.0-0" description: "Loki: like Prometheus, but for logs." diff --git a/charts/loki-stack/values.yaml b/charts/loki-stack/values.yaml index 59c1e300b5..83ed6f016c 100644 --- a/charts/loki-stack/values.yaml +++ b/charts/loki-stack/values.yaml @@ -42,7 +42,7 @@ grafana: enabled: true maxLines: 1000 image: - tag: 8.3.5 + tag: 10.3.3 prometheus: enabled: false From c4f9954b47999628da8c1f6cec48576f5fe8fa59 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:55:41 +0100 Subject: [PATCH 08/13] chore: bump chart versions Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- charts/agent-operator/Chart.yaml | 2 +- charts/enterprise-logs/Chart.yaml | 2 +- charts/fluent-bit/Chart.yaml | 2 +- charts/loki-canary/Chart.yaml | 2 +- charts/loki-distributed/Chart.yaml | 2 +- charts/promtail/Chart.yaml | 2 +- charts/rollout-operator/Chart.yaml | 2 +- charts/snyk-exporter/Chart.yaml | 2 +- charts/synthetic-monitoring-agent/Chart.yaml | 2 +- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo/Chart.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 9c94afae24..f38165b591 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.18 +version: 0.3.19 # renovate: datasource=docker depName=docker.io/grafana/agent-operator appVersion: "0.40.2" home: https://grafana.com/docs/agent/v0.40/ diff --git a/charts/enterprise-logs/Chart.yaml b/charts/enterprise-logs/Chart.yaml index 344f45db37..b54d0f8081 100644 --- a/charts/enterprise-logs/Chart.yaml +++ b/charts/enterprise-logs/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: "v2" name: "enterprise-logs" type: application -version: "2.5.0" +version: "2.5.1" # renovate: datasource=docker depName=docker.io/grafana/enterprise-logs appVersion: "v1.5.2" kubeVersion: "^1.10.0-0" diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index fdcc2cc38e..1b9cdb58fb 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: fluent-bit -version: 2.6.0 +version: 2.6.1 # renovate: datasource=docker depName=grafana/fluent-bit-plugin-loki appVersion: v2.1.0 kubeVersion: "^1.10.0-0" diff --git a/charts/loki-canary/Chart.yaml b/charts/loki-canary/Chart.yaml index 82aeb2ccee..5a4644ac48 100644 --- a/charts/loki-canary/Chart.yaml +++ b/charts/loki-canary/Chart.yaml @@ -4,7 +4,7 @@ description: Helm chart for Grafana Loki Canary type: application # renovate: datasource=docker depName=docker.io/grafana/loki appVersion: 2.9.1 -version: 0.14.0 +version: 0.14.1 home: https://github.com/grafana/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 599d1b1f4f..afe4605221 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -4,7 +4,7 @@ description: Helm chart for Grafana Loki in microservices mode type: application # renovate: datasource=docker depName=docker.io/grafana/loki-canary appVersion: 2.9.4 -version: 0.78.3 +version: 0.78.4 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index ddaafee1c4..c56fd78729 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -4,7 +4,7 @@ description: Promtail is an agent which ships the contents of local logs to a Lo type: application # renovate: datasource=docker depName=docker.io/grafana/promtail appVersion: 2.9.3 -version: 6.15.5 +version: 6.15.6 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index 6795289933..8de08c7fd9 100644 --- a/charts/rollout-operator/Chart.yaml +++ b/charts/rollout-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: rollout-operator description: "Grafana rollout-operator" type: application -version: 0.14.0 +version: 0.14.1 # renovate: datasource=docker depName=docker.io/grafana/rollout-operator appVersion: v0.13.0 home: https://github.com/grafana/rollout-operator diff --git a/charts/snyk-exporter/Chart.yaml b/charts/snyk-exporter/Chart.yaml index 6663bb7b40..df505271ea 100644 --- a/charts/snyk-exporter/Chart.yaml +++ b/charts/snyk-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: snyk-exporter description: Prometheus exporter for Snyk. -version: 0.1.0 +version: 0.1.1 # renovate: datasource=docker depName=docker.io/grafana/snyk_exporter appVersion: v1.4.1 home: https://github.com/grafana/snyk_exporter diff --git a/charts/synthetic-monitoring-agent/Chart.yaml b/charts/synthetic-monitoring-agent/Chart.yaml index 30ff9fb0ed..49a51070c3 100644 --- a/charts/synthetic-monitoring-agent/Chart.yaml +++ b/charts/synthetic-monitoring-agent/Chart.yaml @@ -16,4 +16,4 @@ name: synthetic-monitoring-agent sources: - https://github.com/grafana/synthetic-monitoring-agent type: application -version: 0.2.0 +version: 0.2.1 diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index b33d35888c..214674b615 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.5 +version: 1.8.6 # renovate: datasource=docker depName=docker.io/grafana/tempo appVersion: 2.3.1 engine: gotpl diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index 3d9c82ab01..6200c096d6 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.4.1 +version: 0.4.2 # renovate: datasource=docker depName=docker.io/grafana/tempo-vulture appVersion: 2.2.3 engine: gotpl diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 0e6ff26d6e..70c1264584 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.7.2 +version: 1.7.3 # renovate: datasource=docker depName=docker.io/grafana/tempo appVersion: 2.3.1 engine: gotpl From f492de9cf0b29421e387814119d7b60577404c98 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:08:54 +0100 Subject: [PATCH 09/13] chore: bump super-linter version Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/workflows/linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 7b3c925ddc..b7e4ab04df 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -32,7 +32,7 @@ jobs: fi - name: Lint Code Base - uses: super-linter/super-linter@v3.12.0 + uses: super-linter/super-linter@v4.0.2 env: FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).* FILTER_REGEX_INCLUDE: ${{ inputs.filter_regex_include }} From a485c939e840599a82cfe963e827af5c5e91eba5 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:12:36 +0100 Subject: [PATCH 10/13] chore: helm-docs Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/renovate/entrypoint.sh | 8 ++++++++ .github/renovate/postupgrade.sh | 1 + charts/agent-operator/README.md | 2 +- charts/lgtm-distributed/README.md | 2 +- charts/loki-canary/README.md | 2 +- charts/loki-distributed/README.md | 6 +++--- charts/promtail/README.md | 2 +- charts/rollout-operator/README.md | 2 +- charts/snyk-exporter/README.md | 2 +- charts/synthetic-monitoring-agent/README.md | 4 ++-- charts/tempo-distributed/README.md | 2 +- charts/tempo-vulture/README.md | 2 +- charts/tempo/README.md | 2 +- 13 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.github/renovate/entrypoint.sh b/.github/renovate/entrypoint.sh index 4b1dfcc73d..3f1f616cb8 100755 --- a/.github/renovate/entrypoint.sh +++ b/.github/renovate/entrypoint.sh @@ -6,6 +6,9 @@ export YQ_VERSION=v4.40.5 # renovate: datasource=github-tags depName=jenkins-x-plugins/jx-release-version export JENKINS_JX_VERSION=v2.7.3 +# renovate: datasource=github-releases depName=helm-docs packageName=norwoodj/helm-docs +export HELM_DOCS_VERSION=1.13.1 + curl -fsSL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 chmod a+x /usr/local/bin/yq @@ -14,4 +17,9 @@ mkdir -p /tmp/jx && tar -xf /tmp/jx-release.tar.gz -C /tmp/jx mv /tmp/jx/jx-release-version /usr/local/bin/jx-release-version chmod a+x /usr/local/bin/jx-release-version +curl -fsSL -o /tmp/helm-docs.tar.gz https://github.com/norwoodj/helm-docs/releases/download/v"${HELM_DOCS_VERSION}"/helm-docs_"${HELM_DOCS_VERSION}"_Linux_x86_64.tar.gz +mkdir -p /tmp/helm-docs && tar -xf /tmp/helm-docs.tar.gz -C /tmp/helm-docs +mv /tmp/helm-docs/helm-docs /usr/local/bin/helm-docs +chmod a+x /usr/local/bin/helm-docs + runuser -u ubuntu renovate diff --git a/.github/renovate/postupgrade.sh b/.github/renovate/postupgrade.sh index d9342efbd1..042a8e5dd7 100755 --- a/.github/renovate/postupgrade.sh +++ b/.github/renovate/postupgrade.sh @@ -4,3 +4,4 @@ CHARTVERSION=$(jx-release-version -previous-version=from-file:"$1") export CHARTVERSION yq eval '.version = env(CHARTVERSION)' -i "$1" +helm-docs diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 79833c180e..e15d53a001 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.18](https://img.shields.io/badge/Version-0.3.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.2](https://img.shields.io/badge/AppVersion-0.40.2-informational?style=flat-square) +![Version: 0.3.19](https://img.shields.io/badge/Version-0.3.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.2](https://img.shields.io/badge/AppVersion-0.40.2-informational?style=flat-square) A Helm chart for Grafana Agent Operator diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index 76c4bae8db..f1b07b68bc 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -43,4 +43,4 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | tempo.ingester.replicas | int | `1` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/charts/loki-canary/README.md b/charts/loki-canary/README.md index eb18cd4219..a4b3a78f5f 100644 --- a/charts/loki-canary/README.md +++ b/charts/loki-canary/README.md @@ -1,6 +1,6 @@ # loki-canary -![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square) +![Version: 0.14.1](https://img.shields.io/badge/Version-0.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square) Helm chart for Grafana Loki Canary diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index d9fbdd1d1e..1b497b63f0 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.78.3](https://img.shields.io/badge/Version-0.78.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square) +![Version: 0.78.4](https://img.shields.io/badge/Version-0.78.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -107,7 +107,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | +| compactor.persistence.claims | list | | List of the compactor PVCs | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -300,7 +300,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | +| ingester.persistence.claims | list | | List of the ingester PVCs | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | diff --git a/charts/promtail/README.md b/charts/promtail/README.md index 19b9a14b59..eae89b427e 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.15.5](https://img.shields.io/badge/Version-6.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 6.15.6](https://img.shields.io/badge/Version-6.15.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md index f0de8efaa4..b0c626a391 100644 --- a/charts/rollout-operator/README.md +++ b/charts/rollout-operator/README.md @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r # rollout-operator -![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0](https://img.shields.io/badge/AppVersion-v0.13.0-informational?style=flat-square) +![Version: 0.14.1](https://img.shields.io/badge/Version-0.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0](https://img.shields.io/badge/AppVersion-v0.13.0-informational?style=flat-square) Grafana rollout-operator diff --git a/charts/snyk-exporter/README.md b/charts/snyk-exporter/README.md index 60bb656bf4..8fd9842c46 100644 --- a/charts/snyk-exporter/README.md +++ b/charts/snyk-exporter/README.md @@ -1,6 +1,6 @@ # snyk-exporter -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v1.4.1](https://img.shields.io/badge/AppVersion-v1.4.1-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: v1.4.1](https://img.shields.io/badge/AppVersion-v1.4.1-informational?style=flat-square) Prometheus exporter for Snyk. diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 9e9a4192a1..5be8966473 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -1,6 +1,6 @@ # synthetic-monitoring-agent -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) +![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. @@ -75,4 +75,4 @@ Kubernetes: `^1.16.0-0` | tolerations | list | `[]` | List of node taints to tolerate. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index de831de8bb..eddda151f3 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.6](https://img.shields.io/badge/Version-1.8.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 06033f9db8..089b25e2ca 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square) +![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance. diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 9e61f7a23b..07321130fd 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo Single Binary Mode From de1b208be85fed44ecfe8ba686d7ec81e4fb54c2 Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:16:48 +0100 Subject: [PATCH 11/13] chore: helm-docs 1.8.1 Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- charts/lgtm-distributed/README.md | 2 +- charts/loki-distributed/README.md | 4 ++-- charts/synthetic-monitoring-agent/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index f1b07b68bc..76c4bae8db 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -43,4 +43,4 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | tempo.ingester.replicas | int | `1` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 1b497b63f0..95d3ae3126 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -107,7 +107,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | | List of the compactor PVCs | +| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -300,7 +300,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | | List of the ingester PVCs | +| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 5be8966473..031c0375bc 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -75,4 +75,4 @@ Kubernetes: `^1.16.0-0` | tolerations | list | `[]` | List of node taints to tolerate. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) From 45f9254d7804cb4fbf10c97b04f851a9717931be Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:21:23 +0100 Subject: [PATCH 12/13] chore: fix super-linter Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/workflows/linter.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index b7e4ab04df..de44c95921 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -19,6 +19,9 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 + with: + # Full git history is needed to get a proper list of changed files within `super-linter` + fetch-depth: 0 - name: Check Docs env: From fd33db4398f9f21e6fd55293cbaf698958ceb31a Mon Sep 17 00:00:00 2001 From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> Date: Mon, 22 Apr 2024 21:45:11 +0200 Subject: [PATCH 13/13] chore: sign off renovate commits Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com> --- .github/renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 35f31c825d..d3479344e0 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,6 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: [ "config:recommended" ], + extends: [ "config:recommended", ":gitSignOff" ], ignorePaths: [ "charts/enterprise-logs-simple/", "charts/enterprise-metrics/",