Merge branch 'main' into tempo-distributed-fix-servicemonitor-for-use-with-argocd

Author: stuarta

.github/CODEOWNERS

@@ -6,12 +6,12 @@
 # Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
 * @grafana/helm-charts-admins
 
-/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh
+/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh @QuentinBisson
 /charts/loki-distributed/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/loki-canary/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/promtail/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/tempo/ @grafana/tempo @Sheikh-Abubaker @dgzlopes @swartz-k @BitProcessor @faustodavid
-/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid
+/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid @QuentinBisson
 /charts/enterprise-metrics/ @grafana/mimir-maintainers
 /charts/rollout-operator/ @grafana/mimir-maintainers
 /charts/enterprise-logs/ @grafana/loki-squad

charts/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 10.1.0
+version: 10.1.1
 appVersion: 12.2.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
@@ -29,6 +29,8 @@ maintainers:
     email: [email protected]
   - name: jkroepke
     email: [email protected]
+  - name: QuentinBisson
+    email: [email protected]
 type: application
 keywords:
   - monitoring

charts/tempo-distributed/Chart.yaml

@@ -22,6 +22,8 @@ maintainers:
   - name: zalegrala
   - name: Sheikh-Abubaker
     email: [email protected]
+  - name: QuentinBisson
+    email: [email protected]
 dependencies:
   - name: minio
     alias: minio