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

feat: Add custom label support for ServiceMonitor in DataHub charts (#449) #450

Merged
merged 10 commits into from
May 28, 2024
Merged

feat: Add custom label support for ServiceMonitor in DataHub charts (#449) #450

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bac428a
feat(chart): add custom label support for ServiceMonitor in DataHub c…
Apr 2, 2024
48f35a9
feat(chart): add custom label support for ServiceMonitor in DataHub c…
Apr 2, 2024
610516a
feat(chart): add custom label support for ServiceMonitor in DataHub c…
Apr 2, 2024
b07c97c
Merge remote-tracking branch 'refs/remotes/origin/master' into featur…
Apr 14, 2024
2f1a7ec
Bumb chat version
Squallman Apr 16, 2024
43fcf36
Merge remote-tracking branch 'refs/remotes/origin/master' into featur…
Apr 24, 2024
5615323
Bump version
Apr 24, 2024
0a09be3
Merge remote-tracking branch 'origin/feature/449-enhance-service-moni…
Apr 24, 2024
6dccdb8
Bump version
Squallman May 27, 2024
2b8a151
feat: Add custom label support for ServiceMonitor in DataHub charts
Squallman May 27, 2024
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
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-frontend/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Current chart version is `0.2.0`
| serviceAccount.create | bool | `true` | |
| serviceAccount.name | string | `nil` | |
| serviceMonitor.create | bool | `false` | If set true and `global.datahub.monitoring.enablePrometheus` is set `true` it will create a ServiceMonitor resource |
| serviceMonitor.extraLabels | object | `{}` | |
| tolerations | list | `[]` | |
| global.elasticsearch.host | string | `"elasticsearch"` | |
| global.elasticsearch.port | string | `"9200"` | |
Expand Down
3 changes: 3 additions & 0 deletions charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
name: {{ printf "%s-%s" .Release.Name "datahub-frontend" }}
labels:
{{- include "datahub-frontend.labels" . | nindent 4 }}
{{- range $key, $val := .Values.serviceMonitor.extraLabels }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- with .Values.serviceMonitor.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-frontend/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ service:

serviceMonitor:
create: false
extraLabels: {}

ingress:
# className: ""
Expand Down
3 changes: 2 additions & 1 deletion charts/datahub/subcharts/datahub-gms/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Current chart version is `0.2.0`
| global.kafka.schemaregistry.url | string | `"http://schema-registry:8081"` | |
| global.neo4j.host | string | `"neo4j:7474"` | |
| global.neo4j.uri | string | `"bolt://neo4j"` | |
| global.neo4j.database | string | `"graph.db"` | Neo4J database |
| global.neo4j.database | string | `"graph.db"` | Neo4J database |
| global.neo4j.username | string | `"neo4j"` | |
| global.neo4j.password.secretRef | string | `"neo4j-secrets"` | |
| global.neo4j.password.secretKey | string | `"neo4j-password"` | |
Expand Down Expand Up @@ -72,6 +72,7 @@ Current chart version is `0.2.0`
| serviceAccount.create | bool | `true` | |
| serviceAccount.name | string | `nil` | |
| serviceMonitor.create | bool | `false` | If set true and `global.datahub.monitoring.enablePrometheus` is set `true` it will create a ServiceMonitor resource |
| serviceMonitor.extraLabels | object | `{}` | |
| tolerations | list | `[]` | |
| global.datahub.metadata_service_authentication.enabled | bool | `true` | Whether Metadata Service Authentication is enabled. |
| global.datahub.metadata_service_authentication.systemClientId | string | `"__datahub_system"` | The internal system id that is used to communicate with DataHub GMS. Required if metadata_service_authentication is 'true'. |
Expand Down
3 changes: 3 additions & 0 deletions charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
name: {{ printf "%s-%s" .Release.Name "datahub-gms" }}
labels:
{{- include "datahub-gms.labels" . | nindent 4 }}
{{- range $key, $val := .Values.serviceMonitor.extraLabels }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- with .Values.serviceMonitor.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-gms/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ serviceAccount:

serviceMonitor:
create: false
extraLabels: {}


podAnnotations: {}
Expand Down
Loading