Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Clean up unused haberdasher vars and references #403

Merged
merged 1 commit into from
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

25 changes: 0 additions & 25 deletions deploy/clowdapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"}'