Skip to content

Commit 6a208df

Browse files
leiwingqueenleiwingqueen
committed
resolve conflict
2 parents bcedc72 + 923497f commit 6a208df

35 files changed

+198
-34
lines changed

‎charts/grafana-mcp/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana-mcp
3-
version: 0.1.0
3+
version: 0.1.1
44
appVersion: latest
55
kubeVersion: "^1.8.0-0"
66
description: MCP server for Grafana.

‎charts/grafana-mcp/templates/ingress.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.ingress.enabled }}
12
{{- $fullName := include "grafana-mcp.fullname" . }}
23
{{- $svcPort := .Values.service.port }}
34
{{- if and .Values.ingress.className (not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class")) }}
@@ -45,3 +46,4 @@ spec:
4546
number: {{ $svcPort }}
4647
{{- end }}
4748
{{- end }}
49+
{{- end }}

‎charts/grafana-sampling/Chart.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies:
22
- name: alloy
33
repository: https://grafana.github.io/helm-charts
4-
version: 0.12.5
4+
version: 1.2.1
55
- name: alloy
66
repository: https://grafana.github.io/helm-charts
7-
version: 0.12.5
8-
digest: sha256:e3981ad0a096fac88106d866d61a1cae09a0feec8f50e8f97bdaa0dee556e0a2
9-
generated: "2025-03-31T15:26:38.379304672+02:00"
7+
version: 1.2.1
8+
digest: sha256:2d813ce905b1503d97444bb668aab27814e3dee45e68187d3b12601aa5ba06d0
9+
generated: "2025-08-11T11:05:07.041393-07:00"

‎charts/grafana-sampling/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ apiVersion: v2
22
name: grafana-sampling
33
description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline.
44
type: application
5-
version: 1.1.5
6-
appVersion: "v1.7.5"
5+
version: 1.1.6
6+
appVersion: "v1.10.1"
77
sources:
88
- https://github.com/grafana/alloy
99
- https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/sampling/tail/
1010
dependencies:
1111
- name: alloy
12-
version: 0.12.5
12+
version: 1.2.1
1313
repository: https://grafana.github.io/helm-charts
1414
alias: alloy-deployment
1515
- name: alloy
16-
version: 0.12.5
16+
version: 1.2.1
1717
repository: https://grafana.github.io/helm-charts
1818
alias: alloy-statefulset

‎charts/grafana-sampling/README.md‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# grafana-sampling
22

3-
![Version: 1.1.5](https://img.shields.io/badge/Version-1.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.7.5](https://img.shields.io/badge/AppVersion-v1.7.5-informational?style=flat-square)
3+
![Version: 1.1.6](https://img.shields.io/badge/Version-1.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.10.1](https://img.shields.io/badge/AppVersion-v1.10.1-informational?style=flat-square)
44

55
A Helm chart for a layered OTLP tail sampling and metrics generation pipeline.
66

@@ -143,7 +143,14 @@ A major chart version change indicates that there is an incompatible breaking ch
143143
| batch.statefulset.send_batch_max_size | int | `0` | |
144144
| batch.statefulset.send_batch_size | int | `8192` | |
145145
| batch.statefulset.timeout | string | `"200ms"` | |
146-
| deployment.otlp.receiver | object | `{"grpc":{"max_recv_msg_size":"4MB"}}` | otlp receiver settings for deployment (loadbalancer) |
146+
| deployment.otlp.receiver | object | `{"grpc":{"keepalive":{"enforcementPolicy":{"minTime":"","permitWithoutStream":false},"serverParameters":{"maxConnectionAge":"","maxConnectionAgeGrace":"","maxConnectionIdle":"","time":"","timeout":""}},"max_recv_msg_size":"4MB"}}` | otlp receiver settings for deployment (loadbalancer) |
147+
| deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.minTime | string | `""` | Minimum time clients should wait before sending a keepalive ping. Default is 5 minutes. @section -- Receivers: OTLP |
148+
| deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream | bool | `false` | Allow clients to send keepalive pings when there are no active streams. @section -- Receivers: OTLP |
149+
| deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge | string | `""` | Maximum age for non-idle connections. Default is infinity. @section -- Receivers: OTLP |
150+
| deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace | string | `""` | Time to wait before forcibly closing connections. Default is infinity. @section -- Receivers: OTLP |
151+
| deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle | string | `""` | Maximum age for idle connections. Default is infinity. @section -- Receivers: OTLP |
152+
| deployment.otlp.receiver.grpc.keepalive.serverParameters.time | string | `""` | How often to ping inactive clients to check for liveness. Default is 2 hours. @section -- Receivers: OTLP |
153+
| deployment.otlp.receiver.grpc.keepalive.serverParameters.timeout | string | `""` | Time to wait before closing inactive clients that don’t respond to liveness checks. Default is 20 seconds. @section -- Receivers: OTLP |
147154
| deployment.otlp.receiver.grpc.max_recv_msg_size | string | `"4MB"` | gRPC max message receive size. Default to 4MB |
148155
| liveDebugging.enabled | bool | `false` | Enable live debugging in the Alloy UI. |
149156
| metricsGeneration.dimensions | list | `["service.namespace","service.version","deployment.environment","k8s.cluster.name","k8s.pod.name"]` | Additional dimensions to add to generated metrics. |
@@ -158,6 +165,13 @@ A major chart version change indicates that there is an incompatible breaking ch
158165
| sampling.failedRequests.sample | bool | `false` | Toggle sampling failed requests. |
159166
| sampling.successfulRequests.percentage | int | `10` | Percentage of successful requests to sample. |
160167
| sampling.successfulRequests.sample | bool | `true` | Toggle sampling successful requests. |
161-
| statefulset.otlp.receiver | object | `{"grpc":{"max_recv_msg_size":"4MB"}}` | otlp receiver settings for statefulset (sampler) |
168+
| statefulset.otlp.receiver | object | `{"grpc":{"keepalive":{"enforcementPolicy":{"minTime":"","permitWithoutStream":false},"serverParameters":{"maxConnectionAge":"","maxConnectionAgeGrace":"","maxConnectionIdle":"","time":"","timeout":""}},"max_recv_msg_size":"4MB"}}` | otlp receiver settings for statefulset (sampler) |
169+
| statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.minTime | string | `""` | Minimum time clients should wait before sending a keepalive ping. Default is 5 minutes. @section -- Receivers: OTLP |
170+
| statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream | bool | `false` | Allow clients to send keepalive pings when there are no active streams. @section -- Receivers: OTLP |
171+
| statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge | string | `""` | Maximum age for non-idle connections. Default is infinity. @section -- Receivers: OTLP |
172+
| statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace | string | `""` | Time to wait before forcibly closing connections. Default is infinity. @section -- Receivers: OTLP |
173+
| statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle | string | `""` | Maximum age for idle connections. Default is infinity. @section -- Receivers: OTLP |
174+
| statefulset.otlp.receiver.grpc.keepalive.serverParameters.time | string | `""` | How often to ping inactive clients to check for liveness. Default is 2 hours. @section -- Receivers: OTLP |
175+
| statefulset.otlp.receiver.grpc.keepalive.serverParameters.timeout | string | `""` | Time to wait before closing inactive clients that don’t respond to liveness checks. Default is 20 seconds. @section -- Receivers: OTLP |
162176
| statefulset.otlp.receiver.grpc.max_recv_msg_size | string | `"4MB"` | gRPC max message receive size. Default to 4MB |
163177

‎charts/grafana-sampling/templates/_otelcol_receiver_otlp.alloy.txt‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,43 @@ otelcol.receiver.otlp "default" {
55
// configures the default grpc endpoint "0.0.0.0:4317"
66
grpc {
77
max_recv_msg_size = {{ .Values.deployment.otlp.receiver.grpc.max_recv_msg_size | quote }}
8+
9+
{{- $hasServerParameters := and .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters (or .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle) }}
10+
{{- $hasEnforcementPolicy := and .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy (or .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.minTime .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream) }}
11+
{{- if or $hasServerParameters $hasEnforcementPolicy }}
12+
keepalive {
13+
{{- if $hasServerParameters }}
14+
server_parameters {
15+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge }}
16+
max_connection_age = {{ .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge | quote }}
17+
{{- end }}
18+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace }}
19+
max_connection_age_grace = {{ .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace | quote }}
20+
{{- end }}
21+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle }}
22+
max_connection_idle = {{ .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle | quote }}
23+
{{- end }}
24+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.time }}
25+
time = {{ .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.time | quote }}
26+
{{- end }}
27+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.timeout }}
28+
timeout = {{ .Values.deployment.otlp.receiver.grpc.keepalive.serverParameters.timeout | quote }}
29+
{{- end }}
30+
}
31+
{{- end }}
32+
{{- if $hasEnforcementPolicy }}
33+
enforcement_policy {
34+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.maxConnectionAge }}
35+
min_time = {{ .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.minTime | quote }}
36+
{{- end }}
37+
{{- if .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream }}
38+
permit_without_stream = {{ .Values.deployment.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream }}
39+
{{- end }}
40+
}
41+
{{- end }}
42+
}
43+
{{- end }}
44+
845
}
946

1047
// configures the default http/protobuf endpoint "0.0.0.0:4318"
@@ -24,6 +61,43 @@ otelcol.receiver.otlp "default" {
2461
// configures the default grpc endpoint "0.0.0.0:4317"
2562
grpc {
2663
max_recv_msg_size = {{ .Values.statefulset.otlp.receiver.grpc.max_recv_msg_size | quote }}
64+
65+
{{- $hasServerParameters := and .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters (or .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle) }}
66+
{{- $hasEnforcementPolicy := and .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy (or .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.minTime .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream) }}
67+
{{- if or $hasServerParameters $hasEnforcementPolicy }}
68+
keepalive {
69+
{{- if $hasServerParameters }}
70+
server_parameters {
71+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge }}
72+
max_connection_age = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAge | quote }}
73+
{{- end }}
74+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace }}
75+
max_connection_age_grace = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionAgeGrace | quote }}
76+
{{- end }}
77+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle }}
78+
max_connection_idle = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.maxConnectionIdle | quote }}
79+
{{- end }}
80+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.time }}
81+
time = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.time | quote }}
82+
{{- end }}
83+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.timeout }}
84+
timeout = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.serverParameters.timeout | quote }}
85+
{{- end }}
86+
}
87+
{{- end }}
88+
{{- if $hasEnforcementPolicy }}
89+
enforcement_policy {
90+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.maxConnectionAge }}
91+
min_time = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.minTime | quote }}
92+
{{- end }}
93+
{{- if .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream }}
94+
permit_without_stream = {{ .Values.statefulset.otlp.receiver.grpc.keepalive.enforcementPolicy.permitWithoutStream }}
95+
{{- end }}
96+
}
97+
{{- end }}
98+
}
99+
{{- end }}
100+
27101
}
28102

