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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sumologicexporter]: add flatten_body to json logs #295

Merged
merged 6 commits into from
Oct 11, 2021

Conversation

sumo-drosiek
Copy link
Contributor

@sumo-drosiek sumo-drosiek commented Oct 8, 2021

Add merge_bodyoption which is going to flatten body if set to true. Example:

body:

{
  "a": "b",
  "c": "d"
}

attributes:

{
  "timestamp": 40
}

json_merge: false

{
  "log": {
    "a": "b",
    "c": "d"
  },
  "timestamp": 40
}

json_merge: true

{
  "a": "b",
  "c": "d",
  "timestamp": 40
}

Dominik Rosiek added 2 commits October 8, 2021 10:49
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek sumo-drosiek requested a review from a team as a code owner October 8, 2021 08:57
@github-actions github-actions bot added documentation Improvements or additions to documentation go labels Oct 8, 2021
@sumo-drosiek
Copy link
Contributor Author

@sumo-drosiek sumo-drosiek force-pushed the drosiek-logs-merge branch 2 times, most recently from 96f666b to abc3fe8 Compare October 8, 2021 10:21
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
pkg/exporter/sumologicexporter/README.md Outdated Show resolved Hide resolved
pkg/exporter/sumologicexporter/config.go Outdated Show resolved Hide resolved
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

export BUILDER_VERSION=0.35.0
export BUILDER_VERSION="$(grep '^BUILDER_VERSION' /sumologic/otelcolbuilder/Makefile | sed 's/BUILDER_VERSION ?= //')"
Copy link
Contributor

@pmalek-sumo pmalek-sumo Oct 8, 2021

Choose a reason for hiding this comment

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

<hack></hack>

sumo-drosiek and others added 3 commits October 8, 2021 13:03
Co-authored-by: Patryk Małek <pmalek@sumologic.com>
Co-authored-by: Patryk Małek <pmalek@sumologic.com>
@sumo-drosiek sumo-drosiek changed the title [sumologicexporter]: add merge_json to logs [sumologicexporter]: add flatten_body to json logs Oct 8, 2021
@sumo-drosiek sumo-drosiek merged commit 02fed02 into main Oct 11, 2021
@sumo-drosiek sumo-drosiek deleted the drosiek-logs-merge branch October 11, 2021 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation go
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants