From d75b99aa79c11105a702c0a8d4fa3853cb5dad06 Mon Sep 17 00:00:00 2001 From: Jawad S Date: Tue, 27 Aug 2024 15:25:34 +0200 Subject: [PATCH 1/3] feat(grafana): add support for overriding the call back url and server urls This feature allows for running Grafana and remote image renderer in different namespaces. It is especially useful when you have multiple grafana instances in different clusters and namespaces and you want . them to use same remote image renderer. Signed-off-by: Jawad S --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 2 ++ charts/grafana/templates/_pod.tpl | 8 ++++++++ charts/grafana/values.yaml | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index d463903c3c..80c05b41a8 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.4.8 +version: 8.5.0 appVersion: 11.1.4 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/README.md b/charts/grafana/README.md index 1ce98bfd30..2c9609e122 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -292,6 +292,8 @@ need to instead set `global.imageRegistry`. | `imageRenderer.service.targetPort` | image-renderer service port used by service | `8081` | | `imageRenderer.appProtocol` | Adds the appProtocol field to the service | `` | | `imageRenderer.grafanaSubPath` | Grafana sub path to use for image renderer callback url | `''` | +| `imageRenderer.serverURL` | Remote image renderer url | `''` | +| `imageRenderer.renderingCallbackURL` | Callback url for the Grafana image renderer | `''` | | `imageRenderer.podPortName` | name of the image-renderer port on the pod | `http` | | `imageRenderer.revisionHistoryLimit` | number of image-renderer replica sets to keep | `10` | | `imageRenderer.networkPolicy.limitIngress` | Enable a NetworkPolicy to limit inbound traffic from only the created grafana pods | `true` | diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl index c74e9ddcac..b3f51ef271 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -1059,9 +1059,17 @@ containers: {{- end }} {{- if .Values.imageRenderer.enabled }} - name: GF_RENDERING_SERVER_URL + {{- if .Values.imageRenderer.serverURL }} + value: {{ .Values.imageRenderer.serverURL | quote }} + {{ else }} value: http://{{ include "grafana.fullname" . }}-image-renderer.{{ include "grafana.namespace" . }}:{{ .Values.imageRenderer.service.port }}/render + {{- end }} - name: GF_RENDERING_CALLBACK_URL + {{- if .Values.imageRenderer.renderingCallbackURL }} + value: {{ .Values.imageRenderer.renderingCallbackURL | quote }} + {{ else }} value: {{ .Values.imageRenderer.grafanaProtocol }}://{{ include "grafana.fullname" . }}.{{ include "grafana.namespace" . }}:{{ .Values.service.port }}/{{ .Values.imageRenderer.grafanaSubPath }} + {{- end }} {{- end }} - name: GF_PATHS_DATA value: {{ (get .Values "grafana.ini").paths.data }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index ba7dd3fd28..51e94e01ff 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -1160,6 +1160,10 @@ imageRenderer: targetCPU: "60" targetMemory: "" behavior: {} + # The url of remote image renderer if it is not in the same namespace with the grafana instance + serverURL: "" + # The callback url of grafana instances if it is not in the same namespace with the remote image renderer + renderingCallbackURL: "" image: # -- The Docker registry registry: docker.io From 39f0ef0d6b78d09849940de1269df38661edbe1e Mon Sep 17 00:00:00 2001 From: dig-whois <175815684+dig-whois@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:05:50 +0200 Subject: [PATCH 2/3] Update charts/grafana/templates/_pod.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan-Otto Kröpke Signed-off-by: dig-whois <175815684+dig-whois@users.noreply.github.com> --- charts/grafana/templates/_pod.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl index b3f51ef271..a50368f238 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -1061,7 +1061,7 @@ containers: - name: GF_RENDERING_SERVER_URL {{- if .Values.imageRenderer.serverURL }} value: {{ .Values.imageRenderer.serverURL | quote }} - {{ else }} + {{- else }} value: http://{{ include "grafana.fullname" . }}-image-renderer.{{ include "grafana.namespace" . }}:{{ .Values.imageRenderer.service.port }}/render {{- end }} - name: GF_RENDERING_CALLBACK_URL From 4c984bce220ea557dc2bb31e6046bfdf214677bf Mon Sep 17 00:00:00 2001 From: dig-whois <175815684+dig-whois@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:05:57 +0200 Subject: [PATCH 3/3] Update charts/grafana/templates/_pod.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan-Otto Kröpke Signed-off-by: dig-whois <175815684+dig-whois@users.noreply.github.com> --- charts/grafana/templates/_pod.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl index a50368f238..716e27d022 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -1067,7 +1067,7 @@ containers: - name: GF_RENDERING_CALLBACK_URL {{- if .Values.imageRenderer.renderingCallbackURL }} value: {{ .Values.imageRenderer.renderingCallbackURL | quote }} - {{ else }} + {{- else }} value: {{ .Values.imageRenderer.grafanaProtocol }}://{{ include "grafana.fullname" . }}.{{ include "grafana.namespace" . }}:{{ .Values.service.port }}/{{ .Values.imageRenderer.grafanaSubPath }} {{- end }} {{- end }}