DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases 1 Wiki Activity

fix(blocky): fix GUI apiurl and prometheus metrics (#3908)

Browse Source 
* chore(blocky): bump blocky

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update _webui.tpl

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Create servicemonitor.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update common.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update _blockyConfig.tpl

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update questions.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update values.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Create prometheusrules.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update common.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update _blockyConfig.tpl

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
This commit is contained in:
Kjeld Schouten-Lebbing
2022-09-26 13:35:03 +02:00
committed by GitHub
parent 9b5c5ed8cd
commit 61731554e8
8 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/enterprise/blocky/templates/_blockyConfig.tpl
-2
View File
@@ -22,11 +22,9 @@ redis:
required: true
connectionAttempts: 10
connectionCooldown: 3s
{{- if .Values.blocky.enablePrometheus }}
prometheus:
enable: true
path: /metrics
{{- end }}
upstream:
default:
{{- .Values.defaultUpstreams | toYaml | nindent 8 }}
charts/enterprise/blocky/templates/_webui.tpl
+1 -1
View File
@@ -36,12 +36,12 @@ startupProbe:
env:
- name: NODE_ENV
value: "production"
{{- $url := .Values.webUI.apiURL }}
{{- if .Values.ingress.main.enabled }}
{{- with (first .Values.ingress.main.hosts) }}
{{- $url = ( printf "https://%s" .host ) }}
{{- end }}
{{- else }}
{{- $url = .Values.webUI.apiURL }}
{{- end }}
- name: API_URL
value: "{{ $url }}"
charts/enterprise/blocky/templates/common.yaml
+1 -1
View File
@@ -34,7 +34,7 @@ volumeSpec:
{{- $_ := set .Values.podAnnotations "prometheus.io/scrape" "true" -}}
{{- $_ := set .Values.podAnnotations "prometheus.io/path" "/metrics" -}}
{{- $_ := set .Values.podAnnotations "prometheus.io/port" (.Values.service.http.ports.http.targetPort | toString) -}}
{{- $_ := set .Values.podAnnotations "prometheus.io/port" (.Values.service.http.ports.http.port | toString) -}}
{{- if .Values.webUI.enabled -}}
{{- $_ := set .Values.additionalContainers "frontend" (include "blocky.frontend" . | fromYaml) -}}
charts/enterprise/blocky/templates/prometheusrules.yaml
+18
View File
@@ -0,0 +1,18 @@
{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "tc.common.names.fullname" . }}
rules:
{{- with .Values.metrics.prometheusRule.rules }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
charts/enterprise/blocky/templates/servicemonitor.yaml
+24
View File
@@ -0,0 +1,24 @@
{{- if .Values.metrics.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: {{ .Values.service.http.ports.http.port }}
{{- with .Values.metrics.serviceMonitor.interval }}
interval: {{ . }}
{{- end }}
{{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ . }}
{{- end }}
path: /metrics
{{- end }}