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.

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

Already on GitHub? Sign in to your account

feat: add cri support to experimental otelcol log collector #2017

Merged
merged 1 commit into from Feb 3, 2022

Conversation

swiatekm-sumo
Copy link
Contributor

@swiatekm-sumo swiatekm-sumo commented Jan 10, 2022

Description

Add CRI log format support to the OTC log collector. This gives us containerd support and enables integration tests for the collector on kind. Based on https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/examples/kubernetes/otel-collector-config.yml courtesy of @sumo-drosiek 馃檱 .


Checklist

Remove items which don't apply to your PR.

  • Changelog updated
Testing performed
  • Confirm events, logs, and metrics are coming in

@swiatekm-sumo swiatekm-sumo force-pushed the feat/otelcol-log-collector-containerd branch from b5ab49b to bd5b5c0 Compare January 10, 2022 16:31
@github-actions github-actions bot added the documentation documentation label Jan 10, 2022
@swiatekm-sumo swiatekm-sumo force-pushed the feat/otelcol-log-collector-containerd branch 4 times, most recently from 3323a12 to b61b08e Compare January 11, 2022 15:56
@swiatekm-sumo swiatekm-sumo changed the title feat: add cri support for OTC log collector feat: add cri support to experimental otelcol log collector Jan 11, 2022
@swiatekm-sumo swiatekm-sumo marked this pull request as ready for review January 11, 2022 16:18
@swiatekm-sumo swiatekm-sumo requested a review from a team as a code owner January 11, 2022 16:18
timestamp:
parse_from: time
layout_type: gotime
layout: '2006-01-02T15:04:05.000000000-07:00'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this particular date?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@sumo-drosiek sumo-drosiek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine

@swiatekm-sumo swiatekm-sumo force-pushed the feat/otelcol-log-collector-containerd branch from b61b08e to 8175c6a Compare February 3, 2022 10:59
@swiatekm-sumo swiatekm-sumo merged commit f7b55c5 into main Feb 3, 2022
@swiatekm-sumo swiatekm-sumo deleted the feat/otelcol-log-collector-containerd branch February 3, 2022 11:09
@perk-sumo perk-sumo added this to the v2.5 milestone Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants