Skip to content

Commit

Permalink
feat: Add custom label support for ServiceMonitor in DataHub charts (#…
Browse files Browse the repository at this point in the history 
…449) (#450)

* feat(chart): add custom label support for ServiceMonitor in DataHub charts

This update allows the specification of custom labels for ServiceMonitor resources via the values.yaml file, mirroring the functionality already present for Service and Deployment resources. This enhancement facilitates better integration with monitoring systems like Prometheus that rely on specific labeling conventions for service discovery.

Resolves: #449

* feat(chart): add custom label support for ServiceMonitor in DataHub charts

This update allows the specification of custom labels for ServiceMonitor resources via the values.yaml file, mirroring the functionality already present for Service and Deployment resources. This enhancement facilitates better integration with monitoring systems like Prometheus that rely on specific labeling conventions for service discovery.

Resolves: #449

* feat(chart): add custom label support for ServiceMonitor in DataHub charts

This update allows the specification of custom labels for ServiceMonitor resources via the values.yaml file, mirroring the functionality already present for Service and Deployment resources. This enhancement facilitates better integration with monitoring systems like Prometheus that rely on specific labeling conventions for service discovery.

Resolves: #449

* Bumb chat version

* Bump version

* feat: Add custom label support for ServiceMonitor in DataHub charts

---------

Co-authored-by: Serhii Shepel <[email protected]>
  • Loading branch information
@Squallman
Squallman and Serhii Shepel authored May 28, 2024
1 parent 0c235ee commit 2b1d1ab
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion charts/datahub/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Helm chart for LinkedIn DataHub
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.4.14
version: 0.4.15
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 0.13.2
Expand Down
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-frontend/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ serviceAccount:

serviceMonitor:
create: false
extraLabels: {}


podAnnotations: {}
Expand Down
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-mae-consumer/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,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 | `[]` | |
| 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-mae-consumer/templates/servicemonitor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
name: {{ printf "%s-%s" .Release.Name "datahub-mae-consumer" }}
labels:
{{- include "datahub-mae-consumer.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-mae-consumer/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ serviceAccount:

serviceMonitor:
create: false
extraLabels: {}

podAnnotations: {}
# co.elastic.logs/enabled: "true"
Expand Down
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-mce-consumer/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,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 | `[]` | |
| 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-mce-consumer/templates/servicemonitor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
name: {{ printf "%s-%s" .Release.Name "datahub-mce-consumer" }}
labels:
{{- include "datahub-mce-consumer.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-mce-consumer/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ service:

serviceMonitor:
create: false
extraLabels: {}

ingress:
enabled: false
Expand Down

0 comments on commit 2b1d1ab

Please sign in to comment.