Skip to content

Commit 3bec324

Browse files
zeitlingerzeitlinger
committed
Merge remote-tracking branch 'origin/main' into HEAD
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
2 parents 1defbbf + 02622cb commit 3bec324

139 files changed

Lines changed: 4648 additions & 2344 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/config/flint.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
exclude = ["docs/themes/**", "mvnw", "simpleclient-archive/**"]
33

44
[checks.renovate-deps]
5-
exclude_managers = ["github-actions", "github-runners", "maven"]
5+
exclude_managers = ["github-runners", "maven"]

‎.github/config/lychee.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ exclude = [
1616
# excluding links to pull requests and issues is done for performance
1717
"^https://github.com/prometheus/client_java/(issues|pull)/\\d+$",
1818

19+
# Slack workspace links return 403 to unauthenticated link checkers
20+
"^https://cloud-native\\.slack\\.com/?$",
21+
1922
# exclude localhost URLs as they require running services
2023
"^http://localhost",
2124
"^https://localhost",

‎.github/renovate-tracked-deps.json‎

Lines changed: 236 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,100 +12,217 @@
1212
]
1313
},
1414
".github/workflows/acceptance-tests.yml": {
15-
"regex": [
16-
"mise"
15+
"github-actions": [
16+
"actions/checkout",
17+
"jdx/mise",
18+
"jdx/mise-action",
19+
"ubuntu"
1720
]
1821
},
1922
".github/workflows/api-diff.yml": {
20-
"regex": [
21-
"mise"
23+
"github-actions": [
24+
"actions/cache",
25+
"actions/checkout",
26+
"jdx/mise",
27+
"jdx/mise-action",
28+
"ubuntu"
29+
]
30+
},
31+
".github/workflows/approve-workflows.yml": {
32+
"github-actions": [
33+
"prometheus/promci",
34+
"ubuntu"
2235
]
2336
},
2437
".github/workflows/build.yml": {
25-
"regex": [
26-
"mise"
38+
"github-actions": [
39+
"actions/cache",
40+
"actions/checkout",
41+
"jdx/mise",
42+
"jdx/mise-action",
43+
"ubuntu"
2744
]
2845
},
2946
".github/workflows/bump-api-diff-baseline.yml": {
30-
"regex": [
31-
"mise"
47+
"github-actions": [
48+
"actions/cache",
49+
"actions/checkout",
50+
"jdx/mise",
51+
"jdx/mise-action",
52+
"ubuntu"
53+
]
54+
},
55+
".github/workflows/codeql.yml": {
56+
"github-actions": [
57+
"actions/cache",
58+
"actions/checkout",
59+
"actions/setup-java",
60+
"github/codeql-action",
61+
"ubuntu"
62+
]
63+
},
64+
".github/workflows/detect-api-changes.yml": {
65+
"github-actions": [
66+
"ubuntu"
3267
]
3368
},
3469
".github/workflows/generate-protobuf.yml": {
35-
"regex": [
36-
"mise"
70+
"github-actions": [
71+
"actions/cache",
72+
"actions/checkout",
73+
"actions/download-artifact",
74+
"actions/upload-artifact",
75+
"jdx/mise",
76+
"jdx/mise-action",
77+
"ubuntu"
3778
]
3879
},
3980
".github/workflows/github-pages.yaml": {
40-
"regex": [
41-
"mise"
81+
"github-actions": [
82+
"actions/checkout",
83+
"actions/configure-pages",
84+
"actions/deploy-pages",
85+
"actions/upload-pages-artifact",
86+
"jdx/mise",
87+
"jdx/mise-action",
88+
"ubuntu"
89+
]
90+
},
91+
".github/workflows/issue-management-stale-action.yml": {
92+
"github-actions": [
93+
"actions/stale",
94+
"ubuntu"
4295
]
4396
},
4497
".github/workflows/java-version-matrix-tests.yml": {
45-
"regex": [
46-
"mise"
98+
"github-actions": [
99+
"actions/cache",
100+
"actions/checkout",
101+
"jdx/mise",
102+
"jdx/mise-action",
103+
"ubuntu"
47104
]
48105
},
49106
".github/workflows/jmx-exporter-compatibility.yml": {
50-
"regex": [
51-
"mise"
107+
"github-actions": [
108+
"actions/cache",
109+
"actions/checkout",
110+
"jdx/mise",
111+
"jdx/mise-action",
112+
"ubuntu"
52113
]
53114
},
54115
".github/workflows/lint.yml": {
55-
"regex": [
56-
"mise"
116+
"github-actions": [
117+
"actions/checkout",
118+
"jdx/mise",
119+
"jdx/mise-action",
120+
"ubuntu"
57121
]
58122
},
59123
".github/workflows/micrometer-compatibility.yml": {
124+
"github-actions": [
125+
"actions/cache",
126+
"actions/checkout",
127+
"jdx/mise",
128+
"jdx/mise-action",
129+
"ubuntu"
130+
],
60131
"regex": [
61-
"micrometer-metrics/micrometer",
62-
"mise",
63-
"zeitlinger/micrometer"
132+
"micrometer-metrics/micrometer"
133+
]
134+
},
135+
".github/workflows/multi-version-test.yml": {
136+
"github-actions": [
137+
"actions/cache",
138+
"actions/checkout",
139+
"actions/setup-java",
140+
"ubuntu"
64141
]
65142
},
66143
".github/workflows/native-tests.yml": {
67-
"regex": [
68-
"mise"
144+
"github-actions": [
145+
"actions/checkout",
146+
"jdx/mise",
147+
"jdx/mise-action",
148+
"ubuntu"
69149
]
70150
},
71151
".github/workflows/nightly-benchmarks.yml": {
72-
"regex": [
73-
"mise"
152+
"github-actions": [
153+
"actions/cache",
154+
"actions/checkout",
155+
"actions/download-artifact",
156+
"actions/upload-artifact",
157+
"jdx/mise",
158+
"jdx/mise-action",
159+
"ubuntu"
160+
]
161+
},
162+
".github/workflows/pr-benchmark-report.yml": {
163+
"github-actions": [
164+
"ubuntu"
74165
]
75166
},
76167
".github/workflows/pr-benchmarks.yml": {
77-
"regex": [
78-
"mise"
168+
"github-actions": [
169+
"actions/cache",
170+
"actions/checkout",
171+
"actions/download-artifact",
172+
"actions/upload-artifact",
173+
"jdx/mise",
174+
"jdx/mise-action",
175+
"ubuntu"
79176
]
80177
},
81-
".github/workflows/regenerate-api-diff-otel.yml": {
82-
"regex": [
83-
"mise"
178+
".github/workflows/pr-title.yml": {
179+
"github-actions": [
180+
"grafana/shared-workflows",
181+
"ubuntu"
84182
]
85183
},
86-
".github/workflows/release.yml": {
87-
"regex": [
88-
"mise"
184+
".github/workflows/regenerate-api-diff-otel.yml": {
185+
"github-actions": [
186+
"actions/cache",
187+
"actions/checkout",
188+
"actions/download-artifact",
189+
"actions/upload-artifact",
190+
"jdx/mise",
191+
"jdx/mise-action",
192+
"ubuntu"
89193
]
90194
},
91-
".github/workflows/test-release-build.yml": {
92-
"regex": [
93-
"mise"
195+
".github/workflows/release-please.yml": {
196+
"github-actions": [
197+
"googleapis/release-please-action",
198+
"ubuntu"
94199
]
95200
},
96-
".mise/envs/jmx-exporter/mise.toml": {
97-
"mise": [
98-
"java"
201+
".github/workflows/release.yml": {
202+
"github-actions": [
203+
"actions/checkout",
204+
"actions/setup-java",
205+
"jdx/mise",
206+
"jdx/mise-action",
207+
"ubuntu"
99208
]
100209
},
101-
".mise/envs/micrometer/mise.toml": {
102-
"mise": [
103-
"java"
210+
".github/workflows/scorecard.yml": {
211+
"github-actions": [
212+
"actions/checkout",
213+
"actions/upload-artifact",
214+
"github/codeql-action",
215+
"ossf/scorecard-action",
216+
"ubuntu"
104217
]
105218
},
106-
".mise/envs/native/mise.toml": {
107-
"mise": [
108-
"java"
219+
".github/workflows/test-release-build.yml": {
220+
"github-actions": [
221+
"actions/cache",
222+
"actions/checkout",
223+
"jdx/mise",
224+
"jdx/mise-action",
225+
"ubuntu"
109226
]
110227
},
111228
".mvn/wrapper/maven-wrapper.properties": {
@@ -158,11 +275,13 @@
158275
"mise": [
159276
"actionlint",
160277
"aqua:grafana/flint",
278+
"aqua:grafana/gcx",
279+
"aqua:grafana/oats",
161280
"aqua:jonwiggins/xmloxide",
162281
"aqua:owenlamont/ryl",
163282
"biome",
283+
"checkstyle",
164284
"editorconfig-checker",
165-
"go:github.com/grafana/oats",
166285
"google-java-format",
167286
"hugo",
168287
"java",
@@ -194,5 +313,76 @@
194313
"maven-wrapper"
195314
]
196315
}
316+
},
317+
"actionMeta": {
318+
"actions/cache": {
319+
"packageName": "actions/cache",
320+
"refKind": "version-tag"
321+
},
322+
"actions/checkout": {
323+
"packageName": "actions/checkout",
324+
"refKind": "version-tag"
325+
},
326+
"actions/configure-pages": {
327+
"packageName": "actions/configure-pages",
328+
"refKind": "version-tag"
329+
},
330+
"actions/deploy-pages": {
331+
"packageName": "actions/deploy-pages",
332+
"refKind": "version-tag"
333+
},
334+
"actions/download-artifact": {
335+
"packageName": "actions/download-artifact",
336+
"refKind": "version-tag"
337+
},
338+
"actions/setup-java": {
339+
"packageName": "actions/setup-java",
340+
"refKind": "version-tag"
341+
},
342+
"actions/stale": {
343+
"packageName": "actions/stale",
344+
"refKind": "version-tag"
345+
},
346+
"actions/upload-artifact": {
347+
"packageName": "actions/upload-artifact",
348+
"refKind": "version-tag"
349+
},
350+
"actions/upload-pages-artifact": {
351+
"packageName": "actions/upload-pages-artifact",
352+
"refKind": "version-tag"
353+
},
354+
"github/codeql-action/analyze": {
355+
"packageName": "github/codeql-action",
356+
"refKind": "version-tag"
357+
},
358+
"github/codeql-action/init": {
359+
"packageName": "github/codeql-action",
360+
"refKind": "version-tag"
361+
},
362+
"github/codeql-action/upload-sarif": {
363+
"packageName": "github/codeql-action",
364+
"refKind": "version-tag"
365+
},
366+
"googleapis/release-please-action": {
367+
"packageName": "googleapis/release-please-action",
368+
"refKind": "version-tag"
369+
},
370+
"grafana/shared-workflows/actions/lint-pr-title": {
371+
"packageName": "grafana/shared-workflows",
372+
"refKind": "version-tag",
373+
"compatibility": "lint-pr-title"
374+
},
375+
"jdx/mise-action": {
376+
"packageName": "jdx/mise-action",
377+
"refKind": "version-tag"
378+
},
379+
"ossf/scorecard-action": {
380+
"packageName": "ossf/scorecard-action",
381+
"refKind": "version-tag"
382+
},
383+
"prometheus/promci/approve_workflows": {
384+
"packageName": "prometheus/promci",
385+
"refKind": "version-tag"
386+
}
197387
}
198388
}

0 commit comments

Comments
 (0)