29103
output {

‎charts/grafana-sampling/values.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,34 @@ deployment:
7575
grpc:
7676
# -- gRPC max message receive size. Default to 4MB
7777
max_recv_msg_size: 4MB
78+
keepalive:
79+
serverParameters:
80+
# -- Maximum age for non-idle connections. Default is infinity.
81+
# @section -- Receivers: OTLP
82+
maxConnectionAge: ""
83+
# -- Time to wait before forcibly closing connections. Default is infinity.
84+
# @section -- Receivers: OTLP
85+
maxConnectionAgeGrace: ""
86+
# -- Maximum age for idle connections. Default is infinity.
87+
# @section -- Receivers: OTLP
88+
maxConnectionIdle: ""
89+
# -- How often to ping inactive clients to check for liveness. Default is 2 hours.
90+
# @section -- Receivers: OTLP
91+
time: ""
92+
# -- Time to wait before closing inactive clients that don’t respond to liveness checks.
93+
# Default is 20 seconds.
94+
# @section -- Receivers: OTLP
95+
timeout: ""
96+
97+
enforcementPolicy:
98+
# -- Minimum time clients should wait before sending a keepalive ping. Default is 5 minutes.
99+
# @section -- Receivers: OTLP
100+
minTime: ""
101+
102+
# -- Allow clients to send keepalive pings when there are no active streams.
103+
# @section -- Receivers: OTLP
104+
permitWithoutStream: false
105+
78106

79107
statefulset:
80108
otlp:
@@ -83,6 +111,33 @@ statefulset:
83111
grpc:
84112
# -- gRPC max message receive size. Default to 4MB
85113
max_recv_msg_size: 4MB
114+
keepalive:
115+
serverParameters:
116+
# -- Maximum age for non-idle connections. Default is infinity.
117+
# @section -- Receivers: OTLP
118+
maxConnectionAge: ""
119+
# -- Time to wait before forcibly closing connections. Default is infinity.
120+
# @section -- Receivers: OTLP
121+
maxConnectionAgeGrace: ""
122+
# -- Maximum age for idle connections. Default is infinity.
123+
# @section -- Receivers: OTLP
124+
maxConnectionIdle: ""
125+
# -- How often to ping inactive clients to check for liveness. Default is 2 hours.
126+
# @section -- Receivers: OTLP
127+
time: ""
128+
# -- Time to wait before closing inactive clients that don’t respond to liveness checks.
129+
# Default is 20 seconds.
130+
# @section -- Receivers: OTLP
131+
timeout: ""
132+
133+
enforcementPolicy:
134+
# -- Minimum time clients should wait before sending a keepalive ping. Default is 5 minutes.
135+
# @section -- Receivers: OTLP
136+
minTime: ""
137+
138+
# -- Allow clients to send keepalive pings when there are no active streams.
139+
# @section -- Receivers: OTLP
140+
permitWithoutStream: false
86141

87142
# @ignored Ignore alloy deployment
88143
alloy-deployment:

‎charts/grafana/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana
3-
version: 9.3.0
3+
version: 9.3.2
44
appVersion: 12.1.0
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.

‎charts/grafana/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,3 +795,6 @@ grafana.ini:
795795
alerting:
796796
enabled: false
797797
```
798+
799+
### Installing plugins
800+
For installing plugins please see the [official documentation](https://grafana.com/docs/grafana/latest/administration/plugin-management/#install-plugins-using-the-grafana-helm-chart).

‎charts/grafana/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ extraContainerVolumes: []
411411
# emptyDir: {}
412412

413413
## Enable persistence using Persistent Volume Claims
414-
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
414+
## ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/
415415
##
416416
persistence:
417417
type: pvc

0 commit comments

Comments
 (0)