diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 14c32845a..df81a85d7 100644 --- a/charts/datahub/Chart.yaml +++ b/charts/datahub/Chart.yaml @@ -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 diff --git a/charts/datahub/subcharts/datahub-frontend/README.md b/charts/datahub/subcharts/datahub-frontend/README.md index caf930ca9..46ea4139d 100644 --- a/charts/datahub/subcharts/datahub-frontend/README.md +++ b/charts/datahub/subcharts/datahub-frontend/README.md @@ -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"` | | diff --git a/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml index 8e3a7e5fb..44455da3e 100644 --- a/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml @@ -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 }} diff --git a/charts/datahub/subcharts/datahub-frontend/values.yaml b/charts/datahub/subcharts/datahub-frontend/values.yaml index 7afa08d73..05666bb52 100644 --- a/charts/datahub/subcharts/datahub-frontend/values.yaml +++ b/charts/datahub/subcharts/datahub-frontend/values.yaml @@ -61,6 +61,7 @@ service: serviceMonitor: create: false + extraLabels: {} ingress: # className: "" diff --git a/charts/datahub/subcharts/datahub-gms/README.md b/charts/datahub/subcharts/datahub-gms/README.md index a11bebf48..b9ef26a10 100644 --- a/charts/datahub/subcharts/datahub-gms/README.md +++ b/charts/datahub/subcharts/datahub-gms/README.md @@ -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"` | | @@ -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'. | diff --git a/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml index 68436feb5..b8e5bf922 100644 --- a/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml @@ -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 }} diff --git a/charts/datahub/subcharts/datahub-gms/values.yaml b/charts/datahub/subcharts/datahub-gms/values.yaml index c1e023da3..868cc48d5 100644 --- a/charts/datahub/subcharts/datahub-gms/values.yaml +++ b/charts/datahub/subcharts/datahub-gms/values.yaml @@ -32,6 +32,7 @@ serviceAccount: serviceMonitor: create: false + extraLabels: {} podAnnotations: {} diff --git a/charts/datahub/subcharts/datahub-mae-consumer/README.md b/charts/datahub/subcharts/datahub-mae-consumer/README.md index b52e776e0..f97d73b44 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/README.md +++ b/charts/datahub/subcharts/datahub-mae-consumer/README.md @@ -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'. | diff --git a/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml index 4b9ce522e..c237ba247 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml @@ -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 }} diff --git a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml index a0c8aa52e..387ed2234 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml @@ -32,6 +32,7 @@ serviceAccount: serviceMonitor: create: false + extraLabels: {} podAnnotations: {} # co.elastic.logs/enabled: "true" diff --git a/charts/datahub/subcharts/datahub-mce-consumer/README.md b/charts/datahub/subcharts/datahub-mce-consumer/README.md index 32e0eedec..cf7eb63ab 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/README.md +++ b/charts/datahub/subcharts/datahub-mce-consumer/README.md @@ -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'. | diff --git a/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml index bdc753141..ceeffa662 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml @@ -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 }} diff --git a/charts/datahub/subcharts/datahub-mce-consumer/values.yaml b/charts/datahub/subcharts/datahub-mce-consumer/values.yaml index 285ac670c..0ac6be23d 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/values.yaml @@ -56,6 +56,7 @@ service: serviceMonitor: create: false + extraLabels: {} ingress: enabled: false