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

chore(core): upgrade to v0.49.0 #550

Merged
merged 3 commits into from
Apr 22, 2022
Merged

chore(core): upgrade to v0.49.0 #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2bd770
chore(core): upgrade to v0.49.0
Apr 15, 2022
27a8d96
docs(changelog): update
Apr 15, 2022
646b88f
chore(makefile): fix sed for linux
Apr 15, 2022
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- docs: clarify status of sumologicextension [#553][#553]
- chore(deps): bump golang from 1.18 to 1.18.1 [#546][#546]
- chore: bump OT core to v0.49.0 [#550][#550]

[Unreleased]: https://github.com/SumoLogic/sumologic-otel-collector/compare/v0.48.0-sumo-0...main
[#553]: https://github.com/SumoLogic/sumologic-otel-collector/pull/553
[#546]: https://github.com/SumoLogic/sumologic-otel-collector/pull/546
[#550]: https://github.com/SumoLogic/sumologic-otel-collector/pull/550
[#553]: https://github.com/SumoLogic/sumologic-otel-collector/pull/553

## [v0.48.0-sumo-0]
Copy link
Contributor

Choose a reason for hiding this comment

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

:)


Expand Down
27 changes: 15 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ else
SED ?= sed
endif

.PHONY: install-gsed
install-gsed:
ifeq ($(shell go env GOOS),darwin)
@which gsed || brew install gsed
endif

.PHONY: mdl
mdl:
mdl --style .markdownlint/style.rb $(MD_FILES)
Expand Down Expand Up @@ -79,16 +85,16 @@ check-uniform-dependencies:
OT_CORE_VERSION := $(shell grep "otelcol_version: .*" otelcolbuilder/.otelcol-builder.yaml | cut -f 4 -d " ")
# usage: make update-ot-core OT_CORE_NEW_VERSION=x.x.x
.PHONY: update-ot-core
update-ot-core:
update-ot-core: install-gsed
@test $(OT_CORE_NEW_VERSION) || (echo "usage: make update-otc-core OT_CORE_NEW_VERSION=x.x.x"; exit 1);
@echo "updating OT core from $(OT_CORE_VERSION) to $(OT_CORE_NEW_VERSION)"
@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/.otelcol-builder.yaml
@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/Makefile
@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" README.md
@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/Configuration.md
@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/KnownIssues.md
@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" pkg/receiver/telegrafreceiver/README.md
@find . -type f -name "go.mod" -exec sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" {} \;
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/.otelcol-builder.yaml
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/Makefile
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" README.md
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/Configuration.md
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/KnownIssues.md
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" pkg/receiver/telegrafreceiver/README.md
@find . -type f -name "go.mod" -exec $(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" {} \;
@echo "building OT distro to check for breakage"
make gomod-download-all
pushd otelcolbuilder \
Expand Down Expand Up @@ -149,10 +155,7 @@ delete-tag:
done

.PHONY: prepare-tag
prepare-tag:
ifeq ($(shell go env GOOS),darwin)
@which gsed || brew install gsed
endif
prepare-tag: install-gsed
@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
$(SED) -i 's#\(gomod: "github.com/SumoLogic/sumologic-otel-collector/.*\) v0.0.0-00010101000000-000000000000#\1 ${TAG}#g' \
otelcolbuilder/.otelcol-builder.yaml
Expand Down
124 changes: 62 additions & 62 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ to persist the position in the files it reads between restarts.

See section below on [Collecting logs from files](#collecting-logs-from-files) for details on configuring the Filelog receiver.

[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.48.0/extension/storage/filestorage
[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.49.0/extension/storage/filestorage

### Basic configuration for metrics

Expand Down Expand Up @@ -186,7 +186,7 @@ service:
exporters: [sumologic]
```

[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.48.0/receiver/otlpreceiver
[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.49.0/receiver/otlpreceiver

### Putting it all together

Expand Down Expand Up @@ -471,7 +471,7 @@ Flags: 0
Example configuration with example log can be found in [/examples/logs_json/](/examples/logs_json/) directory.

[json_parser]: https://github.com/open-telemetry/opentelemetry-log-collection/blob/main/docs/operators/json_parser.md
[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.48.0/receiver/filelogreceiver
[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.49.0/receiver/filelogreceiver
[opentelemetry-log-collection]: https://github.com/open-telemetry/opentelemetry-log-collection

## Setting source category
Expand Down Expand Up @@ -586,7 +586,7 @@ The first example creates a `_sourceCategory` label with a hardcoded value of `d
The second example creates a `_sourceCategory` label by copying to it the value of Prometheus' `job` label,
which contains the name of the job - in this case, `otelcol-metrics`.

[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/receiver/prometheusreceiver/README.md
[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/receiver/prometheusreceiver/README.md
[prometheus_website]: https://prometheus.io/
[prometheus_relabel_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config

Expand Down Expand Up @@ -642,7 +642,7 @@ service:
- statsd/another-app
```

[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/processor/resourceprocessor/README.md
[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/processor/resourceprocessor/README.md

## Setting source host

Expand Down Expand Up @@ -714,8 +714,8 @@ Only the first Resource processor's action is required to correctly set the `_so
The other two actions perform an optional metadata cleanup - they delete the unneeded attributes.

[sumologic_source_host_docs]: https://help.sumologic.com/03Send-Data/Sources/04Reference-Information-for-Sources/Metadata-Naming-Conventions#source-host
[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/processor/resourcedetectionprocessor/README.md
[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/processor/resourcedetectionprocessor/README.md#system-metadata
[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/processor/resourcedetectionprocessor/README.md
[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/processor/resourcedetectionprocessor/README.md#system-metadata

## Command-line configuration options

Expand Down Expand Up @@ -786,5 +786,5 @@ service:
# ...
```

[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.48.0/processor/metricstransformprocessor
[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.49.0/processor/metricstransformprocessor
[prometheus_data_model]: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
2 changes: 1 addition & 1 deletion docs/KnownIssues.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ or only read files created or modified after a specific point in time.

There is currently no workaround for this.

[filelogreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/receiver/filelogreceiver/README.md
[filelogreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/receiver/filelogreceiver/README.md

## Multiple multiline logs are sometimes concatenated

Expand Down
28 changes: 12 additions & 16 deletions docs/Migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,21 +611,19 @@ receivers:
- type: regex_parser
regex: (?P<timestamp>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} (\+|\-)\d{4})
## Keep original record in log field
preserve_to: $$body.log
preserve_to: body.log
## Parse timestamp from timestamp field
## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/time_parser.md
timestamp:
parse_from: $$body.timestamp
parse_from: body.timestamp
## Layout are substitute for Timestamp Format configuration
layout_type: gotime
layout: '2006-01-02 15:04:05,000 -0700'
## Restore record from log field
## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/restructure.md#move
- type: restructure
ops:
- move:
from: $$body.log
to: $$body
## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/move.md
- type: move
from: body.log
to: body
# ...
processors:
resource/my example name fields:
Expand Down Expand Up @@ -1015,21 +1013,19 @@ receivers:
- type: regex_parser
regex: (?P<timestamp>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} (\+|\-)\d{4})
## Keep original record in log field
preserve_to: $$body.log
preserve_to: body.log
## Parse timestamp from timestamp field
## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/time_parser.md
timestamp:
parse_from: $$body.timestamp
parse_from: body.timestamp
## Layout are substitute for Timestamp Format configuration
layout_type: gotime
layout: '2006-01-02 15:04:05,000 -0700'
## Restore record from log field
## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/restructure.md#move
- type: restructure
ops:
- move:
from: $$body.log
to: $$body
## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/move.md
- type: move
from: body.log
to: body
processors:
## All my example logs
sumologic_syslog/my example name:
Expand Down
Loading