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

[receiver/promtailreceiver] Add promtail receiver #14632

Merged
merged 27 commits into from
Nov 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e83463a
[receivers/promtail] Add promtail input operator to stanza
mar4uk Oct 3, 2022
56afd58
[receivers/promtail] Add new promtailreceiver component
mar4uk Oct 3, 2022
dadd9b0
[receivers/promtail] Add promtailreceiver component to components
mar4uk Oct 3, 2022
4b974c2
[receivers/promtail] update loki, address review comments
mar4uk Oct 4, 2022
87da808
[receivers/promtail] add more tests
mar4uk Oct 7, 2022
129b2f4
[receivers/promtail] add code comments
mar4uk Oct 10, 2022
179dc78
[receivers/promtail] add README.md
mar4uk Oct 10, 2022
1c3d1a5
[receivers/promtail] added changes to CHANGELOG.md, added license to …
mar4uk Oct 11, 2022
39b1cb9
[receivers/promtail] fix CHANGELOG.md
mar4uk Oct 11, 2022
9672136
[receivers/promtail] fix PR checks
mar4uk Oct 12, 2022
38f5738
[receivers/promtail] add comments
mar4uk Oct 18, 2022
9867096
[receivers/promtail] update CODEOWNERS
mar4uk Oct 20, 2022
60fd2a6
[receivers/promtail] receiver/promtailreceiver go.mod
mar4uk Oct 21, 2022
49a3e3b
[receivers/promtail] remove installing libsystemd-dev from build-and-…
mar4uk Nov 4, 2022
7c126f9
[receivers/promtail] added promtail receiver to component dropdown
mar4uk Nov 4, 2022
1244e74
Promtail: update go.mod, README
mar4uk Nov 9, 2022
56a1ab5
Promtail: fix failed build
mar4uk Nov 9, 2022
cef79ea
Promtail: update go.mod
mar4uk Nov 14, 2022
9562dec
Promtail: revert pkg/winperfcounters/internal/third_party/telegraf/wi…
mar4uk Nov 14, 2022
81d604c
Promtail: revert receive_v1.pb.go, revert stanza go.mod changes
mar4uk Nov 15, 2022
9402222
update promtailreceiver go.mod
mar4uk Nov 15, 2022
6560777
remove replace prometheus directive from go.mod
mar4uk Nov 22, 2022
5efb2f2
fix README, promtail go.mod cleaning
mar4uk Nov 23, 2022
833e463
make some methods and struct private
mar4uk Nov 28, 2022
50b085a
update promtailreceiver go.mod
mar4uk Nov 29, 2022
3e3bebb
update promtail receiver factory to not use deprecated type
mar4uk Nov 29, 2022
54e7181
update go.sum and cmd/configschema/go.sum
mar4uk Nov 29, 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
16 changes: 16 additions & 0 deletions .chloggen/add-promtail-receiver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: new_component

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: receiver/promtailreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add a new receiver that scrapes logs using Promtail client

# One or more tracking issues related to the change
issues: [14632]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ receiver/otlpjsonfilereceiver/ @open-telemetry/collector-c
receiver/postgresqlreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
receiver/prometheusexecreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax
receiver/prometheusreceiver/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
receiver/promtailreceiver/ @open-telemetry/collector-contrib-approvers @mar4uk @kovrus @jpkrohling @gouthamve
receiver/rabbitmqreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @cpheps
receiver/pulsarreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @tjiuming
receiver/purefareceiver/ @open-telemetry/collector-contrib-approvers @jpkrohling @dgoscn @chrroberts-pure
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ body:
- receiver/postgresql
- receiver/prometheus
- receiver/prometheusexec
- receiver/promtail
- receiver/pulsar
- receiver/purefa
- receiver/rabbitmq
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ body:
- receiver/postgresql
- receiver/prometheus
- receiver/prometheusexec
- receiver/promtail
- receiver/pulsar
- receiver/purefa
- receiver/rabbitmq
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ body:
- receiver/postgresql
- receiver/prometheus
- receiver/prometheusexec
- receiver/promtail
- receiver/pulsar
- receiver/purefa
- receiver/rabbitmq
Expand Down
92 changes: 69 additions & 23 deletions cmd/configschema/go.mod

Large diffs are not rendered by default.

417 changes: 376 additions & 41 deletions cmd/configschema/go.sum

Large diffs are not rendered by default.

35 changes: 18 additions & 17 deletions exporter/lokiexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
require (
github.com/gogo/protobuf v1.3.2
github.com/golang/snappy v0.0.4
github.com/grafana/loki v1.6.2-0.20220718071907-6bd05c9a4399
github.com/grafana/loki v1.6.2-0.20221121081917-d3111bcaa774
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0
Expand All @@ -21,16 +21,14 @@ require (
)

require (
github.com/armon/go-metrics v0.3.10 // indirect
github.com/armon/go-metrics v0.4.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/etcd v3.3.25+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
Expand All @@ -39,15 +37,15 @@ require (
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/googleapis v1.4.0 // indirect
github.com/gogo/status v1.1.0 // indirect
github.com/gogo/status v1.1.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grafana/dskit v0.0.0-20220708141012-99f3d0043c23 // indirect
github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb // indirect
github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 // indirect
github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/hashicorp/consul/api v1.15.3 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.3.1 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
Expand Down Expand Up @@ -77,22 +75,21 @@ require (
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/exporter-toolkit v0.7.1 // indirect
github.com/prometheus/exporter-toolkit v0.7.2-0.20220901134540-2434b08435da // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405 // indirect
github.com/prometheus/prometheus v0.39.1 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/weaveworks/common v0.0.0-20220913160921-e98fcdf5519a // indirect
github.com/weaveworks/common v0.0.0-20220916164235-da3fde973eec // indirect
github.com/weaveworks/promrus v1.2.0 // indirect
go.etcd.io/etcd v3.3.25+incompatible // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
Expand All @@ -103,16 +100,17 @@ require (
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.2.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 // indirect
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 // indirect
golang.org/x/tools v0.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -126,3 +124,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/corei
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki => ../../pkg/translator/loki

retract v0.65.0

// fork containing a line-buffered logger which should improve logging performance for loki
replace github.com/go-kit/log => github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b
Loading