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

[metricbeat] [gcp] add redis metadata #33701

Merged
merged 23 commits into from May 4, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4e490c3
add redis metadata
gpop63 Nov 16, 2022
e1860bf
add redis libraries
gpop63 Nov 16, 2022
666f465
update NOTICE.txt
gpop63 Nov 16, 2022
0d91498
add changelog entry
gpop63 Nov 16, 2022
3fce9a9
Merge remote-tracking branch 'upstream/main' into add_gcp-redis_metadata
gpop63 Nov 23, 2022
fa48206
fix linter errors
gpop63 Nov 23, 2022
fbd4836
fix redis sdk import alias
gpop63 Dec 1, 2022
ea6c37b
Merge remote-tracking branch 'upstream/main' into add_gcp-redis_metadata
gpop63 Dec 1, 2022
7dc6591
update deps
gpop63 Dec 1, 2022
14bd21c
update NOTICE.txt
gpop63 Dec 1, 2022
547acc5
Merge remote-tracking branch 'upstream/main' into add_gcp-redis_metadata
gpop63 Dec 1, 2022
8caa28b
Merge branch 'main' into add_gcp-redis_metadata
gpop63 Dec 7, 2022
b289a5f
add ListInstances official documentation comment
gpop63 Dec 14, 2022
1509abc
Merge remote-tracking branch 'upstream/main' into add_gcp-redis_metadata
gpop63 Dec 14, 2022
811b52d
Merge branch 'main' into add_gcp-redis_metadata
rdner Jan 4, 2023
f75406d
use break instead of continue
gpop63 Jan 10, 2023
35e7007
Merge branch 'main' into add_gcp-redis_metadata
gpop63 Jan 18, 2023
6ca9a9c
Merge branch 'main' into add_gcp-redis_metadata
gpop63 Jan 23, 2023
01b76fc
Merge branch 'main' into add_gcp-redis_metadata
gpop63 Feb 28, 2023
7454cdb
Merge remote-tracking branch 'upstream/main' into add_gcp-redis_metadata
gpop63 Apr 20, 2023
6cced26
fix deps
gpop63 Apr 20, 2023
6326127
fix NOTICE.txt
gpop63 Apr 20, 2023
93c018a
Merge remote-tracking branch 'upstream/main' into add_gcp-redis_metadata
gpop63 May 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Expand Up @@ -186,6 +186,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
- Update README file on how to run Metricbeat on Kubernetes. {pull}33308[33308]
- Add per-thread metrics to system_summary {pull}33614[33614]
- Add GCP CloudSQL metadata {pull}33066[33066]
- Add GCP Redis metadata {pull}33701[33701]

*Packetbeat*

Expand Down
1,442 changes: 1,145 additions & 297 deletions NOTICE.txt

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions go.mod
Expand Up @@ -3,8 +3,8 @@ module github.com/elastic/beats/v7
go 1.18

require (
cloud.google.com/go/bigquery v1.8.0
cloud.google.com/go/monitoring v1.1.0
cloud.google.com/go/bigquery v1.42.0
cloud.google.com/go/monitoring v1.7.0
cloud.google.com/go/pubsub v1.25.1
code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee // indirect
code.cloudfoundry.org/go-loggregator v7.4.0+incompatible
Expand Down Expand Up @@ -100,7 +100,7 @@ require (
github.com/golang/snappy v0.0.4
github.com/gomodule/redigo v1.8.3
github.com/google/flatbuffers v1.12.1
github.com/google/go-cmp v0.5.8
github.com/google/go-cmp v0.5.9
github.com/google/gopacket v1.1.19
github.com/google/uuid v1.3.0
github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75
Expand Down Expand Up @@ -157,16 +157,16 @@ require (
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
golang.org/x/sync v0.1.0
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
golang.org/x/text v0.3.7
golang.org/x/text v0.4.0
golang.org/x/time v0.0.0-20220609170525-579cf78fd858
golang.org/x/tools v0.1.12
google.golang.org/api v0.94.0
google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf
google.golang.org/grpc v1.49.0
google.golang.org/api v0.102.0
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
google.golang.org/grpc v1.50.1
google.golang.org/protobuf v1.28.1
gopkg.in/inf.v0 v0.9.1
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
Expand All @@ -184,6 +184,7 @@ require (
)

require (
cloud.google.com/go/redis v1.10.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
github.com/Azure/go-autorest/autorest/adal v0.9.14
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.17
Expand All @@ -200,7 +201,7 @@ require (
github.com/elastic/mito v0.0.0-20221025013803-2ab0322317ce
github.com/elastic/toutoumomoma v0.0.0-20221026030040-594ef30cb640
github.com/google/cel-go v0.12.5
github.com/googleapis/gax-go/v2 v2.5.1
github.com/googleapis/gax-go/v2 v2.6.0
github.com/pierrec/lz4/v4 v4.1.15
github.com/shirou/gopsutil/v3 v3.21.12
go.elastic.co/apm/module/apmelasticsearch/v2 v2.0.0
Expand All @@ -211,9 +212,11 @@ require (
)

require (
cloud.google.com/go v0.104.0 // indirect
cloud.google.com/go/compute v1.9.0 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
cloud.google.com/go v0.105.0 // indirect
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
cloud.google.com/go/iam v0.6.0 // indirect
cloud.google.com/go/longrunning v0.1.1 // indirect
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
github.com/Azure/azure-amqp-common-go/v3 v3.2.1 // indirect
github.com/Azure/azure-pipeline-go v0.2.1 // indirect
Expand Down Expand Up @@ -268,7 +271,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/cronexpr v1.1.0 // indirect
Expand Down Expand Up @@ -329,7 +332,7 @@ require (
go.opencensus.io v0.23.0 // indirect
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
Expand All @@ -343,7 +346,7 @@ require (
)

require (
cloud.google.com/go/storage v1.26.0
cloud.google.com/go/storage v1.27.0
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
Expand Down