diff options
4 files changed, 10 insertions, 3 deletions
diff --git a/reference/logging-kubernetes/logdemonode/charts/logdemonode/templates/service.yaml b/reference/logging-kubernetes/logdemonode/charts/logdemonode/templates/service.yaml index e77f3b3..11637c3 100644 --- a/reference/logging-kubernetes/logdemonode/charts/logdemonode/templates/service.yaml +++ b/reference/logging-kubernetes/logdemonode/charts/logdemonode/templates/service.yaml @@ -41,7 +41,7 @@ spec: - port: {{ .Values.service.externalPort }} #Example internal target port if required #targetPort: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }} name: {{ .Values.service.portName | default "http" }} {{- else -}} - port: {{ .Values.service.externalPort }} diff --git a/reference/logging-kubernetes/logdemonode/charts/logdemonode/values.yaml b/reference/logging-kubernetes/logdemonode/charts/logdemonode/values.yaml index 8772954..6e8c7e0 100644 --- a/reference/logging-kubernetes/logdemonode/charts/logdemonode/values.yaml +++ b/reference/logging-kubernetes/logdemonode/charts/logdemonode/values.yaml @@ -16,7 +16,7 @@ # Global configuration defaults. ################################################################# global: - nodePortPrefix: 302 + #nodePortPrefix: 302 #repository: nexus3.onap.org:10001 repository: oomk8s # readinessRepository: oomk8s @@ -73,7 +73,7 @@ service: type: NodePort externalPort: 8080 internalPort: 8080 - nodePort: 58 + nodePort: 53 # optional port name override - default can be defined in service.yaml #portName: http diff --git a/reference/logging-kubernetes/logdemonode/values.yaml b/reference/logging-kubernetes/logdemonode/values.yaml index ea74553..7ca0600 100644 --- a/reference/logging-kubernetes/logdemonode/values.yaml +++ b/reference/logging-kubernetes/logdemonode/values.yaml @@ -17,6 +17,7 @@ ################################################################# global: nodePortPrefix: 302 + nodePortPrefixExt: 304 #repository: nexus3.onap.org:10001 repository: oomk8s readinessRepository: oomk8s diff --git a/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java b/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java index a359c82..52aeac5 100644 --- a/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java +++ b/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java @@ -57,6 +57,9 @@ public final class ONAPLogConstants { /** Marker reporting invocation. */ public static final Marker INVOKE = MarkerFactory.getMarker("INVOKE"); + + /** Marker reporting invocation. */ + public static final Marker INVOKE_RETURN = MarkerFactory.getMarker("INVOKE_RETURN"); /** Marker reporting synchronous invocation. */ public static final Marker INVOKE_SYNCHRONOUS = build("INVOKE", "SYNCHRONOUS"); @@ -111,6 +114,9 @@ public final class ONAPLogConstants { /** MDC recording target service. */ public static final String TARGET_SERVICE_NAME = "TargetServiceName"; + + /** MDC recording target entity. */ + public static final String TARGET_ENTITY = "TargetEntity"; /** MDC recording current service instance. */ public static final String INSTANCE_UUID = "InstanceUUID"; |