Skip to content

Commit 8becf35

Browse files
Merge branch 'main' into add-myself-as-grafana-mcp-maintainer
2 parents 82df537 + 922155c commit 8becf35

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
77
* @grafana/helm-charts-admins
88

9-
/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh
9+
/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh @QuentinBisson
1010
/charts/loki-distributed/ @grafana/loki-squad @unguiculus @Whyeasy
1111
/charts/loki-canary/ @grafana/loki-squad @unguiculus @Whyeasy
1212
/charts/promtail/ @grafana/loki-squad @unguiculus @Whyeasy
1313
/charts/tempo/ @grafana/tempo @Sheikh-Abubaker @dgzlopes @swartz-k @BitProcessor @faustodavid
14-
/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid
14+
/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid @QuentinBisson
1515
/charts/enterprise-metrics/ @grafana/mimir-maintainers
1616
/charts/rollout-operator/ @grafana/mimir-maintainers
1717
/charts/enterprise-logs/ @grafana/loki-squad

charts/grafana/Chart.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana
3-
version: 10.1.0
3+
version: 10.1.1
44
appVersion: 12.2.0
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.
@@ -29,6 +29,8 @@ maintainers:
2929
3030
- name: jkroepke
3131
32+
- name: QuentinBisson
33+
3234
type: application
3335
keywords:
3436
- monitoring

charts/rollout-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: rollout-operator
33
description: "Grafana rollout-operator"
44
type: application
5-
version: 0.34.0
6-
appVersion: v0.30.0
5+
version: 0.35.1
6+
appVersion: v0.31.1
77
home: https://github.com/grafana/rollout-operator
88
kubeVersion: ^1.10.0-0

charts/rollout-operator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
44

55
# rollout-operator
66

7-
![Version: 0.34.0](https://img.shields.io/badge/Version-0.34.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.30.0](https://img.shields.io/badge/AppVersion-v0.30.0-informational?style=flat-square)
7+
![Version: 0.35.1](https://img.shields.io/badge/Version-0.35.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.31.1](https://img.shields.io/badge/AppVersion-v0.31.1-informational?style=flat-square)
88

99
Grafana rollout-operator
1010

charts/tempo-distributed/Chart.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.48.0
5+
version: 1.48.1
66
appVersion: 2.8.2
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/
@@ -22,6 +22,8 @@ maintainers:
2222
- name: zalegrala
2323
- name: Sheikh-Abubaker
2424
25+
- name: QuentinBisson
26+
2527
dependencies:
2628
- name: minio
2729
alias: minio

charts/tempo-distributed/README.md

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

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

55
Grafana Tempo in MicroService mode
66

0 commit comments

Comments
 (0)