From b969ce18a5ed005f3c40e8d0b8ef1e369d678348 Mon Sep 17 00:00:00 2001 From: travis-cook-sfdc <119886245+travis-cook-sfdc@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:44:16 -0800 Subject: [PATCH] feat: add `monitoring.portName` in values.yaml (#407) * feat: add `monitoring.portName` in values.yaml Add support for customizing the `portName` for monitoring. It is currently hardcoded to `jmx`. In our setup, the prometheus scraper is looking for ports that are called `prometheus`. This change allows this value to be customized to any value that is needed for a specific environment. If no value is provided, it remains `jmx`. --------- Co-authored-by: Travis Cook --- charts/datahub/Chart.yaml | 10 +- charts/datahub/README.md | 199 +++++++++--------- .../subcharts/datahub-frontend/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- .../datahub-frontend/templates/service.yaml | 4 +- .../templates/servicemonitor.yaml | 2 +- .../subcharts/datahub-frontend/values.yaml | 1 + .../datahub/subcharts/datahub-gms/Chart.yaml | 2 +- .../datahub-gms/templates/deployment.yaml | 2 +- .../datahub-gms/templates/service.yaml | 4 +- .../datahub-gms/templates/servicemonitor.yaml | 2 +- .../datahub/subcharts/datahub-gms/values.yaml | 1 + .../subcharts/datahub-mae-consumer/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- .../templates/service.yaml | 4 +- .../templates/servicemonitor.yaml | 2 +- .../datahub-mae-consumer/values.yaml | 1 + .../subcharts/datahub-mce-consumer/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- .../templates/service.yaml | 4 +- .../templates/servicemonitor.yaml | 2 +- .../datahub-mce-consumer/values.yaml | 1 + charts/datahub/values.yaml | 2 + 23 files changed, 131 insertions(+), 124 deletions(-) diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 722845e57..1116f7cea 100644 --- a/charts/datahub/Chart.yaml +++ b/charts/datahub/Chart.yaml @@ -4,25 +4,25 @@ 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.3.16 +version: 0.3.17 # 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.11.0 dependencies: - name: datahub-gms - version: 0.2.157 + version: 0.2.158 repository: file://./subcharts/datahub-gms condition: datahub-gms.enabled - name: datahub-frontend - version: 0.2.149 + version: 0.2.150 repository: file://./subcharts/datahub-frontend condition: datahub-frontend.enabled - name: datahub-mae-consumer - version: 0.2.151 + version: 0.2.152 repository: file://./subcharts/datahub-mae-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-mce-consumer - version: 0.2.153 + version: 0.2.154 repository: file://./subcharts/datahub-mce-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-ingestion-cron diff --git a/charts/datahub/README.md b/charts/datahub/README.md index 546ad43f0..023eecda8 100644 --- a/charts/datahub/README.md +++ b/charts/datahub/README.md @@ -18,105 +18,106 @@ helm install datahub datahub/datahub --values <> ## Chart Values -| Key | Type | Default | Description | -|-----|------|--------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| datahub-frontend.enabled | bool | `true` | Enable Datahub Front-end | -| datahub-frontend.image.repository | string | `"linkedin/datahub-frontend-react"` | Image repository for datahub-frontend | -| datahub-frontend.image.tag | string | `"v0.11.0"` | Image tag for datahub-frontend | -| datahub-frontend.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-frontend | -| datahub-gms.enabled | bool | `true` | Enable GMS | -| datahub-gms.image.repository | string | `"linkedin/datahub-gms"` | Image repository for datahub-gms | -| datahub-gms.image.tag | string | `"v0.11.0"` | Image tag for datahub-gms | -| datahub-gms.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-gms | -| datahub-mae-consumer.image.repository | string | `"linkedin/datahub-mae-consumer"` | Image repository for datahub-mae-consumer | -| datahub-mae-consumer.image.tag | string | `"v0.11.0"` | Image tag for datahub-mae-consumer | -| datahub-mae-consumer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-mae-consumer | -| datahub-mce-consumer.image.repository | string | `"linkedin/datahub-mce-consumer"` | Image repository for datahub-mce-consumer | -| datahub-mce-consumer.image.tag | string | `"v0.11.0"` | Image tag for datahub-mce-consumer | -| datahub-mce-consumer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-mce-consumer | -| datahub-ingestion-cron.enabled | bool | `false` | Enable cronjob for periodic ingestion | -| datahubUpgrade.podSecurityContext | object | `{}` | Pod security context for datahubUpgrade jobs | -| datahubUpgrade.securityContext | object | `{}` | Container security context for datahubUpgrade jobs | -| datahubUpgrade.podAnnotations | object | `{}` | Pod annotations for datahubUpgrade jobs | -| datahubUpgrade.cleanupJob.resources | object | '{}' | Kube Resource definitions for the datahub upgrade job 'cleanupJob' | -| datahubUpgrade.cleanupJob.concurrencyPolicy | string | `Allow, Forbid, Replace` | Add concurrencyPolicy for the clean up cron job | -| datahubUpgrade.cleanupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| datahubUpgrade.restoreIndices.resources | object | '{}' | Kube Resource definitions for the datahub upgrade job 'restore indices' | -| datahubUpgrade.restoreIndices.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| datahubUpgrade.restoreIndices.concurrencyPolicy | string | `Allow, Forbid, Replace` | Add concurrencyPolicy for the restoreIndicies cron job | -| elasticsearchSetupJob.enabled | bool | `true` | Enable setup job for elasicsearch | -| elasticsearchSetupJob.image.repository | string | `"linkedin/datahub-elasticsearch-setup"` | Image repository for elasticsearchSetupJob | -| elasticsearchSetupJob.image.tag | string | `"v0.11.0"` | Image repository for elasticsearchSetupJob | -| elasticsearchSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for elasticsearchSetupJob | -| elasticsearchSetupJob.resources | object | '{}' | Kube Resource definitions for elasticsearchSetupJob | -| elasticsearchSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for elasticsearchSetupJob | -| elasticsearchSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for elasticsearchSetupJob | -| elasticsearchSetupJob.podAnnotations | object | `{}` | Pod annotations for elasticsearchSetupJob | -| elasticsearchSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| kafkaSetupJob.enabled | bool | `true` | Enable setup job for kafka | -| kafkaSetupJob.image.repository | string | `"linkedin/datahub-kafka-setup"` | Image repository for kafkaSetupJob | -| kafkaSetupJob.image.tag | string | `"v0.11.0"` | Image repository for kafkaSetupJob | -| kafkaSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for kafkaSetupJob | -| kafkaSetupJob.resources | object | '{}' | Kube Resource definitions for kafkaSetupJob | -| kafkaSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for kafkaSetupJob | -| kafkaSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for kafkaSetupJob | -| kafkaSetupJob.podAnnotations | object | `{}` | Pod annotations for kafkaSetupJob | -| kafkaSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| mysqlSetupJob.enabled | bool | `false` | Enable setup job for mysql | -| mysqlSetupJob.image.repository | string | `"acryldata/datahub-mysql-setup"` | Image repository for mysqlSetupJob | -| mysqlSetupJob.image.tag | string | `"v0.11.0"` | Image repository for mysqlSetupJob | -| mysqlSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for mysqlSetupJob | -| mysqlSetupJob.resources | object | '{}' | Kube Resource definitions for mysqlSetupJob | -| mysqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob | -| mysqlSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for mysqlSetupJob | -| mysqlSetupJob.podAnnotations | object | `{}` | Pod annotations for mysqlSetupJob | -| mysqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| postgresqlSetupJob.enabled | bool | `false` | Enable setup job for postgresql | -| postgresqlSetupJob.image.repository | string | `"acryldata/datahub-postgres-setup"` | Image repository for postgresqlSetupJob | -| postgresqlSetupJob.image.tag | string | `"v0.11.0"` | Image repository for postgresqlSetupJob | -| postgresqlSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for postgresqlSetupJob | -| postgresqlSetupJob.resources | object | '{}' | Kube Resource definitions for postgresqlSetupJob | -| postgresqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob | -| postgresqlSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for mysqlSetupJob | -| postgresqlSetupJob.podAnnotations | object | `{}` | Pod annotations for mysqlSetupJob | -| postgresqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| datahubSystemUpdate.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | -| global.strict_mode | boolean | true | Enables validations in helm charts to ensure features work as expected. Recommended NOT TO CHANGE. | -| global.datahub_standalone_consumers_enabled | boolean | true | Enable standalone consumers for kafka | -| global.datahub_analytics_enabled | boolean | true | Enable datahub usage analytics | -| global.datahub.appVersion | string | `"1.0"` | App version for annotation | -| global.datahub.gms.port | string | `"8080"` | Port of GMS service | -| global.elasticsearch.host | string | `"elasticsearch-master"` | Elasticsearch host name (endpoint) | -| global.elasticsearch.port | string | `"9200"` | Elasticsearch port | -| global.kafka.bootstrap.server | string | `"prerequisites-broker:9092"` | Kafka bootstrap servers (with port) | -| global.kafka.zookeeper.server | string | `"prerequisites-zookeeper:2181"` | Kafka zookeeper servers (with port) | -| global.kafka.topics.metadata_change_event_name | string | `"MetadataChangeEvent_v4"` | Kafka topic name for Metadata Change Events (deprecated) | -| global.kafka.topics.failed_metadata_change_event_name | string | `"FailedMetadataChangeEvent_v4"` | Kafka topic name for Failed Metadata Change events (deprecated) | -| global.kafka.topics.metadata_audit_event_name | string | `"MetadataAuditEvent_v4"` | Kafka topic name for Metadata Audit events (deprecated) | -| global.kafka.topics.datahub_usage_event_name | string | `"DataHubUsageEvent_v1"` | Kafka topic name for DataHub Usage events | -| global.kafka.topics.metadata_change_proposal_topic_name | string | `"MetadataChangeProposal_v1"` | Kafka topic name for Metadata Change Proposal events | -| global.kafka.topics.failed_metadata_change_proposal_topic_name | string | `"FailedMetadataChangeProposal_v1"` | Kafka topic name for Failed Metadata Change Proposal events | -| global.kafka.topics.metadata_change_log_versioned_topic_name | string | `"MetadataChangeLog_Versioned_v1"` | Kafka topic name for Versioned Metadata Change Log events | -| global.kafka.topics.metadata_change_log_timeseries_topic_name | string | `"MetadataChangeLog_Timeseries_v1"` | Kafka topic name for Timeseries Metadata Change Log events | -| global.kafka.topics.platform_event_topic_name | string | `"PlatformEvent_v1"` | Kafka topic name for Platform events | -| global.kafka.schemaregistry.url | string | `` | URL to kafka schema registry if using `KAFKA` type | -| global.neo4j.host | string | `"prerequisites-neo4j:7474"` | Neo4j host address (with port) | -| global.neo4j.uri | string | `"bolt://prerequisites-neo4j"` | Neo4j URI | -| global.neo4j.username | string | `"neo4j"` | Neo4j user name | -| global.neo4j.password.secretRef | string | `"neo4j-secrets"` | Secret that contains the Neo4j password | -| global.neo4j.password.secretKey | string | `"neo4j-password"` | Secret key that contains the Neo4j password | -| global.sql.datasource.driver | string | `"com.mysql.cj.jdbc.Driver"` | Driver for the SQL database | -| global.sql.datasource.host | string | `"prerequisites-mysql:3306"` | SQL database host (with port) | -| global.sql.datasource.hostForMysqlClient | string | `"prerequisites-mysql"` | SQL database host (without port) | -| global.sql.datasource.port | string | `"3306"` | SQL database port | -| global.sql.datasource.url | string | `"jdbc:mysql://prerequisites-mysql:3306/datahub?verifyServerCertificate=false\u0026useSSL=true"` | URL to access SQL database | -| global.sql.datasource.username | string | `"root"` | SQL user name | -| global.sql.datasource.username.secretRef | string | `"mysql-secrets"` | Secret that contains the MySQL username | -| global.sql.datasource.username.secretKey | string | `"mysql-username"` | Secret key that contains the MySQL username | -| global.sql.datasource.password.secretRef | string | `"mysql-secrets"` | Secret that contains the MySQL password | -| global.sql.datasource.password.secretKey | string | `"mysql-password"` | Secret key that contains the MySQL password | -| global.sql.datasource.password.value | string | `"mysql-password"` | Alternative to using the secret above, uses raw string value instead | -| global.graph_service_impl | string | `elasticsearch` | One of `elasticsearch` or `neo4j`. Determines which backend to use for the GMS graph service. Elasticsearch is recommended for a simplified deployment. | +| Key | Type | Default | Description | +|----------------------------------------------------------------|---------|--------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------| +| datahub-frontend.enabled | bool | `true` | Enable Datahub Front-end | +| datahub-frontend.image.repository | string | `"linkedin/datahub-frontend-react"` | Image repository for datahub-frontend | +| datahub-frontend.image.tag | string | `"v0.11.0"` | Image tag for datahub-frontend | +| datahub-frontend.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-frontend | +| datahub-gms.enabled | bool | `true` | Enable GMS | +| datahub-gms.image.repository | string | `"linkedin/datahub-gms"` | Image repository for datahub-gms | +| datahub-gms.image.tag | string | `"v0.11.0"` | Image tag for datahub-gms | +| datahub-gms.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-gms | +| datahub-mae-consumer.image.repository | string | `"linkedin/datahub-mae-consumer"` | Image repository for datahub-mae-consumer | +| datahub-mae-consumer.image.tag | string | `"v0.11.0"` | Image tag for datahub-mae-consumer | +| datahub-mae-consumer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-mae-consumer | +| datahub-mce-consumer.image.repository | string | `"linkedin/datahub-mce-consumer"` | Image repository for datahub-mce-consumer | +| datahub-mce-consumer.image.tag | string | `"v0.11.0"` | Image tag for datahub-mce-consumer | +| datahub-mce-consumer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-mce-consumer | +| datahub-ingestion-cron.enabled | bool | `false` | Enable cronjob for periodic ingestion | +| datahubUpgrade.podSecurityContext | object | `{}` | Pod security context for datahubUpgrade jobs | +| datahubUpgrade.securityContext | object | `{}` | Container security context for datahubUpgrade jobs | +| datahubUpgrade.podAnnotations | object | `{}` | Pod annotations for datahubUpgrade jobs | +| datahubUpgrade.cleanupJob.resources | object | '{}' | Kube Resource definitions for the datahub upgrade job 'cleanupJob' | +| datahubUpgrade.cleanupJob.concurrencyPolicy | string | `Allow, Forbid, Replace` | Add concurrencyPolicy for the clean up cron job | +| datahubUpgrade.cleanupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| datahubUpgrade.restoreIndices.resources | object | '{}' | Kube Resource definitions for the datahub upgrade job 'restore indices' | +| datahubUpgrade.restoreIndices.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| datahubUpgrade.restoreIndices.concurrencyPolicy | string | `Allow, Forbid, Replace` | Add concurrencyPolicy for the restoreIndicies cron job | +| elasticsearchSetupJob.enabled | bool | `true` | Enable setup job for elasicsearch | +| elasticsearchSetupJob.image.repository | string | `"linkedin/datahub-elasticsearch-setup"` | Image repository for elasticsearchSetupJob | +| elasticsearchSetupJob.image.tag | string | `"v0.11.0"` | Image repository for elasticsearchSetupJob | +| elasticsearchSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for elasticsearchSetupJob | +| elasticsearchSetupJob.resources | object | '{}' | Kube Resource definitions for elasticsearchSetupJob | +| elasticsearchSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for elasticsearchSetupJob | +| elasticsearchSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for elasticsearchSetupJob | +| elasticsearchSetupJob.podAnnotations | object | `{}` | Pod annotations for elasticsearchSetupJob | +| elasticsearchSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| kafkaSetupJob.enabled | bool | `true` | Enable setup job for kafka | +| kafkaSetupJob.image.repository | string | `"linkedin/datahub-kafka-setup"` | Image repository for kafkaSetupJob | +| kafkaSetupJob.image.tag | string | `"v0.11.0"` | Image repository for kafkaSetupJob | +| kafkaSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for kafkaSetupJob | +| kafkaSetupJob.resources | object | '{}' | Kube Resource definitions for kafkaSetupJob | +| kafkaSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for kafkaSetupJob | +| kafkaSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for kafkaSetupJob | +| kafkaSetupJob.podAnnotations | object | `{}` | Pod annotations for kafkaSetupJob | +| kafkaSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| mysqlSetupJob.enabled | bool | `false` | Enable setup job for mysql | +| mysqlSetupJob.image.repository | string | `"acryldata/datahub-mysql-setup"` | Image repository for mysqlSetupJob | +| mysqlSetupJob.image.tag | string | `"v0.11.0"` | Image repository for mysqlSetupJob | +| mysqlSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for mysqlSetupJob | +| mysqlSetupJob.resources | object | '{}' | Kube Resource definitions for mysqlSetupJob | +| mysqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob | +| mysqlSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for mysqlSetupJob | +| mysqlSetupJob.podAnnotations | object | `{}` | Pod annotations for mysqlSetupJob | +| mysqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| postgresqlSetupJob.enabled | bool | `false` | Enable setup job for postgresql | +| postgresqlSetupJob.image.repository | string | `"acryldata/datahub-postgres-setup"` | Image repository for postgresqlSetupJob | +| postgresqlSetupJob.image.tag | string | `"v0.11.0"` | Image repository for postgresqlSetupJob | +| postgresqlSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for postgresqlSetupJob | +| postgresqlSetupJob.resources | object | '{}' | Kube Resource definitions for postgresqlSetupJob | +| postgresqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob | +| postgresqlSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for mysqlSetupJob | +| postgresqlSetupJob.podAnnotations | object | `{}` | Pod annotations for mysqlSetupJob | +| postgresqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| datahubSystemUpdate.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod | +| global.strict_mode | boolean | true | Enables validations in helm charts to ensure features work as expected. Recommended NOT TO CHANGE. | +| global.datahub_standalone_consumers_enabled | boolean | true | Enable standalone consumers for kafka | +| global.datahub_analytics_enabled | boolean | true | Enable datahub usage analytics | +| global.datahub.appVersion | string | `"1.0"` | App version for annotation | +| global.datahub.gms.port | string | `"8080"` | Port of GMS service | +| global.datahub.monitoring.portName | string | `jmx` | Name of Kube port for monitoring | +| global.elasticsearch.host | string | `"elasticsearch-master"` | Elasticsearch host name (endpoint) | +| global.elasticsearch.port | string | `"9200"` | Elasticsearch port | +| global.kafka.bootstrap.server | string | `"prerequisites-broker:9092"` | Kafka bootstrap servers (with port) | +| global.kafka.zookeeper.server | string | `"prerequisites-zookeeper:2181"` | Kafka zookeeper servers (with port) | +| global.kafka.topics.metadata_change_event_name | string | `"MetadataChangeEvent_v4"` | Kafka topic name for Metadata Change Events (deprecated) | +| global.kafka.topics.failed_metadata_change_event_name | string | `"FailedMetadataChangeEvent_v4"` | Kafka topic name for Failed Metadata Change events (deprecated) | +| global.kafka.topics.metadata_audit_event_name | string | `"MetadataAuditEvent_v4"` | Kafka topic name for Metadata Audit events (deprecated) | +| global.kafka.topics.datahub_usage_event_name | string | `"DataHubUsageEvent_v1"` | Kafka topic name for DataHub Usage events | +| global.kafka.topics.metadata_change_proposal_topic_name | string | `"MetadataChangeProposal_v1"` | Kafka topic name for Metadata Change Proposal events | +| global.kafka.topics.failed_metadata_change_proposal_topic_name | string | `"FailedMetadataChangeProposal_v1"` | Kafka topic name for Failed Metadata Change Proposal events | +| global.kafka.topics.metadata_change_log_versioned_topic_name | string | `"MetadataChangeLog_Versioned_v1"` | Kafka topic name for Versioned Metadata Change Log events | +| global.kafka.topics.metadata_change_log_timeseries_topic_name | string | `"MetadataChangeLog_Timeseries_v1"` | Kafka topic name for Timeseries Metadata Change Log events | +| global.kafka.topics.platform_event_topic_name | string | `"PlatformEvent_v1"` | Kafka topic name for Platform events | +| global.kafka.schemaregistry.url | string | `` | URL to kafka schema registry if using `KAFKA` type | +| global.neo4j.host | string | `"prerequisites-neo4j:7474"` | Neo4j host address (with port) | +| global.neo4j.uri | string | `"bolt://prerequisites-neo4j"` | Neo4j URI | +| global.neo4j.username | string | `"neo4j"` | Neo4j user name | +| global.neo4j.password.secretRef | string | `"neo4j-secrets"` | Secret that contains the Neo4j password | +| global.neo4j.password.secretKey | string | `"neo4j-password"` | Secret key that contains the Neo4j password | +| global.sql.datasource.driver | string | `"com.mysql.cj.jdbc.Driver"` | Driver for the SQL database | +| global.sql.datasource.host | string | `"prerequisites-mysql:3306"` | SQL database host (with port) | +| global.sql.datasource.hostForMysqlClient | string | `"prerequisites-mysql"` | SQL database host (without port) | +| global.sql.datasource.port | string | `"3306"` | SQL database port | +| global.sql.datasource.url | string | `"jdbc:mysql://prerequisites-mysql:3306/datahub?verifyServerCertificate=false\u0026useSSL=true"` | URL to access SQL database | +| global.sql.datasource.username | string | `"root"` | SQL user name | +| global.sql.datasource.username.secretRef | string | `"mysql-secrets"` | Secret that contains the MySQL username | +| global.sql.datasource.username.secretKey | string | `"mysql-username"` | Secret key that contains the MySQL username | +| global.sql.datasource.password.secretRef | string | `"mysql-secrets"` | Secret that contains the MySQL password | +| global.sql.datasource.password.secretKey | string | `"mysql-password"` | Secret key that contains the MySQL password | +| global.sql.datasource.password.value | string | `"mysql-password"` | Alternative to using the secret above, uses raw string value instead | +| global.graph_service_impl | string | `elasticsearch` | One of `elasticsearch` or `neo4j`. Determines which backend to use for the GMS graph service. Elasticsearch is recommended for a simplified deployment. | ## Optional Chart Values diff --git a/charts/datahub/subcharts/datahub-frontend/Chart.yaml b/charts/datahub/subcharts/datahub-frontend/Chart.yaml index 4c62836d6..6820c7824 100644 --- a/charts/datahub/subcharts/datahub-frontend/Chart.yaml +++ b/charts/datahub/subcharts/datahub-frontend/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes 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.2.149 +version: 0.2.150 # 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: v0.11.0 diff --git a/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml b/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml index 8bc60ebb5..e480eed58 100644 --- a/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml @@ -75,7 +75,7 @@ spec: containerPort: {{ .Values.service.containerPort }} protocol: TCP {{- if or .Values.global.datahub.monitoring.enablePrometheus .Values.global.datahub.monitoring.enableJMXPort }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} containerPort: 4318 protocol: TCP {{- end }} diff --git a/charts/datahub/subcharts/datahub-frontend/templates/service.yaml b/charts/datahub/subcharts/datahub-frontend/templates/service.yaml index 4a46cc0fb..798749429 100644 --- a/charts/datahub/subcharts/datahub-frontend/templates/service.yaml +++ b/charts/datahub/subcharts/datahub-frontend/templates/service.yaml @@ -21,9 +21,9 @@ spec: {{- end }} {{- end }} {{- if .Values.global.datahub.monitoring.enablePrometheus }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} port: 4318 - targetPort: jmx + targetPort: {{ .Values.global.datahub.monitoring.portName }} protocol: TCP {{- end }} selector: diff --git a/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml index 5df3ce9be..8e3a7e5fb 100644 --- a/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-frontend/templates/servicemonitor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} spec: endpoints: - - port: jmx + - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - separator: / sourceLabels: diff --git a/charts/datahub/subcharts/datahub-frontend/values.yaml b/charts/datahub/subcharts/datahub-frontend/values.yaml index 7b212bf0f..79d9c8bb5 100644 --- a/charts/datahub/subcharts/datahub-frontend/values.yaml +++ b/charts/datahub/subcharts/datahub-frontend/values.yaml @@ -233,6 +233,7 @@ global: port: "8080" monitoring: enablePrometheus: true + portName: "jmx" appVersion: "1.0" frontend: validateSignUpEmail: true diff --git a/charts/datahub/subcharts/datahub-gms/Chart.yaml b/charts/datahub/subcharts/datahub-gms/Chart.yaml index ae318fa55..b494fcc1f 100644 --- a/charts/datahub/subcharts/datahub-gms/Chart.yaml +++ b/charts/datahub/subcharts/datahub-gms/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for LinkedIn DataHub's datahub-gms component 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.2.157 +version: 0.2.158 # 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: v0.11.0 diff --git a/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml b/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml index 6c97f868d..57cc865b6 100644 --- a/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-gms/templates/deployment.yaml @@ -77,7 +77,7 @@ spec: containerPort: 8080 protocol: TCP {{- if or .Values.global.datahub.monitoring.enablePrometheus .Values.global.datahub.monitoring.enableJMXPort }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} containerPort: 4318 protocol: TCP {{- end }} diff --git a/charts/datahub/subcharts/datahub-gms/templates/service.yaml b/charts/datahub/subcharts/datahub-gms/templates/service.yaml index dbc400955..b040c4ac1 100644 --- a/charts/datahub/subcharts/datahub-gms/templates/service.yaml +++ b/charts/datahub/subcharts/datahub-gms/templates/service.yaml @@ -21,9 +21,9 @@ spec: {{- end }} {{- end }} {{- if .Values.global.datahub.monitoring.enablePrometheus }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} port: 4318 - targetPort: jmx + targetPort: {{ .Values.global.datahub.monitoring.portName }} protocol: TCP {{- end }} selector: diff --git a/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml index bf1bc4996..68436feb5 100644 --- a/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-gms/templates/servicemonitor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} spec: endpoints: - - port: jmx + - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - separator: / sourceLabels: diff --git a/charts/datahub/subcharts/datahub-gms/values.yaml b/charts/datahub/subcharts/datahub-gms/values.yaml index ece6809c0..96110be70 100644 --- a/charts/datahub/subcharts/datahub-gms/values.yaml +++ b/charts/datahub/subcharts/datahub-gms/values.yaml @@ -194,6 +194,7 @@ global: monitoring: enablePrometheus: false enableJMXPort: false + portName: jmx gms: port: "8080" appVersion: "1.0" diff --git a/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml b/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml index e14c2c969..f9e738e2a 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes 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.2.151 +version: 0.2.152 # 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: v0.11.0 diff --git a/charts/datahub/subcharts/datahub-mae-consumer/templates/deployment.yaml b/charts/datahub/subcharts/datahub-mae-consumer/templates/deployment.yaml index 6e9bac576..74e33d0a8 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: containerPort: 9091 protocol: TCP {{- if or .Values.global.datahub.monitoring.enablePrometheus .Values.global.datahub.monitoring.enableJMXPort }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} containerPort: 4318 protocol: TCP {{- end }} diff --git a/charts/datahub/subcharts/datahub-mae-consumer/templates/service.yaml b/charts/datahub/subcharts/datahub-mae-consumer/templates/service.yaml index 9bba91be5..36adf3e50 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/templates/service.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/templates/service.yaml @@ -17,9 +17,9 @@ spec: {{- end }} {{- end }} {{- if .Values.global.datahub.monitoring.enablePrometheus }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} port: 4318 - targetPort: jmx + targetPort: {{ .Values.global.datahub.monitoring.portName }} protocol: TCP {{- end }} selector: diff --git a/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml index 450fe182b..4b9ce522e 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/templates/servicemonitor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} spec: endpoints: - - port: jmx + - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - separator: / sourceLabels: diff --git a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml index 89efaf0ce..2639188ae 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml @@ -205,6 +205,7 @@ global: port: "8080" monitoring: enablePrometheus: false + portName: jmx systemUpdate: ## The following options control settings for datahub-upgrade job which will diff --git a/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml b/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml index f3212a5b6..9da495f5b 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes 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.2.153 +version: 0.2.154 # 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: v0.11.0 diff --git a/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml b/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml index daca75de9..f8c201363 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml @@ -72,7 +72,7 @@ spec: containerPort: 9090 protocol: TCP {{- if or .Values.global.datahub.monitoring.enablePrometheus .Values.global.datahub.monitoring.enableJMXPort }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} containerPort: 4318 protocol: TCP {{- end }} diff --git a/charts/datahub/subcharts/datahub-mce-consumer/templates/service.yaml b/charts/datahub/subcharts/datahub-mce-consumer/templates/service.yaml index 67cd48d98..f9a908a9e 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/templates/service.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/templates/service.yaml @@ -17,9 +17,9 @@ spec: {{- end }} {{- end }} {{- if .Values.global.datahub.monitoring.enablePrometheus }} - - name: jmx + - name: {{ .Values.global.datahub.monitoring.portName }} port: 4318 - targetPort: jmx + targetPort: {{ .Values.global.datahub.monitoring.portName }} protocol: TCP {{- end }} selector: diff --git a/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml b/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml index 0e0a54ad3..bdc753141 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/templates/servicemonitor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} spec: endpoints: - - port: jmx + - port: {{ .Values.global.datahub.monitoring.portName }} relabelings: - separator: / sourceLabels: diff --git a/charts/datahub/subcharts/datahub-mce-consumer/values.yaml b/charts/datahub/subcharts/datahub-mce-consumer/values.yaml index 26ee4221c..f8c45f7b9 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/values.yaml @@ -191,6 +191,7 @@ global: version: head monitoring: enablePrometheus: false + portName: jmx gms: port: "8080" metadata_service_authentication: diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml index 25dc9977a..6f7e8084e 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -588,6 +588,8 @@ global: monitoring: enablePrometheus: true + # Set a custom name for the monitoring port + portName: jmx mae_consumer: port: "9091"