diff --git a/Dockerfile b/Dockerfile index 4d0b5fbd..cec968f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,14 +35,6 @@ COPY --from=rules /content /rules-content # copy tutorial/fake rule to external rules to be hit by all reports COPY rules/tutorial/content/ /rules-content/external/rules -# temporarily disabled haberdasher because it was duplicating logs (TODO try again later) -# RUN curl -L -o /usr/bin/haberdasher \ -# https://github.com/RedHatInsights/haberdasher/releases/download/v0.1.3/haberdasher_linux_amd64 && \ -# chmod 755 /usr/bin/haberdasher - USER 1001 -# ENTRYPOINT ["/usr/bin/haberdasher"] - CMD ["/insights-content-service"] - diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml index 355b55fd..934492c8 100644 --- a/deploy/clowdapp.yaml +++ b/deploy/clowdapp.yaml @@ -79,16 +79,6 @@ objects: name: cloudwatch key: aws_secret_access_key optional: true - - name: HABERDASHER_EMITTER - value: ${HABERDASHER_EMITTER} - - name: HABERDASHER_KAFKA_BOOTSTRAP - value: ${HABERDASHER_KAFKA_BOOTSTRAP} - - name: HABERDASHER_KAFKA_TOPIC - value: ${HABERDASHER_KAFKA_TOPIC} - - name: HABERDASHER_LABELS - value: ${HABERDASHER_LABELS} - - name: HABERDASHER_TAGS - value: ${HABERDASHER_TAGS} image: ${IMAGE}:${IMAGE_TAG} imagePullPolicy: Always livenessProbe: @@ -179,18 +169,3 @@ parameters: - name: REPLICAS description: The number of replicas to use in the deployment value: "1" -- name: HABERDASHER_EMITTER - description: Emitter for haberdasher logs [stderr|kafka] - value: stderr -- name: HABERDASHER_KAFKA_BOOTSTRAP - description: Bootstrap server for haberdasher kafka emitter - value: "mq-kafka:29092" -- name: HABERDASHER_KAFKA_TOPIC - description: Kafka topic for haberdasher kafka emitter - value: "platform.logging.logs" -- name: HABERDASHER_TAGS - description: Haberdasher tags for unstrutured logs - value: '["ccx"]' -- name: HABERDASHER_LABELS - description: Haberdasher labels for unstructured logs - value: '{"app": "ccx-insights-content-service"}'