Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add servicemonitor #29

Merged
merged 3 commits into from
Nov 13, 2023
Merged

add servicemonitor #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38f3bc3
add servicemonitor
doxthree Nov 13, 2023
699a028
increase chart testing version
doxthree Nov 13, 2023
9be88fb
add missing condition
doxthree Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
python-version: 3.7

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.0

- name: Run chart-testing (lint)
run: ct lint --validate-maintainers=false --charts charts/gdscan
Expand Down
2 changes: 1 addition & 1 deletion charts/gdscan/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ maintainers:
- name: G DATA CyberDefense AG
email: [email protected]
type: application
version: 1.2.0
version: 1.3.0
19 changes: 19 additions & 0 deletions charts/gdscan/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{- if .Values.metrics.servicemonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "gdscan.fullname" . }}
labels:
{{- include "gdscan.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
{{- include "gdscan.selectorLabels" . | nindent 8 }}
endpoints:
- port: {{ .Values.metrics.servicemonitor.port }}
path: {{ .Values.metrics.servicemonitor.path }}
scheme: {{ .Values.metrics.servicemonitor.scheme | quote }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
{{- end }}
12 changes: 10 additions & 2 deletions charts/gdscan/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ server:
image:
repository: ghcr.io/gdatasoftwareag/scanserver
pullPolicy: Always
tag: 1.7.2
tag: 1.8.0
client:
name: client
image:
repository: ghcr.io/gdatasoftwareag/scanclient
pullPolicy: Always
tag: 1.7.2
tag: 1.8.0
containerSecurityContext:
enabled: false
terminationGracePeriodSeconds: 30
Expand All @@ -31,6 +31,14 @@ service:
type: ""
port: 8080

metrics:
servicemonitor:
enabled: false
port: 8080
path: /metrics
scheme: http


ingress:
enabled: false
className: ""
Expand Down