Skip to content

Commit beef911

Browse files
committed
PMM-7 update imports
1 parent 65a733e commit beef911

File tree

8 files changed

+60
-12
lines changed

8 files changed

+60
-12
lines changed

collector/collectorPerconaExtensions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package collector
1717
import (
1818
"fmt"
1919

20-
"github.com/go-kit/log"
21-
"gopkg.in/alecthomas/kingpin.v2"
20+
kingpin "github.com/alecthomas/kingpin/v2"
21+
log "github.com/go-kit/log"
2222
)
2323

2424
func RegisterCollectorPublic(collector string, isDefaultEnabled bool, factory func(logger log.Logger) (Collector, error)) {

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ require (
2828
github.com/prometheus/exporter-toolkit v0.11.0
2929
github.com/prometheus/procfs v0.14.0
3030
github.com/safchain/ethtool v0.3.0
31+
github.com/stretchr/testify v1.8.4
3132
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
3233
golang.org/x/sys v0.19.0
3334
howett.net/plist v1.0.1
@@ -59,4 +60,5 @@ require (
5960
google.golang.org/appengine v1.6.7 // indirect
6061
google.golang.org/protobuf v1.33.0 // indirect
6162
gopkg.in/yaml.v2 v2.4.0 // indirect
63+
gopkg.in/yaml.v3 v3.0.1 // indirect
6264
)

node_exporter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/prometheus/common/promlog"
2727
"github.com/prometheus/common/promlog/flag"
2828

29-
"github.com/alecthomas/kingpin/v2"
30-
"github.com/go-kit/log"
29+
kingpin "github.com/alecthomas/kingpin/v2"
30+
log "github.com/go-kit/log"
3131
"github.com/go-kit/log/level"
3232
"github.com/prometheus/client_golang/prometheus"
3333
promcollectors "github.com/prometheus/client_golang/prometheus/collectors"

percona/perconacollector/textfile.directory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/go-kit/log"
28+
kingpin "github.com/alecthomas/kingpin/v2"
29+
log "github.com/go-kit/log"
2930
"github.com/go-kit/log/level"
3031
"github.com/prometheus/client_golang/prometheus"
3132
dto "github.com/prometheus/client_model/go"
3233
"github.com/prometheus/common/expfmt"
3334
cl "github.com/prometheus/node_exporter/collector"
34-
kingpin "gopkg.in/alecthomas/kingpin.v2"
3535
)
3636

3737
var (

percona/tests/upstream_update/env_prepare_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// Copyright 2015 The Prometheus Authors
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
114
package perconatests
215

316
import (

percona/tests/upstream_update/metrics_test.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// Copyright 2015 The Prometheus Authors
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
114
package perconatests
215

316
import (
@@ -7,8 +20,6 @@ import (
720
"sort"
821
"strings"
922
"testing"
10-
11-
"github.com/pkg/errors"
1223
)
1324

1425
var dumpMetricsFlag = flag.Bool("dumpMetrics", false, "")

percona/tests/upstream_update/performance_test.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// Copyright 2015 The Prometheus Authors
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
114
package perconatests
215

316
import (
@@ -9,10 +22,7 @@ import (
922
"testing"
1023
"time"
1124

12-
"github.com/montanaflynn/stats"
13-
"github.com/pkg/errors"
1425
"github.com/stretchr/testify/assert"
15-
"github.com/tklauser/go-sysconf"
1626
)
1727

1828
const (

percona/tests/upstream_update/utils_test.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// Copyright 2015 The Prometheus Authors
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
114
package perconatests
215

316
import (
@@ -12,7 +25,6 @@ import (
1225
"strings"
1326
"time"
1427

15-
"github.com/pkg/errors"
1628
"golang.org/x/sys/unix"
1729
)
1830

0 commit comments

Comments
 (0)