This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 98ca28d NIFI-6083 - Improving documentation for Kafka Service Name
property
98ca28d is described below
commit 98ca28d50ddf67ee77c6212ac1da75aa62a3c633
Author: pushpavanthar <[email protected]>
AuthorDate: Tue Mar 12 01:08:32 2019 +0530
NIFI-6083 - Improving documentation for Kafka Service Name property
This closes #3365.
Signed-off-by: Bryan Bende <[email protected]>
---
.../java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java | 2 +-
.../org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java | 3 ++-
.../org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java | 3 ++-
.../org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java | 3 ++-
.../org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java | 3 ++-
.../org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java | 3 ++-
6 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
index 29926ba..fa1b998 100644
---
a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
+++
b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
@@ -262,7 +262,7 @@ public class ReportLineageToAtlas extends
AbstractReportingTask {
static final PropertyDescriptor KAFKA_KERBEROS_SERVICE_NAME = new
PropertyDescriptor.Builder()
.name("kafka-kerberos-service-name")
.displayName("Kafka Kerberos Service Name")
- .description("The Kerberos principal name that Kafka runs for
Atlas notification." +
+ .description("The service name that matches the primary name of
the Kafka server configured in the broker JAAS file." +
" This can be defined either in Kafka's JAAS config or in
Kafka's config." +
" Corresponds to Kafka's 'security.protocol' property." +
" It is ignored unless one of the SASL options of the
<Security Protocol> are selected.")
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 5b65b0d..2dfe1f0 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -92,7 +92,8 @@ final class KafkaProcessorUtils {
static final PropertyDescriptor JAAS_SERVICE_NAME = new
PropertyDescriptor.Builder()
.name("sasl.kerberos.service.name")
.displayName("Kerberos Service Name")
- .description("The Kerberos principal name that Kafka runs as. This
can be defined either in Kafka's JAAS config or in Kafka's config. "
+ .description("The service name that matches the primary name of
the Kafka server configured in the broker JAAS file."
+ + "This can be defined either in Kafka's JAAS config or in
Kafka's config. "
+ "Corresponds to Kafka's 'security.protocol' property."
+ "It is ignored unless one of the SASL options of the
<Security Protocol> are selected.")
.required(false)
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index fa7ebcb..b9a6ae1 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -92,7 +92,8 @@ final class KafkaProcessorUtils {
static final PropertyDescriptor JAAS_SERVICE_NAME = new
PropertyDescriptor.Builder()
.name("sasl.kerberos.service.name")
.displayName("Kerberos Service Name")
- .description("The Kerberos principal name that Kafka runs as. This
can be defined either in Kafka's JAAS config or in Kafka's config. "
+ .description("The service name that matches the primary name of
the Kafka server configured in the broker JAAS file."
+ + "This can be defined either in Kafka's JAAS config or in
Kafka's config. "
+ "Corresponds to Kafka's 'security.protocol' property."
+ "It is ignored unless one of the SASL options of the
<Security Protocol> are selected.")
.required(false)
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 77a7f21..5e9260a 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -90,7 +90,8 @@ final class KafkaProcessorUtils {
static final PropertyDescriptor KERBEROS_PRINCIPLE = new
PropertyDescriptor.Builder()
.name("sasl.kerberos.service.name")
.displayName("Kerberos Service Name")
- .description("The Kerberos principal name that Kafka runs as. This
can be defined either in Kafka's JAAS config or in Kafka's config. "
+ .description("The service name that matches the primary name of
the Kafka server configured in the broker JAAS file."
+ + "This can be defined either in Kafka's JAAS config or in
Kafka's config. "
+ "Corresponds to Kafka's 'security.protocol' property."
+ "It is ignored unless one of the SASL options of the
<Security Protocol> are selected.")
.required(false)
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 5b65b0d..2dfe1f0 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -92,7 +92,8 @@ final class KafkaProcessorUtils {
static final PropertyDescriptor JAAS_SERVICE_NAME = new
PropertyDescriptor.Builder()
.name("sasl.kerberos.service.name")
.displayName("Kerberos Service Name")
- .description("The Kerberos principal name that Kafka runs as. This
can be defined either in Kafka's JAAS config or in Kafka's config. "
+ .description("The service name that matches the primary name of
the Kafka server configured in the broker JAAS file."
+ + "This can be defined either in Kafka's JAAS config or in
Kafka's config. "
+ "Corresponds to Kafka's 'security.protocol' property."
+ "It is ignored unless one of the SASL options of the
<Security Protocol> are selected.")
.required(false)
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 5b65b0d..2dfe1f0 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -92,7 +92,8 @@ final class KafkaProcessorUtils {
static final PropertyDescriptor JAAS_SERVICE_NAME = new
PropertyDescriptor.Builder()
.name("sasl.kerberos.service.name")
.displayName("Kerberos Service Name")
- .description("The Kerberos principal name that Kafka runs as. This
can be defined either in Kafka's JAAS config or in Kafka's config. "
+ .description("The service name that matches the primary name of
the Kafka server configured in the broker JAAS file."
+ + "This can be defined either in Kafka's JAAS config or in
Kafka's config. "
+ "Corresponds to Kafka's 'security.protocol' property."
+ "It is ignored unless one of the SASL options of the
<Security Protocol> are selected.")
.required(false)
