Skip to content

Commit f9adcf4

Browse files
Sheikh-AbubakerSheikh-Abubaker
authored
Merge branch 'main' into tempo
2 parents 2ab5eaf + 0bfec1f commit f9adcf4

File tree

9 files changed

+144
-6
lines changed

9 files changed

+144
-6
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,18 @@ body:
3232
validations:
3333
required: true
3434

35-
- type: input
35+
- type: dropdown
3636
id: chart-name
3737
attributes:
3838
label: Which chart?
39-
description: Enter the name of the chart where you encountered this bug.
39+
description: Select the chart this bug is related to.
40+
options:
41+
- grafana
42+
- grafana-mcp
43+
- synthetic-monitoring-agent
44+
- tempo
45+
- tempo-distributed
46+
- tempo-vulture
4047
validations:
4148
required: true
4249

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,22 @@ body:
88
- type: markdown
99
attributes:
1010
value: |
11-
Thanks for taking the time to fill out this bug report!
11+
Thanks for taking the time to fill out this feature request!
12+
13+
- type: dropdown
14+
id: chart-name
15+
attributes:
16+
label: Which chart?
17+
description: Select the chart this feature request is related to.
18+
options:
19+
- grafana
20+
- grafana-mcp
21+
- synthetic-monitoring-agent
22+
- tempo
23+
- tempo-distributed
24+
- tempo-vulture
25+
validations:
26+
required: true
1227

1328
- type: textarea
1429
id: desc

‎.github/advanced-issue-labeler.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file is auto-generated by scripts/generate-labeler.sh. Do not edit manually.
2+
3+
policy:
4+
- template: [bug_report.yml, feature_request.yml]
5+
section:
6+
- id: [chart-name]
7+
label:
8+
- name: "chart/grafana"
9+
keys: ["grafana"]
10+
- name: "chart/grafana-mcp"
11+
keys: ["grafana-mcp"]
12+
- name: "chart/synthetic-monitoring-agent"
13+
keys: ["synthetic-monitoring-agent"]
14+
- name: "chart/tempo"
15+
keys: ["tempo"]
16+
- name: "chart/tempo-distributed"
17+
keys: ["tempo-distributed"]
18+
- name: "chart/tempo-vulture"
19+
keys: ["tempo-vulture"]

‎.github/workflows/ci.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,29 @@ jobs:
9797
run: |
9898
git diff --exit-code
9999
100+
- name: generate advanced-issue-labeler.yml
101+
run: |
102+
./scripts/generate-labeler.sh | tee .github/advanced-issue-labeler.yml
103+
104+
- name: check advanced-issue-labeler.yml for modifications
105+
run: |
106+
git diff --exit-code
107+
108+
- name: check issue template chart dropdowns
109+
run: |
110+
EXPECTED=$(find charts/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort)
111+
for template in .github/ISSUE_TEMPLATE/*.yml; do
112+
ACTUAL=$(yq -r '.body[] | select(.id == "chart-name") | .attributes.options[]' "$template" 2>/dev/null | sort)
113+
if [[ -z "$ACTUAL" ]]; then
114+
continue
115+
fi
116+
if [[ "$EXPECTED" != "$ACTUAL" ]]; then
117+
echo "ERROR: Chart dropdown in $template is out of sync with charts/ directory." >&2
118+
diff <(echo "$EXPECTED") <(echo "$ACTUAL")
119+
exit 1
120+
fi
121+
done
122+
100123
super-linter:
101124
name: Lint Code Base
102125
runs-on: ubuntu-24.04

‎.github/workflows/issue-triage.yaml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Issue Triage
2+
permissions: {}
3+
4+
on:
5+
issues:
6+
types:
7+
- opened
8+
- edited
9+
10+
jobs:
11+
label-and-assign:
12+
runs-on: ubuntu-24.04
13+
permissions:
14+
contents: read
15+
issues: write
16+
steps:
17+
- name: Checkout Code
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
with:
20+
persist-credentials: false
21+
22+
- name: Parse issue form
23+
if: contains(github.event.issue.labels.*.name, 'bug') || contains(github.event.issue.labels.*.name, 'enhancement')
24+
uses: stefanbuck/github-issue-parser@10dcc54158ba4c137713d9d69d70a2da63b6bda3 # v3.2.3
25+
id: issue-parser
26+
with:
27+
template-path: >-
28+
.github/ISSUE_TEMPLATE/${{
29+
contains(github.event.issue.labels.*.name, 'bug')
30+
&& 'bug_report.yml' || 'feature_request.yml'
31+
}}
32+
33+
- name: Create chart labels
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
run: |
37+
for chart in $(find charts/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort); do
38+
gh label create "chart/${chart}" \
39+
--color ec6d13 \
40+
--description "Issues related to the ${chart} Helm Chart" \
41+
--force
42+
done
43+
44+
- name: Label issue by chart name
45+
if: steps.issue-parser.outputs.jsonString
46+
uses: redhat-plumbers-in-action/advanced-issue-labeler@b80ae64e3e156e9c111b075bfa04b295d54e8e2e # v3.2.4
47+
with:
48+
issue-form: ${{ steps.issue-parser.outputs.jsonString }}
49+
template: >-
50+
${{
51+
contains(github.event.issue.labels.*.name, 'bug')
52+
&& 'bug_report.yml' || 'feature_request.yml'
53+
}}
54+
section: chart-name
55+
config-path: .github/advanced-issue-labeler.yml
56+
token: ${{ github.token }}

‎charts/tempo-vulture/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-vulture
33
description: Grafana Tempo Vulture - A tool to monitor Tempo performance.
44
type: application
5-
version: 0.12.3
5+
version: 0.12.4
66
# renovate: docker=docker.io/grafana/tempo-vulture
77
appVersion: 2.10.0
88
home: https://grafana.com/docs/tempo/latest/

‎charts/tempo-vulture/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-vulture
22

3-
![Version: 0.12.3](https://img.shields.io/badge/Version-0.12.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.0](https://img.shields.io/badge/AppVersion-2.10.0-informational?style=flat-square)
3+
![Version: 0.12.4](https://img.shields.io/badge/Version-0.12.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.0](https://img.shields.io/badge/AppVersion-2.10.0-informational?style=flat-square)
44

55
Grafana Tempo Vulture - A tool to monitor Tempo performance.
66

‎charts/tempo-vulture/templates/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
{{- include "tempo-vulture.labels" . | nindent 4 }}
77
{{- with .Values.annotations }}
88
annotations:
9-
{{- toYaml . | indent 4 }}
9+
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
spec:
1212
minReadySeconds: 10

‎scripts/generate-labeler.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
# Auto-generate .github/advanced-issue-labeler.yml from chart directories.
3+
cat <<HEADER
4+
# This file is auto-generated by scripts/generate-labeler.sh. Do not edit manually.
5+
6+
policy:
7+
- template: [bug_report.yml, feature_request.yml]
8+
section:
9+
- id: [chart-name]
10+
label:
11+
HEADER
12+
13+
for chart in $(find charts/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort); do
14+
cat <<CHARTS
15+
- name: "chart/${chart}"
16+
keys: ["${chart}"]
17+
CHARTS
18+
done

0 commit comments

Comments
 (0)