Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: apm elk integration #40

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

feat: apm elk integration #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b84af0c
feat: apm elk integration
infantesimone Mar 17, 2023
0c89912
fix: delete ai config
infantesimone Mar 17, 2023
d186196
feat: add ai agent
infantesimone Mar 21, 2023
bd53431
Merge branch 'main' into elk-poc
infantesimone May 4, 2023
677454d
feat: add log sending elk
infantesimone May 4, 2023
18caf49
feat: update apm agent
infantesimone May 5, 2023
36a5634
feat: add logs streams
infantesimone May 5, 2023
5070767
fix: logs streams
infantesimone May 5, 2023
b788dd4
fix: logs streams
infantesimone May 5, 2023
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
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ USER user:user
WORKDIR /app/

ARG EXTRACTED=/workspace/app/target/extracted

# AI agent
ADD --chown=user https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.1/applicationinsights-agent-3.4.1.jar ./applicationinsights-agent.jar
COPY --chown=user applicationinsights.json ./applicationinsights.json
# ELK apm agent
ADD --chown=user https://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/1.38.0/elastic-apm-agent-1.38.0.jar ./apm-elk-agent.jar

COPY --from=build --chown=user ${EXTRACTED}/dependencies/ ./
RUN true
Expand All @@ -35,4 +37,4 @@ COPY --from=build --chown=user ${EXTRACTED}/application/ ./
RUN true


ENTRYPOINT ["java","-javaagent:applicationinsights-agent.jar","org.springframework.boot.loader.JarLauncher"]
ENTRYPOINT ["java","-javaagent:apm-elk-agent.jar","-javaagent:applicationinsights-agent.jar","org.springframework.boot.loader.JarLauncher"]
6 changes: 6 additions & 0 deletions helm/values-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,13 @@ microservice-chart:
NODO_PER_PM_URI: /nodo/nodo-per-pm/v1/checkPosition
NODO_READ_TIMEOUT: "10000"
NODO_CONNECTION_TIMEOUT: "10000"
ELASTIC_APM_SERVICE_NAME: pagopa-ecommerce-payment-requests-service
ELASTIC_APM_APPLICATION_PACKAGES: it.pagopa.ecommerce.payment.requests
ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
ELASTIC_APM_LOG_SENDING: "true"
#ELASTIC_APM_DATA_STREAMS_ENABLED: "false"
envSecret:
ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
REDIS_PASSWORD: redis-ecommerce-password
APPLICATIONINSIGHTS_CONNECTION_STRING: applicationinsights-connection-string
NODO_CONNECTION_STRING: nodo-connection-string
Expand Down