From a84824f87622bab3dd84332ea8e79d82c5dcf515 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2026 09:59:58 +0000 Subject: [PATCH 1/2] chore(config): migrate config .github/renovate.json5 --- .github/renovate.json5 | 168 ++++++++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 62 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index c749861ab..b0432246f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,91 +1,135 @@ { - $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.11"], - platformCommit: "enabled", + $schema: 'https://docs.renovatebot.com/renovate-schema.json', + extends: [ + 'config:best-practices', + 'config:recommended', + 'github>grafana/flint#v0.22.11', + ], + platformCommit: 'enabled', automerge: true, ignorePaths: [ - "**/simpleclient-archive/**", - // old projects - // agent resources packages an OTel API that is the minimum required API version - "**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml", + '**/simpleclient-archive/**', + '**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml', + ], + labels: [ + 'dependencies', ], - labels: ["dependencies"], packageRules: [ { - description: "Update component-prefixed shared-workflow action tags", - matchManagers: ["github-actions"], - matchPackageNames: ["grafana/shared-workflows"], - matchCurrentValue: "/^.+[-/]v?\\d+\\.\\d+(?:\\.\\d+)?$/", - overrideDatasource: "github-tags", - versioning: "regex:^(?.*)[-/]v?(?\\d+)\\.(?\\d+)(?:\\.(?\\d+))?$", + description: 'Update component-prefixed shared-workflow action tags', + matchManagers: [ + 'github-actions', + ], + matchPackageNames: [ + 'grafana/shared-workflows', + ], + matchCurrentValue: '/^.+[-/]v?\\d+\\.\\d+(?:\\.\\d+)?$/', + overrideDatasource: 'github-tags', + versioning: 'regex:^(?.*)[-/]v?(?\\d+)\\.(?\\d+)(?:\\.(?\\d+))?$', }, { - matchFileNames: ["mise.toml"], - matchDepNames: ["java"], - groupName: "java temurin", - additionalBranchPrefix: "temurin-", + matchFileNames: [ + 'mise.toml', + ], + matchDepNames: [ + 'java', + ], + groupName: 'java temurin', + additionalBranchPrefix: 'temurin-', }, { - matchFileNames: [".mise/envs/native/mise.toml"], - matchDepNames: ["java"], - groupName: "java graalvm", - additionalBranchPrefix: "graalvm-", + matchFileNames: [ + '.mise/envs/native/mise.toml', + ], + matchDepNames: [ + 'java', + ], + groupName: 'java graalvm', + additionalBranchPrefix: 'graalvm-', }, { - description: "Compat tests pin an LTS JDK the upstream release supports; block major JDK bumps that would break those builds", - matchFileNames: [".mise/envs/jmx-exporter/mise.toml", ".mise/envs/micrometer/mise.toml"], - matchDepNames: ["java"], - matchUpdateTypes: ["major"], + description: 'Compat tests pin an LTS JDK the upstream release supports; block major JDK bumps that would break those builds', + matchFileNames: [ + '.mise/envs/jmx-exporter/mise.toml', + '.mise/envs/micrometer/mise.toml', + ], + matchDepNames: [ + 'java', + ], + matchUpdateTypes: [ + 'major', + ], enabled: false, }, { - matchPackageNames: ["io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha"], + matchPackageNames: [ + 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha', + ], ignoreUnstable: false, }, { enabled: false, - description: "Ignore internal project modules", - matchPackageNames: ["/^io\\.prometheus:(prometheus-metrics-bom|examples|example-.+|integration-tests|it-.+)$/"], + description: 'Ignore internal project modules', + matchPackageNames: [ + '/^io\\.prometheus:(prometheus-metrics-bom|examples|example-.+|integration-tests|it-.+)$/', + ], }, { - description: "Group protobuf-java and protoc together so generated code can be updated in one PR", - matchDepNames: ["com.google.protobuf:protobuf-java", "protoc"], - groupName: "protobuf", + description: 'Group protobuf-java and protoc together so generated code can be updated in one PR', + matchDepNames: [ + 'com.google.protobuf:protobuf-java', + 'protoc', + ], + groupName: 'protobuf', separateMajorMinor: false, }, { - description: "Update the Micrometer typed-descriptor compatibility ref weekly", - matchManagers: ["custom.regex"], - matchDatasources: ["git-refs"], - matchDepNames: ["micrometer-metrics/micrometer"], - matchCurrentValue: ["main"], - schedule: ["on sunday"], + description: 'Update the Micrometer typed-descriptor compatibility ref weekly', + matchManagers: [ + 'custom.regex', + ], + matchDatasources: [ + 'git-refs', + ], + matchDepNames: [ + 'micrometer-metrics/micrometer', + ], + matchCurrentValue: 'main', + schedule: [ + 'on sunday', + ], }, ], customManagers: [ - { - "customType": "regex", - "description": "update _VERSION variables in mise.toml", - "managerFilePatterns": ["/^mise\\.toml$/"], - "matchStrings": [ - "# renovate: datasource=(?[a-z-]+?)(?: depName=(?.+?))?(?: packageName=(?.+?))?(?: versioning=(?[a-z-]+?))?\\s.+?_VERSION\\s*=\\s*\"?(?[^@\"]+?)(?:@(?sha256:[a-f0-9]+))?\"?\\s" - ] - }, - { - customType: "regex", - description: "track the latest Micrometer release for upstream compatibility", - managerFilePatterns: ["/^\\.github\\/workflows\\/micrometer-compatibility\\.yml$/"], - matchStrings: [ - "# renovate: datasource=(?\\S+) depName=(?\\S+) packageName=(?\\S+)\\n\\s*ref:\\s*(?v[0-9][^\\s]*)", - ], - }, - { - customType: "regex", - description: "pin the Micrometer typed-descriptor compatibility ref", - managerFilePatterns: ["/^\\.github\\/workflows\\/micrometer-compatibility\\.yml$/"], - matchStrings: [ - "# renovate: datasource=(?\\S+) depName=(?\\S+) packageName=(?\\S+) currentValue=(?\\S+)\\n\\s*ref:\\s*(?[a-f0-9]{40})", - ], - }, + { + customType: 'regex', + description: 'update _VERSION variables in mise.toml', + managerFilePatterns: [ + '/^mise\\.toml$/', + ], + matchStrings: [ + '# renovate: datasource=(?[a-z-]+?)(?: depName=(?.+?))?(?: packageName=(?.+?))?(?: versioning=(?[a-z-]+?))?\\s.+?_VERSION\\s*=\\s*"?(?[^@"]+?)(?:@(?sha256:[a-f0-9]+))?"?\\s', + ], + }, + { + customType: 'regex', + description: 'track the latest Micrometer release for upstream compatibility', + managerFilePatterns: [ + '/^\\.github\\/workflows\\/micrometer-compatibility\\.yml$/', + ], + matchStrings: [ + '# renovate: datasource=(?\\S+) depName=(?\\S+) packageName=(?\\S+)\\n\\s*ref:\\s*(?v[0-9][^\\s]*)', + ], + }, + { + customType: 'regex', + description: 'pin the Micrometer typed-descriptor compatibility ref', + managerFilePatterns: [ + '/^\\.github\\/workflows\\/micrometer-compatibility\\.yml$/', + ], + matchStrings: [ + '# renovate: datasource=(?\\S+) depName=(?\\S+) packageName=(?\\S+) currentValue=(?\\S+)\\n\\s*ref:\\s*(?[a-f0-9]{40})', + ], + }, ], } From cab50c7c50a49ad3806bbf88f94c92d6271de843 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 26 Aug 2026 14:59:45 +0000 Subject: [PATCH 2/2] fix: restore Renovate config comments Signed-off-by: Gregor Zeitlinger --- .github/renovate.json5 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index b0432246f..8663fe9ec 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -9,6 +9,8 @@ automerge: true, ignorePaths: [ '**/simpleclient-archive/**', + // old projects + // agent resources packages an OTel API that is the minimum required API version '**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml', ], labels: [