Skip to content

Commit

Permalink
PMM-7 update imports
Browse files Browse the repository at this point in the history
  • Loading branch information
BupycHuk committed Sep 16, 2024
1 parent 65a733e commit beef911
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 12 deletions.
4 changes: 2 additions & 2 deletions collector/collectorPerconaExtensions.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package collector
import (
"fmt"

"github.com/go-kit/log"
"gopkg.in/alecthomas/kingpin.v2"
kingpin "github.com/alecthomas/kingpin/v2"
log "github.com/go-kit/log"
)

func RegisterCollectorPublic(collector string, isDefaultEnabled bool, factory func(logger log.Logger) (Collector, error)) {
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ require (
github.com/prometheus/exporter-toolkit v0.11.0
github.com/prometheus/procfs v0.14.0
github.com/safchain/ethtool v0.3.0
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
golang.org/x/sys v0.19.0
howett.net/plist v1.0.1
Expand Down Expand Up @@ -59,4 +60,5 @@ require (
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
4 changes: 2 additions & 2 deletions node_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/prometheus/common/promlog"
"github.com/prometheus/common/promlog/flag"

"github.com/alecthomas/kingpin/v2"
"github.com/go-kit/log"
kingpin "github.com/alecthomas/kingpin/v2"
log "github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/prometheus/client_golang/prometheus"
promcollectors "github.com/prometheus/client_golang/prometheus/collectors"
Expand Down
4 changes: 2 additions & 2 deletions percona/perconacollector/textfile.directory.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"strings"
"time"

"github.com/go-kit/log"
kingpin "github.com/alecthomas/kingpin/v2"
log "github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
cl "github.com/prometheus/node_exporter/collector"
kingpin "gopkg.in/alecthomas/kingpin.v2"
)

var (
Expand Down
13 changes: 13 additions & 0 deletions percona/tests/upstream_update/env_prepare_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
// Copyright 2015 The Prometheus Authors

Check failure on line 1 in percona/tests/upstream_update/env_prepare_test.go

View workflow job for this annotation

GitHub Actions / lint

: # github.com/prometheus/node_exporter/percona/tests/upstream_update [github.com/prometheus/node_exporter/percona/tests/upstream_update.test]
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package perconatests

import (
Expand Down
15 changes: 13 additions & 2 deletions percona/tests/upstream_update/metrics_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
// Copyright 2015 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package perconatests

import (
Expand All @@ -7,8 +20,6 @@ import (
"sort"
"strings"
"testing"

"github.com/pkg/errors"
)

var dumpMetricsFlag = flag.Bool("dumpMetrics", false, "")
Expand Down
16 changes: 13 additions & 3 deletions percona/tests/upstream_update/performance_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
// Copyright 2015 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package perconatests

import (
Expand All @@ -9,10 +22,7 @@ import (
"testing"
"time"

"github.com/montanaflynn/stats"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/tklauser/go-sysconf"
)

const (
Expand Down
14 changes: 13 additions & 1 deletion percona/tests/upstream_update/utils_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
// Copyright 2015 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package perconatests

import (
Expand All @@ -12,7 +25,6 @@ import (
"strings"
"time"

"github.com/pkg/errors"
"golang.org/x/sys/unix"
)

Expand Down

0 comments on commit beef911

Please sign in to comment.