Skip to content

Commit 09b00b7

Browse files
anthonycorbachoanthonycorbacho
committed
chore: update grafana
1 parent b3932f8 commit 09b00b7

43 files changed

Lines changed: 2101 additions & 395 deletions

Some content is hidden

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

‎kit/grpc/grpc.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
1010
grpcvalidator "github.com/grpc-ecosystem/go-grpc-middleware/validator"
1111
grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
12-
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
1312
"google.golang.org/grpc"
1413
"google.golang.org/grpc/codes"
1514
"google.golang.org/grpc/status"
@@ -24,13 +23,11 @@ func NewServer(opts ...grpc.ServerOption) *grpc.Server {
2423
// interpreter call chain is from left to right.
2524
serverOpts := []grpc.ServerOption{
2625
grpc.ChainStreamInterceptor(
27-
otelgrpc.StreamServerInterceptor(),
2826
grpcrecovery.StreamServerInterceptor(grpcrecovery.WithRecoveryHandlerContext(recoverFrom(log.L()))),
2927
grpcprometheus.StreamServerInterceptor,
3028
grpcvalidator.StreamServerInterceptor(),
3129
),
3230
grpc.ChainUnaryInterceptor(
33-
otelgrpc.UnaryServerInterceptor(),
3431
grpcrecovery.UnaryServerInterceptor(grpcrecovery.WithRecoveryHandlerContext(recoverFrom(log.L()))),
3532
grpcprometheus.UnaryServerInterceptor,
3633
grpcvalidator.UnaryServerInterceptor(),
@@ -60,19 +57,17 @@ func NewClient(addr string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
6057
// interpreter call chain is from left to right.
6158
dialOps := []grpc.DialOption{
6259
grpc.WithChainUnaryInterceptor(
63-
otelgrpc.UnaryClientInterceptor(),
6460
grpcretry.UnaryClientInterceptor(),
6561
grpcprometheus.UnaryClientInterceptor,
6662
grpcvalidator.UnaryClientInterceptor(),
6763
),
6864
grpc.WithChainStreamInterceptor(
69-
otelgrpc.StreamClientInterceptor(),
7065
grpcretry.StreamClientInterceptor(),
7166
grpcprometheus.StreamClientInterceptor,
7267
),
7368
}
7469
dialOps = append(dialOps, opts...)
75-
return grpc.Dial(addr, dialOps...)
70+
return grpc.NewClient(addr, dialOps...)
7671
}
7772

7873
// WithMaxRetries sets the maximum number of retries on this call, or this interceptor.

‎overlays/local-foundation/grafana/charts/grafana/Chart.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
annotations:
2+
artifacthub.io/license: Apache-2.0
23
artifacthub.io/links: |
34
- name: Chart Source
45
url: https://github.com/grafana/helm-charts
56
- name: Upstream Project
67
url: https://github.com/grafana/grafana
78
apiVersion: v2
8-
appVersion: 9.5.5
9+
appVersion: 12.3.1
910
description: The leading tool for querying and visualizing time series and metrics.
10-
home: https://grafana.net
11-
icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
11+
home: https://grafana.com
12+
icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116
13+
keywords:
14+
- monitoring
15+
- metric
1216
kubeVersion: ^1.8.0-0
1317
maintainers:
1418
- email: zanhsieh@gmail.com
@@ -21,9 +25,13 @@ maintainers:
2125
name: Xtigyro
2226
- email: mail@torstenwalter.de
2327
name: torstenwalter
28+
- email: github@jkroepke.de
29+
name: jkroepke
30+
- email: quentin.bisson@gmail.com
31+
name: QuentinBisson
2432
name: grafana
2533
sources:
2634
- https://github.com/grafana/grafana
2735
- https://github.com/grafana/helm-charts
2836
type: application
29-
version: 6.57.4
37+
version: 10.5.13

‎overlays/local-foundation/grafana/charts/grafana/README.md‎

Lines changed: 172 additions & 34 deletions
Large diffs are not rendered by default.

‎overlays/local-foundation/grafana/charts/grafana/ci/with-image-renderer-values.yaml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,91 @@ imageRenderer:
1717
requests:
1818
cpu: 500m
1919
memory: 50Mi
20+
extraVolumes:
21+
- name: empty-renderer-volume
22+
emtpyDir: {}
23+
extraVolumeMounts:
24+
- mountPath: /tmp/renderer
25+
name: empty-renderer-volume
26+
extraConfigmapMounts:
27+
- name: renderer-config
28+
mountPath: /usr/src/app/config.json
29+
subPath: renderer-config.json
30+
configMap: image-renderer-config
31+
extraSecretMounts:
32+
- name: renderer-certificate
33+
mountPath: /usr/src/app/certs/
34+
secretName: image-renderer-certificate
35+
readOnly: true
36+
37+
extraObjects:
38+
- apiVersion: v1
39+
kind: ConfigMap
40+
metadata:
41+
name: image-renderer-config
42+
data:
43+
renderer-config.json: |
44+
{
45+
"service": {
46+
"host": null,
47+
"port": 8081,
48+
"protocol": "http",
49+
"certFile": "",
50+
"certKey": "",
51+
52+
"metrics": {
53+
"enabled": true,
54+
"collectDefaultMetrics": true,
55+
"requestDurationBuckets": [1, 5, 7, 9, 11, 13, 15, 20, 30]
56+
},
57+
58+
"logging": {
59+
"level": "info",
60+
"console": {
61+
"json": true,
62+
"colorize": false
63+
}
64+
},
65+
66+
"security": {
67+
"authToken": "-"
68+
}
69+
},
70+
"rendering": {
71+
"chromeBin": null,
72+
"args": ["--no-sandbox", "--disable-gpu"],
73+
"ignoresHttpsErrors": false,
74+
75+
"timezone": null,
76+
"acceptLanguage": null,
77+
"width": 1000,
78+
"height": 500,
79+
"deviceScaleFactor": 1,
80+
"maxWidth": 3080,
81+
"maxHeight": 3000,
82+
"maxDeviceScaleFactor": 4,
83+
"pageZoomLevel": 1,
84+
"headed": false,
85+
86+
"mode": "default",
87+
"emulateNetworkConditions": false,
88+
"clustering": {
89+
"monitor": false,
90+
"mode": "browser",
91+
"maxConcurrency": 5,
92+
"timeout": 30
93+
},
94+
95+
"verboseLogging": false,
96+
"dumpio": false,
97+
"timingMetrics": false
98+
}
99+
}
100+
- apiVersion: v1
101+
kind: Secret
102+
metadata:
103+
name: image-renderer-certificate
104+
type: Opaque
105+
data:
106+
# Decodes to 'PLACEHOLDER CERTIFICATE'
107+
not-a-real-certificate: UExBQ0VIT0xERVIgQ0VSVElGSUNBVEU=

‎overlays/local-foundation/grafana/charts/grafana/ci/with-nondefault-values.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
global:
2+
environment: prod
3+
ingress:
4+
enabled: true
5+
hosts:
6+
- monitoring-{{ .Values.global.environment }}.example.com
7+
8+
route:
9+
main:
10+
enabled: true
11+
labels:
12+
app: monitoring-prometheus
13+
hostnames:
14+
- "*.example.com"
15+
- "{{ .Values.global.environment }}.example.com"
16+
filters:
17+
- type: RequestHeaderModifier
18+
requestHeaderModifier:
19+
set:
20+
- name: my-header-name
21+
value: my-new-header-value
22+
additionalRules:
23+
- filters:
24+
- type: RequestHeaderModifier
25+
requestHeaderModifier:
26+
set:
27+
- name: my-header-name
28+
value: my-new-header-value
29+
matches:
30+
- path:
31+
type: PathPrefix
32+
value: /foo/

‎overlays/local-foundation/grafana/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
extraObjects:
2+
- apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: '{{ include "grafana.fullname" . }}-test'
6+
data:
7+
var1: "value1"
8+
- apiVersion: v1
9+
kind: Secret
10+
metadata:
11+
name: '{{ include "grafana.fullname" . }}-test'
12+
type: Opaque
13+
data:
14+
var2: "dmFsdWUy"
15+
16+
sidecar:
17+
alerts:
18+
enabled: true
19+
envValueFrom:
20+
VAR1:
21+
configMapKeyRef:
22+
name: '{{ include "grafana.fullname" . }}-test'
23+
key: var1
24+
VAR2:
25+
secretKeyRef:
26+
name: '{{ include "grafana.fullname" . }}-test'
27+
key: var2
28+
VAR3:
29+
fieldRef:
30+
apiVersion: v1
31+
fieldPath: metadata.namespace
32+
dashboards:
33+
enabled: true
34+
envValueFrom:
35+
VAR1:
36+
configMapKeyRef:
37+
name: '{{ include "grafana.fullname" . }}-test'
38+
key: var1
39+
VAR2:
40+
secretKeyRef:
41+
name: '{{ include "grafana.fullname" . }}-test'
42+
key: var2
43+
datasources:
44+
enabled: true
45+
envValueFrom:
46+
VAR1:
47+
configMapKeyRef:
48+
name: '{{ include "grafana.fullname" . }}-test'
49+
key: var1
50+
VAR2:
51+
secretKeyRef:
52+
name: '{{ include "grafana.fullname" . }}-test'
53+
key: var2

‎overlays/local-foundation/grafana/charts/grafana/templates/NOTES.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
3. Login with the password from step 1 and the username: {{ .Values.adminUser }}
4949

50-
{{- if not .Values.persistence.enabled }}
50+
{{- if and (not .Values.persistence.enabled) (not .Values.persistence.disableWarning) }}
5151
#################################################################################
5252
###### WARNING: Persistence is disabled!!! You will lose your data when #####
5353
###### the Grafana pod is terminated. #####

0 commit comments

Comments
 (0)