CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: migrate to cloud.google.com/go/monitoring/apiv3/v2 (#9880)

This commit is contained in:
Sebastian Spaink 2021-10-07 14:47:59 -05:00 committed by GitHub
parent 282ec85cd7
commit 15753a6f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/inputs/stackdriver/stackdriver.go
View File

@ -9,7 +9,7 @@ import (
"sync" "sync"
"time" "time"
monitoring "cloud.google.com/go/monitoring/apiv3" monitoring "cloud.google.com/go/monitoring/apiv3/v2"
googlepbduration "github.com/golang/protobuf/ptypes/duration" googlepbduration "github.com/golang/protobuf/ptypes/duration"
googlepbts "github.com/golang/protobuf/ptypes/timestamp" googlepbts "github.com/golang/protobuf/ptypes/timestamp"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
@ -397,7 +397,7 @@ func (s *Stackdriver) newTimeSeriesConf(
StartTime: &googlepbts.Timestamp{Seconds: startTime.Unix()}, StartTime: &googlepbts.Timestamp{Seconds: startTime.Unix()},
} }
tsReq := &monitoringpb.ListTimeSeriesRequest{ tsReq := &monitoringpb.ListTimeSeriesRequest{
Name: monitoring.MetricProjectPath(s.Project), Name: fmt.Sprintf("projects/%s", s.Project),
Filter: filter, Filter: filter,
Interval: interval, Interval: interval,
} }
@ -533,7 +533,7 @@ func (s *Stackdriver) generatetimeSeriesConfs(
ret := []*timeSeriesConf{} ret := []*timeSeriesConf{}
req := &monitoringpb.ListMetricDescriptorsRequest{ req := &monitoringpb.ListMetricDescriptorsRequest{
Name: monitoring.MetricProjectPath(s.Project), Name: fmt.Sprintf("projects/%s", s.Project),
} }
filters := s.newListMetricDescriptorsFilters() filters := s.newListMetricDescriptorsFilters()

4
plugins/outputs/stackdriver/stackdriver.go
View File

@ -9,7 +9,7 @@ import (
"sort" "sort"
"strings" "strings"
monitoring "cloud.google.com/go/monitoring/apiv3" // Imports the Stackdriver Monitoring client package. monitoring "cloud.google.com/go/monitoring/apiv3/v2" // Imports the Stackdriver Monitoring client package.
googlepb "github.com/golang/protobuf/ptypes/timestamp" googlepb "github.com/golang/protobuf/ptypes/timestamp"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal"
@ -218,7 +218,7 @@ func (s *Stackdriver) Write(metrics []telegraf.Metric) error {
// Prepare time series request. // Prepare time series request.
timeSeriesRequest := &monitoringpb.CreateTimeSeriesRequest{ timeSeriesRequest := &monitoringpb.CreateTimeSeriesRequest{
Name: monitoring.MetricProjectPath(s.Project), Name: fmt.Sprintf("projects/%s", s.Project),
TimeSeries: timeSeries, TimeSeries: timeSeries,
} }

2
plugins/outputs/stackdriver/stackdriver_test.go
View File

@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "time"
monitoring "cloud.google.com/go/monitoring/apiv3" monitoring "cloud.google.com/go/monitoring/apiv3/v2"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
emptypb "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty"
googlepb "github.com/golang/protobuf/ptypes/timestamp" googlepb "github.com/golang/protobuf/ptypes/timestamp"